meta-edc 0.3.22__tar.gz → 0.3.24__tar.gz

{meta_edc-0.3.22 → meta_edc-0.3.24}/CHANGES

@@ -1,6 +1,15 @@
 Changes
 -------
 
+0.3.24
+------
+- add glucose summary
+- simplify DM referral baseline form
+
+0.3.23
+------
+- add report for missing OGTT at screening
+
 0.3.21
 ------
 - bump edc 0.6.0, django-crypto-fields 0.4.2, Django 5.1

{meta_edc-0.3.22 → meta_edc-0.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.22
+Version: 0.3.24
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -19,7 +19,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==0.6.1
+Requires-Dist: edc==0.6.2
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: edc-analytics

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py

@@ -10,6 +10,8 @@ from edc_pdutils.dataframes import (
 )
 from edc_utils import get_utcnow
 
+from meta_reports.models import Endpoints
+
 from .constants import (
     CASE_EOS,
     CASE_FBG_ONLY,
@@ -31,68 +33,57 @@ class GlucoseEndpointsByDate:
     fbg_threshhold = 7.0
     ogtt_threshhold = 11.1
     endpoint_cls = EndpointByDate
+    keep_cols = [
+        "subject_visit_id",
+        "fasting",
+        "fasting_hrs",
+        "fbg_value",
+        "fbg_units",
+        "fbg_datetime",
+        "ogtt_value",
+        "ogtt_units",
+        "ogtt_datetime",
+        "source",
+        "report_datetime",
+    ]
+
+    visit_cols = [
+        "subject_visit_id",
+        "subject_identifier",
+        "visit_code",
+        "visit_datetime",
+        "site",
+        "baseline_datetime",
+    ]
 
     def __init__(
         self, subject_identifiers: list[str] | None = None, case_list: list[int] | None = None
     ):
+        self.subject_identifiers = subject_identifiers or []
+        if len(self.subject_identifiers) == Endpoints.objects.all().count():
+            self.subject_identifiers = []
         self.case_list = case_list or [CASE_OGTT, 2, 3, CASE_EOS]
         self.endpoint_cases = {k: v for k, v in endpoint_cases.items() if k in self.case_list}
-        self.endpoint_only_df = None
-        self.fbg_only_df = get_crf(
-            model="meta_subject.glucosefbg", subject_identifiers=subject_identifiers
-        )
-        self.fbg_only_df["source"] = "meta_subject.glucosefbg"
-        self.fbg_only_df.rename(
-            columns={"fbg_fasting": "fasting", "subject_visit": "subject_visit_id"},
-            inplace=True,
-        )
-        self.fbg_only_df.loc[(self.fbg_only_df["fasting"] == "fasting"), "fasting"] = YES
-        self.fbg_only_df.loc[(self.fbg_only_df["fasting"] == "non_fasting"), "fasting"] = NO
+        self.endpoint_only_df = pd.DataFrame()
+
+        self.fbg_only_df = self.get_fbg_only_df()
 
         self.df = get_crf(
-            model="meta_subject.glucose", subject_identifiers=subject_identifiers
+            model="meta_subject.glucose",
+            subject_identifiers=self.subject_identifiers,
         )
         self.df["source"] = "meta_subject.glucose"
 
-        for dftmp in [self.fbg_only_df, self.df]:
-            dftmp.loc[(dftmp["fasting"] == NO), "fasting_duration_delta"] = pd.NaT
-            if dftmp.empty:
-                dftmp["fasting_hrs"] = np.nan
-            else:
-                dftmp["fasting_hrs"] = (
-                    dftmp["fasting_duration_delta"].dt.total_seconds() / 3600
-                )
+        self.calculate_fasting_hrs()
 
-        keep_cols = [
-            "subject_visit_id",
-            "fasting",
-            "fasting_hrs",
-            "fbg_value",
-            "fbg_units",
-            "fbg_datetime",
-            "ogtt_value",
-            "ogtt_units",
-            "ogtt_datetime",
-            "source",
-            "report_datetime",
-        ]
         self.fbg_only_df = self.fbg_only_df[
-            [col for col in keep_cols if not col.startswith("ogtt")]
+            [col for col in self.keep_cols if not col.startswith("ogtt")]
         ]
-        self.df = self.df[keep_cols]
+        self.df = self.df[self.keep_cols]
         self.df.reset_index(drop=True)
         self.df = self.df.copy()
 
-        # normalize dates
-        for col in ["fbg_datetime", "report_datetime"]:
-            if not self.fbg_only_df[col].empty:
-                self.fbg_only_df[col] = self.fbg_only_df[col].dt.floor("d")
-            if not self.df[col].empty:
-                self.df[col] = self.df[col].dt.floor("d")
-        if not self.df["ogtt_datetime"].empty:
-            self.df["ogtt_datetime"] = self.df["ogtt_datetime"].dt.floor("d")
-        else:
-            self.df["ogtt_datetime"] = pd.NaT
+        self.normalize_dates()
 
         # same shape but fbg_only_df ogtt columns are null
         self.df = pd.merge(
@@ -104,7 +95,6 @@ class GlucoseEndpointsByDate:
             suffixes=("", "2"),
         )
         self.df.reset_index(drop=True, inplace=True)
-
         self.df_merged = self.df.copy()
 
         # right_only
@@ -121,16 +111,8 @@ class GlucoseEndpointsByDate:
         df_subject_visit = get_subject_visit(
             "meta_subject.subjectvisit", subject_identifiers=subject_identifiers
         )
-        visit_cols = [
-            "subject_visit_id",
-            "subject_identifier",
-            "visit_code",
-            "visit_datetime",
-            "site",
-            "baseline_datetime",
-        ]
         self.df = pd.merge(
-            df_subject_visit[visit_cols], self.df, on="subject_visit_id", how="left"
+            df_subject_visit[self.visit_cols], self.df, on="subject_visit_id", how="left"
         )
         self.df = self.df.sort_values(by=["subject_identifier", "fbg_datetime"])
         self.df.reset_index(drop=True, inplace=True)
@@ -147,9 +129,10 @@ class GlucoseEndpointsByDate:
         self.df = self.df.sort_values(by=["subject_identifier", "fbg_datetime"])
         self.df.reset_index(drop=True, inplace=True)
 
-        self.df["visit_days"] = (
-            self.df["baseline_datetime"].rsub(self.df["visit_datetime"]).dt.days
-        )
+        if not self.df.loc[self.df["visit_datetime"].notna()].empty:
+            self.df["visit_days"] = (
+                self.df["baseline_datetime"].rsub(self.df["visit_datetime"]).dt.days
+            )
         if not self.df.loc[self.df["fbg_datetime"].notna()].empty:
             self.df["fgb_days"] = (
                 self.df.loc[self.df["fbg_datetime"].notna()]["baseline_datetime"]
@@ -167,12 +150,18 @@ class GlucoseEndpointsByDate:
         else:
             self.df["ogtt_days"] = np.nan
 
-        self.df["visit_days"] = pd.to_numeric(self.df["visit_days"], downcast="integer")
-        self.df["fgb_days"] = pd.to_numeric(self.df["fgb_days"], downcast="integer")
-        self.df["ogtt_days"] = pd.to_numeric(self.df["ogtt_days"], downcast="integer")
+        if self.df.empty:
+            self.df["visit_days"] = np.nan
+            self.df["fgb_days"] = np.nan
+            self.df["ogtt_days"] = np.nan
+            self.df["test"] = np.nan
+        else:
+            self.df["visit_days"] = pd.to_numeric(self.df["visit_days"], downcast="integer")
+            self.df["fgb_days"] = pd.to_numeric(self.df["fgb_days"], downcast="integer")
+            self.df["ogtt_days"] = pd.to_numeric(self.df["ogtt_days"], downcast="integer")
 
-        # label rows by type of glu tests (ones with value)
-        self.df["test"] = self.df.apply(get_test_string, axis=1)
+            # label rows by type of glu tests (ones with value)
+            self.df["test"] = self.df.apply(get_test_string, axis=1)
 
         self.df = self.df.sort_values(by=["subject_identifier", "visit_code"])
         self.df = self.df.reset_index(drop=True)
@@ -232,6 +221,41 @@ class GlucoseEndpointsByDate:
             ].index
         )
 
+    def get_fbg_only_df(self) -> pd.DataFrame:
+        fbg_only_df = get_crf(
+            model="meta_subject.glucosefbg", subject_identifiers=self.subject_identifiers
+        )
+        fbg_only_df["source"] = "meta_subject.glucosefbg"
+        fbg_only_df.rename(
+            columns={"fbg_fasting": "fasting", "subject_visit": "subject_visit_id"},
+            inplace=True,
+        )
+        fbg_only_df.loc[(fbg_only_df["fasting"] == "fasting"), "fasting"] = YES
+        fbg_only_df.loc[(fbg_only_df["fasting"] == "non_fasting"), "fasting"] = NO
+        return fbg_only_df
+
+    def normalize_dates(self):
+        """Normalize dates"""
+        for col in ["fbg_datetime", "report_datetime"]:
+            if not self.fbg_only_df[col].empty:
+                self.fbg_only_df[col] = self.fbg_only_df[col].dt.floor("d")
+            if not self.df[col].empty:
+                self.df[col] = self.df[col].dt.floor("d")
+        if not self.df["ogtt_datetime"].empty:
+            self.df["ogtt_datetime"] = self.df["ogtt_datetime"].dt.floor("d")
+        else:
+            self.df["ogtt_datetime"] = pd.NaT
+
+    def calculate_fasting_hrs(self):
+        for dftmp in [self.fbg_only_df, self.df]:
+            dftmp.loc[(dftmp["fasting"] == NO), "fasting_duration_delta"] = pd.NaT
+            if dftmp.empty:
+                dftmp["fasting_hrs"] = np.nan
+            else:
+                dftmp["fasting_hrs"] = (
+                    dftmp["fasting_duration_delta"].dt.total_seconds() / 3600
+                )
+
     def append_subject_to_endpoint_df(self, subject_df: pd.DataFrame) -> None:
         if self.endpoint_df.empty:
             self.endpoint_df = subject_df.copy()
@@ -303,40 +327,43 @@ class GlucoseEndpointsByDate:
 
     def merge_with_final_endpoints(self):
         # merge endpoint_df with original df
-        self.endpoint_df["test"] = self.endpoint_df.apply(get_test_string, axis=1)
-        self.endpoint_df.loc[self.endpoint_df["endpoint"] == 1, "days_to_endpoint"] = (
-            self.endpoint_df["fbg_datetime"] - self.endpoint_df["baseline_datetime"]
-        ).dt.days
-
-        # print(f"Before dedup = {len(self.endpoint_df)}")
-
-        df1 = self.endpoint_df.copy()
-        df1 = df1[(df1["endpoint_type"] == CASE_EOS) & (df1["endpoint"] == 1)]
-        df1 = df1.sort_values(["subject_identifier", "fbg_datetime"])
-        df1 = df1.reset_index(drop=True)
-        df1 = df1.set_index(["subject_identifier"])
-        df1 = df1[~df1.index.duplicated(keep="last")]
-        df1 = df1.reset_index(drop=False)
-
-        df2 = self.endpoint_df.copy()
-        df2 = df2[(df2["endpoint_type"] != CASE_EOS) & (df2["endpoint"] == 1)]
-        df2 = df2.sort_values(["subject_identifier", "fbg_datetime"])
-        df2 = df2.reset_index(drop=True)
-        df2 = df2.set_index(["subject_identifier"])
-        df2 = df2[~df2.index.duplicated(keep="first")]
-        df2 = df2.reset_index(drop=False)
-
-        self.endpoint_only_df = pd.concat([df1, df2])
-        self.endpoint_only_df = self.endpoint_only_df.reset_index(drop=True)
-        # print(f"After dedup = {len(self.endpoint_df)}")
-
-        self.df = pd.merge(
-            self.df,
-            self.endpoint_only_df[["subject_identifier", "visit_code", "endpoint"]],
-            on=["subject_identifier", "visit_code"],
-            how="left",
-            suffixes=("", "_y"),
-        )
+        if self.endpoint_df.empty:
+            self.df = self.df[~(self.df["subject_identifier"].isin(self.subject_identifiers))]
+        else:
+            self.endpoint_df["test"] = self.endpoint_df.apply(get_test_string, axis=1)
+            self.endpoint_df.loc[self.endpoint_df["endpoint"] == 1, "days_to_endpoint"] = (
+                self.endpoint_df["fbg_datetime"] - self.endpoint_df["baseline_datetime"]
+            ).dt.days
+
+            # print(f"Before dedup = {len(self.endpoint_df)}")
+
+            df1 = self.endpoint_df.copy()
+            df1 = df1[(df1["endpoint_type"] == CASE_EOS) & (df1["endpoint"] == 1)]
+            df1 = df1.sort_values(["subject_identifier", "fbg_datetime"])
+            df1 = df1.reset_index(drop=True)
+            df1 = df1.set_index(["subject_identifier"])
+            df1 = df1[~df1.index.duplicated(keep="last")]
+            df1 = df1.reset_index(drop=False)
+
+            df2 = self.endpoint_df.copy()
+            df2 = df2[(df2["endpoint_type"] != CASE_EOS) & (df2["endpoint"] == 1)]
+            df2 = df2.sort_values(["subject_identifier", "fbg_datetime"])
+            df2 = df2.reset_index(drop=True)
+            df2 = df2.set_index(["subject_identifier"])
+            df2 = df2[~df2.index.duplicated(keep="first")]
+            df2 = df2.reset_index(drop=False)
+
+            self.endpoint_only_df = pd.concat([df1, df2])
+            self.endpoint_only_df = self.endpoint_only_df.reset_index(drop=True)
+            # print(f"After dedup = {len(self.endpoint_df)}")
+
+            self.df = pd.merge(
+                self.df,
+                self.endpoint_only_df[["subject_identifier", "visit_code", "endpoint"]],
+                on=["subject_identifier", "visit_code"],
+                how="left",
+                suffixes=("", "_y"),
+            )
         self.df = self.df.sort_values(by=["subject_identifier", "fbg_datetime"])
         self.df = self.df.reset_index(drop=True)
 
@@ -394,30 +421,35 @@ class GlucoseEndpointsByDate:
             model_cls.objects.filter(subject_identifier__in=subject_identifiers).delete()
         else:
             model_cls.objects.all().delete()
-        data = [
-            model_cls(
-                subject_identifier=row["subject_identifier"],
-                site_id=row["site"],
-                baseline_datetime=(
-                    None if pd.isna(row["baseline_datetime"]) else row["baseline_datetime"]
-                ),
-                visit_code=None if pd.isna(row["visit_code"]) else row["visit_code"],
-                fbg_value=(None if pd.isna(row["fbg_value"]) else row["fbg_value"]),
-                ogtt_value=None if pd.isna(row["ogtt_value"]) else row["ogtt_value"],
-                fbg_datetime=(None if pd.isna(row["fbg_datetime"]) else row["fbg_datetime"]),
-                fasting=(None if pd.isna(row["fasting"]) else row["fasting"]),
-                endpoint_label=(
-                    None if pd.isna(row["endpoint_label"]) else row["endpoint_label"]
-                ),
-                offstudy_datetime=(
-                    None if pd.isna(row["offstudy_datetime"]) else row["offstudy_datetime"]
-                ),
-                offstudy_reason=(
-                    None if pd.isna(row["offstudy_reason"]) else row["offstudy_reason"]
-                ),
-                report_model=model,
-                created=now,
-            )
-            for _, row in df.iterrows()
-        ]
-        return len(model_cls.objects.bulk_create(data))
+        created = 0
+        if not df.empty:
+            data = [
+                model_cls(
+                    subject_identifier=row["subject_identifier"],
+                    site_id=row["site"],
+                    baseline_datetime=(
+                        None if pd.isna(row["baseline_datetime"]) else row["baseline_datetime"]
+                    ),
+                    visit_code=None if pd.isna(row["visit_code"]) else row["visit_code"],
+                    fbg_value=(None if pd.isna(row["fbg_value"]) else row["fbg_value"]),
+                    ogtt_value=None if pd.isna(row["ogtt_value"]) else row["ogtt_value"],
+                    fbg_datetime=(
+                        None if pd.isna(row["fbg_datetime"]) else row["fbg_datetime"]
+                    ),
+                    fasting=(None if pd.isna(row["fasting"]) else row["fasting"]),
+                    endpoint_label=(
+                        None if pd.isna(row["endpoint_label"]) else row["endpoint_label"]
+                    ),
+                    offstudy_datetime=(
+                        None if pd.isna(row["offstudy_datetime"]) else row["offstudy_datetime"]
+                    ),
+                    offstudy_reason=(
+                        None if pd.isna(row["offstudy_reason"]) else row["offstudy_reason"]
+                    ),
+                    report_model=model,
+                    created=now,
+                )
+                for _, row in df.iterrows()
+            ]
+            created = len(model_cls.objects.bulk_create(data))
+        return created

meta_edc-0.3.24/meta_edc/__init__.py

@@ -0,0 +1,21 @@
+import os
+import sys
+from importlib.metadata import PackageNotFoundError, version
+
+# celery_app loads settings before Django, so ensure
+# it will load the correct settings module coming from
+# systemd service
+if "meta_edc.celery.live:app" in sys.argv:
+    from .celery.live import app as celery_app
+elif "meta_edc.celery.uat:app" in sys.argv:
+    from .celery.uat import app as celery_app
+else:
+    from .celery.debug import app as celery_app
+
+try:
+    __version__ = version(os.getcwd().split(os.sep)[-1])
+except PackageNotFoundError:
+    __version__ = None
+
+
+__all__ = ["celery_app", "__version__"]

meta_edc-0.3.24/meta_edc/celery/__init__.py

@@ -0,0 +1,2 @@
+# do not import modules
+# see conditional import at root __init__

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc/wsgi.py

@@ -2,6 +2,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.debug")
+os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.debug"
 
 application = get_wsgi_application()

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc/wsgi_live.py

@@ -2,6 +2,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.live")
+os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.live"
 
 application = get_wsgi_application()

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc/wsgi_uat.py

@@ -2,6 +2,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "meta_edc.settings.uat")
+os.environ["DJANGO_SETTINGS_MODULE"] = "meta_edc.settings.uat"
 
 application = get_wsgi_application()

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.22
+Version: 0.3.24
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -19,7 +19,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==0.6.1
+Requires-Dist: edc==0.6.2
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: edc-analytics

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc.egg-info/SOURCES.txt

