meta-edc 0.3.25__py3-none-any.whl → 0.3.26__py3-none-any.whl

meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py

@@ -436,14 +436,14 @@ class GlucoseEndpointsByDate:
         self.df = self.df.sort_values(by=["subject_identifier", "fbg_datetime"])
         self.df = self.df.reset_index(drop=True)
 
-    def to_model(self, model: str | None = None, subject_identifiers: list[str] | None = None):
+    def to_model(self):
         """Write endpoint_only_df to the Endpoints model"""
         df = self.endpoint_only_df
-        model = model or "meta_reports.endpoints"
+        model = "meta_reports.endpoints"
         now = get_utcnow()
         model_cls = django_apps.get_model(model)
-        if subject_identifiers:
-            model_cls.objects.filter(subject_identifier__in=subject_identifiers).delete()
+        if self.subject_identifiers:
+            model_cls.objects.filter(subject_identifier__in=self.subject_identifiers).delete()
         else:
             model_cls.objects.all().delete()
         created = 0

meta_dashboard/views/subject/dashboard/dashboard_view.py

@@ -1,9 +1,35 @@
+from typing import Any
+
+from django.core.checks import messages
+from django.core.exceptions import ObjectDoesNotExist
+from django.urls import reverse
+from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from edc_subject_dashboard.views import SubjectDashboardView
 
+from meta_reports.models import Endpoints, GlucoseSummary
+
 
 class DashboardView(SubjectDashboardView):
     consent_model = "meta_consent.subjectconsentv1"
     navbar_selected_item = "consented_subject"
     visit_model = "meta_subject.subjectvisit"
     history_button_label = _("Audit")
+
+    def get_context_data(self, **kwargs) -> dict[str, Any]:
+        context = super().get_context_data(**kwargs)
+        try:
+            Endpoints.objects.get(subject_identifier=self.subject_identifier)
+        except ObjectDoesNotExist:
+            pass
+        else:
+            url = reverse("meta_reports_admin:meta_reports_glucosesummary_changelist")
+            url = f"{url}?q={self.subject_identifier}"
+            message = _(
+                format_html(
+                    f"Subject has reached the protocol endpoint. "
+                    f'See <A href="{url}">{GlucoseSummary._meta.verbose_name}</A>'
+                )
+            )
+            self.message_user(message, level=messages.WARNING)
+        return context

{meta_edc-0.3.25.dist-info → meta_edc-0.3.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.25
+Version: 0.3.26
 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.25.dist-info → meta_edc-0.3.26.dist-info}/RECORD

@@ -91,7 +91,7 @@ meta_analytics/dataframes/enrolled/get_glucose_df.py,sha256=L4gzszNjYzu-QmYu4gs1
 meta_analytics/dataframes/glucose_endpoints/__init__.py,sha256=a9RlAnFM0Z4AKw-WztBvnGMo3tLLe1dx3292A2n_CnA,107
 meta_analytics/dataframes/glucose_endpoints/constants.py,sha256=XIt19uf5aSxiOVzkvHtUHs1RJo-1XqJLQOySOJvhQb8,789
 meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py,sha256=MOIcrrdH26q2zrmQDXE-lxHg9klNuKjRjDAc4Elc9ZE,6506
-meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=Wcf-vMtfVi2hnjNVkzVzCbtmfMHcjjLd74RBS9clYCQ,19359
+meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=Lqfa8YXiOJXrGNyXrbqOLXhkygZjtE5pGgemyYgeVik,19288
 meta_analytics/dataframes/glucose_endpoints/utils.py,sha256=2V3nFFnaysuJvNrcHUOLqOk8e_3aP71079kB_YBXcQw,2014
 meta_analytics/dataframes/screening/__init__.py,sha256=onGpmB4474gu_JcyRGdRy09YQyP2Np-mX-rYZTFdJoA,114
 meta_analytics/dataframes/screening/get_glucose_tested_only_df.py,sha256=0oMJIsIJRjurfpPONuJ4Aoab1UJikezGe3lQNWRoOo4,660
@@ -204,7 +204,7 @@ meta_dashboard/views/screening/__init__.py,sha256=bjnvZdqdonOW_DPFs1MR2GQv2x4oqA
 meta_dashboard/views/screening/listboard_view.py,sha256=DF42XR3ftCHO4vd3cuxtq5ir2NqOmQHGQV6cGObr7is,578
 meta_dashboard/views/subject/__init__.py,sha256=s7l0halOqlqscWdMD_r98V4VKeEsgchhY3eAgs0EI3k,81
 meta_dashboard/views/subject/dashboard/__init__.py,sha256=1961drFBW7OVhglUAL4OGFxLOU0tN3jOGMvO7Oone8U,42
