meta-edc 1.2.6__py3-none-any.whl → 1.2.7__py3-none-any.whl

meta_subject/migrations/0237_historicalhivexitreview_singleton_field_and_more.py

@@ -0,0 +1,68 @@
+# Generated by Django 5.2.7 on 2025-10-14 00:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "meta_subject",
+            "0236_alter_historicalhivexitreview_other_current_arv_regimen_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalhivexitreview",
+            name="singleton_field",
+            field=models.CharField(
+                db_index=True,
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                verbose_name="subject identifier",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="hivexitreview",
+            name="singleton_field",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                unique=True,
+                verbose_name="subject identifier",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="healtheconomicsupdate",
+            name="singleton_field",
+            field=models.CharField(
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                unique=True,
+                verbose_name="subject identifier",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="historicalhealtheconomicsupdate",
+            name="singleton_field",
+            field=models.CharField(
+                db_index=True,
+                default="",
+                editable=False,
+                help_text="auto updated for unique constraint",
+                max_length=50,
+                verbose_name="subject identifier",
+            ),
+            preserve_default=False,
+        ),
+    ]

meta_subject/migrations/0238_historicalhivexitreview_available_and_more.py

@@ -0,0 +1,88 @@
+# Generated by Django 5.2.7 on 2025-10-14 12:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "meta_lists",
+            "0020_alter_abnormalfootappearanceobservations_extra_value_and_more",
+        ),
+        ("meta_subject", "0237_historicalhivexitreview_singleton_field_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicalhivexitreview",
+            name="available",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="Yes",
+                max_length=25,
+                verbose_name="Are HIV test result and treatment information available?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalhivexitreview",
+            name="comment",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="May be left blank.",
+                verbose_name="Any other comment?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalhivexitreview",
+            name="not_available_reason",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="If not available, please explain ...",
+            ),
+        ),
+        migrations.AddField(
+            model_name="hivexitreview",
+            name="available",
+            field=models.CharField(
+                choices=[("Yes", "Yes"), ("No", "No")],
+                default="Yes",
+                max_length=25,
+                verbose_name="Are HIV test result and treatment information available?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="hivexitreview",
+            name="comment",
+            field=models.TextField(
+                blank=True,
+                default="",
+                help_text="May be left blank.",
+                verbose_name="Any other comment?",
+            ),
+        ),
+        migrations.AddField(
+            model_name="hivexitreview",
+            name="not_available_reason",
+            field=models.TextField(
+                blank=True,
+                default="",
+                verbose_name="If not available, please explain ...",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="hivexitreview",
+            name="current_arv_regimen",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="last_arv_regimen",
+                to="meta_lists.arvregimens",
+                verbose_name="Which antiretroviral therapy regimen is the patient currently on?",
+            ),
+        ),
+    ]

meta_subject/model_mixins/__init__.py

@@ -1,4 +1,5 @@
 from .arv_history_model_mixin import ArvHistoryModelMixin
+from .arv_review_model_mixin import ArvReviewModelMixin
 from .crf_model_mixin import CrfModelMixin
 from .crf_with_action_model_mixin import CrfWithActionModelMixin
 from .search_slug_model_mixin import SearchSlugModelMixin
@@ -6,6 +7,7 @@ from .vitals_fields_model_mixin import VitalsFieldsModelMixin
 
 __all__ = [
     "ArvHistoryModelMixin",
+    "ArvReviewModelMixin",
     "CrfModelMixin",
     "CrfWithActionModelMixin",
     "SearchSlugModelMixin",

meta_subject/model_mixins/arv_history_model_mixin.py

@@ -1,13 +1,13 @@
-from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from edc_constants.choices import YES_NO
 from edc_model.models import OtherCharField
-from edc_reportable import CELLS_PER_MILLIMETER_CUBED_DISPLAY, COPIES_PER_MILLILITER
 
 from meta_lists.models import ArvRegimens, OiProphylaxis
 
+from .arv_review_model_mixin import ArvReviewModelMixin
 
-class ArvHistoryModelMixin(models.Model):
+
+class ArvHistoryModelMixin(ArvReviewModelMixin, models.Model):
     hiv_diagnosis_date = models.DateField(
         verbose_name="When was the diagnosis of HIV made?", null=True, blank=True
     )
@@ -18,47 +18,6 @@ class ArvHistoryModelMixin(models.Model):
         blank=True,
     )
 
