meta-edc 0.3.31__py3-none-any.whl → 0.3.33__py3-none-any.whl

meta_analytics/dataframes/__init__.py

@@ -1,2 +1,17 @@
+from .constants import (
+    CASE_EOS,
+    CASE_FBG_ONLY,
+    CASE_FBGS_WITH_FIRST_OGTT,
+    CASE_FBGS_WITH_SECOND_OGTT,
+    CASE_OGTT,
+    endpoint_cases,
+    endpoint_columns,
+)
 from .glucose_endpoints import EndpointByDate, GlucoseEndpointsByDate
 from .screening import get_glucose_tested_only_df, get_screening_df
+from .utils import (
+    get_empty_endpoint_df,
+    get_test_string,
+    get_unique_subject_identifiers,
+    get_unique_visit_codes,
+)

meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py

@@ -2,7 +2,7 @@ import numpy as np
 import pandas as pd
 from edc_constants.constants import YES
 
-from .constants import endpoint_cases
+from ..constants import endpoint_cases
 
 
 class EndpointTdeltaError(Exception):
@@ -23,8 +23,8 @@ class EndpointByDate:
     Evaluation is done in order
 
     Order of protocol endpoint evaluation:
-      * case 2. FBG >= 7 x 2, first OGTT<=11.1
-      * case 3.  FBG >= 7 x 2, second OGTT<=11.1
+      * case 2. FBG >= 7 x 2, first OGTT<11.1
+      * case 3.  FBG >= 7 x 2, second OGTT<11.1
 
     Additional criteria considered:
       1. any threshhold FBG must be taken while fasted (fasting=YES)
@@ -96,7 +96,7 @@ class EndpointByDate:
         ] = self.endpoint_cases[case]
 
     def case_two(self, index: int):
-        """FBG >= 7 x 2, first OGTT<=11.1.
+        """FBG >= 7 x 2, first OGTT<11.1.
 
         First FBG must be done with corresponding OGTT.
         """
@@ -104,11 +104,14 @@ class EndpointByDate:
             self.get_next("fbg_datetime", index)
             and self.get("fbg_value", index)
             and self.get("ogtt_value", index)
+            and self.get("fasting", index)
             and self.get_next("fbg_value", index)
+            and self.get_next("fasting", index)
             and self.get("fbg_value", index) >= self.fbg_threshhold
             and self.get("ogtt_value", index) < self.ogtt_threshhold
+            and self.get("fasting", index) == YES
             and self.get_next("fbg_value", index) >= self.fbg_threshhold
-            and self.fasting(index)
+            and self.get_next("fasting", index) == YES
             and (self.get_next("fbg_datetime", index) - self.get("fbg_datetime", index)).days
             >= 7
         )
@@ -117,19 +120,22 @@ class EndpointByDate:
         return reached
 
     def case_three(self, index: int):
-        """FBG >= 7 x 2, second OGTT<=11.1.
+        """FBG >= 7 x 2, second OGTT<11.1.
 
         Second FBG must be done with corresponding OGTT.
         """
         reached = (
             self.get_next("fbg_datetime", index)
             and self.get("fbg_value", index)
+            and self.get("fasting", index)
             and self.get_next("fbg_value", index)
             and self.get_next("ogtt_value", index)
+            and self.get_next("fasting", index)
             and self.get("fbg_value", index) >= self.fbg_threshhold
+            and self.get("fasting", index) == YES
             and self.get_next("fbg_value", index) >= self.fbg_threshhold
             and self.get_next("ogtt_value", index) < self.ogtt_threshhold
-            and self.fasting(index)
+            and self.get_next("fasting", index) == YES
             and (self.get_next("fbg_datetime", index) - self.get("fbg_datetime", index)).days
             >= 7
         )
