more improvements

longs/forms.py

@@ -9,14 +9,12 @@ from django.forms import (
 from django.forms import inlineformset_factory
 
 from longs.models import (
-    Abnormality,
     Examination,
     Note,
     Long,
+    LongSeries,
+    LongSeriesImage,
     LongCreationDefault,
-    LongImage,
-    Region,
-    Answer,
     CidUserAnswer,
     Exam,
 )
@@ -28,7 +26,7 @@ from django.forms.widgets import RadioSelect, TextInput, Textarea
 class LongAnswerForm(ModelForm):
     class Meta:
         model = CidUserAnswer
-        fields = ("answer",)
+        fields = ("answer_observations","answer_interpretation","answer_principle_diagnosis","answer_differential_diagnosis","answer_further_management",)
 
 
 class MarkLongQuestionForm(Form):
@@ -50,17 +48,6 @@ class NoteForm(ModelForm):
         fields = ["note"]
 
 
-class RegionForm(ModelForm):
-    class Meta:
-        model = Region
-        fields = ["name"]
-
-
-class AbnormalityForm(ModelForm):
-    class Meta:
-        model = Abnormality
-        fields = ["name"]
-
 
 class LongCreationDefaultForm(ModelForm):
     class Meta:
@@ -85,37 +72,17 @@ class LongForm(ModelForm):
         super(LongForm, self).__init__(*args, **kwargs)
         # self.fields['question'].widget.attrs = {'class': 'question-form', 'rows': 10, 'cols': 100}
         # self.fields['feedback'].widget.attrs = {'class': 'feedback-form', 'rows': 10, 'cols': 100}
-        self.fields["abnormality"] = ModelMultipleChoiceField(
-            required=False,
-            queryset=Abnormality.objects.all(),
-            widget=FilteredSelectMultiple(verbose_name="Abnormality", is_stacked=False),
-        )
-
-        self.fields["region"] = ModelMultipleChoiceField(
-            required=False,
-            queryset=Region.objects.all(),
-            widget=FilteredSelectMultiple(verbose_name="Region", is_stacked=False),
-        )
-
-        self.fields["examination"] = ModelMultipleChoiceField(
-            queryset=Examination.objects.all(),
-            widget=FilteredSelectMultiple(verbose_name="Examination", is_stacked=False),
-        )
-
-        self.fields["laterality"] = ChoiceField(
-            choices=Long.LATERALITY_CHOICES, required=True, widget=RadioSelect()
-        )
+        #self.fields["examination"] = ModelMultipleChoiceField(
+        #    queryset=Examination.objects.all(),
+        #    widget=FilteredSelectMultiple(verbose_name="Examination", is_stacked=False),
+        #)
 
     class Meta:
         model = Long
         # fields = ['due_back']
         # fields = '__all__'
         fields = [
-            "normal",
-            "abnormality",
-            "region",
-            "laterality",
-            "examination",
+            #"examination",
             "site",
             "feedback",
         ]
@@ -127,43 +94,12 @@ class LongForm(ModelForm):
         }
 
 
-ImageFormSet = inlineformset_factory(
+SeriesFormSet = inlineformset_factory(
     Long,
-    LongImage,
-    fields=["image", "feedback_image"],
+    LongSeries,
     exclude=[],
     can_delete=True,
     extra=4,
     max_num=10,
     field_classes="testing",
 )
-
-AnswerFormSet = inlineformset_factory(
-    Long,
-    Answer,
-    fields=["answer", "status"],
-    widgets={
-        "answer": Textarea(
-            attrs={"required": "true", "minlength": 2, "maxlength": 500, "rows": 3}
-        )
-    },
-    exclude=[],
-    can_delete=True,
-    extra=1,
-    max_num=10,
-)
-
-AnswerUpdateFormSet = inlineformset_factory(
-    Long,
-    Answer,
-    fields=["answer", "status"],
-    widgets={
-        "answer": Textarea(
-            attrs={"required": "true", "minlength": 2, "maxlength": 500, "rows": 3}
-        )
-    },
-    exclude=[],
-    can_delete=True,
-    extra=0,
-    max_num=10,
-)