Merge branch 'release/0.3.62' into main

clinicedc · Oct 31, 2023 · 01805bf · 01805bf
2 parents 1e4c3c6 + 70cc510
commit 01805bf
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 56 deletions.
diff --git a/data_manager_app/models.py b/data_manager_app/models.py
@@ -27,7 +27,6 @@
 from edc_model.models import BaseUuidModel
 from edc_model.models.historical_records import HistoricalRecords
 from edc_offstudy.model_mixins import OffstudyModelMixin
-from edc_reference.model_mixins import ReferenceModelMixin
 from edc_registration.model_mixins import UpdatesOrCreatesRegistrationModelMixin
 from edc_sites.models import SiteModelMixin
 from edc_visit_schedule.model_mixins import OffScheduleModelMixin, OnScheduleModelMixin
@@ -97,7 +96,6 @@ def natural_key(self):
 
 class SubjectVisit(
     VisitModelMixin,
-    ReferenceModelMixin,
     CreatesMetadataModelMixin,
     SiteModelMixin,
     BaseUuidModel,
@@ -146,7 +144,6 @@ class BaseCrfModel(
     VisitTrackingCrfModelMixin,
     SiteModelMixin,
     UpdatesCrfMetadataModelMixin,
-    ReferenceModelMixin,
     models.Model,
 ):
     f1 = models.CharField(max_length=50, default=uuid.uuid4)

diff --git a/data_manager_app/reference_model_configs.py b/data_manager_app/reference_model_configs.py
diff --git a/edc_data_manager/migrations/0031_alter_dataquery_visit_code_sequence_and_more.py b/edc_data_manager/migrations/0031_alter_dataquery_visit_code_sequence_and_more.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.2.5 on 2023-10-11 13:29
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("edc_data_manager", "0030_alter_datadictionary_device_created_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dataquery",
+            name="visit_code_sequence",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(0),
+                    django.core.validators.MaxValueValidator(25),
+                ],
+                verbose_name="Visit code sequence",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicaldataquery",
+            name="visit_code_sequence",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(0),
+                    django.core.validators.MaxValueValidator(25),
+                ],
+                verbose_name="Visit code sequence",
+            ),
+        ),
+    ]
diff --git a/edc_data_manager/tests/tests/test_endpoints.py b/edc_data_manager/tests/tests/test_endpoints.py
@@ -16,7 +16,6 @@
 from model_bakery import baker
 
 from data_manager_app.lab_profiles import lab_profile
-from data_manager_app.reference_model_configs import register_to_site_reference_configs
 from data_manager_app.visit_schedules import visit_schedule
 from edc_data_manager.auth_objects import DATA_MANAGER_ROLE
 from edc_data_manager.models import CrfDataDictionary, DataQuery
@@ -60,7 +59,6 @@ def setUp(self):
         site_labs.loaded = False
         site_labs.register(lab_profile=lab_profile)
 
-        register_to_site_reference_configs()
         site_visit_schedules._registry = {}
         site_visit_schedules.loaded = False
         site_visit_schedules.register(visit_schedule)

diff --git a/edc_data_manager/tests/tests/test_query_rule.py b/edc_data_manager/tests/tests/test_query_rule.py
@@ -15,7 +15,6 @@
 from edc_lab.models.panel import Panel
 from edc_lab.site_labs import site_labs
 from edc_metadata.metadata_inspector import MetaDataInspector
-from edc_reference.site_reference import site_reference_configs
 from edc_utils.date import get_utcnow
 from edc_visit_schedule.apps import populate_visit_schedule
 from edc_visit_schedule.constants import HOURS
@@ -57,10 +56,6 @@ def setUp(self):
 
         populate_visit_schedule()
 
-        site_reference_configs.register_from_visit_schedule(
-            visit_models={"edc_appointment.appointment": "data_manager_app.subjectvisit"}
-        )
-
         self.subject_identifier = "101-40990029-4"
         identity = "123456789"
         subject_consent = SubjectConsent.objects.create(
@@ -374,21 +369,6 @@ def test_crf_rule_with_requisition(self):
             1,
         )
 
-        # # create the CRF, field value missing => query when DUE.
-        # crf_one = CrfOne.objects.create(
-        #     subject_visit=subject_visit,
-        #     report_datetime=subject_visit.report_datetime,
-        #     f1=None,
-        # )
-
-        # # assert DataQuery stays opens.
-        # self.assertEqual(
-        #     DataQuery.objects.filter(
-        #         rule_generated=True, rule_reference=query_rule.reference, status=OPEN
-        #     ).count(),
-        #     1,
-        # )
-
         crf_one.f1 = "erik"
         crf_one.save()
 

diff --git a/edc_data_manager/tests/urls.py b/edc_data_manager/tests/urls.py
@@ -19,7 +19,6 @@
     "edc_device",
     "edc_lab_dashboard",
     "edc_protocol",
-    "edc_reference",
     "edc_subject_dashboard",
     "edc_visit_schedule",
     "data_manager_app",

diff --git a/runtests.py b/runtests.py
@@ -64,7 +64,6 @@
         "edc_offstudy.apps.AppConfig",
         "edc_protocol.apps.AppConfig",
         "edc_randomization.apps.AppConfig",
-        "edc_reference.apps.AppConfig",
         "edc_pharmacy.apps.AppConfig",
         "edc_registration.apps.AppConfig",
         "edc_review_dashboard.apps.AppConfig",