-meta_dashboard/views/subject/dashboard/dashboard_view.py,sha256=FdijhyyRb6us-ksU5SCgmP1BNj2nE5NVIz78gnJZ7-E,344
+meta_dashboard/views/subject/dashboard/dashboard_view.py,sha256=FBgOQpZAkTOSeZtUnKRc_CayACOTMeeH6lmwNvEG9vQ,1330
 meta_dashboard/views/subject/listboard/__init__.py,sha256=WHtaM6dXPN7vtnROBOutMO9zEBVIkx3T0RPJdbq4sq4,49
 meta_dashboard/views/subject/listboard/listboard_view.py,sha256=bQ5fPqbbkVvPNrmNvIGNZ_GoRIkqUFHk6T7p1dkjr_Y,601
 meta_data_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -431,7 +431,7 @@ meta_reports/ae_report.py,sha256=K0DCdfVBOCqqWWvCsl-Tf8rRCnNv3W2xbUI10VCuEhI,154
 meta_reports/apps.py,sha256=uQb4mBQ94Ij0luH5yzMF-a5t2N418JHcovYovislwS4,194
 meta_reports/death_report.py,sha256=mJw08jMxOWIAtsKQN8zCP64HIrxW1fb48D9OXqEMpM0,4713
 meta_reports/pdf_report.py,sha256=9lWnRc_BNieDFXC4VgA0QHK6g_ct58u8tupPRsbRvV0,2395
-meta_reports/tasks.py,sha256=HQUV_hnUaGM6TiVXQFO0_0d1-_vC1c3CAyG5EWAHYLI,409
+meta_reports/tasks.py,sha256=wPzfm99Hox1AIvt1KxYg1r6g9v8ta2AHOHesoN6AxEk,370
 meta_reports/urls.py,sha256=_c6AMrK4U5MsyFSU2JSPNfiZlbhuw24C7CyPNYpqGd0,206
 meta_reports/admin/__init__.py,sha256=dpLUWcQsAUP-Mfx-eehY9Zegia9qp0uF82iwIdJCego,313
 meta_reports/admin/endpoints_admin.py,sha256=L4mDLNIkR6203RI3ImBYel2kevaH_Nwa6KMYuoDwyNU,518
@@ -992,7 +992,7 @@ meta_subject/model_mixins/crf_model_mixin.py,sha256=UK1ycbYwaZ8LSNTJm74QJ5c-01HD
 meta_subject/model_mixins/crf_with_action_model_mixin.py,sha256=q1Q16YyPjQlpDtCPOXRkO5C7Vr7JO_QL8xWC48Uz33M,298
 meta_subject/model_mixins/search_slug_model_mixin.py,sha256=r5KmTykU0qV4JymMMKP2IBwAP8Z5hDnVJix-rO2PvME,296
 meta_subject/model_mixins/vitals_fields_model_mixin.py,sha256=JYh0w1eEFLR_BCvzHb2ldwNIkyINbfvef-SL4_wA-NY,1160
-meta_subject/models/__init__.py,sha256=3WYHv3NgJiY5IsUBrlzKZ8zR5AsJHa1IA4bOH9Fh5bA,1707
+meta_subject/models/__init__.py,sha256=wHtGa2pg7-1rfAZRE2dMWpCyenLto4he0_YUaaWxQJo,1762
 meta_subject/models/birth_outcomes.py,sha256=zikxatYZvL1qvnJ6JtVZ5aw8LCKLwQNXi6cP5F-5Jj0,3124
 meta_subject/models/complications.py,sha256=lkUoM3wJ9GuCFkuBUVxbCRSWfl3UtiVNSoMmkPKQdzg,1849
 meta_subject/models/complications_glycemia.py,sha256=2wHind-dDsPY5J4M0pUbRzjp72Brz990oDzCbF-V1CM,6056
@@ -1017,7 +1017,7 @@ meta_subject/models/patient_history.py,sha256=q1GFQYoH0rYowBFUDUYebYthKSdTHNuDnz
 meta_subject/models/physical_exam.py,sha256=SlDJJQrCEouTMaETYGjjVzFYONVx6AdtalPioUCN9yg,1991
 meta_subject/models/pregnancy_update.py,sha256=Cs5bZAslR7jtDS_dJE_btHN8Jw21KdqKCHA-Ll9ISO0,949
 meta_subject/models/sf12.py,sha256=1f6cAMtBUXy7jMaacAU8RJFFv73r9c3rJjBbNl-bSM4,283