-    viral_load = models.IntegerField(
-        verbose_name="Last viral load",
-        validators=[MinValueValidator(0), MaxValueValidator(999999)],
-        null=True,
-        blank=True,
-        help_text=COPIES_PER_MILLILITER,
-    )
-
-    viral_load_date = models.DateField(
-        verbose_name="Date of last viral load", null=True, blank=True
-    )
-
-    cd4 = models.IntegerField(
-        verbose_name="Last CD4",
-        validators=[MinValueValidator(0), MaxValueValidator(3000)],
-        null=True,
-        blank=True,
-        help_text=CELLS_PER_MILLIMETER_CUBED_DISPLAY,
-    )
-
-    cd4_date = models.DateField(verbose_name="Date of last CD4", null=True, blank=True)
-
-    current_arv_regimen = models.ForeignKey(
-        ArvRegimens,
-        on_delete=models.PROTECT,
-        related_name="current_arv_regimen",
-        verbose_name="Which antiretroviral therapy regimen is the patient currently on?",
-        null=True,
-        blank=False,
-    )
-
-    other_current_arv_regimen = OtherCharField(null=True, blank=True)
-
-    current_arv_regimen_start_date = models.DateField(
-        verbose_name=(
-            "When did the patient start this current antiretroviral therapy regimen?"
-        ),
-        null=True,
-        blank=True,
-    )
-
     has_previous_arv_regimen = models.CharField(
         verbose_name="Has the patient been on any previous regimen?",
         max_length=15,

meta_subject/model_mixins/arv_review_model_mixin.py

@@ -0,0 +1,53 @@
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db import models
+from edc_constants.constants import NULL_STRING
+from edc_model.models import OtherCharField
+from edc_reportable import CELLS_PER_MILLIMETER_CUBED_DISPLAY, COPIES_PER_MILLILITER
+
+from meta_lists.models import ArvRegimens
+
+
+class ArvReviewModelMixin(models.Model):
+    viral_load = models.IntegerField(
+        verbose_name="Last viral load",
+        validators=[MinValueValidator(0), MaxValueValidator(999999)],
+        null=True,
+        blank=True,
+        help_text=COPIES_PER_MILLILITER,
+    )
+
+    viral_load_date = models.DateField(
+        verbose_name="Date of last viral load", null=True, blank=True
+    )
+
+    cd4 = models.IntegerField(
+        verbose_name="Last CD4",
+        validators=[MinValueValidator(0), MaxValueValidator(3000)],
+        null=True,
+        blank=True,
+        help_text=CELLS_PER_MILLIMETER_CUBED_DISPLAY,
+    )
+
+    cd4_date = models.DateField(verbose_name="Date of last CD4", null=True, blank=True)
+
+    current_arv_regimen = models.ForeignKey(
+        ArvRegimens,
+        on_delete=models.PROTECT,
+        related_name="current_arv_regimen",
+        verbose_name="Which antiretroviral therapy regimen is the patient currently on?",
+        null=True,
+        blank=False,
+    )
+
+    other_current_arv_regimen = OtherCharField(default=NULL_STRING, blank=True)
+
+    current_arv_regimen_start_date = models.DateField(
+        verbose_name=(
+            "When did the patient start this current antiretroviral therapy regimen?"
+        ),
+        null=True,
+        blank=True,
+    )
+
+    class Meta:
+        abstract = True

meta_subject/models/__init__.py

@@ -26,6 +26,7 @@ from .health_economics import (
     HealthEconomicsUpdate,
 )
 from .hepatitis_test import HepatitisTest
+from .hiv_exit_review import HivExitReview
 from .malaria_test import MalariaTest
 from .medication_adherence import MedicationAdherence
 from .mnsi import Mnsi
@@ -75,6 +76,7 @@ __all__ = [
     "HealthEconomicsSimple",
     "HealthEconomicsUpdate",
     "HepatitisTest",
+    "HivExitReview",
     "MalariaTest",
     "MedicationAdherence",
     "Mnsi",

meta_subject/models/glucose_fbg.py

@@ -1,12 +1,15 @@
 from django.db import models
 from edc_constants.choices import YES_NO
-from edc_constants.constants import NO
+from edc_constants.constants import NO, NOT_APPLICABLE
 from edc_glucose.model_mixin_factories import (
     fasting_model_mixin_factory,
     fbg_model_mixin_factory,
 )
 from edc_model.models import BaseUuidModel
+from edc_utils import formatted_date
 
+from ..choices import ENDPOINT_CHOICES
+from ..constants import AMENDMENT_DATE
 from ..model_mixins import CrfModelMixin
 
 
@@ -49,6 +52,17 @@ class GlucoseFbg(
         ),
     )
 
+    endpoint_today = models.CharField(
+        verbose_name="Has the participant reached a study endpoint today?",
+        max_length=25,
+        choices=ENDPOINT_CHOICES,
+        default=NOT_APPLICABLE,
+        help_text=(
+            f"Response is applicable if reporting after {formatted_date(AMENDMENT_DATE)} "
+            "and both the FBG and OGTT were performed"
+        ),
+    )
+
     repeat_fbg_date = models.DateField(
         null=True,
         blank=True,

meta_subject/models/hiv_exit_review.py

@@ -0,0 +1,44 @@
+from django.db import models
+from edc_constants.choices import YES_NO
+from edc_constants.constants import NULL_STRING, YES
+from edc_crf.model_mixins import SingletonCrfModelMixin
+from edc_model.models import BaseUuidModel
+
+from meta_lists.models import ArvRegimens
+
+from ..model_mixins import ArvReviewModelMixin, CrfModelMixin
+
+
+class HivExitReview(SingletonCrfModelMixin, ArvReviewModelMixin, CrfModelMixin, BaseUuidModel):
+    available = models.CharField(
+        verbose_name="Are HIV test result and treatment information available?",
+        max_length=25,
+        default=YES,
+        choices=YES_NO,
+    )
+
+    not_available_reason = models.TextField(
+        verbose_name="If not available, please explain ...",
+        default=NULL_STRING,
+        blank=True,
+    )
+
+    current_arv_regimen = models.ForeignKey(
+        ArvRegimens,
+        on_delete=models.PROTECT,
+        related_name="last_arv_regimen",
+        verbose_name="Which antiretroviral therapy regimen is the patient currently on?",
+        null=True,
+        blank=True,
+    )
+
+    comment = models.TextField(
+        verbose_name="Any other comment?",
+        default=NULL_STRING,
+        blank=True,
+        help_text="May be left blank.",
+    )
+
+    class Meta(CrfModelMixin.Meta, BaseUuidModel.Meta):
+        verbose_name = "HIV Exit Review"
+        verbose_name_plural = "HIV Exit Review"

meta_visit_schedule/visit_schedules/phase_three/crfs.py

@@ -9,6 +9,7 @@ crfs_prn = CrfCollection(
     Crf(show_order=255, model="meta_subject.bloodresultslft"),
     Crf(show_order=265, model="meta_subject.bloodresultslipids"),
     Crf(show_order=268, model="meta_subject.bloodresultsins"),
+    Crf(show_order=321, model="meta_subject.hivexitreview"),
     Crf(show_order=461, model="meta_subject.eq5d3l"),
     Crf(show_order=466, model="meta_subject.sf12"),
     Crf(show_order=471, model="meta_subject.mnsi"),
@@ -141,6 +142,7 @@ crfs_12m = CrfCollection(
     Crf(show_order=250, model="meta_subject.bloodresultslipids"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
@@ -155,6 +157,7 @@ crfs_15m = CrfCollection(
     Crf(show_order=200, model="meta_subject.glucosefbg"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
@@ -170,6 +173,7 @@ crfs_18m = CrfCollection(
     Crf(show_order=220, model="meta_subject.bloodresultsfbc"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
@@ -184,6 +188,7 @@ crfs_21m = CrfCollection(
     Crf(show_order=200, model="meta_subject.glucosefbg"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
@@ -202,6 +207,7 @@ crfs_24m = CrfCollection(
     # Crf(show_order=250, model="meta_subject.bloodresultslipids"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi"),
@@ -216,6 +222,7 @@ crfs_27m = CrfCollection(
     Crf(show_order=155, model="meta_subject.glucose", required=False),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -231,6 +238,7 @@ crfs_30m = CrfCollection(
     Crf(show_order=205, model="meta_subject.glucosefbg"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -245,6 +253,7 @@ crfs_33m = CrfCollection(
     Crf(show_order=155, model="meta_subject.glucose", required=False),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -264,6 +273,7 @@ crfs_36m = CrfCollection(
     Crf(show_order=250, model="meta_subject.bloodresultslipids"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l"),
     Crf(show_order=465, model="meta_subject.sf12"),
     Crf(show_order=470, model="meta_subject.mnsi"),
@@ -278,6 +288,7 @@ crfs_39m = CrfCollection(
     Crf(show_order=155, model="meta_subject.glucose", required=False),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -293,6 +304,7 @@ crfs_42m = CrfCollection(
     Crf(show_order=200, model="meta_subject.glucosefbg"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -307,6 +319,7 @@ crfs_45m = CrfCollection(
     Crf(show_order=155, model="meta_subject.glucose", required=False),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview", required=False),
     Crf(show_order=460, model="meta_subject.eq5d3l", required=False),
     Crf(show_order=465, model="meta_subject.sf12", required=False),
     Crf(show_order=470, model="meta_subject.mnsi", required=False),
@@ -326,6 +339,7 @@ crfs_48m = CrfCollection(
     Crf(show_order=250, model="meta_subject.bloodresultslipids"),
     Crf(show_order=300, model="meta_subject.studymedication"),
     Crf(show_order=310, model="meta_subject.medicationadherence"),
+    Crf(show_order=320, model="meta_subject.hivexitreview"),
     Crf(show_order=460, model="meta_subject.eq5d3l"),
     Crf(show_order=465, model="meta_subject.sf12"),
     Crf(show_order=470, model="meta_subject.mnsi"),