meta-edc 0.2.24__py3-none-any.whl → 1.4.0__py3-none-any.whl

meta_screening/models/subject_screening.py

@@ -1,11 +1,14 @@
+from clinicedc_constants import PENDING, QUESTION_RETIRED
+from django.contrib.sites.models import Site
 from django.core.validators import RegexValidator
+from django.db import models
 from django_crypto_fields.fields import EncryptedCharField
-from edc_constants.constants import QUESTION_RETIRED
 from edc_model.models import BaseUuidModel
 from edc_screening.model_mixins import ScreeningModelMixin
 from edc_screening.screening_identifier import (
     ScreeningIdentifier as BaseScreeningIdentifier,
 )
+from edc_utils import get_utcnow
 
 from ..model_mixins import (
     CalculatedModelMixin,
@@ -21,7 +24,6 @@ class SubjectScreeningModelError(Exception):
 
 
 class ScreeningIdentifier(BaseScreeningIdentifier):
-
     template = "S{random_string}"
 
 
@@ -34,8 +36,8 @@ class SubjectScreening(
     ScreeningModelMixin,
     BaseUuidModel,
 ):
-
     identifier_cls = ScreeningIdentifier
+    # consent_definitions = [consent_v1]
 
     contact_number = EncryptedCharField(
         validators=[RegexValidator(r"^[0-9\-\(\)\ ]+$", message="Enter a valid number")],
@@ -43,12 +45,26 @@ class SubjectScreening(
         help_text="Provide a contact number if repeating glucose measures (Encryption: RSA)",
     )
 
+    site = models.ForeignKey(Site, on_delete=models.PROTECT, null=True, related_name="+")
+
     def save(self, *args, **kwargs):
         if self._meta.label_lower == "meta_screening.subjectscreening":
             raise SubjectScreeningModelError("Unable to save. Save via P1-3 proxy models.")
         self.consent_ability = QUESTION_RETIRED
         super().save(*args, **kwargs)
 
+    @property
+    def human_readable_identifier(self):
+        """Returns a humanized screening identifier."""
+        x = self.screening_identifier
+        return f"{x[0:4]}-{x[4:]}"
+
+    @property
+    def repeat_due_in_days(self):
+        if self.repeat_glucose_performed == PENDING and self.ogtt_datetime:
+            return (get_utcnow() - self.ogtt_datetime).days
+        return 0
+
     class Meta:
         verbose_name = "Subject Screening"
         verbose_name_plural = "Subject Screening"

meta_sites/__init__.py

@@ -1 +0,0 @@
-from .sites import all_sites, fqdn  # noqa

meta_sites/apps.py

@@ -1,33 +1,10 @@
-import sys
-
 from django.apps import AppConfig as DjangoAppConfig
-from django.apps import apps as django_apps
 from django.core.management.color import color_style
-from django.db.models.signals import post_migrate
-
-from .sites import all_sites
 
 style = color_style()
 
 
-def post_migrate_update_sites(sender=None, **kwargs):
-    from edc_sites.add_or_update_django_sites import add_or_update_django_sites
-
-    sys.stdout.write(style.MIGRATE_HEADING("Updating sites:\n"))
-    for country, sites in all_sites.items():
-        add_or_update_django_sites(
-            apps=django_apps,
-            sites=sites,
-            verbose=True,
-        )
-    sys.stdout.write("Done.\n")
-    sys.stdout.flush()
-
-
 class AppConfig(DjangoAppConfig):
     name = "meta_sites"
     default_auto_field = "django.db.models.BigAutoField"
     verbose_name = "META Sites"
-
-    def ready(self):
-        post_migrate.connect(post_migrate_update_sites, sender=self)

meta_sites/sites.py

@@ -1,57 +1,65 @@
+from django.conf import settings
 from edc_sites.single_site import SingleSite
+from edc_sites.site import sites as site_sites
 
-fqdn = "meta3.clinicedc.org"
+domain_suffix = settings.EDC_SITES_DOMAIN_SUFFIX
+languages = ["sw", "en", "mas"]
 
-
-all_sites = {
-    "tanzania": (
-        SingleSite(
-            10,
-            "hindu_mandal",
-            title="Hindu Mandal Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"hindu-mandal.tz.{fqdn}",
-        ),
-        SingleSite(
-            20,
-            "amana",
-            title="Amana Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"amana.tz.{fqdn}",
-        ),
-        SingleSite(
-            30,
-            "temeke",
-            title="Temeke Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"temeke.tz.{fqdn}",
-        ),
-        SingleSite(
-            40,
-            "mwananyamala",
-            title="Mwananyamala Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"mwananyamala.tz.{fqdn}",
-        ),
-        SingleSite(
-            50,
-            "mbagala",
-            title="Mbagala Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"mbagala.tz.{fqdn}",
-        ),
-        SingleSite(
-            60,
-            "mnazi_moja",
-            title="Mnazi Moja Hospital",
-            country="tanzania",
-            country_code="tz",
-            domain=f"mnazi-moja.tz.{fqdn}",
-        ),
+all_sites = [
+    SingleSite(
+        10,
+        "hindu_mandal",
+        title="Hindu Mandal Hospital",
+        country="tanzania",
+        country_code="tz",
+        domain=f"hindu-mandal.tz.{domain_suffix}",
+        language_codes=languages,
+    ),
+    SingleSite(
+        20,
+        "amana",
+        title="Amana Hospital",
+        country="tanzania",
+        country_code="tz",
+        domain=f"amana.tz.{domain_suffix}",
+        language_codes=languages,
+    ),
+    SingleSite(
+        30,
+        "temeke",
+        title="Temeke Hospital",
+        country="tanzania",
+        country_code="tz",
+        domain=f"temeke.tz.{domain_suffix}",
+        language_codes=languages,
+    ),
+    SingleSite(
+        40,
+        "mwananyamala",
+        title="Mwananyamala Hospital",
+        country="tanzania",
+        country_code="tz",
+        language_codes=languages,
+        domain=f"mwananyamala.tz.{domain_suffix}",
     ),
-}
+    SingleSite(
+        50,
+        "mbagala",
+        title="Mbagala Hospital",
+        country="tanzania",
+        country_code="tz",
+        language_codes=languages,
+        domain=f"mbagala.tz.{domain_suffix}",
+    ),
+    SingleSite(
+        60,
+        "mnazi_moja",
+        title="Mnazi Moja Hospital",
+        country="tanzania",
+        country_code="tz",
+        language_codes=languages,
+        domain=f"mnazi-moja.tz.{domain_suffix}",
+    ),
+]
+
+site_sites.register(*all_sites)

meta_subject/action_items.py

@@ -1,32 +1,37 @@
+from clinicedc_constants import GRADE3, GRADE4, HIGH_PRIORITY, NEW, NONE, POS, YES
 from django.apps import apps as django_apps
-from edc_action_item import Action, ActionWithNotification, site_action_items
-from edc_action_item.site_action_items import AlreadyRegistered
+from edc_action_item.action import Action
+from edc_action_item.action_with_notification import ActionWithNotification
+from edc_action_item.site_action_items import AlreadyRegistered, site_action_items
 from edc_adverse_event.constants import AE_INITIAL_ACTION
-from edc_constants.constants import HIGH_PRIORITY, NEW, NONE, POS, YES
 from edc_egfr.constants import EGFR_DROP_NOTIFICATION_ACTION
 from edc_lab_results.action_items import (
     BloodResultsFbcAction,
-    BloodResultsGluAction,
     BloodResultsHba1cAction,
     BloodResultsLftAction,
-    BloodResultsLipidAction,
+    BloodResultsLipidsAction,
+)
+from edc_lab_results.action_items import (
+    BloodResultsGluAction as BaseBloodResultsGluAction,
 )
 from edc_lab_results.action_items import (
     BloodResultsRftAction as BaseBloodResultsRftAction,
 )
 from edc_ltfu.constants import LTFU_ACTION
-from edc_reportable import GRADE3, GRADE4
+from edc_visit_schedule.constants import OFFSCHEDULE_ACTION
 from edc_visit_schedule.utils import is_baseline
 from edc_visit_tracking.constants import MISSED_VISIT
 
 from meta_prn.constants import (
-    OFFSCHEDULE_ACTION,
+    DM_REFFERAL_ACTION,
+    OFFSCHEDULE_DM_REFERRAL_ACTION,
     OFFSCHEDULE_PREGNANCY_ACTION,
     PREGNANCY_NOTIFICATION_ACTION,
 )
 
 from .constants import (
     DELIVERY_ACTION,
+    DM_FOLLOWUP_ACTION,
     FOLLOWUP_EXAMINATION_ACTION,
     MISSED_VISIT_ACTION,
     URINE_PREGNANCY_ACTION,
@@ -42,24 +47,31 @@ class MissedVisitAction(Action):
     create_by_user = False
 
     def get_next_actions(self):
-        # TODO: define LTFU, 6 months off study medication
+        """LTFU, 6 months off study medication using
+        diff of report_datetime and refill_end_datetime.
+        """
         next_actions = []
-        subjectconsent_model_cls = django_apps.get_model("meta_consent.subjectconsent")
-        subjectvisit_model_cls = django_apps.get_model("meta_subject.subjectvisit")
-        subject_consent = subjectconsent_model_cls.objects.get(
-            subject_identifier=self.subject_identifier
-        )
+        subject_visit_model_cls = django_apps.get_model("meta_subject.subjectvisit")
+        study_medication_model_cls = django_apps.get_model("meta_subject.studymedication")
         last_visit = (
-            subjectvisit_model_cls.objects.filter(subject_identifier=self.subject_identifier)
+            subject_visit_model_cls.objects.filter(subject_identifier=self.subject_identifier)
             .exclude(reason=MISSED_VISIT)
             .order_by("report_datetime")
             .last()
         )
-        # last_refill_until
-        # TODO: last_refill_until in below calc
+        last_study_medication = (
+            study_medication_model_cls.objects.filter(
+                subject_visit__subject_identifier=self.subject_identifier
+            )
+            .order_by("refill_end_datetime")
+            .last()
+        )
         if (
             last_visit
-            and (last_visit.report_datetime - subject_consent.consent_datetime).days >= 182
+            and last_study_medication
+            and last_study_medication.refill_end_datetime
+            and (last_study_medication.refill_end_datetime - last_visit.report_datetime).days
+            >= 182
         ):
             next_actions = [LTFU_ACTION]
         return next_actions
@@ -79,8 +91,7 @@ class FollowupExaminationAction(Action):
             self.reference_obj.symptoms_g3.exclude(name=NONE).count() > 0
             or self.reference_obj.symptoms_g4.exclude(name=NONE).count() > 0
             or self.reference_obj.any_other_problems_sae_grade in [GRADE3, GRADE4]
-            or self.reference_obj.lactic_acidosis == YES
-            or self.reference_obj.hepatomegaly == YES
+            or YES in (self.reference_obj.lactic_acidosis, self.reference_obj.hepatomegaly)
         ) and not is_baseline(instance=self.reference_obj.subject_visit):
             next_actions.append(AE_INITIAL_ACTION)
         return next_actions
@@ -104,7 +115,6 @@ class UrinePregnancyAction(Action):
 
 
 class BloodResultsRftAction(BaseBloodResultsRftAction):
-
     reference_model = "meta_subject.bloodresultsrft"
 
     def get_next_actions(self):
@@ -114,27 +124,30 @@ class BloodResultsRftAction(BaseBloodResultsRftAction):
         return next_actions
 
 
+class BloodResultsGluAction(BaseBloodResultsGluAction):
+    reference_model = "meta_subject.bloodresultsgludummy"
+
+
 class DeliveryAction(ActionWithNotification):
     name = DELIVERY_ACTION
     display_name = "Submit Delivery Form"
     notification_display_name = "Delivery Form"
-    parent_action_names = [PREGNANCY_NOTIFICATION_ACTION]
+    parent_action_names = (PREGNANCY_NOTIFICATION_ACTION,)
     reference_model = "meta_subject.delivery"
     show_link_to_changelist = True
-    show_link_to_add = True
+    show_link_to_add = False
     admin_site_name = "meta_subject_admin"
     priority = HIGH_PRIORITY
 
     def get_next_actions(self):
-        next_actions = [OFFSCHEDULE_PREGNANCY_ACTION]
-        return next_actions
+        return [OFFSCHEDULE_PREGNANCY_ACTION]
 
 
 class EgfrDropNotificationAction(ActionWithNotification):
     name = EGFR_DROP_NOTIFICATION_ACTION
     display_name = "eGFR drop warning"
     notification_display_name = "eGFR drop warning"
-    parent_action_names = []
+    parent_action_names = ()
     reference_model = "meta_subject.egfrdropnotification"
     show_link_to_changelist = True
     show_link_to_add = True
@@ -145,19 +158,37 @@ class EgfrDropNotificationAction(ActionWithNotification):
         return self.reference_obj.report_status != NEW
 
 
+class DmFollowAction(ActionWithNotification):
+    name = DM_FOLLOWUP_ACTION
+    display_name = "Diabetes Followup"
+    notification_display_name = "Diabetes Followup"
+    parent_action_names = (DM_REFFERAL_ACTION,)
+    reference_model = "meta_subject.dmfollowup"
+    show_link_to_changelist = True
+    show_link_to_add = False
+    show_on_dashboard = False
+    create_by_user = False
+    create_by_action = True
+    admin_site_name = "meta_subject_admin"
+    priority = HIGH_PRIORITY
+
+    def get_next_actions(self):
+        return [OFFSCHEDULE_DM_REFERRAL_ACTION]
+
+
 def register_actions():
     for action_item_cls in [
         BloodResultsFbcAction,
-        BloodResultsLipidAction,
+        BloodResultsLipidsAction,
         BloodResultsLftAction,
         BloodResultsRftAction,
-        BloodResultsGluAction,
         BloodResultsHba1cAction,
         FollowupExaminationAction,
         MissedVisitAction,
         UrinePregnancyAction,
         DeliveryAction,
         EgfrDropNotificationAction,
+        DmFollowAction,
     ]:
         try:
             site_action_items.register(action_item_cls)

meta_subject/admin/__init__.py

@@ -2,24 +2,28 @@ from .autocomplete_admin import ArvRegimensAdmin
 from .birth_outcome_admin import BirthOutcomesAdmin
 from .blood_results import (
     BloodResultsFbcAdmin,
-    BloodResultsGluAdmin,
     BloodResultsLftAdmin,
+    BloodResultsLipidsAdmin,
     BloodResultsRftAdmin,
 )
 from .complications_admin import ComplicationsAdmin
 from .complications_glycemia_admin import ComplicationsGlycemiaAdmin
 from .concomitant_medication_admin import ConcomitantMedicationAdmin
 from .delivery_admin import DeliveryAdmin
+from .diabetes import DmEndpointAdmin, DmFollowupAdmin
 from .egfr_drop_notification_admin import EgfrDropNotificationAdmin
 from .eq5d3l_admin import Eq5d3lAdmin
 from .followup_examination_admin import FollowupExaminationAdmin
 from .followup_vitals_admin import FollowupVitalsAdmin
 from .glucose_admin import GlucoseAdmin
-from .health_economics_simple_admin import HealthEconomicsSimpleAdmin
+from .glucose_fbg_admin import GlucoseFbgAdmin
+from .health_economics import HealthEconomicsSimpleAdmin, HealthEconomicsUpdateAdmin
 from .hepatitis_test_admin import HepatitisTestAdmin
+from .hiv_exit_review_admin import HivExitReviewAdmin
 from .malaria_test_admin import MalariaTestAdmin
 from .medication_adherence_admin import MedicationAdherenceAdmin
 from .mnsi_admin import MnsiAdmin
+from .next_appointment_admin import NextAppointmentAdmin
 from .other_arv_regimens_admin import OtherArvRegimensAdmin
 from .patient_history_admin import PatientHistoryAdmin
 from .physical_exam_admin import PhysicalExamAdmin
@@ -31,3 +35,43 @@ from .subject_visit_admin import SubjectVisitAdmin
 from .subject_visit_missed_admin import SubjectVisitMissedAdmin
 from .urine_dipstick_test_admin import UrineDipstickTestAdmin
 from .urine_pregnancy_admin import UrinePregnancyAdmin
+
+__all__ = [
+    "ArvRegimensAdmin",
+    "BirthOutcomesAdmin",
+    "BloodResultsFbcAdmin",
+    "BloodResultsLftAdmin",
+    "BloodResultsLipidsAdmin",
+    "BloodResultsRftAdmin",
+    "ComplicationsAdmin",
+    "ComplicationsGlycemiaAdmin",
+    "ConcomitantMedicationAdmin",
+    "DeliveryAdmin",
+    "DmEndpointAdmin",
+    "DmFollowupAdmin",
+    "EgfrDropNotificationAdmin",
+    "Eq5d3lAdmin",
+    "FollowupExaminationAdmin",
+    "FollowupVitalsAdmin",
+    "GlucoseAdmin",
+    "GlucoseFbgAdmin",
+    "HealthEconomicsSimpleAdmin",
+    "HealthEconomicsUpdateAdmin",
+    "HepatitisTestAdmin",
+    "HivExitReviewAdmin",
+    "MalariaTestAdmin",
+    "MedicationAdherenceAdmin",
+    "MnsiAdmin",
+    "NextAppointmentAdmin",
+    "OtherArvRegimensAdmin",
+    "PatientHistoryAdmin",
+    "PhysicalExamAdmin",
+    "PregnancyUpdateAdmin",
+    "Sf12Admin",
+    "StudyMedicationAdmin",
+    "SubjectRequisitionAdmin",
+    "SubjectVisitAdmin",
+    "SubjectVisitMissedAdmin",
+    "UrineDipstickTestAdmin",
+    "UrinePregnancyAdmin",
+]

meta_subject/admin/birth_outcome_admin.py

@@ -1,14 +1,13 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.core.exceptions import ObjectDoesNotExist
 from django.template.loader import render_to_string
 from django.urls import NoReverseMatch, reverse
 from django_audit_fields.admin import audit_fieldset_tuple
-from edc_data_manager.modeladmin_mixins import DataManagerModelAdminMixin
+from edc_crf.fieldset import crf_status_fieldset
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 from edc_model_admin.history import SimpleHistoryAdmin
 from edc_registration.models import RegisteredSubject
+from edc_sites.admin import SiteModelAdminMixin
 
 from ..admin_site import meta_subject_admin
 from ..forms import BirthOutcomesForm
@@ -17,11 +16,10 @@ from ..models import BirthOutcomes
 
 @admin.register(BirthOutcomes, site=meta_subject_admin)
 class BirthOutcomesAdmin(
-    DataManagerModelAdminMixin,
+    SiteModelAdminMixin,
     ModelAdminSubjectDashboardMixin,
     SimpleHistoryAdmin,
 ):
-
     form = BirthOutcomesForm
 
     fieldsets = (
@@ -36,6 +34,7 @@ class BirthOutcomesAdmin(
                 )
             },
         ),
+        crf_status_fieldset,
         audit_fieldset_tuple,
     )
 
@@ -46,11 +45,11 @@ class BirthOutcomesAdmin(
         "birth_outcome",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "birth_outcome": admin.VERTICAL,
     }
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         fields = super().get_list_filter(request)
         custom_fields = (
             "birth_order",
@@ -58,21 +57,20 @@ class BirthOutcomesAdmin(
         )
         return custom_fields + fields
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
+    def get_search_fields(self, request) -> tuple[str, ...]:
         fields = super().get_search_fields(request)
         custom_fields = (
-            "delivery__action_identifier__subject_visit__subject_identifier",
+            "delivery__subject_visit__subject_identifier",
             "delivery__action_identifier",
-            "delivery__tracking_identifier",
         )
         return tuple(set(fields + custom_fields))
 
     @admin.display
-    def delivery_report(self, obj=None, label=None):
-        url = reverse("meta_prn_admin:meta_prn_delivery_changelist")
+    def delivery_report(self, obj=None, label=None):  # noqa: ARG002
+        url = reverse("meta_subject_admin:meta_subject_delivery_changelist")
         url = f"{url}?q={obj.subject_identifier}"
         context = dict(title="Delivery", url=url, label="Delivery")
-        return render_to_string("dashboard_button.html", context=context)
+        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
 
     def get_subject_dashboard_url_kwargs(self, obj):
         return dict(subject_identifier=obj.subject_identifier)
@@ -93,6 +91,6 @@ class BirthOutcomesAdmin(
                     url = super().view_on_site(obj)
                 else:
                     raise NoReverseMatch(
-                        f"{e}. See subject_dashboard_url_name for {repr(self)}."
-                    )
+                        f"{e}. See subject_dashboard_url_name for {self!r}."
+                    ) from e
         return url

meta_subject/admin/blood_results/__init__.py

@@ -1,7 +1,15 @@
 from .blood_results_fbc_admin import BloodResultsFbcAdmin
-from .blood_results_glu_admin import BloodResultsGluAdmin
 from .blood_results_hba1c_admin import BloodResultsHba1cAdmin
 from .blood_results_ins_admin import BloodResultsInsAdmin
 from .blood_results_lft_admin import BloodResultsLftAdmin
-from .blood_results_lipid_admin import BloodResultsLipidAdmin
+from .blood_results_lipids_admin import BloodResultsLipidsAdmin
 from .blood_results_rft_admin import BloodResultsRftAdmin
+
+__all__ = [
+    "BloodResultsFbcAdmin",
+    "BloodResultsHba1cAdmin",
+    "BloodResultsInsAdmin",
+    "BloodResultsLftAdmin",
+    "BloodResultsLipidsAdmin",
+    "BloodResultsRftAdmin",
+]

meta_subject/admin/blood_results/blood_results_fbc_admin.py

@@ -1,16 +1,19 @@
 from django.contrib import admin
-from edc_action_item import action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_lab_results.admin import BloodResultsModelAdminMixin
 from edc_lab_results.fieldsets import BloodResultFieldset
+from edc_model_admin.history import SimpleHistoryAdmin
 
 from ...admin_site import meta_subject_admin
 from ...forms import BloodResultsFbcForm
 from ...models import BloodResultsFbc
-from ..modeladmin import CrfModelAdmin
+from ..modeladmin import CrfModelAdminMixin
 
 
 @admin.register(BloodResultsFbc, site=meta_subject_admin)
-class BloodResultsFbcAdmin(BloodResultsModelAdminMixin, CrfModelAdmin):
+class BloodResultsFbcAdmin(
+    BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
+):
     form = BloodResultsFbcForm
     fieldsets = BloodResultFieldset(
         BloodResultsFbc.lab_panel,

meta_subject/admin/blood_results/blood_results_hba1c_admin.py

@@ -1,19 +1,22 @@
 from django.contrib import admin
-from edc_action_item import action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_lab_panel.panels import hba1c_panel
 from edc_lab_results.admin import BloodResultsModelAdminMixin
 from edc_lab_results.fieldsets import BloodResultFieldset
+from edc_model_admin.history import SimpleHistoryAdmin
 
 from ...admin_site import meta_subject_admin
 from ...forms import BloodResultsHba1cForm
 from ...models import BloodResultsHba1c
-from ..modeladmin import CrfModelAdmin
+from ..modeladmin import CrfModelAdminMixin
 
 # TODO: add is poc? YES, always
 
 
 @admin.register(BloodResultsHba1c, site=meta_subject_admin)
-class BloodResultsHba1cAdmin(BloodResultsModelAdminMixin, CrfModelAdmin):
+class BloodResultsHba1cAdmin(
+    BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
+):
     form = BloodResultsHba1cForm
     fieldsets = BloodResultFieldset(
         hba1c_panel,

meta_subject/admin/blood_results/blood_results_ins_admin.py

@@ -1,16 +1,19 @@
 from django.contrib import admin
-from edc_action_item import action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_lab_results.admin import BloodResultsModelAdminMixin
 from edc_lab_results.fieldsets import BloodResultFieldset
+from edc_model_admin.history import SimpleHistoryAdmin
 
 from ...admin_site import meta_subject_admin
 from ...forms import BloodResultsInsForm
 from ...models import BloodResultsIns
-from ..modeladmin import CrfModelAdmin
+from ..modeladmin import CrfModelAdminMixin
 
 
 @admin.register(BloodResultsIns, site=meta_subject_admin)
-class BloodResultsInsAdmin(BloodResultsModelAdminMixin, CrfModelAdmin):
+class BloodResultsInsAdmin(
+    BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
+):
     form = BloodResultsInsForm
     fieldsets = BloodResultFieldset(
         BloodResultsIns.lab_panel,

meta_subject/admin/blood_results/blood_results_lft_admin.py

@@ -1,16 +1,19 @@
 from django.contrib import admin
-from edc_action_item import action_fieldset_tuple
+from edc_action_item.fieldsets import action_fieldset_tuple
 from edc_lab_results.admin import BloodResultsModelAdminMixin
 from edc_lab_results.fieldsets import BloodResultFieldset
+from edc_model_admin.history import SimpleHistoryAdmin
 
 from ...admin_site import meta_subject_admin
 from ...forms import BloodResultsLftForm
 from ...models import BloodResultsLft
-from ..modeladmin import CrfModelAdmin
+from ..modeladmin import CrfModelAdminMixin
 
 
 @admin.register(BloodResultsLft, site=meta_subject_admin)
-class BloodResultsLftAdmin(BloodResultsModelAdminMixin, CrfModelAdmin):
+class BloodResultsLftAdmin(
+    BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
+):
     form = BloodResultsLftForm
     fieldsets = BloodResultFieldset(
         BloodResultsLft.lab_panel,