meta-edc 1.1.7__py3-none-any.whl → 1.1.8__py3-none-any.whl

{meta_edc-1.1.7.dist-info → meta_edc-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.1.7
+Version: 1.1.8
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -694,7 +694,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: edc==1.1.6
+Requires-Dist: edc==1.1.7
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]
 Requires-Dist: django-pylabels

{meta_edc-1.1.7.dist-info → meta_edc-1.1.8.dist-info}/RECORD

@@ -290,8 +290,8 @@ meta_edc/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 meta_edc/tests/tests/test_endpoints.py,sha256=5FdIHTd1xhUIgQLBzMV-Ml3VoFrlBrLLUbNarme5raw,23541
 meta_edc/views/__init__.py,sha256=TBXTih4Mpsg5Oh2jbyXqL9kH7bu3vWNRgVe93hvLCl8,32
 meta_edc/views/home_view.py,sha256=BXydy77TcdcM0-R3S_uHI4DtfnLMIzPJMyqjFJZFSsA,916
-meta_edc-1.1.7.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
-meta_edc-1.1.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.1.8.dist-info/licenses/AUTHORS.rst,sha256=wL4KUOd7FAFThhkLAJxSLQ2BPzd3ikG9q0UVZr3BbLg,244
+meta_edc-1.1.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 meta_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_export/admin_site.py,sha256=CiKAf0gDFvBKVc-1VM6KwM905ayVZuiY1tgaTeUeCi0,167
 meta_export/apps.py,sha256=3_5LB1MLtzfKekI2vT9Cm6puAx6t6AjtIfTTVdItdKg,226
@@ -816,7 +816,7 @@ meta_subject/admin/eq5d3l_admin.py,sha256=NB_DwtEA4PNnoxXqXdfnMYqUDVjwOaRtNOsIbz
 meta_subject/admin/fields.py,sha256=-be67ToKIOHOmytxR9qsEAucbDEFWyFySmG_VoIrRn4,277
 meta_subject/admin/fieldsets.py,sha256=nds9nLPscsaETET-bxX94AsBGZ6npQk_4POz8oex6jc,1523
 meta_subject/admin/followup_examination_admin.py,sha256=_w8Mds3K0JajsMa7stKRKdJM-QidPu_k-ZKWX1805TA,5154
-meta_subject/admin/followup_vitals_admin.py,sha256=dvpU5tR-_5YeB5_HHrP8-DwQ7Z6j9tgCsyP5Bn3yM3M,1585
+meta_subject/admin/followup_vitals_admin.py,sha256=epzZAT9Rr1bEjAvThqb7h01bns5-5tYwPufcru8KvqU,2292
 meta_subject/admin/glucose_admin.py,sha256=IBKJp-tgeIZUObmanL8UPtZWQHsUiOl3raBqesh0MJU,2981
 meta_subject/admin/glucose_fbg_admin.py,sha256=GsXp5vIzgEt355qyXYr5QhWkGZdOzXzX-ZPOWAHmGlU,2492
 meta_subject/admin/hepatitis_test_admin.py,sha256=xIsUIS6Fh5U03soz_RSzqoQSyAG-zE5IEC_LrFDp_mk,1404
@@ -867,7 +867,7 @@ meta_subject/forms/delivery_form.py,sha256=L4WZqWbo9gz_BzxSdckh3e0v6DojOSoygD2xE
 meta_subject/forms/egfr_drop_notification_form.py,sha256=qQ5Q1aeGqzohD5FjBto1ThMP8iS-aNrA7I_OMrtVZFA,507
 meta_subject/forms/eq53d3l_form.py,sha256=EE67-CAIRNKZCKpmQolC8wgL5MMIjXlkn5SXe3XdhN0,508
 meta_subject/forms/followup_examination_form.py,sha256=PATGiGn1AXmK1koXy1QjMvgn43KuZn7yyZIrA_8sPXk,502
-meta_subject/forms/followup_vitals_form.py,sha256=uSwVTw7pE-RxvxLKx-UWUH4fLhY4_gAgmY5CdG55lRU,354
+meta_subject/forms/followup_vitals_form.py,sha256=o3e7DMFNUx8hxClRApmwm-FY3BflSBUVPbukGhYJ9iU,1397
 meta_subject/forms/glucose_fbg_form.py,sha256=H1cEIkGUBe49nnhDd7x62Tr-3nrZg5Hn62GAMvIJZkU,2372
 meta_subject/forms/glucose_form.py,sha256=3PjxVaUEjswCq-m-LGz4Gj6dX1EDVdFs6UQH99ekMBs,442
 meta_subject/forms/hepatitis_test_form.py,sha256=d4ZZuB0cGiuTHrbhkLnkyMmnOKs76op-J4CFATDJML4,794