@@ -513,7 +513,9 @@ meta_reports/tasks.py
 meta_reports/urls.py
 meta_reports/admin/__init__.py
 meta_reports/admin/endpoints_admin.py
+meta_reports/admin/list_filters.py
 meta_reports/admin/unmanaged/__init__.py
+meta_reports/admin/unmanaged/glucose_summary_admin.py
 meta_reports/admin/unmanaged/missing_screening_ogtt_admin.py
 meta_reports/admin/unmanaged/patient_history_missing_baseline_cd4_admin.py
 meta_reports/admin/unmanaged/unattended_three_in_row2_admin.py
@@ -545,11 +547,20 @@ meta_reports/migrations/0020_auto_20240819_1811.py
 meta_reports/migrations/0021_auto_20240819_1817.py
 meta_reports/migrations/0022_auto_20240819_1832.py
 meta_reports/migrations/0023_endpoints_meta_report_subject_a56b22_idx.py
+meta_reports/migrations/0024_glucosesummary.py
+meta_reports/migrations/0025_auto_20240822_0115.py
+meta_reports/migrations/0026_auto_20240822_0120.py
+meta_reports/migrations/0027_auto_20240822_0140.py
+meta_reports/migrations/0028_alter_glucosesummary_options.py
+meta_reports/migrations/0029_auto_20240822_0149.py
 meta_reports/migrations/__init__.py
 meta_reports/models/__init__.py
 meta_reports/models/endpoints.py
 meta_reports/models/dbviews/README
 meta_reports/models/dbviews/__init__.py
