fixed participant edit form

UiL-OTS-labs · Dec 18, 2023 · eb42159 · eb42159
1 parent 6530ec4
commit eb42159
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 31 deletions.
diff --git a/lab/participants/forms.py b/lab/participants/forms.py
@@ -1,4 +1,8 @@
-from cdh.core.forms import BootstrapCheckboxInput, TemplatedModelForm
+from cdh.core.forms import (
+    BootstrapCheckboxInput,
+    BootstrapRadioSelect,
+    TemplatedModelForm,
+)
 from django import forms
 
 from .models import ExtraData, ParticipantData
@@ -25,7 +29,7 @@ class Meta:
             "name": forms.TextInput,
             "phonenumber": forms.TextInput,
             "phonenumber_alt": forms.TextInput,
-            "sex": ParticipantSexWidget,
+            "sex": BootstrapRadioSelect,
             "email_subscription": BootstrapCheckboxInput,
             "english_contact": BootstrapCheckboxInput,
         }

diff --git a/lab/participants/models/participantdata.py b/lab/participants/models/participantdata.py
@@ -4,15 +4,15 @@
 
 from utils.models import EncryptedManager
 
-from .enums import BirthWeight, PregnancyDuration, WhichParent
+from .enums import BirthWeight, PregnancyDuration, Sex, WhichParent
 from .language import Language
 
 
 class ParticipantData(models.Model):
     objects = EncryptedManager()
 
     name = e_fields.EncryptedTextField(_("participant:attribute:name"), blank=True, null=True)
-    sex = e_fields.EncryptedTextField(_("participant:attribute:sex"), blank=True, null=True)
+    sex = e_fields.EncryptedTextField(_("participant:attribute:sex"), null=True, choices=Sex.choices)
     birth_date = e_fields.EncryptedDateField(_("participant:attribute:birth_date"), blank=True, null=True)
 
     birth_weight = e_fields.EncryptedCharField(

diff --git a/lab/participants/views.py b/lab/participants/views.py
@@ -15,7 +15,7 @@
 
 from . import graphs
 from .forms import ExtraDataForm, ParticipantForm
-from .models import ExtraData, Participant
+from .models import ExtraData, Participant, ParticipantData
 
 
 class ParticipantsHomeView(RandomLeaderMixin, generic.ListView):
@@ -43,7 +43,7 @@ def get_context_data(self, *args, **kwargs):
 
 
 class ParticipantUpdateView(RandomLeaderMixin, SuccessMessageMixin, generic.UpdateView):
-    model = Participant
+    model = ParticipantData
     template_name = "participants/edit.html"
     success_message = _("participants:messages:updated_participant")
     form_class = ParticipantForm

diff --git a/lab/participants/widgets.py b/lab/participants/widgets.py