meta-edc 0.3.38__py3-none-any.whl → 0.3.39__py3-none-any.whl

meta_subject/migrations/0215_alter_historicalstudymedication_stock_codes_and_more.py

@@ -0,0 +1,46 @@
+# Generated by Django 5.1.2 on 2024-11-18 02:34
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_subject", "0214_historicalstudymedication_stock_codes_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalstudymedication",
+            name="stock_codes",
+            field=models.CharField(
+                blank=True,
+                help_text="Enter the medication bottle barcode or barcodes seperated by comma, no spaces",
+                max_length=30,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Enter one or more valid codes separated by comma",
+                        regex="^([A-Z0-9]{6})(,[A-Z0-9]{6})*$",
+                    )
+                ],
+            ),
+        ),
+        migrations.AlterField(
+            model_name="studymedication",
+            name="stock_codes",
+            field=models.CharField(
+                blank=True,
+                help_text="Enter the medication bottle barcode or barcodes seperated by comma, no spaces",
+                max_length=30,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Enter one or more valid codes separated by comma",
+                        regex="^([A-Z0-9]{6})(,[A-Z0-9]{6})*$",
+                    )
+                ],
+            ),
+        ),
+    ]

meta_subject/tests/tests/test_mnsi.py

@@ -3,15 +3,37 @@ from zoneinfo import ZoneInfo
 
 import time_machine
 from dateutil.relativedelta import relativedelta
-from django.test import TestCase
+from django.core.exceptions import ObjectDoesNotExist
+from django.test import TestCase, tag
 from edc_constants.constants import NO, YES
 from edc_utils import get_utcnow
 from model_bakery import baker
 
 from meta_screening.tests.meta_test_case_mixin import MetaTestCaseMixin
-from meta_visit_schedule.constants import MONTH1, MONTH3, MONTH6, MONTH9, MONTH12, WEEK2
-
-
+from meta_subject.models import SubjectVisit
+from meta_visit_schedule.constants import (
+    MONTH1,
+    MONTH3,
+    MONTH6,
+    MONTH9,
+    MONTH12,
+    MONTH15,
+    MONTH18,
+    MONTH21,
+    MONTH24,
+    MONTH27,
+    MONTH30,
+    MONTH33,
+    MONTH36,
+    MONTH39,
+    MONTH42,
+    MONTH45,
+    MONTH48,
+    WEEK2,
+)
+
+
+@tag("mnsi")
 @time_machine.travel(datetime(2022, 6, 11, 8, 00, tzinfo=ZoneInfo("UTC")))
 class TestMnsiRequired(MetaTestCaseMixin, TestCase):
     def setUp(self):
@@ -33,45 +55,34 @@ class TestMnsiRequired(MetaTestCaseMixin, TestCase):
             appt_datetime=six_months_ago,
         )
 
-    def get_week2_visit(self):
-        return self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=WEEK2,
-            appt_datetime=self.baseline_datetime + relativedelta(weeks=2),
-        )
-
-    def get_month1_visit(self):
-        return self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=MONTH1,
-            appt_datetime=self.baseline_datetime + relativedelta(months=1),
-        )
-
-    def get_month3_visit(self):
-        return self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=MONTH3,
-            appt_datetime=self.baseline_datetime + relativedelta(months=3),
-        )
-
-    def get_month6_visit(self):
-        return self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=MONTH6,
-            appt_datetime=self.baseline_datetime + relativedelta(months=6),
-        )
-
-    def get_month9_visit(self):
-        return self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=MONTH9,
-            appt_datetime=self.baseline_datetime + relativedelta(months=9),
-        )
+    def get_visit(self, visit_code: str):
+        """Returns a scheduled visit with the specified visit code.
+
+        If the visit already exists, it will be returned. If not, it
+        will be created (along with any interim visits) and returned.
+        """
+        subject_identifier = self.subject_consent.subject_identifier
+        try:
+            subject_visit = SubjectVisit.objects.get(
+                subject_identifier=subject_identifier,
+                visit_code=visit_code,
+                visit_code_sequence=0,
+            )
+        except ObjectDoesNotExist:
+            subject_visit = (
+                SubjectVisit.objects.filter(
+                    subject_identifier=subject_identifier,
+                    visit_code_sequence=0,
+                )
+                .order_by("visit_code")
+                .last()
+            )
+            while subject_visit.visit_code != visit_code:
+                subject_visit = self.get_next_subject_visit(subject_visit)
+
+        self.assertEqual(subject_visit.visit_code, visit_code)
+        self.assertEqual(subject_visit.visit_code_sequence, 0)
+        return subject_visit
 
     @staticmethod
     def set_mnsi_status(subject_visit, mnsi_performed):
