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

meta_pharmacy/migrations/0006_lotnumber_label.py

@@ -0,0 +1,289 @@
+# Generated by Django 5.1 on 2024-10-07 22:05
+
+import _socket
+import django.db.models.deletion
+import django_audit_fields.fields.hostname_modification_field
+import django_audit_fields.fields.userfield
+import django_audit_fields.fields.uuid_auto_field
+import django_audit_fields.models.audit_model_mixin
+import django_revision.revision_field
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_pharmacy", "0005_auto_20240911_0352"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="LotNumber",
+            fields=[
+                (
+                    "revision",
+                    django_revision.revision_field.RevisionField(
+                        blank=True,
+                        editable=False,
+                        help_text="System field. Git repository tag:branch:commit.",
+                        max_length=75,
+                        null=True,
+                        verbose_name="Revision",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "user_created",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user created",
+                    ),
+                ),
+                (
+                    "user_modified",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user modified",
+                    ),
+                ),
+                (
+                    "hostname_created",
+                    models.CharField(
+                        blank=True,
+                        default=_socket.gethostname,
+                        help_text="System field. (modified on create only)",
+                        max_length=60,
+                        verbose_name="Hostname created",
+                    ),
+                ),
+                (
+                    "hostname_modified",
+                    django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
+                        blank=True,
+                        help_text="System field. (modified on every save)",
+                        max_length=50,
+                        verbose_name="Hostname modified",
+                    ),
+                ),
+                (
+                    "device_created",
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
+                ),
+                (
+                    "device_modified",
+                    models.CharField(
+                        blank=True, max_length=10, verbose_name="Device modified"
+                    ),
+                ),
+                (
+                    "locale_created",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale created",
+                    ),
+                ),
+                (
+                    "locale_modified",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale modified",
+                    ),
+                ),
+                (
+                    "id",
+                    django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
+                        blank=True,
+                        editable=False,
+                        help_text="System auto field. UUID primary key.",
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("lot_no", models.CharField(max_length=25, unique=True)),
+                (
+                    "allocation",
+                    models.CharField(
+                        choices=[("active", "Active"), ("placebo", "Placebo")], max_length=25
+                    ),
+                ),
+                ("expiration_date", models.DateField()),
+                ("qty", models.IntegerField(null=True)),
+            ],
+            options={
+                "verbose_name": "Lot Number",
+                "verbose_name_plural": "Lot Numbers",
+                "abstract": False,
+                "default_permissions": ("add", "change", "delete", "view", "export", "import"),
+                "default_manager_name": "objects",
+                "indexes": [
+                    models.Index(
+                        fields=["modified", "created"], name="meta_pharma_modifie_a98e60_idx"
+                    ),
+                    models.Index(
+                        fields=["user_modified", "user_created"],
+                        name="meta_pharma_user_mo_1be860_idx",
+                    ),
+                ],
+            },
+        ),
+        migrations.CreateModel(
+            name="Label",
+            fields=[
+                (
+                    "revision",
+                    django_revision.revision_field.RevisionField(
+                        blank=True,
+                        editable=False,
+                        help_text="System field. Git repository tag:branch:commit.",
+                        max_length=75,
+                        null=True,
+                        verbose_name="Revision",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "modified",
+                    models.DateTimeField(
+                        blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow
+                    ),
+                ),
+                (
+                    "user_created",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user created",
+                    ),
+                ),
+                (
+                    "user_modified",
+                    django_audit_fields.fields.userfield.UserField(
+                        blank=True,
+                        help_text="Updated by admin.save_model",
+                        max_length=50,
+                        verbose_name="user modified",
+                    ),
+                ),
+                (
+                    "hostname_created",
+                    models.CharField(
+                        blank=True,
+                        default=_socket.gethostname,
+                        help_text="System field. (modified on create only)",
+                        max_length=60,
+                        verbose_name="Hostname created",
+                    ),
+                ),
+                (
+                    "hostname_modified",
+                    django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
+                        blank=True,
+                        help_text="System field. (modified on every save)",
+                        max_length=50,
+                        verbose_name="Hostname modified",
+                    ),
+                ),
+                (
+                    "device_created",
+                    models.CharField(blank=True, max_length=10, verbose_name="Device created"),
+                ),
+                (
+                    "device_modified",
+                    models.CharField(
+                        blank=True, max_length=10, verbose_name="Device modified"
+                    ),
+                ),
+                (
+                    "locale_created",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale created",
+                    ),
+                ),
+                (
+                    "locale_modified",
+                    models.CharField(
+                        blank=True,
+                        help_text="Auto-updated by Modeladmin",
+                        max_length=10,
+                        null=True,
+                        verbose_name="Locale modified",
+                    ),
+                ),
+                (
+                    "id",
+                    django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
+                        blank=True,
+                        editable=False,
+                        help_text="System auto field. UUID primary key.",
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("rx_label_reference", models.CharField(max_length=15, unique=True)),
+                ("printed_datetime", models.DateTimeField(null=True)),
+                ("printed", models.BooleanField(default=False)),
+                ("scanned", models.BooleanField(default=False)),
+                ("scanned_datetime", models.DateTimeField(null=True)),
+                (
+                    "rx",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="meta_pharmacy.rx"
+                    ),
+                ),
+                (
+                    "lot_no",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="meta_pharmacy.lotnumber",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Label",
+                "verbose_name_plural": "Labels",
+                "abstract": False,
+                "default_permissions": ("add", "change", "delete", "view", "export", "import"),
+                "default_manager_name": "objects",
+                "indexes": [
+                    models.Index(
+                        fields=["modified", "created"], name="meta_pharma_modifie_ebebcc_idx"
+                    ),
+                    models.Index(
+                        fields=["user_modified", "user_created"],
+                        name="meta_pharma_user_mo_cd7246_idx",
+                    ),
+                ],
+            },
+        ),
+    ]

