meta-edc 0.3.34__tar.gz → 0.3.36__tar.gz

{meta_edc-0.3.34 → meta_edc-0.3.36}/CHANGES

@@ -1,6 +1,10 @@
 Changes
 -------
 
+0.3.35
+------
+- add report_datetime to IMP Substitutions changelists
+
 0.3.34
 ------
 - add IMP Substitutions model and report

{meta_edc-0.3.34 → meta_edc-0.3.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.34
+Version: 0.3.36
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_edc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.34
+Version: 0.3.36
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_edc.egg-info/SOURCES.txt

@@ -378,6 +378,8 @@ meta_pharmacy/urls.py
 meta_pharmacy/migrations/0001_initial.py
 meta_pharmacy/migrations/0002_initial.py
 meta_pharmacy/migrations/0003_auto_20240909_2335.py
+meta_pharmacy/migrations/0004_alter_historicalsubstitutions_report_datetime_and_more.py
+meta_pharmacy/migrations/0005_auto_20240911_0352.py
 meta_pharmacy/migrations/__init__.py
 meta_prn/__init__.py
 meta_prn/action_items.py
@@ -589,6 +591,7 @@ meta_reports/migrations/0045_auto_20240829_0248.py
 meta_reports/migrations/0046_auto_20240829_0250.py
 meta_reports/migrations/0047_impsubstitutions.py
 meta_reports/migrations/0048_auto_20240909_2338.py
+meta_reports/migrations/0049_auto_20240911_0327.py
 meta_reports/migrations/__init__.py
 meta_reports/models/__init__.py
 meta_reports/models/endpoints.py

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_pharmacy/admin.py

@@ -2,6 +2,7 @@ from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
+from edc_model_admin.list_filters import ReportDateListFilter
 from edc_pharmacy.admin.list_filters import MedicationsListFilter
 from edc_sites.admin import SiteModelAdminMixin
 
@@ -51,15 +52,21 @@ class SubstitutionsAdmin(
         "dispensed_sid",
         "arm_match",
         "subject_identifier",
-        "report_datetime",
+        "report_date",
     )
 
     radio_fields = {"arm_match": admin.VERTICAL}
 
-    list_filter = ("arm_match", "report_datetime")
+    list_filter = ("arm_match", ReportDateListFilter)
 
     search_fields = ["subject_identifier", "sid", "dispensed_sid"]
 
+    @admin.display(description="Report date", ordering="report_datetime")
+    def report_date(self, obj) -> str | None:
+        if obj.report_datetime:
+            return obj.report_datetime.date()
+        return None
+
 
 @admin.register(Rx, site=meta_pharmacy_admin)
 class RxAdmin(ModelAdminSubjectDashboardMixin, admin.ModelAdmin):

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_pharmacy/forms.py

@@ -7,6 +7,8 @@ from edc_offstudy.modelform_mixins import OffstudyNonCrfModelFormMixin
 from edc_prn.modelform_mixins import PrnFormValidatorMixin
 from edc_sites.forms import SiteModelFormMixin
 
+from meta_rando.models import RandomizationList
+
 from .models import Rx, Substitutions
 
 
@@ -41,11 +43,11 @@ class SubstitutionsForm(
                     )
         if self.cleaned_data.get("dispensed_sid"):
             try:
-                Rx.objects.get(
-                    rando_sid=self.cleaned_data.get("dispensed_sid"),
+                RandomizationList.objects.get(
+                    sid=self.cleaned_data.get("dispensed_sid"),
                 )
             except ObjectDoesNotExist:
-                raise forms.ValidationError({"dispensed_sid": "Unknown SID for this trial"})
+                raise forms.ValidationError({"dispensed_sid": "Invalid SID for this trial"})
 
     class Meta:
         model = Substitutions

meta_edc-0.3.36/meta_pharmacy/migrations/0004_alter_historicalsubstitutions_report_datetime_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1 on 2024-09-11 00:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_pharmacy", "0003_auto_20240909_2335"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="historicalsubstitutions",
+            name="report_datetime",
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.AlterField(
+            model_name="substitutions",
+            name="report_datetime",
+            field=models.DateTimeField(null=True),
+        ),
+    ]

meta_edc-0.3.36/meta_pharmacy/migrations/0005_auto_20240911_0352.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1 on 2024-09-11 00:52
+from django.apps import apps as django_apps
+from django.db import migrations
+
+
+def update_report_datetime_as_none(apps, schema_editor):
+    model_cls = django_apps.get_model("meta_pharmacy.substitutions")
+    model_cls.objects.update(report_datetime=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_pharmacy", "0004_alter_historicalsubstitutions_report_datetime_and_more"),
+    ]
+
+    operations = [migrations.RunPython(update_report_datetime_as_none)]

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_pharmacy/models.py

@@ -41,7 +41,7 @@ class Substitutions(NonUniqueSubjectIdentifierFieldMixin, SiteModelMixin, BaseUu
     values are sequential and not designed for human transcription.
     """
 
-    report_datetime = models.DateTimeField()
+    report_datetime = models.DateTimeField(null=True, blank=False)
 
     row_index = models.IntegerField(null=True)
 

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_reports/admin/dbviews/imp_substitutions_admin.py

@@ -6,6 +6,7 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from edc_appointment.models import Appointment
 from edc_model_admin.dashboard import ModelAdminDashboardMixin
+from edc_model_admin.list_filters import ReportDateListFilter
 from edc_model_admin.mixins import TemplatesModelAdminMixin
 from edc_qareports.modeladmin_mixins import QaReportModelAdminMixin
 from edc_sites.admin import SiteModelAdminMixin
@@ -31,6 +32,7 @@ class ImpSubstitutionsAdmin(
         "subject",
         "sid",
         "dispensed_sid",
+        "report_date",
         "arm_match",
         "allocated_date",
         "user_created",
@@ -38,7 +40,12 @@ class ImpSubstitutionsAdmin(
         "modified",
     ]
 
-    list_filter = ["arm_match", ScheduleStatusListFilter, "allocated_datetime"]
+    list_filter = [
+        "arm_match",
+        ScheduleStatusListFilter,
+        ReportDateListFilter,
+        "allocated_datetime",
+    ]
 
     search_fields = ["subject_identifier", "sid", "dispensed_sid"]
 
@@ -86,3 +93,9 @@ class ImpSubstitutionsAdmin(
             context=dict(title=title, url=url, label=label),
         )
         return crf_button
+
+    @admin.display(description="Report date", ordering="report_datetime")
+    def report_date(self, obj) -> str | None:
+        if obj.report_datetime:
+            return obj.report_datetime.date()
+        return None

meta_edc-0.3.36/meta_reports/migrations/0049_auto_20240911_0327.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.1 on 2024-09-11 00:27
+
+import django_db_views.migration_functions
+import django_db_views.operations
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0048_auto_20240909_2338"),
+    ]
+
+    operations = [
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "select *, uuid() as id, now() as `created`, 'meta_reports.imp_subjectitutions_view' as `report_model` from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, s.report_datetime, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.mysql",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "select *, uuid() as id, now() as `created`, 'meta_reports.imp_subjectitutions_view' as `report_model` from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.mysql",
+            ),
+            atomic=False,
+        ),
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "select *, get_random_uuid() as id, now() as created, 'meta_reports.imp_subjectitutions_view' as report_model from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, s.report_datetime, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier NULLS FIRST) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.postgresql",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "select *, get_random_uuid() as id, now() as created, 'meta_reports.imp_subjectitutions_view' as report_model from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier NULLS FIRST) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.postgresql",
+            ),
+            atomic=False,
+        ),
+        django_db_views.operations.ViewRunPython(
+            code=django_db_views.migration_functions.ForwardViewMigration(
+                "select *, uuid() as id, datetime() as created, 'meta_reports.imp_subjectitutions_view' as report_model from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, s.report_datetime, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.sqlite3",
+            ),
+            reverse_code=django_db_views.migration_functions.BackwardViewMigration(
+                "select *, uuid() as id, datetime() as created, 'meta_reports.imp_subjectitutions_view' as report_model from (SELECT s.subject_identifier, s.sid, s.dispensed_sid, arm_match, r.allocated_datetime, s.site_id, s.user_created, s.user_modified, s.modified, s.id AS original_id FROM meta_pharmacy_substitutions AS s LEFT JOIN meta_rando_randomizationlist AS r ON r.subject_identifier = s.subject_identifier ORDER BY s.subject_identifier) as A ORDER BY subject_identifier, site_id",
+                "imp_subjectitutions_view",
+                engine="django.db.backends.sqlite3",
+            ),
+            atomic=False,
+        ),
+    ]

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_reports/models/dbviews/imp_substitutions/unmanaged_model.py

@@ -19,6 +19,8 @@ class ImpSubstitutions(QaReportModelMixin, DBView):
         max_length=15, choices=YES_NO_NOT_EVALUATED, default=NOT_EVALUATED
     )
 
+    report_datetime = models.DateTimeField(null=True)
+
     allocated_datetime = models.DateTimeField(null=True)
 
     user_created = models.CharField(max_length=25)

{meta_edc-0.3.34 → meta_edc-0.3.36}/meta_reports/models/dbviews/imp_substitutions/view_definition.py

@@ -3,7 +3,8 @@ from edc_qareports.sql_generator import SqlViewGenerator
 
 def get_view_definition() -> dict:
     subquery = """
-        select s.subject_identifier, s.sid, s.dispensed_sid, arm_match, r.allocated_datetime,
+        select s.subject_identifier, s.sid, s.dispensed_sid, arm_match,
+        s.report_datetime, r.allocated_datetime,
         s.site_id, s.user_created, s.user_modified, s.modified, s.id as original_id
         from meta_pharmacy_substitutions as s left join meta_rando_randomizationlist as r
         on r.subject_identifier=s.subject_identifier