+meta_reports/models/dbviews/glucose_summary/__init__.py
+meta_reports/models/dbviews/glucose_summary/unmanaged_model.py
+meta_reports/models/dbviews/glucose_summary/view_definition.py
 meta_reports/models/dbviews/missing_screening_ogtt/__init__.py
 meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py
 meta_reports/models/dbviews/missing_screening_ogtt/view_definition.py
@@ -576,6 +587,7 @@ meta_reports/models/unmanaged/unattended_three_in_row2.sql
 meta_reports/models/unmanaged/unattended_two_in_row.py
 meta_reports/models/unmanaged/unattended_two_in_row.sql
 meta_reports/templates/meta_reports/endpoints_changelist_note.html
+meta_reports/templates/meta_reports/columns/subject_identifier_column.html
 meta_reports/tests/__init__.py
 meta_reports/tests/test_reports.py
 meta_reports/tests/urls.py
@@ -769,7 +781,7 @@ meta_subject/admin/blood_results/blood_results_lft_admin.py
 meta_subject/admin/blood_results/blood_results_lipid_admin.py
 meta_subject/admin/blood_results/blood_results_rft_admin.py
 meta_subject/admin/diabetes/__init__.py
-meta_subject/admin/diabetes/dm_diagnosis_admin.py
+meta_subject/admin/diabetes/dm_endpoint_admin.py
 meta_subject/admin/diabetes/dm_followup_admin.py
 meta_subject/admin/health_economics/__init__.py
 meta_subject/admin/health_economics/health_economics_simple_admin.py