@@ -883,7 +883,7 @@ meta_subject/forms/physical_exam_form.py,sha256=QgH1zAmYgp8Hi1tU-e68HaRRkZxf-6xG
 meta_subject/forms/pregnancy_update_form.py,sha256=BTiWPoQ-HYbZhW0Go2DSqYU_e51pmJ_UIxEdSNlzTwE,559
 meta_subject/forms/sf12_form.py,sha256=VDV4hyU9UckPX70isylfHWggcWZwiQfCWrpk9kGvxis,397
 meta_subject/forms/slider_widget.py,sha256=KOIyTfpl8yrcR9GZH4zrba8JUsVVEJME3AvrYiPHYJc,821
-meta_subject/forms/study_medication_form.py,sha256=KI-aFBQGZywwUUOlswTOiOrhR4jhOXfjTq7_SzZ3Y30,3104
+meta_subject/forms/study_medication_form.py,sha256=UQoin_iqi3iCM5D2dij2S94VnUbpJf2gA5TszNM_y8o,3170
 meta_subject/forms/subject_requisition_form.py,sha256=BWWk1njDTxenHAX1a-VHPgz9zAGTJxMNHtVsobO7Vqo,953
 meta_subject/forms/subject_visit_form.py,sha256=Zxyjb5-7wUmcLHD-M76ofuM8Vr92yzjvXqQ7GsB3U6o,1374
 meta_subject/forms/subject_visit_missed_form.py,sha256=Qrvo2A8836CspOKll_iN3a6U6ttzz1TFNbEbJRrg62g,2275
@@ -1134,13 +1134,15 @@ meta_subject/migrations/0221_auto_20250402_1913.py,sha256=4quuKgAvnd-_yRhyC211x6
 meta_subject/migrations/0222_alter_historicalstudymedication_stock_codes_and_more.py,sha256=hxGQ5E2_DG8RmBeg7rRxtODsigUOZANop8GJYHPNVqg,1544
 meta_subject/migrations/0223_bloodresultsfbc_errors_bloodresultsgludummy_errors_and_more.py,sha256=twzCzmB230Fd2Os2WOkLHyodfWGgHPBYBkDas7lhG7A,2714
 meta_subject/migrations/0224_bloodresultsfbc_abnormal_summary_and_more.py,sha256=U_-nNqH6AHwGDoCEqogGZ9GMdPK92s_hCrJWVeUMyrY,5471
+meta_subject/migrations/0225_followupvitals_waist_circumference_and_more.py,sha256=50t7cUy6s5phxdpRBV7zSnkb4igqZkjU3Bjl2lFEPEY,1451
+meta_subject/migrations/0226_followupvitals_waist_circumference_comment_and_more.py,sha256=E8EsKrrGBubuGkALTAOErXZ8nozfEcF4N1Ikpx586x4,3751
 meta_subject/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_subject/model_mixins/__init__.py,sha256=6DdDDOwDdagrz6Q7X9lxuAVszsFWFhwPqLz4JOD85Wo,286
 meta_subject/model_mixins/arv_history_model_mixin.py,sha256=6ILacF2koyYmwZIFHmmQO1uIT1eWzrahXxhAlxpQiX0,2898
 meta_subject/model_mixins/crf_model_mixin.py,sha256=UK1ycbYwaZ8LSNTJm74QJ5c-01HDXOApDy5k9LM4RKM,248
 meta_subject/model_mixins/crf_with_action_model_mixin.py,sha256=q1Q16YyPjQlpDtCPOXRkO5C7Vr7JO_QL8xWC48Uz33M,298
 meta_subject/model_mixins/search_slug_model_mixin.py,sha256=r5KmTykU0qV4JymMMKP2IBwAP8Z5hDnVJix-rO2PvME,296
-meta_subject/model_mixins/vitals_fields_model_mixin.py,sha256=JYh0w1eEFLR_BCvzHb2ldwNIkyINbfvef-SL4_wA-NY,1160
+meta_subject/model_mixins/vitals_fields_model_mixin.py,sha256=PUprWNOqZ4w3LW73RWhU_1d6AX9fGti9UvZytdXrZE0,2204
 meta_subject/models/__init__.py,sha256=c8EYwYsi7e3dAqhsw_KeF6MRyBQStC_rSpthVpO_a98,1835
 meta_subject/models/birth_outcomes.py,sha256=zikxatYZvL1qvnJ6JtVZ5aw8LCKLwQNXi6cP5F-5Jj0,3124
 meta_subject/models/complications.py,sha256=lkUoM3wJ9GuCFkuBUVxbCRSWfl3UtiVNSoMmkPKQdzg,1849