@@ -82,169 +93,225 @@ class TestMnsiRequired(MetaTestCaseMixin, TestCase):
         )
         visit_mnsi.save()
 
+    def test_mnsi_not_required_at_baseline(self):
+        crfs = self.get_crf_metadata(self.subject_visit)
+        self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
     def test_mnsi_not_required_at_2w(self):
-        crfs = self.get_crf_metadata(self.get_week2_visit())
+        crfs = self.get_crf_metadata(self.get_visit(visit_code=WEEK2))
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_required_at_1m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
-        crfs = self.get_crf_metadata(month1_visit)
+        crfs = self.get_crf_metadata(self.get_visit(visit_code=MONTH1))
         self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_3m_if_already_performed_at_1m(self):
-        self.get_week2_visit()
-
         # MNSI shouldn't be required at any point after it has been performed
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         crfs = self.get_crf_metadata(month3_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_required_at_3m_if_not_performed_at_1m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         crfs = self.get_crf_metadata(month3_visit)
         self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_6m_if_already_performed_at_1m(self):
-        self.get_week2_visit()
-
         # MNSI shouldn't be required at any point after it has been performed
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         crfs = self.get_crf_metadata(month3_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         crfs = self.get_crf_metadata(month6_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_6m_if_already_performed_at_3m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
         # MNSI shouldn't be required at any point after it has been performed
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=YES)
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         crfs = self.get_crf_metadata(month6_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_required_at_6m_if_not_performed_by_3m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=NO)
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         crfs = self.get_crf_metadata(month6_visit)
         self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_9m_if_already_performed_at_1m(self):
-        self.get_week2_visit()
-
         # MNSI shouldn't be required at any point after it has been performed
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         crfs = self.get_crf_metadata(month3_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         crfs = self.get_crf_metadata(month6_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
-        month9_visit = self.get_month9_visit()
+        month9_visit = self.get_visit(visit_code=MONTH9)
         crfs = self.get_crf_metadata(month9_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_9m_if_already_performed_at_3m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
         # MNSI shouldn't be required at any point after it has been performed
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=YES)
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         crfs = self.get_crf_metadata(month6_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
-        month9_visit = self.get_month9_visit()
+        month9_visit = self.get_visit(visit_code=MONTH9)
         crfs = self.get_crf_metadata(month9_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
     def test_mnsi_not_required_at_9m_if_already_performed_at_6m(self):
-        self.get_week2_visit()
-
-        month1_visit = self.get_month1_visit()
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=NO)
 
         # MNSI shouldn't be required at any point after it has been performed
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         self.set_mnsi_status(subject_visit=month6_visit, mnsi_performed=YES)
 
-        month9_visit = self.get_month9_visit()
+        month9_visit = self.get_visit(visit_code=MONTH9)
         crfs = self.get_crf_metadata(month9_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
 
-    def test_mnsi_not_required_at_9m_even_if_not_performed_by_6m(self):
-        self.get_week2_visit()
+    def test_mnsi_not_required_between_9m_and_33m_when_performed_in_first_6m(self):
+        month1_visit = self.get_visit(visit_code=MONTH1)
+        self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
+
+        month3_visit = self.get_visit(visit_code=MONTH3)
+        self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=YES)
 
-        month1_visit = self.get_month1_visit()
+        for visit_code in [
+            MONTH9,
+            MONTH12,
+            MONTH15,
+            MONTH18,
+            MONTH21,
+            MONTH24,
+            MONTH27,
+            MONTH30,
+            MONTH33,
+        ]:
+            with self.subTest(visit_code=visit_code):
+                subject_visit = self.get_visit(visit_code=visit_code)
+                self.assertEqual(subject_visit.visit_code, visit_code)
+                self.assertEqual(subject_visit.visit_code_sequence, 0)
+                crfs = self.get_crf_metadata(subject_visit)
+                self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
+    def test_mnsi_not_required_between_9m_and_33m_even_if_not_performed_first_6m(self):
+        month1_visit = self.get_visit(visit_code=MONTH1)
         self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
 
-        month3_visit = self.get_month3_visit()
+        month3_visit = self.get_visit(visit_code=MONTH3)
         self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=NO)
 
-        month6_visit = self.get_month6_visit()
+        month6_visit = self.get_visit(visit_code=MONTH6)
         self.set_mnsi_status(subject_visit=month6_visit, mnsi_performed=NO)
 
-        month9_visit = self.get_month9_visit()
-        crfs = self.get_crf_metadata(month9_visit)
-        self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        for visit_code in [
+            MONTH9,
+            MONTH12,
+            MONTH15,
+            MONTH18,
+            MONTH21,
+            MONTH24,
+            MONTH27,
+            MONTH30,
+            MONTH33,
+        ]:
+            with self.subTest(visit_code=visit_code):
+                subject_visit = self.get_visit(visit_code=visit_code)
+                self.assertEqual(subject_visit.visit_code, visit_code)
+                self.assertEqual(subject_visit.visit_code_sequence, 0)
+                crfs = self.get_crf_metadata(subject_visit)
+                self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
+    def test_mnsi_required_between_36m_and_45m(self):
+        month1_visit = self.get_visit(visit_code=MONTH1)
+        self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
 
-    def test_mnsi_not_required_at_12m_even_if_not_performed_by_6m(self):
-        self.get_week2_visit()
+        for visit_code in [MONTH36, MONTH39, MONTH42, MONTH45]:
+            with self.subTest(visit_code=visit_code):
+                subject_visit = self.get_visit(visit_code=visit_code)
+                crfs = self.get_crf_metadata(subject_visit)
+                self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+                self.set_mnsi_status(subject_visit=subject_visit, mnsi_performed=NO)
 
-        month1_visit = self.get_month1_visit()
-        self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=NO)
+    def test_mnsi_only_required_once_between_36m_and_45m(self):
+        month1_visit = self.get_visit(visit_code=MONTH1)
+        self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
 
-        month3_visit = self.get_month3_visit()
-        self.set_mnsi_status(subject_visit=month3_visit, mnsi_performed=NO)
+        month36_visit = self.get_visit(visit_code=MONTH36)
+        crfs = self.get_crf_metadata(month36_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        self.set_mnsi_status(subject_visit=month36_visit, mnsi_performed=NO)
 
-        month6_visit = self.get_month6_visit()
-        self.set_mnsi_status(subject_visit=month6_visit, mnsi_performed=NO)
+        month39_visit = self.get_next_subject_visit(month36_visit)
+        crfs = self.get_crf_metadata(month39_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        self.set_mnsi_status(subject_visit=month39_visit, mnsi_performed=NO)
 
-        self.get_month9_visit()
+        month42_visit = self.get_next_subject_visit(month39_visit)
+        crfs = self.get_crf_metadata(month42_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        self.set_mnsi_status(subject_visit=month42_visit, mnsi_performed=YES)
 
-        month12_visit = self.get_subject_visit(
-            subject_screening=self.subject_screening,
-            subject_consent=self.subject_consent,
-            visit_code=MONTH12,
-            appt_datetime=self.baseline_datetime + relativedelta(months=12),
-        )
-        crfs = self.get_crf_metadata(month12_visit)
+        month45_visit = self.get_next_subject_visit(month42_visit)
+        crfs = self.get_crf_metadata(month45_visit)
         self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
+    def test_mnsi_required_at_48m(self):
+        month1_visit = self.get_visit(visit_code=MONTH1)
+        crfs = self.get_crf_metadata(month1_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        self.set_mnsi_status(subject_visit=month1_visit, mnsi_performed=YES)
+
+        month3_visit = self.get_next_subject_visit(month1_visit)
+        crfs = self.get_crf_metadata(month3_visit)
+        self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
+        month36_visit = self.get_visit(visit_code=MONTH36)
+        crfs = self.get_crf_metadata(month36_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+        self.set_mnsi_status(subject_visit=month36_visit, mnsi_performed=YES)
+
+        month39_visit = self.get_next_subject_visit(month36_visit)
+        crfs = self.get_crf_metadata(month39_visit)
+        self.assertNotIn("meta_subject.mnsi", [o.model for o in crfs.all()])
+
+        month48_visit = self.get_visit(visit_code=MONTH48)
+        crfs = self.get_crf_metadata(month48_visit)
+        self.assertIn("meta_subject.mnsi", [o.model for o in crfs.all()])

meta_visit_schedule/visit_schedules/phase_three/crfs.py

@@ -9,6 +9,9 @@ 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=461, model="meta_subject.eq5d3l"),
+    Crf(show_order=466, model="meta_subject.sf12"),
+    Crf(show_order=471, model="meta_subject.mnsi"),
     Crf(show_order=275, model="meta_subject.hepatitistest"),
     Crf(show_order=285, model="meta_subject.malariatest"),
     Crf(show_order=295, model="meta_subject.urinedipsticktest"),
@@ -57,7 +60,7 @@ crfs_w2 = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     Crf(show_order=460, model="meta_subject.eq5d3l"),
     Crf(show_order=465, model="meta_subject.sf12"),
-    Crf(show_order=470, model="meta_subject.healtheconomicssimple"),
+    Crf(show_order=480, model="meta_subject.healtheconomicssimple"),
     name="week2",
 )
 
@@ -68,10 +71,10 @@ crfs_1m = 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=450, model="meta_subject.healtheconomicssimple", 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"),
+    Crf(show_order=480, model="meta_subject.healtheconomicssimple", required=False),
     name="1m",
 )
 
@@ -191,6 +194,7 @@ crfs_24m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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"),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="24m",
 )
@@ -203,6 +207,7 @@ crfs_27m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="27m",
 )
@@ -216,6 +221,7 @@ crfs_30m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="30m",
 )
@@ -228,6 +234,7 @@ crfs_33m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="33m",
 )
@@ -243,8 +250,9 @@ 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=460, model="meta_subject.eq5d3l", required=False),
-    Crf(show_order=465, model="meta_subject.sf12", 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"),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="36m",
 )