@@ -777,8 +789,7 @@ meta_subject/admin/health_economics/health_economics_update_admin.py
 meta_subject/form_validators/__init__.py
 meta_subject/form_validators/birth_outcomes_form_validator.py
 meta_subject/form_validators/delivery_form_validator.py
-meta_subject/form_validators/dm_diagnosis_form_validator.py
-meta_subject/form_validators/dm_dx_result_form_validator.py
+meta_subject/form_validators/dm_endpoint_form_validator.py
 meta_subject/form_validators/dm_followup_form_validator.py
 meta_subject/form_validators/egfr_drop_notification_form_validator.py
 meta_subject/form_validators/followup_examination_form_validator.py
@@ -821,8 +832,7 @@ meta_subject/forms/blood_results/blood_results_lft_form.py
 meta_subject/forms/blood_results/blood_results_lipid_form.py
 meta_subject/forms/blood_results/blood_results_rft_form.py
 meta_subject/forms/diabetes/__init__.py
-meta_subject/forms/diabetes/dm_diagnosis_form.py
-meta_subject/forms/diabetes/dm_dx_result_form.py
+meta_subject/forms/diabetes/dm_endpoint_form.py
 meta_subject/forms/diabetes/dm_followup_form.py
 meta_subject/forms/health_economics/__init__.py
 meta_subject/forms/health_economics/health_economics_simple_form.py