@@ -1241,7 +1243,7 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-1.1.7.dist-info/METADATA,sha256=x8g7TgVmIZHGaqFK1KPhyc2yOIC-H0FelJqXFlNt-7A,43587
-meta_edc-1.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meta_edc-1.1.7.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.1.7.dist-info/RECORD,,
+meta_edc-1.1.8.dist-info/METADATA,sha256=xJbuDwwUyCvWLHpA1Lm48D7ChFS9LLaB8EpMbL2M1ZQ,43587
+meta_edc-1.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meta_edc-1.1.8.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.1.8.dist-info/RECORD,,

meta_subject/admin/followup_vitals_admin.py

@@ -16,27 +16,52 @@ class FollowupVitalsAdmin(CrfModelAdminMixin, FormLabelModelAdminMixin, SimpleHi
     form = FollowupVitalsForm
 
     additional_instructions = [
-        "If participant is pregnant, complete the action linked CRF `Pregnancy notification`."
+        "If participant is pregnant, complete the action "
+        "linked CRF `Pregnancy notification`."
     ]
 
     fieldsets = (
         (None, {"fields": ("subject_visit", "report_datetime")}),
         (
-            "Vitals",
+            "Weight",
+            {
+                "fields": ("weight",),
+            },
+        ),
+        (
+            "Waist circumference",
+            {
+                "description": (
+                    "REQUIRED at 36 and 48 months. If not measured "
+                    "at 36 and 48 months, provide the reason."
+                ),
+                "fields": (
+                    "waist_circumference_measured",
+                    "waist_circumference",
+                    "waist_circumference_comment",
+                ),
+            },
+        ),
+        (
+            "BP and heart rate",
             {
                 "description": (
                     "To be completed by the research nurse. <BR>"
                     "Refer to SOP for blood pressure measurement procedure."
                 ),
                 "fields": (
-                    "weight",
                     *get_blood_pressure_fields(),
                     "heart_rate",
                     *get_respiratory_o2_fields(),
-                    "temperature",
                 ),
             },
         ),
+        (
+            "Temperature",
+            {
+                "fields": ("temperature",),
+            },
+        ),
         crf_status_fieldset,
         audit_fieldset_tuple,
     )
@@ -44,5 +69,6 @@ class FollowupVitalsAdmin(CrfModelAdminMixin, FormLabelModelAdminMixin, SimpleHi
     filter_horizontal = ()
 
     radio_fields = {
+        "waist_circumference_measured": admin.VERTICAL,
         "severe_htn": admin.VERTICAL,
     }

meta_subject/forms/followup_vitals_form.py

@@ -1,12 +1,43 @@
 from django import forms
+from edc_constants.constants import NO, YES
 from edc_crf.crf_form_validator import CrfFormValidator
 from edc_crf.modelform_mixins import CrfModelFormMixin
+from edc_visit_schedule.constants import MONTH36, MONTH48
 
 from ..models import FollowupVitals
 
 
+class FollowupVitalsFormValidator(CrfFormValidator):
+    def clean(self):
+
+        self.required_if(
+            YES, field="waist_circumference_measured", field_required="waist_circumference"
+        )
+
+        visit_code = (
+            f"{self.related_visit.visit_code}.{self.related_visit.visit_code_sequence}"
+        )
+        require_waist_circumference_comment = (
+            True
+            if (
+                visit_code in [f"{MONTH36}.0", f"{MONTH48}.0"]
+                or self.cleaned_data.get("waist_circumference_measured") == YES
+            )
+            else False
+        )
+
+        if (
+            self.cleaned_data.get("waist_circumference_measured")
+            and self.cleaned_data.get("waist_circumference_measured") == NO
+        ):
+            self.required_if_true(
+                require_waist_circumference_comment,
+                field_required="waist_circumference_comment",
+            )
+
+
 class FollowupVitalsForm(CrfModelFormMixin, forms.ModelForm):
-    form_validator_cls = CrfFormValidator
+    form_validator_cls = FollowupVitalsFormValidator
 
     class Meta:
         model = FollowupVitals

meta_subject/forms/study_medication_form.py

@@ -1,6 +1,7 @@
 import re
 
 from django import forms
+from django.core.exceptions import ObjectDoesNotExist
 from edc_crf.modelform_mixins import CrfModelFormMixin
 from edc_form_validators import INVALID_ERROR
 from edc_pharmacy.form_validators import (
@@ -53,12 +54,12 @@ class StudyMedicationFormValidator(BaseStudyMedicationFormValidator):
                 try:
                     Stock.objects.get(
                         code=stock_code,
-                        dispensed=True,
+                        dispenseitem__isnull=False,
                         allocation__registered_subject__subject_identifier=(
                             self.subject_identifier
                         ),
                     )
-                except Stock.DoesNotExist:
+                except ObjectDoesNotExist:
                     raise forms.ValidationError(
                         {
                             "stock_codes": (

meta_subject/migrations/0225_followupvitals_waist_circumference_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.2.3 on 2025-07-10 12:05
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0224_bloodresultsfbc_abnormal_summary_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="followupvitals",
+            name="waist_circumference",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=1,
+                help_text="in centimeters",
+                max_digits=5,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(50.0),
+                    django.core.validators.MaxValueValidator(175.0),
+                ],
+                verbose_name="Waist circumference",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalfollowupvitals",
+            name="waist_circumference",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=1,
+                help_text="in centimeters",
+                max_digits=5,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(50.0),
+                    django.core.validators.MaxValueValidator(175.0),
+                ],
+                verbose_name="Waist circumference",
+            ),
+        ),
+    ]

meta_subject/migrations/0226_followupvitals_waist_circumference_comment_and_more.py

@@ -0,0 +1,97 @@
+# Generated by Django 5.2.3 on 2025-07-10 14:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0225_followupvitals_waist_circumference_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="followupvitals",
+            name="waist_circumference_comment",
+            field=models.TextField(
+                blank=True,
+                help_text="A comment is only required at 36 and 48 months",
+                null=True,
+                verbose_name="If waist circumference not measured, please explain ...",
+            ),
+        ),
+        migrations.AddField(
+            model_name="followupvitals",
+            name="waist_circumference_measured",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="No",
+                help_text="Waist circumference is required at 36 and 48 months",
+                max_length=15,
+                verbose_name="Was the patient's waist circumference measured today?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalfollowupvitals",
+            name="waist_circumference_comment",
+            field=models.TextField(
+                blank=True,
+                help_text="A comment is only required at 36 and 48 months",
+                null=True,
+                verbose_name="If waist circumference not measured, please explain ...",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalfollowupvitals",
+            name="waist_circumference_measured",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="No",
+                help_text="Waist circumference is required at 36 and 48 months",
+                max_length=15,
+                verbose_name="Was the patient's waist circumference measured today?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalphysicalexam",
+            name="waist_circumference_comment",
+            field=models.TextField(
+                blank=True,
+                help_text="A comment is only required at 36 and 48 months",
+                null=True,
+                verbose_name="If waist circumference not measured, please explain ...",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalphysicalexam",
+            name="waist_circumference_measured",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="No",
+                help_text="Waist circumference is required at 36 and 48 months",
+                max_length=15,
+                verbose_name="Was the patient's waist circumference measured today?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="physicalexam",
+            name="waist_circumference_comment",
+            field=models.TextField(
+                blank=True,
+                help_text="A comment is only required at 36 and 48 months",
+                null=True,
+                verbose_name="If waist circumference not measured, please explain ...",
+            ),
+        ),
+        migrations.AddField(
+            model_name="physicalexam",
+            name="waist_circumference_measured",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="No",
+                help_text="Waist circumference is required at 36 and 48 months",
+                max_length=15,
+                verbose_name="Was the patient's waist circumference measured today?",
+            ),
+        ),
+    ]