-meta_subject/models/signals.py,sha256=S8yhI1eAgZTIYJS9I1jBiBm8JvGKb-LiSDQZt7jJHR0,3989
+meta_subject/models/signals.py,sha256=N-Y-QmwSiiJnridHMrAm08YttRorjB9hzo9XTCdMzWk,4557
 meta_subject/models/study_medication.py,sha256=1kA_w4pYT1gcunfiQ46KdM01pd1jrQqLt4JEPLvfTTo,461
 meta_subject/models/subject_requisition.py,sha256=bSDwD-hpXeioH3xA7E6eGMu4hxWLDDSxhznfjrpXTjw,341
 meta_subject/models/subject_visit.py,sha256=f49M7ywCQqdYdiT5dUhlWXTTXs5K6aKlxkMgzWyj3VE,2152
@@ -1089,9 +1089,9 @@ tests/etc/user-rsa-restricted-private.pem,sha256=CUcHW9bznWdmmASN00hCzvxFPAFl4N2
 tests/etc/user-rsa-restricted-public.pem,sha256=mt84djoL-uHw6Wc5SJh0zml6VzXulnf8eQSFg7-fheg,450
 tests/etc/user-salt-local.key,sha256=x5anBw9fvbHurczouT3CjrkWb_xs7Ypm1htIJsgiuiw,256
 tests/etc/user-salt-restricted.key,sha256=pxmpcfBRNB-4C6wTvHXz-9fOfJgKIFOjaAF8ZFfa4q4,256
-meta_edc-0.3.25.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-0.3.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-0.3.25.dist-info/METADATA,sha256=_h3VBVgFtMfng1bM34X77mipeNrGWNGSLczqNHi1QGg,2771
-meta_edc-0.3.25.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-meta_edc-0.3.25.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-0.3.25.dist-info/RECORD,,
+meta_edc-0.3.26.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.26.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.26.dist-info/METADATA,sha256=G4yeTPysQ4wOftmA6bRMObIYXwqjSanz2r6NCLcOAs0,2771
+meta_edc-0.3.26.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+meta_edc-0.3.26.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.26.dist-info/RECORD,,

meta_reports/tasks.py

@@ -9,4 +9,4 @@ def update_endpoints_table(subject_identifiers: list[str] | None = None):
         subject_identifiers = []
     cls = GlucoseEndpointsByDate(subject_identifiers=subject_identifiers)
     cls.run()
-    return cls.to_model(subject_identifiers=subject_identifiers)
+    return cls.to_model()

meta_subject/models/__init__.py

@@ -36,6 +36,7 @@ from .pregnancy_update import PregnancyUpdate
 from .sf12 import Sf12
 from .signals import (
     study_medication_on_pre_save,
+    update_glucose_endpoints_for_subject_on_post_save,
     update_pregnancy_notification_on_delivery_post_save,
     update_schedule_on_delivery_post_save,
 )

meta_subject/models/signals.py

@@ -11,6 +11,7 @@ from meta_edc.meta_version import get_meta_version
 from meta_pharmacy.constants import METFORMIN
 from meta_visit_schedule.constants import SCHEDULE_PREGNANCY
 
+from . import Glucose, GlucoseFbg
 from .delivery import Delivery
 from .study_medication import StudyMedication
 from .subject_visit import SubjectVisit
@@ -105,3 +106,21 @@ def update_schedule_on_delivery_post_save(sender, instance, raw, **kwargs):
                 subject_identifier=instance.subject_identifier,
                 offschedule_datetime=offschedule_datetime,
             )
+
+
+@receiver(
+    post_save,
+    weak=False,
+    dispatch_uid="update_glucose_endpoints_for_subject_on_post_save",
+)
+def update_glucose_endpoints_for_subject_on_post_save(
+    sender, instance, raw, update_fields, **kwargs
+):
+    if not raw and not update_fields and sender in [Glucose, GlucoseFbg]:
+        from meta_analytics.dataframes import GlucoseEndpointsByDate
+
+        cls = GlucoseEndpointsByDate(
+            subject_identifiers=[instance.subject_visit.subject_identifier]
+        )
+        cls.run()
+        cls.to_model()