@@ -1042,6 +1052,9 @@ meta_subject/migrations/0205_historicalsubjectrequisition_crf_status_and_more.py
 meta_subject/migrations/0206_bloodresultsfbc_crf_status_and_more.py
 meta_subject/migrations/0207_alter_historicalphysicalexam_waist_circumference_and_more.py
 meta_subject/migrations/0208_birthoutcomes_crf_status_and_more.py
+meta_subject/migrations/0209_remove_historicaldmdxresult_dm_diagnosis_and_more.py
+meta_subject/migrations/0210_remove_dmdxresult_dm_diagnosis_and_more.py
+meta_subject/migrations/0211_dmendpoint_endpoint_reached_and_more.py
 meta_subject/migrations/__init__.py
 meta_subject/model_mixins/__init__.py
 meta_subject/model_mixins/arv_history_model_mixin.py
@@ -1090,8 +1103,7 @@ meta_subject/models/blood_results/blood_results_lft.py
 meta_subject/models/blood_results/blood_results_lipid.py
 meta_subject/models/blood_results/blood_results_rft.py
 meta_subject/models/diabetes/__init__.py
-meta_subject/models/diabetes/dm_diagnosis.py
-meta_subject/models/diabetes/dm_dx_result.py
+meta_subject/models/diabetes/dm_endpoint.py
 meta_subject/models/diabetes/dm_followup.py
 meta_subject/models/health_economics/__init__.py
 meta_subject/models/health_economics/health_economics.py

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_edc.egg-info/requires.txt

