meta-edc 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

meta_analytics/dataframes/get_eos_df.py

@@ -14,7 +14,7 @@ def get_eos_df() -> pd.DataFrame:
     df_visit = get_subject_visit("meta_subject.subjectvisit")
     df_last_visit = (
         df_visit.groupby(["subject_identifier", "site"])
-        .agg({"last_visit_code": "max", "last_visit_datetime": "max"})
+        .agg({"endline_visit_code": "max", "endline_visit_datetime": "max"})
         .reset_index()
     )
     df_last_visit = df_last_visit.rename(columns={"site": "site_id"})

meta_analytics/dataframes/get_last_imp_visits_df.py

@@ -37,11 +37,14 @@ def get_last_imp_visits_df(
     df_meds = (
         df_meds[(df_meds.refill == "Yes") & (site_cond(df_meds, site_id))]
         .groupby(by=["subject_identifier", "site_id"])
-        .agg({"last_visit_code": "max", "last_visit_datetime": "max"})
+        .agg({"endline_visit_code": "max", "endline_visit_datetime": "max"})
         .reset_index()
     )
     df_meds = df_meds.rename(
-        columns={"last_visit_code": "imp_visit_code", "last_visit_datetime": "imp_visit_date"}
+        columns={
+            "endline_visit_code": "imp_visit_code",
+            "endline_visit_datetime": "imp_visit_date",
+        }
     )
     df_meds.reset_index()
 

meta_analytics/dataframes/screening/get_screening_df.py

@@ -110,7 +110,8 @@ def get_screening_df(df: pd.DataFrame | None = None) -> pd.DataFrame:
 
     # bmi
     # subject SR9E8B4D has eligible part two == No but subject has a glucose value
-    df.loc[(df["screening_identifier"] == "SR9E8B4D"), "eligible_part_two"] = "Yes"
+    # NOTE: update 10-02-2025: subject is not eligible by congestive_heart_failure
+    # df.loc[(df["screening_identifier"] == "SR9E8B4D"), "eligible_part_two"] = "Yes"
 
     # merge with physical exam to get waist circumference if taken at baseline
     subject_identifiers = list(df["subject_identifier"])

meta_edc/settings/debug.py

@@ -7,11 +7,11 @@ from .defaults import *  # noqa
 print(f"Settings file {__file__}")
 
 # TZ Sites:
-SITE_ID = SiteID(default=20)  # Amana
+# SITE_ID = SiteID(default=20)  # Amana
 # SITE_ID = SiteID(default=10)  # Hindu Mandal
 # SITE_ID = SiteID(default=40)  # Mwananyamala
 # SITE_ID = SiteID(default=50)  # Mbagala
-# SITE_ID = SiteID(default=60)  # Mnazi-Moja
+SITE_ID = SiteID(default=60)  # Mnazi-Moja
 # SITE_ID = SiteID(default=30)  # Temeke
 INDEX_PAGE = "http://localhost:8000"
 EDC_SITES_UAT_DOMAIN = False

{meta_edc-1.0.3.dist-info → meta_edc-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: meta-edc
-Version: 1.0.3
+Version: 1.0.4
 Summary: META Trial EDC (http://www.isrctn.com/ISRCTN76157257)
 Home-page: https://github.com/meta-trial/meta-edc
 Author: Erik van Widenfelt
@@ -693,7 +693,7 @@ Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: edc==1.0.2
+Requires-Dist: edc==1.0.5
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: celery[redis]
@@ -712,7 +712,7 @@ Metformin treatment in Africa- META
 * https://www.lstmed.ac.uk/research/departments/international-public-health/respond-africa/meta
 * http://www.isrctn.com/ISRCTN76157257
 
-py 3.12 / DJ 5.1 / edc 0.6.0 (META3)
+py 3.12 / DJ 5.1.5 / edc 1.0.3 (META3)
 
 This codebase is used for two randomized clinical trials:
 

{meta_edc-1.0.3.dist-info → meta_edc-1.0.4.dist-info}/RECORD

@@ -87,8 +87,8 @@ meta_analytics/constants.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/get_tables.py,sha256=3jFmvLXWHY3FPd1u5OPVpAKWUcruCH0-A0KdKiiFGpc,2219
 meta_analytics/dataframes/__init__.py,sha256=DHO81CYc5foDgy2HBEnlaHRtohMo-blvSvZPMDQaHUk,547
 meta_analytics/dataframes/constants.py,sha256=Wcub_3U5xHa027ykotySiUxMECjmswGIADVeT0iJXXs,792
-meta_analytics/dataframes/get_eos_df.py,sha256=YJ0YB93FkqwpNfWDphzFbX6B7BannbvfScc0WEgtn2w,778
-meta_analytics/dataframes/get_last_imp_visits_df.py,sha256=ROBsYzJvlmSk86jA35dq-hK-2r7Nh6XSyAY8m1Zl93Q,3756
+meta_analytics/dataframes/get_eos_df.py,sha256=quWdYsgwna9wfJ8GJPiiNLreRIrD4lY9BkFNAAjb2ds,784
+meta_analytics/dataframes/get_last_imp_visits_df.py,sha256=cScwy_nBGHg04_AYpjz_pTq13Q4iyb33SiKk6CltbyQ,3803
 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
@@ -97,7 +97,7 @@ meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py,sha256=aOadsfecl
 meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=052BpLJoJezjr2tMXI5-GBRk_e6gT0bZZsjhx_Uhlm8,21550
 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=VS3fjpQcD_CdRT2MRx2MUU6xqpYL1fMYFvKNvZsvrro,6188
+meta_analytics/dataframes/screening/get_screening_df.py,sha256=t_xxr7YId3QsXbwjPpi7nIgkleKprmZSqAin2cuB2Vc,6273
 meta_analytics/notebooks/cleaning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_analytics/tables/__init__.py,sha256=mhESCt0Lq4RJU-lbQ5fVfIbXzrEsootGYp7EzQIqDBI,70
 meta_analytics/tables/eligible.py,sha256=2q-SMbAsrBgOVc4Ttq5P3bpjsUKwP5hYhJBMgyH6GGI,3389
@@ -247,7 +247,7 @@ meta_edc/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 meta_edc/management/commands/update_forms_reference.py,sha256=jvCU9YdMtp9wbmjqKQsB9gxNw4DcAP97sZD-kfIxOns,1071
 meta_edc/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc/settings/debug.py,sha256=ys60bSDcEMbWewoTdE4HRIp2woOwy3RPjIgXMUCEJpQ,1296
+meta_edc/settings/debug.py,sha256=5WkxxapNtYDi9XKXCOCnlZ3q9--zktBtRyGhCVUaMEs,1296
 meta_edc/settings/defaults.py,sha256=YBOFTG7k9ESeOD_DUx6vdK6ewncTtPwnZFQTdSP_WAk,19614
 meta_edc/settings/live.py,sha256=uLTlsIc3H6gdE_7pkL6vyOVa6V_74hnXFkiojqGFAYY,264
 meta_edc/settings/logging.py,sha256=6qVUE37OMkf5rzwTmMq4krFsZ2jcyCpWdFtGih_Cs4U,1938
@@ -280,7 +280,7 @@ meta_lists/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/admin.py,sha256=g05vpXfVIEBVG03aiPD8Vn-AnR7gL60MbPJAfzsO6R8,2157
 meta_lists/admin_site.py,sha256=M4uorELumZDIKD8SHs-AEX1doQFqXhRy-eCcRWYEu9k,165
 meta_lists/apps.py,sha256=aegHpyrHw188UxhNVFd-v35HP9wO7J7G9BYmliOOE0c,278
-meta_lists/list_data.py,sha256=kybIQAevrVKqncQHNoCatdgUpkLTV0S-Avim6hSgPWw,9819
+meta_lists/list_data.py,sha256=jhj9KJ7VdOjoHxa56bxJ9cvg3eDjBldy0wbh_SySknc,9919
 meta_lists/models.py,sha256=3amfYtGe4GGtSpLXs36On8k_ZmpDzNs5ga54O-SIABs,3032
 meta_lists/urls.py,sha256=9NCrRvdkPXzH3L7VMCa0iQnz-j5tujzhvvtRRAGunV8,204
 meta_lists/migrations/0001_initial.py,sha256=87crhJGEUzUxe9TaNTzzKM6AjE3Pjw032PkhYrnRz9k,13881
@@ -301,6 +301,7 @@ meta_lists/migrations/0015_abnormalfootappearanceobservations_extra_value_and_mo
 meta_lists/migrations/0016_alter_abnormalfootappearanceobservations_options_and_more.py,sha256=FiXjIoQk0Q9LVRxmyBUA9k7ZAN3noUbvLdmqHhgBygo,20692
 meta_lists/migrations/0017_complications_dmmedications_dmtreatments_and_more.py,sha256=_Hq5WK2KgXy1OTFdE6ESH_txPi5YbduS0kl84GyU-YI,13041
 meta_lists/migrations/0018_missedreferralreasons.py,sha256=E_-Jrkwz_nAc3SND6EPdkWKeobi6q308J--mDM8JgHA,2639
+meta_lists/migrations/0019_auto_20250128_0143.py,sha256=NtS06qHmBQnoGZhZTR-OAfmoyllmMAyyTozXGl1JdbM,1577
 meta_lists/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/tests/test_lists.py,sha256=qcp2emRyd5-cP2oLluy8MpUucBDQ8_GdUxjh2KbZPv4,212
@@ -753,7 +754,7 @@ meta_stats/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 meta_stats/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_stats/tests/tests/test_incidence.py,sha256=Uxv05_xZ0hZKtTBDow3goRcQrK5644j9NQwyW9d_CX8,313
 meta_subject/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_subject/action_items.py,sha256=Y0V_L6V8foKYEcZ8FxGLDfdiPoJNql47enKFRpClGeg,6642
+meta_subject/action_items.py,sha256=eRONfgYX0DbSCI5JqFbMojiy86jDRvQgV-BUlQpmNog,6895
 meta_subject/admin_site.py,sha256=fxUn5QKgo6wYUG18HW11kVrPqWvmWV2_PzKbgZQM4pU,169
 meta_subject/apps.py,sha256=iAQ8lizUpKa4gJnCGkTsuRQPtGWmSjnshZn8rZUguO8,289
 meta_subject/baker_recipes.py,sha256=C8ag5z5MRczzb3MkYGL37DccQg1FykiLgxepBlitlh0,2741
@@ -761,7 +762,7 @@ meta_subject/choices.py,sha256=LjKRsEG0uGJow2BHshV_oKXdNYktNGn1Xj9H8SbGtBA,6782
 meta_subject/constants.py,sha256=6rpHsHj3CPV7ntdWxYScRhPVoj4YIxX2lUZdZ9lrFN0,704
 meta_subject/identifiers.py,sha256=pBYvMFXK7N2oNDMJJM2xLCvk0NuzLzzm15VqQ2Cp7Og,325
 meta_subject/urls.py,sha256=v2fM0R9gvt8MWdZj9cRnYU8xvqecLK5b_8leYVEtYZI,206
-meta_subject/admin/__init__.py,sha256=yMvCb_HcfG-7ZEee2R_HJJxKTobbpw1UTrneIwtbSuk,1734
+meta_subject/admin/__init__.py,sha256=i95-mnCq78eCpSwsSPxtBLrdv665ivs3pJHjLeoc7g8,1791
 meta_subject/admin/autocomplete_admin.py,sha256=bVxma7KTHhKHWqLPxbP2GwiGcHeBUyMutTDXZ2RomEY,1158
 meta_subject/admin/birth_outcome_admin.py,sha256=TFqO3aeAWeMtgrgFrxE6zIBQaZ_b_1YC3msubO4vDc4,3233
 meta_subject/admin/complications_admin.py,sha256=qxaJVWW86Hg56T8IYfyM9SiP5IcPFNuMfIWBI9fqz90,1017
@@ -782,6 +783,7 @@ meta_subject/admin/malaria_test_admin.py,sha256=qLa5StnwN_2ytNYykXcLKwSJn6tc7e0-
 meta_subject/admin/medication_adherence_admin.py,sha256=mhKGcDHUParW6BATj9S2wa5Th3u_ndQRKVNnjYcxKyM,543
 meta_subject/admin/mnsi_admin.py,sha256=nF2tBC3pKA1eQ6EPdyX92ZoEOmW1B1mZRi5IDpF8cPk,1430
 meta_subject/admin/modeladmin.py,sha256=ehH9gMgTFBzmEzQj7sZboQgHdGQ3eaEgHjh0HmcDOVo,510
+meta_subject/admin/next_appointment_admin.py,sha256=jludu5ag_ojc1GqjasvZW-x9uVDSmmk8ZDZR6E4IZUc,606
 meta_subject/admin/other_arv_regimens_admin.py,sha256=GsaKPaR6Chwuwk0DE-qpyq4xhiD0v979U2C4--gtG1k,1674
 meta_subject/admin/patient_history_admin.py,sha256=kXglsPOngnjYY2FQYP_YHoH5IcSJutGF14CBsSViplQ,1763
 meta_subject/admin/physical_exam_admin.py,sha256=nCcY42CQXbZCro4vsQUfw5gQ1KKs-zjsHPqP-KtUQQc,1858
@@ -815,7 +817,7 @@ meta_subject/form_validators/egfr_drop_notification_form_validator.py,sha256=y5M
 meta_subject/form_validators/followup_examination_form_validator.py,sha256=NS3Sa-bwC_HEe-CmezkFrbbjPanLe9p1v5ZOFspqgxg,4241
 meta_subject/form_validators/glucose_form_validator.py,sha256=ebtWmJo_0z8mlZzH377q4aTa9kY2R3CfCT5WtRxARb8,3371
 meta_subject/form_validators/health_economics_form_validator.py,sha256=kp-LQU4ydBXlnYFt-0xKuVSb8Y4irlhz9d_X8ppvWgE,250
-meta_subject/forms/__init__.py,sha256=1uQ6CIF9MA8KfrM0u_a_Z_eOC1JjGlF3k7MEkqD3XCI,1700
+meta_subject/forms/__init__.py,sha256=LrGBLJ3Se3McgUOdcrDyTM4B7G8ChVCrxDq4DXiYDLE,1755
 meta_subject/forms/birth_outcomes_form.py,sha256=qqhZNQKiYk8C8CFebZTQB0hOm4ONrgkTG7hfuK7kW-o,374
 meta_subject/forms/complications_glycemia_form.py,sha256=yTm3qRDJ1wPuukmpf0s0lg-oXi8fZ5Y7D7T9V-CsOXk,375
 meta_subject/forms/concomitant_medication_form.py,sha256=eznM4YOSV0eSsc-qaQgkga76T76Oz6i8svyBaleW-gQ,375
@@ -831,6 +833,7 @@ meta_subject/forms/malaria_test_form.py,sha256=xQeF-wBq06anAU9it0lLvQhIxJoWoFc_b
 meta_subject/forms/medication_adherence_form.py,sha256=yjDmr3uIDwQXnph6mkCgluYEJgFCpXzUPoTVbivba0Y,865
 meta_subject/forms/mixins.py,sha256=MdiCuVB5pyD0ExZs48t0NiL_BiQD8pVwMoWbjHR3WBA,2084
 meta_subject/forms/mnsi_form.py,sha256=RLZqJlcZKvHyfoYoYSkz_HhdkLanYxY7CkVJH1Nu3ZA,323
+meta_subject/forms/next_appointment_form.py,sha256=saEpcIPkwQ-QOCM4Sch8tt9t5RIQjZNJ3uBkcQovX8s,1080
 meta_subject/forms/other_arv_regimens_detail_form.py,sha256=dxFJBqAkKKfIAJ_HGbuUANbnbUxk-6Rf6c7c0GrkpjE,962
 meta_subject/forms/other_arv_regimens_form.py,sha256=TApyN2QYIlSYc3esVXjMdLhYE8JM7quRLqALf8Cnhu4,1687
 meta_subject/forms/patient_history_form.py,sha256=wVXMp5k21jWHKsm-FXvjBEN32PaF8Sw3r3KQzyVLl-k,1807
@@ -863,8 +866,8 @@ meta_subject/management/commands/create_missing_refills.py,sha256=IkxEOV2AHl2FYh
 meta_subject/management/commands/create_missing_rx.py,sha256=jAqgz9yxhaEL1XBN9FqM-5cPv1TpNtL4XdltLPArOEA,1463
 meta_subject/management/commands/missed.py,sha256=qTHggBxlJWcEF_V4cGtxe93UJXlaW-ON6m1SOpJzmgg,8209
 meta_subject/metadata_rules/__init__.py,sha256=U8fKGiHsbSWW27dWbTp2A2pCmdcFgybbJDhazP591cE,53
-meta_subject/metadata_rules/metadata_rules.py,sha256=Pe7YK1Ss9P_0vi75ImqC0eaOi3rgEGYeukanVzyXXAY,3981
-meta_subject/metadata_rules/predicates.py,sha256=QAaguLepmT9DQnF3TdXvdLZk0dBF7skGsZw1KnjG31g,9214
+meta_subject/metadata_rules/metadata_rules.py,sha256=CeZKXkr_sFsMlZK3CoU8buF51hqSH5hyxTWS92ZfBGk,4323
+meta_subject/metadata_rules/predicates.py,sha256=Neu5O34ly2J2H5GrC5oot1v5ZwU1uaPQFbTerzPssbQ,10015
 meta_subject/migrations/0001_initial.py,sha256=UHMfeHsfaGWg97-gMxfcmD4_-xDnrj-cslhT_mZQdZw,408932
 meta_subject/migrations/0002_auto_20191021_0353.py,sha256=ekA3FFPdsAGmqWt2wrwQahzuwTE98e1VZLouXbZocrY,29351
 meta_subject/migrations/0003_auto_20191021_0534.py,sha256=Ye9au73hXxbvd1tBmrafin20NPWUZfhxj50x4S-tYqk,4024
@@ -1080,6 +1083,11 @@ meta_subject/migrations/0212_auto_20240827_2222.py,sha256=ClHxTDTE9Ft6w8qT2LMSfD
 meta_subject/migrations/0213_rename_bloodresultslipid_bloodresultslipids_and_more.py,sha256=51UvT_rl0R2phHX0-QCdJqIPbfDcWzVMWdONwhWQ7Ws,1129
 meta_subject/migrations/0214_historicalstudymedication_stock_codes_and_more.py,sha256=Mzz4aPKvLeANXy9osTlefXXqbi-VwTA1SOBewkTLZ1I,1422
 meta_subject/migrations/0215_alter_historicalstudymedication_stock_codes_and_more.py,sha256=bUPpZPSwmRGnXOdd6kw1fmkGPEHdA0SWQ_P6wMtKyvI,1580
+meta_subject/migrations/0216_historicalnextappointment_nextappointment.py,sha256=u8HHxBb8Wa6qv71G5H6L8kCd8-BaeoWhGIxUjuc_qkU,22670
+meta_subject/migrations/0217_alter_historicalnextappointment_appt_datetime_and_more.py,sha256=4nRX3nS81TBEUtqQSke3YrH_i7GePwoHE3QmBByoBr0,1442
+meta_subject/migrations/0218_alter_historicalnextappointment_appt_date_and_more.py,sha256=4YpEw1btk2G3wjx2SJKqTOEWymCTbd8iD640Ttpf-cs,1848
+meta_subject/migrations/0219_remove_historicalnextappointment_allow_create_interim_and_more.py,sha256=UCSUXzoa-TSqv7pPfZpg5jI1siKDFBXRknH6OFv0tL4,3476
+meta_subject/migrations/0220_historicalbloodresultsgludummy_bloodresultsgludummy.py,sha256=6TT5p5hQAhkL-vc3mo7xAAoZlQSoPAQ_KBTWNxYkr-0,34009
 meta_subject/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_subject/model_mixins/__init__.py,sha256=6DdDDOwDdagrz6Q7X9lxuAVszsFWFhwPqLz4JOD85Wo,286
 meta_subject/model_mixins/arv_history_model_mixin.py,sha256=6ILacF2koyYmwZIFHmmQO1uIT1eWzrahXxhAlxpQiX0,2898
@@ -1087,7 +1095,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=lsN0x_SG3N4J8-2tdxa9EerdUH3CqZIv68QtLKIIplg,1763
+meta_subject/models/__init__.py,sha256=c8EYwYsi7e3dAqhsw_KeF6MRyBQStC_rSpthVpO_a98,1835
 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
@@ -1105,6 +1113,7 @@ meta_subject/models/hepatitis_test.py,sha256=zhUhRDAD_rMu_8kyiA4LFYG7YEHTK2c8Tpq
 meta_subject/models/malaria_test.py,sha256=4gQNBnvLDv70rjRcFBOpLPmYL8eeuqs0lRsJ7LrFqHM,343
 meta_subject/models/medication_adherence.py,sha256=7a9WQAvgin2WeSgznNDNdet69JTT7DO61hfMseF4cVY,399
 meta_subject/models/mnsi.py,sha256=tD6Sh4aQ1Oszt3SLzhgOLwxXr8zW8jvEEETEJP75Hdc,284
+meta_subject/models/next_appointment.py,sha256=mQBdki1XR0s3XfLw8X6X8w1-aCZuY0uV25Uwvx1QjcU,530
 meta_subject/models/off_study_drug.py,sha256=puKUqsSsw48BxzfOCT2DS44Kal3SUFlguAk2q6MS8OY,706
 meta_subject/models/other_arv_regimens.py,sha256=AYiMgJVcpcw3Vn-I7ePl-zOEMlkKgWHtWwWmsDjsjyw,607
 meta_subject/models/other_arv_regimens_detail.py,sha256=UxbTAHIuTCjAZzQlZp1x5HVbv8Oa3-oIHnoRsFNXds8,1828
@@ -1120,8 +1129,9 @@ meta_subject/models/subject_visit_missed.py,sha256=_qXuKzhFukRm5k44GgdT368MuOmOZ
 meta_subject/models/todo.txt,sha256=yMP-BRI7dB6iwU0FicB3A0muydm6qlqGTSyy7Bvh2f4,248
 meta_subject/models/urine_dipstick_test.py,sha256=T_IrBRAJ_6ckJUjT_MHKaOzfNkxk5zso0JCsroLM8jc,1178
 meta_subject/models/urine_pregnancy.py,sha256=LVC4PonyoSbnMJJN0EVIZo7iCuBzm6-W6ne7YxHUBEY,1336
-meta_subject/models/blood_results/__init__.py,sha256=j6_4aR0eA58TaErYyh_vFyIKaXVcGw5o97Foa7Ib2JE,292
+meta_subject/models/blood_results/__init__.py,sha256=ktxJOUM5PO3mXpLHxiSjt7Tmi5JACUbeCWjXhUK6qyU,344
 meta_subject/models/blood_results/blood_results_fbc.py,sha256=kkOqCsqeIvCf2rw7vHGWMCEgo1_yiMDtTOi44aKtBro,1324
+meta_subject/models/blood_results/blood_results_glu.py,sha256=QvIZjXWQ4qLfbGz5TbTIPHMJh2dtmi2kXTjVXP9xqYg,1029
 meta_subject/models/blood_results/blood_results_hba1c.py,sha256=KaPJhpRPmR_-9oRQ7cdiVPle9exGPZDxjMc6WeyS1mQ,1036
 meta_subject/models/blood_results/blood_results_ins.py,sha256=uHHFdry5s70UGTxllAlN4hhF4rcC2ybc6mCV_Rd1lCY,1052
 meta_subject/models/blood_results/blood_results_lft.py,sha256=VRWKM5292AuHd-BZDC9RHA9sb_xdPwlj2OIKeQAzpRE,1235
@@ -1149,6 +1159,7 @@ meta_subject/tests/tests/test_manager_order.py,sha256=wmVxMd85mJ6HGAL_3Z_mSp_mqe
 meta_subject/tests/tests/test_medication_adherence.py,sha256=y_JDajAqKuQTGDxeQwq4O4xwKj6azCfUnDFaW5SjJIM,2611
 meta_subject/tests/tests/test_metadata_rules.py,sha256=4mSQVXf4EteDUUjrRkpKhOzDukEBC1M9IXkyg0MEAOA,5712
 meta_subject/tests/tests/test_mnsi.py,sha256=MidXvGYmzw7gtZHk33dfMrNdS6iN1JFnfmAyindKsIo,14706
+meta_subject/tests/tests/test_next_appointment.py,sha256=OVe6Jf6uaR5ch28skkNrr4h5uMTnvOpPSvEJjWnsoKo,9938
 meta_subject/tests/tests/test_patient_history_form.py,sha256=JzqCx_-g2jeknngGl94FhZNVCl0CfnWIAZ9R11y7-wY,2827
 meta_subject/tests/tests/test_physical_exam.py,sha256=U3TKOPWTVu8iXxsS8LGgJJEY8e2sKJ5iTBcIWIHKCAo,2947
 meta_subject/tests/tests/test_sf12.py,sha256=5Daf-R4EeLjfDpsC5PZELfPIqY--joGzrj8nPVUiatI,6837
@@ -1164,12 +1175,12 @@ meta_visit_schedule/tests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 meta_visit_schedule/tests/tests/test_schedule.py,sha256=858fXo-PvbppgIsCAGll05fqnuWW6f-vMIwnvRLZgnc,7351
 meta_visit_schedule/visit_schedules/__init__.py,sha256=j0Q8tAGhHHbFBd3R-iLRy4QB47WgtucWG7xCLLfVvFU,339
 meta_visit_schedule/visit_schedules/phase_three/__init__.py,sha256=18ken4S10X0dkEFHj1EFO2M4xblXD04cjfhzIEkhYUQ,74
-meta_visit_schedule/visit_schedules/phase_three/crfs.py,sha256=mPfCfbwvTyWNBwZWX3_sOw6-GAAYhIydZvIElWYjhVk,16060
+meta_visit_schedule/visit_schedules/phase_three/crfs.py,sha256=JcAHxtui3ZEnr7wjih34V8yuTUJ6ZVWTDFANabYYovo,17563
 meta_visit_schedule/visit_schedules/phase_three/crfs_pregnancy.py,sha256=_I6IVLMC3-KlpI86eii790mlx-p2vxWxvNRKD927rXo,169
 meta_visit_schedule/visit_schedules/phase_three/requisitions.py,sha256=Noeki8zX2MCwQVmCCWfuOyh_aN4YC-cyhUmrAZP8d5g,4579
 meta_visit_schedule/visit_schedules/phase_three/schedule.py,sha256=5vT_J_IUap-ohYigIt327noAAGXt77yDOact4rJuxEQ,8231
 meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py,sha256=Txnmf03jPyFhC2gOseywHyyaGJmJFKAET-x12hknW-I,1752
-meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=0V2t68Moyla6MfmAyOU8c_bzN45ksADc-jDf8ZOB6Pw,1123
+meta_visit_schedule/visit_schedules/phase_three/schedule_pregnancy.py,sha256=m5KLFK6sPmUwKBYKD1OVZHNZQDiG9M1-VeBXvN1AGF0,1123
 meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py,sha256=ak4qazeKlpIlvpqrK9hDDO0fwWuWyvb4Ec-JU31IJxc,654
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/holidays.csv,sha256=Ywr5pK_caGUJMgRwLzjMeSEUuyEpUWyJE5aJkfbg3bg,539
@@ -1184,9 +1195,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-1.0.3.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc-1.0.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-meta_edc-1.0.3.dist-info/METADATA,sha256=oR_0N4H1Hizx_OekvtjQH--oacuwLIOD5Ge5w8s6wqQ,43527
-meta_edc-1.0.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-meta_edc-1.0.3.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
-meta_edc-1.0.3.dist-info/RECORD,,
+meta_edc-1.0.4.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-1.0.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-1.0.4.dist-info/METADATA,sha256=orwfOWZimxYfYXbqfvPe6ihe-UWsUPsfkbFcik5CxaY,43529
+meta_edc-1.0.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+meta_edc-1.0.4.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-1.0.4.dist-info/RECORD,,

{meta_edc-1.0.3.dist-info → meta_edc-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

meta_lists/list_data.py

@@ -1,4 +1,5 @@
 from edc_constants.constants import (
+    CLINIC,
     DEAD,
     DELIVERY,
     DIABETES,
@@ -236,4 +237,7 @@ list_data = {
         ("stigma", "Concerned about stigma"),
         (OTHER, "Other reason (specify below)"),
     ],
+    "edc_facility.healthfacilitytypes": [
+        (CLINIC, "META Study Clinic"),
+    ],
 }

meta_lists/migrations/0019_auto_20250128_0143.py

@@ -0,0 +1,48 @@
+# Generated by Django 6.0 on 2025-01-27 22:43
+from django.apps import apps as django_apps
+from django.core.exceptions import ObjectDoesNotExist
+from django.db import migrations
+from edc_facility.utils import get_health_facility_model_cls
+from edc_sites.site import sites as site_sites
+from edc_sites.utils import get_site_model_cls
+
+from meta_lists.list_data import list_data
+
+
+def update_healthfacility(apps, schema_editor):
+    health_facility_model_cls = get_health_facility_model_cls()
+
+    name, display_name = list_data.get("edc_facility.healthfacilitytypes")[0]
+    try:
+        health_facility_type = django_apps.get_model(
+            "edc_facility.healthfacilitytypes"
+        ).objects.get(name=name)
+    except ObjectDoesNotExist:
+        health_facility_type = django_apps.get_model(
+            "edc_facility.healthfacilitytypes"
+        ).objects.create(name=name, display_name=display_name)
+
+    for site_obj in get_site_model_cls().objects.all():
+        single_site = site_sites.get(site_obj.id)
+        health_facility_model_cls.objects.create(
+            name=single_site.name,
+            title=single_site.title,
+            mon=True,
+            tue=True,
+            wed=True,
+            thu=True,
+            fri=True,
+            sat=False,
+            sun=False,
+            site_id=site_obj.id,
+            health_facility_type=health_facility_type,
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("meta_lists", "0018_missedreferralreasons"),
+    ]
+
+    operations = [migrations.RunPython(update_healthfacility)]

meta_subject/action_items.py

@@ -4,8 +4,11 @@ from edc_action_item.site_action_items import AlreadyRegistered
 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
+from edc_lab_results.action_items import (
+    BloodResultsGluAction as BaseBloodResultsGluAction,
+)
 from edc_lab_results.action_items import (
-    BloodResultsFbcAction,
     BloodResultsHba1cAction,
     BloodResultsLftAction,
     BloodResultsLipidsAction,
@@ -122,6 +125,10 @@ 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"

meta_subject/admin/__init__.py

@@ -22,6 +22,7 @@ from .hepatitis_test_admin import HepatitisTestAdmin
 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

meta_subject/admin/next_appointment_admin.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from django.contrib import admin
+from edc_appointment.modeladmin_mixins import NextAppointmentCrfModelAdminMixin
+from edc_model_admin.history import SimpleHistoryAdmin
+
+from ..admin_site import meta_subject_admin
+from ..forms import NextAppointmentForm
+from ..models import NextAppointment
+from .modeladmin import CrfModelAdminMixin
+
+__all__ = ["NextAppointmentAdmin"]
+
+
+@admin.register(NextAppointment, site=meta_subject_admin)
+class NextAppointmentAdmin(
+    CrfModelAdminMixin, NextAppointmentCrfModelAdminMixin, SimpleHistoryAdmin
+):
+
+    form = NextAppointmentForm

meta_subject/forms/__init__.py

@@ -22,6 +22,7 @@ from .hepatitis_test_form import HepatitisTestForm
 from .malaria_test_form import MalariaTestForm
 from .medication_adherence_form import MedicationAdherenceForm
 from .mnsi_form import MnsiForm
+from .next_appointment_form import NextAppointmentForm
 from .other_arv_regimens_detail_form import OtherArvRegimensDetailForm
 from .other_arv_regimens_form import OtherArvRegimensForm
 from .patient_history_form import PatientHistoryForm

meta_subject/forms/next_appointment_form.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from django import forms
+from edc_appointment.form_validator_mixins import NextAppointmentCrfFormValidatorMixin
+from edc_crf.crf_form_validator import CrfFormValidator
+from edc_crf.modelform_mixins import CrfModelFormMixin
+
+from ..models import NextAppointment
+
+__all__ = ["NextAppointmentForm"]
+
+
+class NextAppointmentCrfFormValidator(
+    NextAppointmentCrfFormValidatorMixin,
+    CrfFormValidator,
+):
+    pass
+
+
+class NextAppointmentForm(CrfModelFormMixin, forms.ModelForm):
+
+    form_validator_cls = NextAppointmentCrfFormValidator
+
+    class Meta:
+        model = NextAppointment
+        fields = "__all__"
+        labels = {
+            "appt_date": "Next scheduled appointment date",
+            "visitschedule": "Next scheduled appointment",
+        }
+        help_texts = {
+            "appt_date": (
+                "Default recommended. If changed, should be within "
+                "the window period of the next appointment"
+            ),
+            "visitschedule": "Default recommended. Can only be the next visit",
+        }

meta_subject/metadata_rules/metadata_rules.py

@@ -160,3 +160,17 @@ class Eq53dlRuleGroup(CrfRuleGroup):
     class Meta:
         app_label = "meta_subject"
         source_model = "meta_subject.subjectvisit"
+
+
+@register()
+class NextAppointmentRuleGroup(CrfRuleGroup):
+    next_appt = CrfRule(
+        predicate=pc.next_appt_required,
+        consequence=REQUIRED,
+        alternative=NOT_REQUIRED,
+        target_models=["nextappointment"],
+    )
+
+    class Meta:
+        app_label = "meta_subject"
+        source_model = "meta_subject.subjectvisit"

meta_subject/metadata_rules/predicates.py

@@ -3,6 +3,7 @@ from zoneinfo import ZoneInfo
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
+from edc_appointment.constants import NEW_APPT
 from edc_constants.constants import YES
 from edc_lab_panel.panels import hba1c_panel, insulin_panel
 from edc_metadata.metadata_rules import PersistantSingletonMixin
@@ -69,6 +70,12 @@ def hba1c_requisition_required_at_baseline(visit):
 class Predicates(PersistantSingletonMixin):
     app_label = "meta_subject"
 
+    @staticmethod
+    def next_appt_required(visit, **kwargs):
+        if visit.appointment.next and visit.appointment.next.appt_status == NEW_APPT:
+            return True
+        return False
+
     @staticmethod
     def glucose_required(visit, **kwargs):
         if visit.visit_code in [MONTH12, MONTH24, MONTH36, MONTH48]:
@@ -213,7 +220,10 @@ class Predicates(PersistantSingletonMixin):
         """
         model_cls = django_apps.get_model(f"{self.app_label}.mnsi")
         required = True
-        if visit.visit_code_sequence != 0:
+
+        if self.offschedule_today(visit):
+            return True
+        elif visit.visit_code_sequence != 0:
             required = False
         elif visit.visit_code not in [
             MONTH1,
@@ -250,7 +260,9 @@ class Predicates(PersistantSingletonMixin):
 
     def sf12_required(self, visit, **kwargs):
         model = f"{self.app_label}.sf12"
-        if visit.visit_code_sequence == 0 and visit.visit_code in [MONTH36, MONTH48]:
+        if self.offschedule_today(visit):
+            return True
+        elif visit.visit_code_sequence == 0 and visit.visit_code in [MONTH36, MONTH48]:
             return True
         return self.persistant_singleton_required(
             visit, model=model, exclude_visit_codes=[DAY1]
@@ -258,8 +270,22 @@ class Predicates(PersistantSingletonMixin):
 
     def eq5d3l_required(self, visit, **kwargs):
         model = f"{self.app_label}.eq5d3l"
-        if visit.visit_code_sequence == 0 and visit.visit_code in [MONTH36, MONTH48]:
+        if self.offschedule_today(visit):
+            return True
+        elif visit.visit_code_sequence == 0 and visit.visit_code in [MONTH36, MONTH48]:
             return True
         return self.persistant_singleton_required(
             visit, model=model, exclude_visit_codes=[DAY1]
         )
+
+    def offschedule_today(self, visit):
+        try:
+            obj = django_apps.get_model(f"{self.app_label}.nextappointment").objects.get(
+                subject_visit=visit
+            )
+        except ObjectDoesNotExist:
+            pass
+        else:
+            if obj.offschedule_today == YES:
+                return True
+        return False