meta_subject/model_mixins/vitals_fields_model_mixin.py

@@ -1,11 +1,44 @@
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
+from edc_constants.choices import YES_NO
+from edc_constants.constants import NO
 from edc_vitals.models import WeightField
 
 
 class VitalsFieldsModelMixin(models.Model):
     weight = WeightField(null=True)
 
+    waist_circumference_measured = models.CharField(
+        verbose_name="Was the patient's waist circumference measured today?",
+        max_length=15,
+        choices=YES_NO,
+        help_text=(
+            "Waist circumference may be provided at anytime "
+            "but is required at 36 and 48 months"
+        ),
+        default=NO,
+    )
+
+    waist_circumference = models.DecimalField(
+        verbose_name="Waist circumference",
+        max_digits=5,
+        decimal_places=1,
+        validators=[MinValueValidator(50.0), MaxValueValidator(175.0)],
+        help_text="in centimeters",
+        null=True,
+        blank=True,
+    )
+
+    waist_circumference_comment = models.TextField(
+        verbose_name="If waist circumference not measured, please explain ...",
+        help_text=(
+            "A reason not measured may be provided at anytime "
+            "but is required at 36 and 48 months"
+        ),
+        null=True,
+        blank=True,
+    )
+
     # 10
     heart_rate = models.IntegerField(
         verbose_name="Heart rate:",