meta_pharmacy/migrations/0007_lotnumber_medication.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.2 on 2024-10-10 04:23
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_pharmacy", "0023_remove_rx_edc_pharmac_modifie_986021_idx_and_more"),
+        ("meta_pharmacy", "0006_lotnumber_label"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="lotnumber",
+            name="medication",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="edc_pharmacy.medication",
+            ),
+        ),
+    ]

meta_pharmacy/models/__init__.py

@@ -0,0 +1,4 @@
+from .label import Label
+from .lot_number import LotNumber
+from .rx import Rx
+from .substitutions import MyManager, Substitutions

meta_pharmacy/models/label.py

@@ -0,0 +1,50 @@
+from django.db import models
+from edc_identifier.simple_identifier import SimpleUniqueIdentifier
+from edc_model.models import BaseUuidModel
+
+from .lot_number import LotNumber
+from .rx import Rx
+
+
+class LabelIdentifier(SimpleUniqueIdentifier):
+    random_string_length = 6
+    identifier_type = "rx_label_reference"
+    template = "{random_string}"
+
+
+class Label(BaseUuidModel):
+
+    identifier_cls = LabelIdentifier
+    identifier_field_name: str = "rx_label_reference"
+
+    rx = models.ForeignKey(Rx, on_delete=models.PROTECT)
+    lot_no = models.ForeignKey(LotNumber, on_delete=models.PROTECT)
+    rx_label_reference = models.CharField(max_length=15, unique=True)
+
+    printed_datetime = models.DateTimeField(null=True)
+    printed = models.BooleanField(default=False)
+    scanned = models.BooleanField(default=False)
+    scanned_datetime = models.DateTimeField(null=True)
+
+    def __str__(self):
+        return self.rx_label_reference
+
+    def save(self, *args, **kwargs):
+        """Label referenceis always allocated."""
+        if not self.id:
+            setattr(
+                self,
+                self.identifier_field_name,
+                self.identifier_cls().identifier,
+            )
+        super().save(*args, **kwargs)  # type:ignore
+
+    @property
+    def human_readable_identifier(self):
+        """Returns a humanized screening identifier."""
+        x = self.screening_identifier
+        return f"{x[0:4]}-{x[4:]}"
+
+    class Meta(BaseUuidModel.Meta):
+        verbose_name = "Label"
+        verbose_name_plural = "Labels"