@@ -143,21 +149,24 @@ class EndpointByDate:
         This is not a protocol endpoint.
         """
         reached = (
-            self.get_next("fbg_datetime", index)
-            and self.get("fbg_value", index)
+            self.get("fbg_value", index)
+            and self.get("fbg_datetime", index)
+            and self.get("fasting", index)
             and self.get_next("fbg_value", index)
             and self.get_next("ogtt_value", index)
+            and self.get_next("fbg_datetime", index)
+            and self.get_next("fasting", index)
             and self.get("fbg_value", index) >= self.fbg_threshhold
+            and self.get("fasting", index) == YES
             and self.get_next("fbg_value", index) >= self.fbg_threshhold
-            and self.fasting(index)
+            and self.get_next("fasting", index) == YES
+            and (self.get_next("fbg_datetime", index) - self.get("fbg_datetime", index)).days
+            >= 7
         )
         if reached:
             self.endpoint_reached(index, case=4, next_is_endpoint=True)
         return reached
 
-    def fasting(self, index) -> bool:
-        return self.get("fasting", index) == YES and self.get_next("fasting", index) == YES
-
     def sequential_assessments_in_days(self, index) -> int:
         if not self.get_next("fbg_value", index):
             raise EndpointTdeltaError

meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py

@@ -2,10 +2,15 @@ import numpy as np
 import pandas as pd
 from django.apps import apps as django_apps
 from edc_constants.constants import NO, YES
-from edc_pdutils.dataframes import get_crf, get_eos, get_subject_consent
+from edc_pdutils.dataframes import (
+    get_crf,
+    get_eos,
+    get_subject_consent,
+    get_subject_visit,
+)
 from edc_utils import get_utcnow
 
-from .constants import (
+from ..constants import (
     CASE_EOS,
     CASE_FBG_ONLY,
     CASE_FBGS_WITH_FIRST_OGTT,
@@ -14,13 +19,13 @@ from .constants import (
     endpoint_cases,
     endpoint_columns,
 )
-from .endpoint_by_date import EndpointByDate
-from .utils import (
+from ..utils import (
     get_empty_endpoint_df,
     get_test_string,
     get_unique_subject_identifiers,
     get_unique_visit_codes,
 )
+from .endpoint_by_date import EndpointByDate
 
 
 def normalize_date_columns(df: pd.DataFrame, cols: list[str] = None) -> pd.DataFrame:
@@ -83,13 +88,12 @@ class GlucoseEndpointsByDate:
         self.endpoint_cases = {k: v for k, v in endpoint_cases.items() if k in self.case_list}
 
         # merge two model DFs
-        self.df = pd.merge(
-            self.glucose_fbg_ogtt_df,
+        self.df = self.glucose_fbg_ogtt_df.merge(
             self.glucose_fbg_df,
-            on=["subject_visit_id", "fbg_datetime", "fbg_value"],
+            on=["subject_visit_id"],
             how="outer",
             indicator=True,
-            suffixes=("", "2"),
+            suffixes=("", "_y"),
         )
         self.df = self.df.reset_index(drop=True)
 
@@ -97,13 +101,21 @@ class GlucoseEndpointsByDate:
         cols = {
             "fasting": None,
             "fasting_hrs": np.nan,
+            "fbg_value": None,
             "fbg_units": None,
+            "fbg_datetime": None,
             "source": None,
             "report_datetime": pd.NaT,
         }
         for col, null_value in cols.items():
-            self.df.loc[self.df["_merge"] == "right_only", col] = self.df[f"{col}2"]
-        cols = [col for col in self.df.columns if col.endswith("2")]
+            self.df.loc[
+                (self.df["_merge"].isin(["both", "right_only"])) & (self.df[col].isna()), col
+            ] = self.df[f"{col}_y"]
+        # if fbg_datetime still null, use visit datetime to sort order
+        self.df.loc[(self.df["fbg_datetime"].isna()), "fbg_datetime"] = self.df[
+            "visit_datetime"
+        ]
+        cols = [col for col in self.df.columns if col.endswith("_y")]
         cols.append("_merge")
         self.df = self.df.drop(columns=cols)
         self.df = self.df.reset_index(drop=True)
@@ -163,6 +175,11 @@ class GlucoseEndpointsByDate:
                 subject_identifiers=self.subject_identifiers,
                 subject_visit_model="meta_subject.subjectvisit",
             )
+            # merge w/ subject_visit
+            subject_visit_df = get_subject_visit("meta_subject.subjectvisit")
+            df = subject_visit_df.merge(
+                df, on=["subject_visit_id"], how="left", suffixes=("", "_y")
+            )
             df["source"] = "meta_subject.glucosefbg"
             df.rename(columns={"fbg_fasting": "fasting"}, inplace=True)
             df.loc[(df["fasting"] == "fasting"), "fasting"] = YES
@@ -189,6 +206,11 @@ class GlucoseEndpointsByDate:
                 subject_visit_model="meta_subject.subjectvisit",
             )
             df["source"] = "meta_subject.glucose"
+            # merge w/ subject_visit
+            subject_visit_df = get_subject_visit("meta_subject.subjectvisit")
+            df = subject_visit_df.merge(
+                df, on=["subject_visit_id"], how="left", suffixes=("", "_y")
+            )
             df = calculate_fasting_hrs(df)
             df = df[self.keep_cols]
             df = df.reset_index(drop=True)
@@ -270,6 +292,12 @@ class GlucoseEndpointsByDate:
             & (self.working_df["fasting"] == YES)
             & (self.working_df["fbg_value"].notna())
         ].copy()
+        subject_endpoint_df.sort_values(by=["subject_identifier", "fbg_datetime"])
+        subject_endpoint_df = subject_endpoint_df.reset_index(drop=True)
+        subject_endpoint_df = subject_endpoint_df.drop_duplicates(
+            subset=["subject_identifier"], keep="first"
+        )
+        subject_endpoint_df = subject_endpoint_df.reset_index(drop=True)
         if not subject_endpoint_df.empty:
             # flag the selected endpoint rows as endpoints
             subject_endpoint_df["endpoint"] = 1
@@ -344,19 +372,19 @@ class GlucoseEndpointsByDate:
         subject_df["endpoint_type"] = None
         subject_df["endpoint_label"] = None
         subject_df["endpoint"] = 0
-        subject_df = subject_df.sort_values(["subject_identifier", "fbg_datetime"])
-        subject_df = subject_df.reset_index(drop=True)
         subject_df = subject_df[endpoint_columns]
-        subject_df = subject_df.merge(
-            self.visit_codes_df,
-            on="visit_code",
-            how="outer",
-            indicator=False,
-            suffixes=["", "2"],
-        )
-        subject_df["subject_identifier"] = subject_identifier
-        subject_df = subject_df.drop(columns=["count"])
+        subject_df = subject_df.sort_values(["subject_identifier", "fbg_datetime"])
         subject_df = subject_df.reset_index(drop=True)
+        # subject_df = subject_df.merge(
+        #     self.visit_codes_df,
+        #     on="visit_code",
+        #     how="outer",
+        #     indicator=False,
+        #     suffixes=["", "2"],
+        # )
+        # subject_df["subject_identifier"] = subject_identifier
+        # subject_df = subject_df.drop(columns=["count"])
+        # subject_df = subject_df.reset_index(drop=True)
         return subject_df
 
     def check_endpoint_by_fbg_for_subject(

meta_analytics/notebooks/meta_endpoints.ipynb

@@ -76,62 +76,158 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "df519e75-d536-435e-8c1e-d4087b99d174",
+   "id": "b0ebcb02-9d70-43b2-8614-b97ce6fc5aac",
    "metadata": {},
    "outputs": [],
    "source": [
-    "cls.summarize()"
+    "kb_subjects = [\n",
+    "    \"105-10-0156-6\",\n",
+    "    \"105-10-0020-4\",\n",
+    "    \"105-10-0061-8\",\n",
+    "    \"105-10-0009-7\",\n",
+    "    \"105-10-0074-1\",\n",
+    "    \"105-10-0136-8\",\n",
+    "    \"105-10-0162-4\",\n",
+    "    \"105-10-0054-3\",\n",
+    "    \"105-10-0080-8\",\n",
+    "    \"105-10-0097-2\",\n",
+    "    \"105-20-0159-9\",\n",
+    "    \"105-20-0236-5\",\n",
+    "    \"105-20-0009-6\",\n",
+    "    \"105-20-0197-9\",\n",
+    "    \"105-20-0354-6\",\n",
+    "    \"105-20-0067-4\",\n",
+    "    \"105-20-0015-3\",\n",
+    "    \"105-30-0044-2\",\n",
+    "    \"105-30-0037-6\",\n",
+    "    \"105-30-0147-3\",\n",
+    "    \"105-30-0052-5\",\n",
+    "    \"105-40-0034-2\",\n",
+    "    \"105-40-0246-2\",\n",
+    "    \"105-40-0160-5\",\n",
+    "    \"105-40-0153-0\",\n",
+    "    \"105-40-0054-0\",\n",
+    "    \"105-40-0390-8\",\n",
+    "    \"105-40-0389-0\",\n",
+    "    \"105-40-0379-1\",\n",
+    "    \"105-40-0036-7\",\n",
+    "    \"105-40-0024-3\",\n",
+    "    \"105-40-0233-0\",\n",
+    "    \"105-40-0202-5\",\n",
+    "    \"105-40-0028-4\",\n",
+    "    \"105-40-0010-2\",\n",
+    "    \"105-40-0029-2\",\n",
+    "    \"105-40-0215-7\",\n",
+    "    \"105-40-0274-4\",\n",
+    "    \"105-40-0124-1\",\n",
+    "    \"105-40-0186-0\",\n",
+    "    \"105-40-0219-9\",\n",
+    "    \"105-40-0336-1\",\n",
+    "    \"105-40-0304-9\",\n",
+    "    \"105-40-0214-0\",\n",
+    "    \"105-40-0111-8\",\n",
+    "    \"105-40-0361-9\",\n",
+    "    \"105-40-0121-7\",\n",
+    "    \"105-40-0158-9\",\n",
+    "    \"105-40-0048-2\",\n",
+    "    \"105-40-0273-6\",\n",
+    "    \"105-40-0333-8\",\n",
+    "    \"105-40-0298-3\",\n",
+    "    \"105-40-0021-9\",\n",
+    "    \"105-40-0494-8\",\n",
+    "    \"105-40-0171-2\",\n",
+    "    \"105-40-0303-1\",\n",
+    "    \"105-40-0109-2\",\n",
+    "    \"105-60-0173-6\",\n",
+    "    \"105-60-0104-1\",\n",
+    "    \"105-60-0144-7\",\n",
+    "    \"105-60-0163-7\",\n",
+    "    \"105-60-0121-5\",\n",
+    "    \"105-60-0198-3\",\n",
+    "    \"105-60-0145-4\",\n",
+    "    \"105-60-0155-3\",\n",
+    "    \"105-60-0146-2\",\n",
+    "    \"105-60-0076-1\",\n",
+    "    \"105-60-0172-8\",\n",
+    "    \"105-60-0024-1\",\n",
+    "    \"105-60-0201-5\",\n",
+    "    \"105-60-0029-0\",\n",
+    "    \"105-60-0166-0\",\n",
+    "    \"105-60-0212-2\",\n",
+    "    \"105-60-0106-6\",\n",
+    "]"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "526b5f1a-cc77-4182-b9b4-c17c297344f6",
+   "id": "5bee69bb-30db-4b51-9e81-b391ccb63c42",
    "metadata": {},
    "outputs": [],
    "source": [
-    "# table meta_subject.glucose\n",
-    "fname = f\"meta-subject-glucose-{datetime.now().strftime(\"%Y-%m-%d-%H%M\")}.csv\"\n",
-    "get_crf(\"meta_subject.glucose\", subject_visit_model=\"meta_subject.subjectvisit\", drop_columns=[\"consent_model\"]).to_csv(report_folder / fname, sep=\"|\", encoding=\"utf8\", index=False)\n"
+    "kb_extras = [s for s in cls.endpoint_only_df[\"subject_identifier\"] if s not in kb_subjects]\n",
+    "ew_extras = [s for s in kb_subjects if s not in list(cls.endpoint_only_df[\"subject_identifier\"])]"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "b914aef9-5a27-4474-8359-2d8e0509720b",
+   "id": "b3856dc1-cd6e-4886-a89b-e73c064b5f56",
    "metadata": {},
    "outputs": [],
    "source": [
-    "# table meta_subject.glucosefbg\n",
-    "fname = f\"meta-subject-glucosefbg-{datetime.now().strftime(\"%Y-%m-%d-%H%M\")}.csv\"\n",
-    "get_crf(\"meta_subject.glucosefbg\", subject_visit_model=\"meta_subject.subjectvisit\", drop_columns=[\"consent_model\"]).to_csv(report_folder / fname, sep=\"|\", encoding=\"utf8\", index=False)\n"
+    "kb_extras"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "66064ddd-51b6-4474-9664-42ecd471e9ce",
+   "id": "ecb272b1-341b-4488-90dd-25ce98087dcc",
    "metadata": {},
    "outputs": [],
    "source": [
-    "# all glucose merged\n",
-    "fname = f\"glucose-merged-{datetime.now().strftime(\"%Y-%m-%d-%H%M\")}.csv\"\n",
-    "cls.df.to_csv(report_folder / fname, sep=\"|\", encoding=\"utf8\", index=False)\n"
+    "ew_extras"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "df519e75-d536-435e-8c1e-d4087b99d174",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "526b5f1a-cc77-4182-b9b4-c17c297344f6",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b914aef9-5a27-4474-8359-2d8e0509720b",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "66064ddd-51b6-4474-9664-42ecd471e9ce",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
    "id": "a8a9da26-84f0-4cc3-a33b-83bf1c292380",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "# pivot of glucose readings for subjects who have reached\n",
-    "# an ednpoint\n",
-    "fname = f\"glucose-pivot-{datetime.now().strftime(\"%Y-%m-%d-%H%M\")}.csv\"\n",
-    "df_pivot = cls.endpoint_df.sort_values(by=[\"subject_identifier\"]).set_index(\"subject_identifier\").pivot_table(columns=[\"visit_code\"], values=[\"fbg_value\",\"ogtt_value\"], index=[\"subject_identifier\"])\n",
-    "df_pivot.sort_values(('visit_code'), axis=1).sort_values(\"subject_identifier\").to_csv(report_folder / fname, sep=\"|\", encoding=\"utf8\", index=True)\n"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -139,11 +235,7 @@
    "id": "f97dcfa7-4575-43c1-8614-9f51eb4adff5",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "# all subjects with endpoint data\n",
-    "fname = f\"endpoint_df-{datetime.now().strftime(\"%Y-%m-%d-%H%M\")}.csv\"\n",
-    "cls.endpoint_df.to_csv(report_folder / fname, sep=\"|\", encoding=\"utf8\", index=False)\n"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -151,9 +243,7 @@
    "id": "b394252c-443c-49a9-9f32-77a686d00067",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "# len(cls.endpoint_only_df)"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -161,9 +251,7 @@
    "id": "82634927-c2bf-4745-9fdf-841a1fec008b",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "# len(cls.endpoint_only_df[\"subject_identifier\"].unique())"
-   ]
+   "source": []
   },
   {
    "cell_type": "code",
@@ -171,10 +259,7 @@
    "id": "dc597ae7-d66e-4e1f-9f69-b35dd2d28ec4",
    "metadata": {},
    "outputs": [],
-   "source": [
-    "# subject_identifier = \"105-10-0064-2\"\n",
-    "# cls.df[cls.df[\"subject_identifier\"]==subject_identifier][[\"visit_code\", \"fbg_datetime\", \"fasting\", \"fbg_value\", \"ogtt_value\"]]"
-   ]
+   "source": []
   }
  ],
  "metadata": {
@@ -193,7 +278,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.12.4"
   }
  },
  "nbformat": 4,

{meta_edc-0.3.31.dist-info → meta_edc-0.3.33.dist-info}/METADATA

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

{meta_edc-0.3.31.dist-info → meta_edc-0.3.33.dist-info}/RECORD

@@ -85,18 +85,18 @@ meta_analytics/README.rst,sha256=x5KDks1P2bSPdyq3f9CNkynAAgJaXl7AX_3rnmC16HU,357
 meta_analytics/__init__.py,sha256=kw_E-hvxNPuGxraTF6L5MFzADYn3vTSmww1vcGr96CQ,104
 meta_analytics/constants.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/get_tables.py,sha256=KDCFdzQmwtCdTrMrODpEDHQXVNzztOa8UiqV6C4hzlc,3043
-meta_analytics/dataframes/__init__.py,sha256=yJQS5Ix7QTSGFwNnebSVMwYXAtxGQXxTtEOropiw-1A,138
+meta_analytics/dataframes/__init__.py,sha256=EsDu7Dn6mz4yz2enKyrdZiQKN224VwcD7VqTzYGdYjs,453
+meta_analytics/dataframes/constants.py,sha256=XIt19uf5aSxiOVzkvHtUHs1RJo-1XqJLQOySOJvhQb8,789
+meta_analytics/dataframes/utils.py,sha256=2V3nFFnaysuJvNrcHUOLqOk8e_3aP71079kB_YBXcQw,2014
 meta_analytics/dataframes/enrolled/__init__.py,sha256=uKniE7L86umlSmGOjAFuwwsbyZj31mELGUpY3hByo4s,43
 meta_analytics/dataframes/enrolled/get_glucose_df.py,sha256=L4gzszNjYzu-QmYu4gs1c7_Edcv7FgAjucihxHtANSY,5004
 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=Lqfa8YXiOJXrGNyXrbqOLXhkygZjtE5pGgemyYgeVik,19288
-meta_analytics/dataframes/glucose_endpoints/utils.py,sha256=2V3nFFnaysuJvNrcHUOLqOk8e_3aP71079kB_YBXcQw,2014
+meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py,sha256=aOadsfeclOEGFo5agSZUbY2NdM8iZDsOLdg-5j8aelg,7011
+meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=rWbCTg4D35Gp2BI3DjWZcfBOiMCwwTMyjewXsRNk1YE,20489
 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
 meta_analytics/dataframes/screening/get_screening_df.py,sha256=_6AmaHvH06ubFGiQB6XbVRkVGE5kvtbVbDfs7k5TPX8,4854
-meta_analytics/notebooks/meta_endpoints.ipynb,sha256=dvLNb8nsCjM7upQhj7LIwwdv0Hv5gK54wAgfVAw0qXw,5816
+meta_analytics/notebooks/meta_endpoints.ipynb,sha256=cmdGX_sKa32AfwWzOXmSS-9oB3Lxhuy5c-FbQdSgMFs,7118
 meta_analytics/tables/__init__.py,sha256=mhESCt0Lq4RJU-lbQ5fVfIbXzrEsootGYp7EzQIqDBI,70
 meta_analytics/tables/eligible.py,sha256=2q-SMbAsrBgOVc4Ttq5P3bpjsUKwP5hYhJBMgyH6GGI,3389
 meta_analytics/tables/has_dm.py,sha256=W6pObFI7k2hpL46Q7t2QIfYDVfo7-PHJMdCv6Q5EUQk,1739
@@ -438,7 +438,7 @@ meta_reports/admin/__init__.py,sha256=W9unT8v7A8yHLn0WS8Wn4ZRk6W32POBS-ePh1UA-DH
 meta_reports/admin/endpoints_admin.py,sha256=L4mDLNIkR6203RI3ImBYel2kevaH_Nwa6KMYuoDwyNU,518
 meta_reports/admin/endpoints_all_admin.py,sha256=_czdezZf9fSjwZJmO-3HbmdXrXP6nk8-HdiweqUzPRE,476
 meta_reports/admin/list_filters.py,sha256=pByBzz9-qGwqBfdZFlByxJUZDTJQXOTWfNLjmK8KF00,870
-meta_reports/admin/modeladmin_mixins.py,sha256=9Fv3G3dPGl5EVlmKw2zhEsxEoTKAA2wOdET9vdVuWZ0,3669
+meta_reports/admin/modeladmin_mixins.py,sha256=RhdkF5W9ccuwaX5NTMF4b9shQJgDFaOlj7ENOTBAG0g,3669
 meta_reports/admin/dbviews/__init__.py,sha256=5NoJxTvBaZX0hJnE9Bf-HyJBEgGd59Hebj50Q23gguk,616
 meta_reports/admin/dbviews/glucose_summary_admin.py,sha256=NqnDKx5l0Q-2xxRGdnf50DaRX1Sn8-DC0jHSk96LkRo,4005
 meta_reports/admin/dbviews/patient_history_missing_baseline_cd4_admin.py,sha256=XyroEqxlX816xrdi0IVSelNPxPBWi96niKa-MQVGkck,2058
@@ -499,7 +499,7 @@ meta_reports/migrations/0039_onstudymissingvalues.py,sha256=Tpr_0vujhzWEDYKKBNJe
 meta_reports/migrations/0040_auto_20240824_0412.py,sha256=mgUvizbsZUqEVDxu4EMymJ0L2vKaoAxyhjZkc1dUFDI,67126
 meta_reports/migrations/0041_auto_20240828_2229.py,sha256=BpbbBqzo9WED5owo30w-UBDX9ReJfOxQjyFEsNCMcp0,302
 meta_reports/migrations/0042_onstudymissinglabvalues.py,sha256=zSEgSrjOe19d3s9XoPkx9ZzirchII9KQblU-cnrcEyY,1783
-meta_reports/migrations/0043_auto_20240828_2309.py,sha256=AAlPRv6b6nE7QDwfyvY-GF9Q_EgiIdqiL_qDr3PpypE,88807
+meta_reports/migrations/0043_auto_20240828_2309.py,sha256=ZQUFjpWb6Jl2__ghkXL_gviCRjOD5DMC2DS0YaZrlp4,88894
 meta_reports/migrations/0044_auto_20240828_2323.py,sha256=oOuxdpmk3NjdkljjqtSHOPv-C2cFNgHquTz-qjPwff4,143236
 meta_reports/migrations/0045_auto_20240829_0248.py,sha256=V9F3yLQsbvUL40Fei3FrhBB4t7eReGGW4tnkx2lAjrw,33850
 meta_reports/migrations/0046_auto_20240829_0250.py,sha256=lKVlj7LrkOJ49LJxccYvQdYEZhnSKTcZEcZMYj7h9q8,30676
@@ -1123,9 +1123,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.31.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-0.3.31.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-0.3.31.dist-info/METADATA,sha256=bXhH4QYN6UYUyqD7xHibhRUlgh3S-tLKWInug-Rko4U,2810
-meta_edc-0.3.31.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-meta_edc-0.3.31.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-0.3.31.dist-info/RECORD,,
+meta_edc-0.3.33.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.33.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.33.dist-info/METADATA,sha256=jWZeykN68G-2vi6uWOB1U6hKVx_BeJ4gEudLbml9sqQ,2811
+meta_edc-0.3.33.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+meta_edc-0.3.33.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.33.dist-info/RECORD,,

meta_reports/admin/modeladmin_mixins.py

@@ -36,7 +36,7 @@ class EndpointsModelAdminMixin(
 ):
     queryset_filter: dict | None = None
     actions = [update_endpoints_table_action]
-    qa_report_list_display_insert_pos = 2
+    qa_report_list_display_insert_pos = 3
     ordering = ["-fbg_datetime"]
     list_display = [
         "dashboard",

meta_reports/migrations/0043_auto_20240828_2309.py

@@ -9,6 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("meta_reports", "0042_onstudymissinglabvalues"),
+        ("meta_subject", "0213_rename_bloodresultslipid_bloodresultslipids_and_more"),
     ]
 
     operations = [