ModelForms implemented; closed #15. Still have bugs in processing the POST in recadm, however.

Author: dgets

.gitignore

@@ -105,3 +105,7 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# my additions (IDE, detc)
+.idea/
+

recadm/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Usage
+from .forms import Usage
 
 # Register your models here.
 

recadm/forms.py

@@ -1,16 +1,21 @@
 from django import forms
+from django.db import models
 from django.utils import timezone
-#from django.forms import ModelForms
+from django.forms import ModelForm
 
 from subadd.models import Substance
 
-class UsageForm(forms.Form):
-    #sub = forms.ForeignKey('subadd.Substance', on_delete=models.CASCADE)
-    #switching this out for the new ModelForms 'Substance'
-    sub = forms.ModelChoiceField(queryset=Substance.objects.all())
-    dosage = forms.IntegerField()
-    #not completely sure, but I don't think this is needed for the form, it
-    #should just be the model, I think
-    #timestamp = forms.DataTimeField('time administered', default=timezone.now)
-    notes = forms.CharField(max_length=160)
+
+class Usage(models.Model):
+    sub = models.ForeignKey('subadd.Substance', on_delete=models.CASCADE)
+    dosage = models.IntegerField()
+    timestamp = models.DateTimeField('time administered', default=timezone.now)
+    notes = models.CharField(max_length=160)
+
+
+class UsageForm(ModelForm):
+    class Meta:
+        model = Usage
+        fields = ['sub', 'dosage', 'notes']
+
 

recadm/models.py

@@ -3,10 +3,11 @@
 
 # Create your models here.
 
-class Usage(models.Model):
-    sub = models.ForeignKey('subadd.Substance', on_delete=models.CASCADE)
-    dosage = models.IntegerField()
-    timestamp = models.DateTimeField('time administered', default=timezone.now)
-    notes = models.CharField(max_length=160)
+
+# class Usage(models.Model):
+#     sub = models.ForeignKey('subadd.Substance', on_delete=models.CASCADE)
+#     dosage = models.IntegerField()
+#     timestamp = models.DateTimeField('time administered', default=timezone.now)
+#     notes = models.CharField(max_length=160)
 
 

recadm/views.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from django.http import HttpResponse
 
-from .models import Usage
+#from .models import Usage
 from .forms import UsageForm
 
 from subadd.models import Substance

subadd/forms.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.forms import ModelForms
+from django.forms import ModelForm
 
 DOSAGE_CHOICES = (
     ('MCG', 'mcg'),
@@ -15,6 +15,7 @@
     ('DAYS', 'days'),
 )
 
+
 class Substance(models.Model):
     common_name = models.CharField(max_length=40)
     sci_name = models.CharField(max_length=60)

subadd/models.py

@@ -3,6 +3,7 @@
 
 # Create your models here.
 
+
 class Substance(models.Model):
     common_name = models.CharField(max_length=40)
     sci_name = models.CharField(max_length=60)