meta_pharmacy/models/lot_number.py

@@ -0,0 +1,25 @@
+from django.db import models
+from edc_model.models import BaseUuidModel
+from edc_pharmacy.models import Medication
+from edc_randomization.constants import ACTIVE, PLACEBO
+
+
+class LotNumber(BaseUuidModel):
+
+    lot_no = models.CharField(max_length=25, unique=True)
+
+    medication = models.ForeignKey(
+        Medication, on_delete=models.PROTECT, null=True, blank=False
+    )
+
+    allocation = models.CharField(
+        max_length=25, choices=((ACTIVE, "Active"), (PLACEBO, "Placebo"))
+    )
+
+    expiration_date = models.DateField()
+
+    qty = models.IntegerField(null=True)
+
+    class Meta(BaseUuidModel.Meta):
+        verbose_name = "Lot Number"
+        verbose_name_plural = "Lot Numbers"

meta_pharmacy/models/rx.py

@@ -0,0 +1,18 @@
+from edc_pharmacy.models import Rx as BaseRx
+
+
+class Rx(BaseRx):
+    """A proxy model of edc_pharmacy.Rx.
+
+    A model for the prescription.
+
+    For autocomplete only.
+    """
+
+    def save(self, *args, **kwargs):
+        raise NotImplementedError(
+            "This proxy model may not be saved. Permissions should be view only"
+        )
+
+    class Meta:
+        proxy = True

meta_pharmacy/{models.py → models/substitutions.py}

@@ -5,33 +5,19 @@ from edc_constants.choices import YES_NO_NOT_EVALUATED
 from edc_constants.constants import NO, NOT_EVALUATED, YES
 from edc_identifier.model_mixins import NonUniqueSubjectIdentifierFieldMixin
 from edc_model.models import BaseUuidModel, HistoricalRecords
-from edc_pharmacy.models import Rx as BaseRx
 from edc_sites.managers import CurrentSiteManager
 from edc_sites.model_mixins import SiteModelMixin
 
 from meta_pharmacy.constants import MISSING_SUBJECT_IDENTIFIER
 from meta_rando.models import RandomizationList
 
+from .rx import Rx
+
 
 class MyManager(models.Manager):
     use_in_migrations = True
 
 