@@ -257,6 +265,7 @@ crfs_39m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="39m",
 )
@@ -270,6 +279,7 @@ crfs_42m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="42m",
 )
@@ -282,6 +292,7 @@ crfs_45m = CrfCollection(
     Crf(show_order=310, model="meta_subject.medicationadherence"),
     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),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="45m",
 )
@@ -297,8 +308,9 @@ 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=460, model="meta_subject.eq5d3l", required=False),
-    Crf(show_order=465, model="meta_subject.sf12", 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"),
     Crf(show_order=500, model="meta_subject.healtheconomicsupdate", required=False),
     name="48m",
 )

tests/test_settings.py

@@ -96,6 +96,7 @@ project_settings = DefaultTestSettings(
         "django.contrib.messages",
         "django.contrib.staticfiles",
         "django.contrib.sites",
+        "django_pylabels.apps.AppConfig",
         "django_crypto_fields.apps.AppConfig",
         "django_revision.apps.AppConfig",
         # "debug_toolbar",
@@ -104,6 +105,7 @@ project_settings = DefaultTestSettings(
         "logentry_admin",
         "simple_history",
         "storages",
+        "edc_pylabels.apps.AppConfig",
         "edc_sites.apps.AppConfig",
         "edc_action_item.apps.AppConfig",
         "edc_adherence.apps.AppConfig",
@@ -138,7 +140,6 @@ project_settings = DefaultTestSettings(
         "edc_visit_tracking.apps.AppConfig",
         "edc_visit_schedule.apps.AppConfig",
         "edc_pdutils.apps.AppConfig",
-        "edc_pharmacy.apps.AppConfig",
         "edc_protocol.apps.AppConfig",
         "edc_protocol_incident.apps.AppConfig",
         "edc_prn.apps.AppConfig",
@@ -156,6 +157,7 @@ project_settings = DefaultTestSettings(
         "edc_qol.apps.AppConfig",
         "edc_dx_review.apps.AppConfig",
         "edc_dx.apps.AppConfig",
+        "edc_pharmacy.apps.AppConfig",
         "meta_auth.apps.AppConfig",
         "meta_consent.apps.AppConfig",
         "meta_lists.apps.AppConfig",
@@ -170,6 +172,7 @@ project_settings = DefaultTestSettings(
         "meta_sites.apps.AppConfig",
         "meta_screening.apps.AppConfig",
         "meta_reports.apps.AppConfig",
+        "meta_pharmacy.apps.AppConfig",
         "meta_edc.apps.AppConfig",
         "edc_appconfig.apps.AppConfig",
     ],

meta_edc/celery/__init__.py

@@ -1,2 +0,0 @@
-# do not import modules
-# see conditional import at root __init__

meta_edc/celery/live.py

@@ -1,17 +0,0 @@
-import os
-
-from celery import Celery
-
-# load settings
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.live")
-
-# config celery
-# remember to include additional apps with tasks
-app = Celery("meta_edc", include=["meta_reports"])
-app.config_from_object("django.conf:settings", namespace="CELERY")
-app.autodiscover_tasks()
-
-
-@app.task(bind=True)
-def debug_task(self):
-    print("Request: {0!r}".format(self.request))

meta_edc/celery/uat.py

@@ -1,17 +0,0 @@
-import os
-
-from celery import Celery
-
-# load settings
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.uat")
-
-# config celery
-# remember to include additional apps with tasks
-app = Celery("meta_edc", include=["meta_reports"])
-app.config_from_object("django.conf:settings", namespace="CELERY")
-app.autodiscover_tasks()
-
-
-@app.task(bind=True)
-def debug_task(self):
-    print("Request: {0!r}".format(self.request))