meta-edc 1.4.1__py3-none-any.whl → 1.5.1__py3-none-any.whl

meta_analytics/dataframes/get_glucose_df.py

@@ -52,6 +52,9 @@ def get_glucose_df(subject_identifiers: list[str] | None = None) -> pd.DataFrame
         how="left",
     )
 
+    for col in [c for c in df_glucose_fbg.columns if "datetime" in c]:
+        df_glucose_fbg[col] = pd.to_datetime(df_glucose_fbg[col])
+
     if subject_identifiers:
         df_glucose = read_frame(
             Glucose.objects.filter(subject_visit__subject_identifier__in=subject_identifiers),
@@ -70,6 +73,9 @@ def get_glucose_df(subject_identifiers: list[str] | None = None) -> pd.DataFrame
     )
     df_glucose["source"] = "meta_subject.glucose"
 
+    for col in [c for c in df_glucose.columns if "datetime" in c]:
+        df_glucose[col] = pd.to_datetime(df_glucose[col])
+
     df_glucose = subject_visit_df[
         [
             "subject_identifier",
@@ -108,7 +114,6 @@ def get_glucose_df(subject_identifiers: list[str] | None = None) -> pd.DataFrame
         df_glucose_fbg[keep_cols],
         on="subject_visit_id",
         how="outer",
-        # indicator=True,
         suffixes=("", "_2"),
     )
 
@@ -129,7 +134,7 @@ def get_glucose_df(subject_identifiers: list[str] | None = None) -> pd.DataFrame
 
     # reconcile all to single column
     for col in ["fasted", "fbg_value", "ogtt_value", "fbg_datetime", "ogtt_datetime"]:
-        df.loc[(df[col].isna()) & (df[f"{col}_2"].notna()), col] = df[f"{col}_2"]
+        df[col] = df[col].fillna(df[f"{col}_2"])
 
     df_consent = get_subject_consent("meta_consent.subjectconsent")
     df_eos = get_eos("meta_prn.endofstudy")

{meta_edc-1.4.1.dist-info → meta_edc-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meta-edc
-Version: 1.4.1
+Version: 1.5.1
 Summary: META Trial EDC (https://www.isrctn.com/ISRCTN76157257)
 Keywords: django,clinicedc,META EDC,EDC,clinical trials,META Trial,ISRCTN76157257
 Author: Erik van Widenfelt, Jonathan Willitts
@@ -15,12 +15,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: clinicedc>=2.2.2
+Requires-Dist: clinicedc==2.2.5
 Requires-Dist: edc-he>=1.5.2
 Requires-Dist: edc-microscopy>=1.4.2
 Requires-Dist: edc-mnsi>=1.4.0
 Requires-Dist: edc-phq9>=1.3.1
 Requires-Dist: edc-qol>=1.4.0
+Requires-Dist: notebook>=7.4.7
 Requires-Python: >=3.12, <3.14
 Description-Content-Type: text/x-rst
 
@@ -88,8 +89,8 @@ Assuming you are logged into the account ``myaccount``:
     mkdir ~/edc && \
     cd ~/edc && \
     uv venv && \
-    uv pip install -U meta-edc==1.4.0 && \
-    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.4.0/manage.py && \
+    uv pip install -U meta-edc==1.5.0 && \
+    wget https://raw.githubusercontent.com/meta-trial/meta-edc/1.5.0/manage.py && \
     uv pip freeze | grep meta-edc
 
 Copy your ``.env`` file to ``~/.etc``.
@@ -139,7 +140,7 @@ From the above example:
 
     cd ~/edc && \
     uv venv --clear && \
-    uv pip install -U meta-edc==1.4.0 && \
+    uv pip install -U meta-edc==1.5.0 && \
     wget -O manage.py https://raw.githubusercontent.com/meta-trial/meta-edc/1.1.10/manage.py && \
     uv pip freeze | grep meta-edc && \
     python manage.py check

{meta_edc-1.4.1.dist-info → meta_edc-1.5.1.dist-info}/RECORD

@@ -84,7 +84,7 @@ meta_analytics/constants.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/dataframes/__init__.py,sha256=naGZtYGJ8BW03XslsFPZe9VZ2fWuU9ew84BB_iBLWxo,1266
 meta_analytics/dataframes/constants.py,sha256=oA0a9N7RzYstXuZXWclUjrbsWvNQbv1F4P9lFGlNRRg,937
 meta_analytics/dataframes/get_eos_df.py,sha256=N_7A_Io3KCGj8mrMjUfYP7w6gi7_2Dx2RSG6orQTWp4,1226
-meta_analytics/dataframes/get_glucose_df.py,sha256=eGzA7dxh3igGZdNKvMfiH7maRl2IAngWiQp9Dx8FZHU,5884
+meta_analytics/dataframes/get_glucose_df.py,sha256=CcscaTuZhx-pMFQ0-sx1w56jCIQQ7PmgblZOdFAc0UI,6089
 meta_analytics/dataframes/get_glucose_fbg_df.py,sha256=yAshgtc_R6Q41p5iA9n7a_W0llp1JRsnj3NGQE6kVRk,898
 meta_analytics/dataframes/get_glucose_fbg_ogtt_df.py,sha256=BfMU1sNj1a4dVOy7yKGESARpb3SNTFxLA-BVB5oZ14Q,657
 meta_analytics/dataframes/get_last_imp_visits_df.py,sha256=N5tL6gANDr_g5AuNVv_cEN4U-QktLxJUAJaUIW2MiWs,3818
@@ -748,7 +748,7 @@ meta_subject/admin/fieldsets.py,sha256=NjFKDAMvzePa9TijR_-zTLsDbawfBQDuws2BzWDze
 meta_subject/admin/followup_examination_admin.py,sha256=nNFQvW_zipgJCd1RDa2A2UOQkcPIq8cirwM2f3Ih0ZY,5278
 meta_subject/admin/followup_vitals_admin.py,sha256=a2bwBwFsQ1sMmnBgmeCOEv6wNCXuKeIqIwEZB-Lqt_E,2297
 meta_subject/admin/glucose_admin.py,sha256=5K9rMFE8jCZRTJBsORJi0aKJF1xizh0303iwdJCrTLM,2902
-meta_subject/admin/glucose_fbg_admin.py,sha256=DbfO2opLwBJfQskYhGwN_i50qbzB6brZFtHCU2gh-dU,2810
+meta_subject/admin/glucose_fbg_admin.py,sha256=z9m9xGMnIgagqe-BWSRgUJngEN2OYbjKIsQva410BGE,2852
 meta_subject/admin/health_economics/__init__.py,sha256=t0vFauE3auk7FESIvk5tFjc3-Jtshl9eiAJswQBG1gw,212
 meta_subject/admin/health_economics/health_economics_simple_admin.py,sha256=nL0CvjWQsFsR19ine14iItt9e8Px53Ln_tSppMN8UQ4,1053
 meta_subject/admin/health_economics/health_economics_update_admin.py,sha256=mtsd1fJ8yvTK1eol5f03fZ8jk1afeYKSxEydPGmma7w,3905
@@ -1158,7 +1158,7 @@ meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=LU1HRaV6o1UeK
 meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=q12p5wXc2D7lSiJVBnoSQw8Q3vL6uDx1t3PuDJO-Z-U,1735
 meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=bEpbpCX3vfZmnsqudr0z8PU5kiaX4ws1sO5Im98Mo28,1106
 meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
-meta_edc-1.4.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.4.1.dist-info/WHEEL,sha256=w4ZtLaDgMAZW2MMZZwtH8zENekoQYBCeullI-zsXJQk,78
-meta_edc-1.4.1.dist-info/METADATA,sha256=aat3YZPqv-YJUOu8NjiF13qhD7kaMXEklAOFAZdAlhs,5131
-meta_edc-1.4.1.dist-info/RECORD,,
+meta_edc-1.5.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.5.1.dist-info/WHEEL,sha256=ZHijuPszqKbNczrBXkSuoxdxocbxgFghqnequ9ZQlVk,79
+meta_edc-1.5.1.dist-info/METADATA,sha256=3ElDLLKioF4hDj7vh33tvKuI5tOxOvWi74C7yGpssPY,5162
+meta_edc-1.5.1.dist-info/RECORD,,

{meta_edc-1.4.1.dist-info → meta_edc-1.5.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.9
+Generator: uv 0.9.10
 Root-Is-Purelib: true
 Tag: py3-none-any

meta_subject/admin/glucose_fbg_admin.py

@@ -69,6 +69,7 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
         "fasting": admin.VERTICAL,
         "fbg_units": admin.VERTICAL,
         "fbg_performed": admin.VERTICAL,
+        "endpoint_today": admin.VERTICAL,
     }
 
     @admin.display(description="FBG", ordering="fbg_value")