-class Rx(BaseRx):
-    """A proxy model of edc_pharmacy.Rx.
-
-    For autocomplete only.
-    """
-
-    def save(self, *args, **kwargs):
-        raise NotImplementedError(
-            "This proxy model may not be saved. Permissions should be view only"
-        )
-
-    class Meta:
-        proxy = True
-
-
 class Substitutions(NonUniqueSubjectIdentifierFieldMixin, SiteModelMixin, BaseUuidModel):
     """A model to capture a CSV file that lists IMP substitutions
     made where a bottle of `sid` is substituted with a bottle of

meta_reports/admin/endpoints_admin.py

@@ -8,7 +8,7 @@ from .modeladmin_mixins import EndpointsModelAdminMixin
 
 @admin.register(Endpoints, site=meta_reports_admin)
 class EndpointsAdmin(EndpointsModelAdminMixin, admin.ModelAdmin):
-    queryset_filter = dict(offstudy_datetime__isnull=True)
+    queryset_filter = dict(offstudy_date__isnull=True)
 
     def rendered_change_list_note(self):
         return render_to_string("meta_reports/endpoints_change_list_note.html")

meta_reports/admin/modeladmin_mixins.py

@@ -37,7 +37,7 @@ class EndpointsModelAdminMixin(
     queryset_filter: dict | None = None
     actions = [update_endpoints_table_action]
     qa_report_list_display_insert_pos = 3
-    ordering = ["-fbg_datetime"]
+    ordering = ["-fbg_date"]
     list_display = [
         "dashboard",
         "subject",
@@ -48,7 +48,7 @@ class EndpointsModelAdminMixin(
         "ogtt",
         "endpoint",
         "last_updated",
-        "offstudy_datetime",
+        "offstudy_date",
         "offstudy_reason",
     ]
 
@@ -79,9 +79,9 @@ class EndpointsModelAdminMixin(
     def visit(self, obj=None):
         return obj.visit_code
 
-    @admin.display(description="FBG DATE", ordering="fbg_datetime")
-    def fbg_date(self, obj=None):
-        return obj.fbg_datetime.date() if obj.fbg_datetime else None
+    # @admin.display(description="FBG DATE", ordering="fbg_date")
+    # def fbg_date(self, obj=None):
+    #     return obj.fbg_datetime.date() if obj.fbg_datetime else None
 
     @admin.display(description="FAST", ordering="fasting")
     def fast(self, obj=None):

meta_reports/migrations/0050_alter_endpoints_created.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1 on 2024-10-07 22:02
+
+import edc_utils.date
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0049_auto_20240911_0327"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="endpoints",
+            name="created",
+            field=models.DateTimeField(default=edc_utils.date.get_utcnow),
+        ),
+    ]

meta_reports/migrations/0051_remove_endpoints_baseline_datetime_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.1 on 2024-10-09 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_reports", "0050_alter_endpoints_created"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="endpoints",
+            name="baseline_datetime",
+        ),
+        migrations.RemoveField(
+            model_name="endpoints",
+            name="fbg_datetime",
+        ),
+        migrations.RemoveField(
+            model_name="endpoints",
+            name="offstudy_datetime",
+        ),
+        migrations.AddField(
+            model_name="endpoints",
+            name="baseline_date",
+            field=models.DateField(null=True),
+        ),
+        migrations.AddField(
+            model_name="endpoints",
+            name="fbg_date",
+            field=models.DateField(null=True),
+        ),
+        migrations.AddField(
+            model_name="endpoints",
+            name="offstudy_date",
+            field=models.DateField(null=True),
+        ),
+    ]

meta_reports/models/dbviews/imp_substitutions/unmanaged_model.py

@@ -16,7 +16,9 @@ class ImpSubstitutions(QaReportModelMixin, DBView):
     dispensed_sid = models.IntegerField(verbose_name="Dispensed SID", null=True)
 
     arm_match = models.CharField(
-        max_length=15, choices=YES_NO_NOT_EVALUATED, default=NOT_EVALUATED
+        max_length=15,
+        choices=YES_NO_NOT_EVALUATED,
+        default=NOT_EVALUATED,
     )
 
     report_datetime = models.DateTimeField(null=True)

meta_reports/models/endpoints.py

@@ -11,7 +11,7 @@ class Endpoints(QaReportModelMixin, models.Model):
 
     fasting = models.CharField(max_length=10, null=True)
 
-    fbg_datetime = models.DateTimeField(null=True)
+    fbg_date = models.DateField(null=True)
 
     fbg_value = models.FloatField(null=True)
 
@@ -19,9 +19,9 @@ class Endpoints(QaReportModelMixin, models.Model):
 
     endpoint_label = models.CharField(max_length=250, null=True)
 
-    baseline_datetime = models.DateTimeField(null=True)
+    baseline_date = models.DateField(null=True)
 
-    offstudy_datetime = models.DateTimeField(null=True)
+    offstudy_date = models.DateField(null=True)
 
     offstudy_reason = models.CharField(max_length=250, null=True)
 

meta_visit_schedule/visit_schedules/phase_three/crfs.py

@@ -8,6 +8,7 @@ crfs_prn = CrfCollection(
     Crf(show_order=245, model="meta_subject.bloodresultsrft"),
     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=275, model="meta_subject.hepatitistest"),
     Crf(show_order=285, model="meta_subject.malariatest"),
     Crf(show_order=295, model="meta_subject.urinedipsticktest"),