@@ -1,4 +1,4 @@
-edc==0.6.1
+edc==0.6.2
 edc-microscopy
 beautifulsoup4
 edc-analytics

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_prn/tests/tests/test_dm_referral.py

@@ -18,7 +18,7 @@ from meta_prn.constants import (
 from meta_prn.models import DmReferral, OnScheduleDmReferral
 from meta_screening.tests.meta_test_case_mixin import MetaTestCaseMixin
 from meta_subject.constants import DM_FOLLOWUP_ACTION
-from meta_subject.models import DmDiagnosis, DmFollowup, SubjectVisit
+from meta_subject.models import DmEndpoint, DmFollowup, SubjectVisit
 from meta_visit_schedule.constants import DM_BASELINE, DM_FOLLOWUP, SCHEDULE_DM_REFERRAL
 
 
@@ -146,7 +146,7 @@ class TestDmReferral(MetaTestCaseMixin, TestCase):
             info_source=PATIENT,
         )
 
-        DmDiagnosis.objects.create(
+        DmEndpoint.objects.create(
             subject_visit=subject_visit,
             report_datetime=get_utcnow(),
             dx_date=referral_datetime.date(),

meta_edc-0.3.24/meta_reports/__init__.py

@@ -0,0 +1 @@
+from .tasks import update_endpoints_table

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_reports/admin/__init__.py

@@ -1,5 +1,6 @@
 from .endpoints_admin import EndpointAdmin
 from .unmanaged import (
+    GlucoseSummaryAdmin,
     MissingScreeningOgttAdmin,
     PatientHistoryMissingBaselineCd4Admin,
     UnattendedThreeInRow2Admin,

{meta_edc-0.3.22 → meta_edc-0.3.24}/meta_reports/admin/endpoints_admin.py

@@ -5,6 +5,7 @@ from django.contrib import admin
 from django.contrib.admin import SimpleListFilter
 from django.db.models import QuerySet
 from django.template.loader import render_to_string
+from django.urls import reverse
 from edc_model_admin.dashboard import ModelAdminDashboardMixin
 from edc_model_admin.mixins import (
     ModelAdminFormInstructionsMixin,
@@ -17,19 +18,19 @@ from edc_visit_schedule.admin import ScheduleStatusListFilter
 
 from ..admin_site import meta_reports_admin
 from ..models import Endpoints
-from ..tasks import update_unmanaged_table
+from ..tasks import update_endpoints_table
 
 
-def update_unmanaged_table_action(modeladmin, request, queryset):
+def update_endpoints_table_action(modeladmin, request, queryset):
     subject_identifiers = []
     if queryset.count() != modeladmin.model.objects.count():
         subject_identifiers = [o.subject_identifier for o in queryset]
     if settings.CELERY_ENABLED:
-        return update_unmanaged_table.delay(subject_identifiers)
-    return update_unmanaged_table(subject_identifiers)
+        return update_endpoints_table.delay(subject_identifiers)
+    return update_endpoints_table(subject_identifiers)
 
 
-update_unmanaged_table_action.short_description = "Regenerate report for selected subjects"
+update_endpoints_table_action.short_description = "Regenerate report for selected subjects"
 
 
 @admin.register(Endpoints, site=meta_reports_admin)
@@ -43,7 +44,7 @@ class EndpointAdmin(
 ):
 
     change_list_note = render_to_string("meta_reports/endpoints_changelist_note.html")
-    actions = [update_unmanaged_table_action]
+    actions = [update_endpoints_table_action]
     qa_report_list_display_insert_pos = 2
     ordering = ["-fbg_datetime"]
     list_display = [
@@ -104,7 +105,16 @@ class EndpointAdmin(
 
     @admin.display(description="endpoint", ordering="endpoint_label")
     def endpoint(self, obj=None):
-        return obj.endpoint_label
+        url = reverse("meta_reports_admin:meta_reports_glucosesummary_changelist")
+        return render_to_string(
+            "meta_reports/columns/subject_identifier_column.html",
+            {
+                "subject_identifier": obj.subject_identifier,
+                "url": url,
+                "label": obj.endpoint_label,
+            },
+        )
+        return
 
     @admin.display(description="last_updated", ordering="created")
     def last_updated(self, obj=None):