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

meta_auth/auth_objects.py

@@ -3,6 +3,7 @@ from edc_auth.get_app_codenames import get_app_codenames
 
 META_REPORTS = "META_REPORTS"
 META_REPORTS_AUDIT = "META_REPORTS_AUDIT"
+META_PHARMACIST = "META_PHARMACIST"
 
 
 clinic_codenames = get_app_codenames(
@@ -10,6 +11,20 @@ clinic_codenames = get_app_codenames(
 )
 
 reports_codenames = get_app_codenames("meta_reports")
+reports_codenames.remove("meta_reports.view_impsubstitutions")
+
+meta_pharmacy_codenames = get_app_codenames("meta_pharmacy")
+meta_pharmacy_codenames.append("meta_reports.view_impsubstitutions")
+meta_pharmacy_codenames.append("meta_reports.viewallsites_impsubstitutions")
+excluded_meta_pharmacy_codenames = [
+    "meta_pharmacy.add_rx",
+    "meta_pharmacy.change_rx",
+    "meta_pharmacy.delete_rx",
+]
+
+meta_pharmacy_codenames = [
+    c for c in meta_pharmacy_codenames if c not in excluded_meta_pharmacy_codenames
+]
 
 add_perms = []
 if not settings.LIVE_SYSTEM:

meta_auth/auths.py

@@ -28,15 +28,18 @@ from edc_subject_dashboard.auths import SUBJECT_VIEW
 from edc_unblinding.auth_objects import UNBLINDING_REQUESTORS
 
 from .auth_objects import (
+    META_PHARMACIST,
     META_REPORTS,
     META_REPORTS_AUDIT,
     clinic_codenames,
+    meta_pharmacy_codenames,
     reports_codenames,
     screening_codenames,
 )
 
 site_auths.add_group(*reports_codenames, name=META_REPORTS)
 site_auths.add_group(*reports_codenames, name=META_REPORTS_AUDIT, view_only=True)
+site_auths.add_group(*meta_pharmacy_codenames, name=META_PHARMACIST)
 
 # update edc_auth default groups
 site_auths.update_group(*clinic_codenames, name=AUDITOR, view_only=True)
@@ -69,8 +72,8 @@ site_auths.update_role(
     DATA_MANAGER_EXPORT,
     name=DATA_EXPORTER_ROLE,
 )
-site_auths.update_role(RANDO_UNBLINDED, PII, name=PHARMACIST_ROLE)
-site_auths.update_role(RANDO_BLINDED, PII, name=SITE_PHARMACIST_ROLE)
+site_auths.update_role(RANDO_UNBLINDED, PII, META_PHARMACIST, name=PHARMACIST_ROLE)
+site_auths.update_role(RANDO_BLINDED, PII, META_PHARMACIST, name=SITE_PHARMACIST_ROLE)
 site_auths.update_role(SUBJECT_VIEW, SCREENING_VIEW, name=DATA_MANAGER_ROLE)
 site_auths.update_role(
     SUBJECT_VIEW, SCREENING_VIEW, ACTION_ITEM, UNBLINDING_REQUESTORS, name=TMG_ROLE

meta_edc/settings/debug.py

@@ -7,8 +7,8 @@ from .defaults import *  # noqa
 print(f"Settings file {__file__}")
 
 # TZ Sites:
-SITE_ID = SiteID(default=20)  # Amana
-# SITE_ID = SiteID(default=10)  # Hindu Mandal
+# 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

meta_edc/settings/defaults.py

@@ -188,6 +188,7 @@ MIDDLEWARE = [
     "django.contrib.sites.middleware.CurrentSiteMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.auth.middleware.LoginRequiredMiddleware",
     "defender.middleware.FailedLoginMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
@@ -413,6 +414,9 @@ EDC_RANDOMIZATION_SKIP_VERIFY_CHECKS = True
 # edc-sites
 EDC_SITES_MODULE_NAME = env.str("EDC_SITES_MODULE_NAME")
 
+# meta_pharmacy
+META_PHARMACY_RX_SUBSTITUTION_FILE = env.str("META_PHARMACY_RX_SUBSTITUTION_FILE")
+
 # django-multisite
 CACHE_MULTISITE_KEY_PREFIX = "meta4"
 SILENCED_SYSTEM_CHECKS = ["sites.E101"]

meta_edc/urls.py

@@ -62,6 +62,7 @@ urlpatterns = [
     *paths_for_urlpatterns("meta_consent"),
     *paths_for_urlpatterns("meta_export"),
     *paths_for_urlpatterns("meta_lists"),
+    *paths_for_urlpatterns("meta_pharmacy"),
     *paths_for_urlpatterns("meta_prn"),
     *paths_for_urlpatterns("meta_screening"),
     *paths_for_urlpatterns("meta_subject"),

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meta-edc
-Version: 0.3.33
+Version: 0.3.35
 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.10
+Requires-Dist: edc ==0.6.11
 Requires-Dist: edc-microscopy
 Requires-Dist: beautifulsoup4
 Requires-Dist: edc-analytics
@@ -35,7 +35,10 @@ META Edc
 
 Metformin treatment in Africa- META
 
-https://www.lstmed.ac.uk/research/departments/international-public-health/respond-africa/meta
+* https://www.ucl.ac.uk/global-health/research/z-research/respond-africa/metformin-treatment-africa-meta
+* https://www.inteafrica.org/related-projects/meta-trial/
+* 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)
 

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

@@ -96,7 +96,6 @@ meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py,sha256=
 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=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
@@ -106,8 +105,8 @@ meta_analytics/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 meta_analytics/tests/test_endpoints_by_date.py,sha256=43uBO5VTcF5zq9I5ow9f6Isn-xs7Km_qOrXELJjaew4,3034
 meta_auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_auth/apps.py,sha256=AcVJmdM3EuebpqB7A1vXRfYBcovgsqPvE71lnGuM-qo,298
-meta_auth/auth_objects.py,sha256=6Y-PHb6SPEg99fOlV5tiL3rwq7eDmnKMpz390qf67VI,1988
-meta_auth/auths.py,sha256=keHTn95nxZ3Wm6vN9AxPDibaUOOw2YFAIBn_U-N8zTk,2855
+meta_auth/auth_objects.py,sha256=C9ANQTiqML8oH8DharMc8JQYYKV0At9kGCysehcrTfU,2539
+meta_auth/auths.py,sha256=EBdK6b5b2yduDvqYmnmJFRvuJ0fLDQ_q226iuwHA_QU,3008
 meta_auth/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 meta_consent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_consent/action_items.py,sha256=JIU5DCNeenaOk0PVTsDkAvFmHCquXBeFZf4Vw7JONl0,756
@@ -219,7 +218,7 @@ meta_edc/meta_version.py,sha256=8IASYGnr43t18oDhNAPNnQoKvFYVAUnPILl6a05HAoc,211
 meta_edc/model_callers.py,sha256=PjQEW7Kp5HHcUMdmz7dvxg53HvGJHXUKr6QTd-4hsyE,1339
 meta_edc/models.py,sha256=DLA-hDdFszAVNCe1sZqVoLmIXifFW0HeZsipP9D1Ic4,46
 meta_edc/navbars.py,sha256=1E7JzjI9NUGKwOVvyMGE2Gs2FM40vImMcuB_01t5FTs,1099
-meta_edc/urls.py,sha256=Lqnu9siL9_Eu38DbgtSq2PxMP8Vv412RwXzbTOf9-yA,3489
+meta_edc/urls.py,sha256=BpDuV2XX7Qe8xkSgjhT7ehiZ7QCVtQwzQiY2YPhta_I,3534
 meta_edc/utils.py,sha256=FdGGHT0zCUM9FLovLanH_ultcxbVitCvvPAwq0U3yYc,342
 meta_edc/wsgi.py,sha256=Ns9vu_jcEqpOLM5tb-hwVUh3ciInocrG3kUPAxh7nJg,165
 meta_edc/wsgi_live.py,sha256=EprgdsDiEvNN033w6lUQHaS8Y3ntpPrWHDTOgZcjaCQ,164
@@ -232,8 +231,8 @@ meta_edc/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 meta_edc/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_edc/management/commands/update_forms_reference.py,sha256=_DiCqhHUk8lGhDGlsjOA069EE-g7UBDlZQCH6L1xiHo,1003
 meta_edc/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_edc/settings/debug.py,sha256=-PvZN-nPpEBr49ndpBHFcV71SDu1tAXmVfKESDFIr4Q,947
-meta_edc/settings/defaults.py,sha256=V7_2rZ6hQRix_pfzkzM4pAf_RSTQXDX3wCvsqGqadvs,18602
+meta_edc/settings/debug.py,sha256=PUUzyXtMyiKYCyqHeD-mT6PjEKJS8ASDcSxtiG84E1Y,947
+meta_edc/settings/defaults.py,sha256=Q1WJEfWQF5A-IvFoMeyQi0n5BaPmXSgpfAkJ011B_SY,18764
 meta_edc/settings/live.py,sha256=uLTlsIc3H6gdE_7pkL6vyOVa6V_74hnXFkiojqGFAYY,264
 meta_edc/settings/logging.py,sha256=6qVUE37OMkf5rzwTmMq4krFsZ2jcyCpWdFtGih_Cs4U,1938
 meta_edc/settings/minimal.py,sha256=3z-7GBluflnUkuSotKZlYvpL34NZ6tfFNuQNJLCyflo,592
@@ -290,14 +289,22 @@ meta_lists/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 meta_lists/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_lists/tests/test_lists.py,sha256=qcp2emRyd5-cP2oLluy8MpUucBDQ8_GdUxjh2KbZPv4,212
 meta_pharmacy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_pharmacy/apps.py,sha256=KTBxPWUCPnN_0Vk7D3oJuz2R57TRssi8ftnkd-Yh1-0,599
-meta_pharmacy/constants.py,sha256=lxofauPDtINP7PyYbeJ7tY9vozdvH7pQ6jZ9RNXYRtk,24
-meta_pharmacy/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_pharmacy/admin.py,sha256=-HCVaaDFtt_uHzdaSQfM5yDfP44_VgIl-s-IcrPQqzg,3535
+meta_pharmacy/admin_site.py,sha256=Ekq8Z13f1w4Llm6exO5w4Jk4Bvt-5WN1ydy_BS2rbdI,171
+meta_pharmacy/apps.py,sha256=VNiKT23F5d5nkXxzu1L-kAqovNOdfxzp-cUC6qcioVQ,732
+meta_pharmacy/constants.py,sha256=d3NAZwpxCDm9LLQ_QGKBG2txooYg748Ajh8a2deF0kw,263
+meta_pharmacy/forms.py,sha256=b02OM7TbMyQ12qrZ8WptmhIuGj87fgkQQkc0qVxMopw,2104
+meta_pharmacy/models.py,sha256=qwjsvsCr7ryb8DRn1aYD1_wOpAQR6ffumLuYNGxeNEs,3395
 meta_pharmacy/prepare_meta_pharmacy.py,sha256=5gNiPkmOzWwCW-_q6hgIzj_0tnPuN4Tl1lVI6FygNgs,2945
+meta_pharmacy/urls.py,sha256=jncXssL_SeRhb_OJVXLdGFvPT3BqtrkSPdq-eyJnGfY,207
 meta_pharmacy/migrations/0001_initial.py,sha256=2uyWhZ-Qkjum1gJJA5v-BWUdpmKhkf8BcuDQMl8895s,1115
+meta_pharmacy/migrations/0002_initial.py,sha256=zkPXmGhdEi-EM0HJRBaTUAltdiLRjW1BhU4GEydoBM8,27355
+meta_pharmacy/migrations/0003_auto_20240909_2335.py,sha256=_hbzV6HaBm-VS_jQMhl3w5srvyaYOQclLBvr_8f79uk,2227
+meta_pharmacy/migrations/0004_alter_historicalsubstitutions_report_datetime_and_more.py,sha256=33SpQ4UtFs3gblj4WG3KtKtalo8Wynv3uyUOqBe7_Zo,585
+meta_pharmacy/migrations/0005_auto_20240911_0352.py,sha256=ZwjFlBX_ubNDbTnDny7cvgCb4aSiqhVKhTYDWd6oQmg,534
 meta_pharmacy/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_prn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_prn/action_items.py,sha256=kJ5RiMh0btpcDpHxEfqMI4MJ-4fp5Wh3dNTGabzkDBQ,8850
+meta_prn/action_items.py,sha256=wz6X7Ve8ibqPBO5kB6S9rYYkWfx8JxsoYRVppzIGAzk,9110
 meta_prn/admin_site.py,sha256=E4dJ6ofu9Kp-1SIWIuY3PraVPbEJSWBBqhorJPGUNqU,161
 meta_prn/apps.py,sha256=NEqrwzEW277BAPGeL1H1KdK9e74FqXfYHK6o46BtaJA,280
 meta_prn/baker_recipes.py,sha256=jDGg3btxjtvnsph_AnKoZBDUeTfokMs5iQWnQBJD-jw,660
@@ -434,13 +441,14 @@ meta_reports/pdf_report.py,sha256=9lWnRc_BNieDFXC4VgA0QHK6g_ct58u8tupPRsbRvV0,23
 meta_reports/tasks.py,sha256=wPzfm99Hox1AIvt1KxYg1r6g9v8ta2AHOHesoN6AxEk,370
 meta_reports/urls.py,sha256=_c6AMrK4U5MsyFSU2JSPNfiZlbhuw24C7CyPNYpqGd0,206
 meta_reports/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_reports/admin/__init__.py,sha256=W9unT8v7A8yHLn0WS8Wn4ZRk6W32POBS-ePh1UA-DHE,407
+meta_reports/admin/__init__.py,sha256=3GDQM-HA1h8FdsmGSAiPaCd1paMGGJHTq6Ivd4Ob9bA,434
 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=RhdkF5W9ccuwaX5NTMF4b9shQJgDFaOlj7ENOTBAG0g,3669
-meta_reports/admin/dbviews/__init__.py,sha256=5NoJxTvBaZX0hJnE9Bf-HyJBEgGd59Hebj50Q23gguk,616
+meta_reports/admin/dbviews/__init__.py,sha256=2yPu0SO7ZX9yjan0OS9izzws14YYoXcGXmZhwJhax1I,675
 meta_reports/admin/dbviews/glucose_summary_admin.py,sha256=NqnDKx5l0Q-2xxRGdnf50DaRX1Sn8-DC0jHSk96LkRo,4005
+meta_reports/admin/dbviews/imp_substitutions_admin.py,sha256=-poOw3fJK7jQERB1PNXNDrWNthwEQpiwmrxoWOsDtjI,3622
 meta_reports/admin/dbviews/patient_history_missing_baseline_cd4_admin.py,sha256=XyroEqxlX816xrdi0IVSelNPxPBWi96niKa-MQVGkck,2058
 meta_reports/admin/dbviews/unattended_three_in_row2_admin.py,sha256=0r13KRr0gsH2osmSlffRV11SpSBpWM612AYl-GOoYm0,1347
 meta_reports/admin/dbviews/unattended_three_in_row_admin.py,sha256=i_-H3pMXRjssf8jFw8gJ8_b0FaM4tX2AI4xfHQDyssU,1121
@@ -473,7 +481,7 @@ meta_reports/migrations/0013_auto_20240813_1516.py,sha256=6m7f0kzDjmQ1WuvTe2YmYc
 meta_reports/migrations/0014_auto_20240813_1517.py,sha256=73gFSbkF_1Ujj-ynf6kzpVw7-iJjyxBhwTQwek0gbM0,5506
 meta_reports/migrations/0015_alter_endpoints_site.py,sha256=j3SqxCkI6MO3-SdDkmYPtRJ8tidcXL5RJ_IK42R6soQ,551
 meta_reports/migrations/0016_missingscreeningogtt.py,sha256=Dmgh4Hmzrye_GHGXNksBCt6p-cI4U5qakj3RHYi4sOw,1962
-meta_reports/migrations/0017_auto_20240819_1711.py,sha256=B0QpypzPM5VRL05VuYxdREBXgdNFk1wjrW_uNVvR93Y,36679
+meta_reports/migrations/0017_auto_20240819_1711.py,sha256=OJmsJFp7eMoBOphCNaJEDvwnHzab6Q8tl92Uxdqir20,36773
 meta_reports/migrations/0018_auto_20240819_1713.py,sha256=BaYwu6TA-wNzKqR-1GJ3fzrZ9b9Oj6C7M5f32QFyPGU,5309
 meta_reports/migrations/0019_auto_20240819_1721.py,sha256=oxpy4mTbvJoBC2AqDg5FXkjOhTKmr6LiF4x74-yUr_k,5594
 meta_reports/migrations/0020_auto_20240819_1811.py,sha256=CgjDxYzefPLngSZ8l4XSm3K086-2SCbK6S_8tuMgS6w,6038
@@ -503,15 +511,21 @@ meta_reports/migrations/0043_auto_20240828_2309.py,sha256=ZQUFjpWb6Jl2__ghkXL_gv
 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
+meta_reports/migrations/0047_impsubstitutions.py,sha256=VPTb5j2t9IvwR-Bq0lnVBGLAVKdL7IbY8DD-cjl_m5o,2088
+meta_reports/migrations/0048_auto_20240909_2338.py,sha256=mYAOUzJohv9eW9y93fpZTmlgmx_eOBRhUBMr0F3_-_M,3169
+meta_reports/migrations/0049_auto_20240911_0327.py,sha256=APBkFY9kwzEmhTXkK2-bu6csikh_dVEMH6t2dv_Iz9M,4760
 meta_reports/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_reports/models/__init__.py,sha256=1tv2jW-ZAwyC6g2SUvrSGkmuLYquupfut1qEQJqm5Z0,358
+meta_reports/models/__init__.py,sha256=8JnKMG9devIPboCCGj423x77Ylry2ROdGOnDSk5Xo4w,380
 meta_reports/models/endpoints.py,sha256=HfxQuKkzu883xbTeVfIEktN-ARoGe1qC6KgEAzRtV5E,925
 meta_reports/models/endpoints_proxy.py,sha256=3h3JGaPmnJedFPVWGrk4idV4YtdihqiCI5W7QomwG4E,318
 meta_reports/models/dbviews/README,sha256=GdeboB7Xqb-Qo_rE1ondcxP8Ps93MIjLzCePQCePig0,686
-meta_reports/models/dbviews/__init__.py,sha256=T7HZj0LAVw0kWKDV8c8aLrQj5gwwgEZ0wD5orCxImTQ,511
+meta_reports/models/dbviews/__init__.py,sha256=C5YGOKwVAexjWxLh5vl0m561TBMWDM_yAvIrwqG_M70,559
 meta_reports/models/dbviews/glucose_summary/__init__.py,sha256=Tfgjso4TpxMCidAdRJp8g1Ykqqa43yWlQSotzAaORAo,93
 meta_reports/models/dbviews/glucose_summary/unmanaged_model.py,sha256=uqhD5JLXtyQ94zpG5Puxodjzli3quE4GgiFi7en6EeM,1055
 meta_reports/models/dbviews/glucose_summary/view_definition.py,sha256=Fc5KN-It9dcBvRta-b26kUl8uQEHA19vrYIhNRqe2Xo,1512
+meta_reports/models/dbviews/imp_substitutions/__init__.py,sha256=N0507JzoVRtNA9W9_RoiAQYEQZGdvP2U8P83ZJMeZxQ,46
+meta_reports/models/dbviews/imp_substitutions/unmanaged_model.py,sha256=ozrkfZFBHAnBBlEY19gRVj6eFiZrVfAnAV6E8OBwnP8,1223
+meta_reports/models/dbviews/imp_substitutions/view_definition.py,sha256=1t6znTYQJxM_-nTRjMgEY3T2L_ZDFvh2tw-zT8fmxQU,897
 meta_reports/models/dbviews/missing_screening_ogtt/__init__.py,sha256=7uX_2HfVU-3G1O_xecfGnE5_pcX5eceiRaapeDQtzIw,105
 meta_reports/models/dbviews/missing_screening_ogtt/note_model.py,sha256=JHItVS11WDFg3lTe7ayH9T7Epd-VvXXD_79FssrmAwc,1813
 meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py,sha256=_XFzpOiMoxr-F0ebKNEnyXqS6dnb3P5tBRnZlbrQ2x8,1346
@@ -521,7 +535,7 @@ meta_reports/models/dbviews/on_study_missing_lab_values/qa_cases.py,sha256=QBptc
 meta_reports/models/dbviews/on_study_missing_lab_values/unmanged_model.py,sha256=QI9T3K35pAAUMCiIbtwU_cf9kPodBfG9jwNeahPzTMQ,647
 meta_reports/models/dbviews/on_study_missing_lab_values/view_definition.py,sha256=Z0dnJZZT7EokC0M2TVSCjcLU0SyFfjxydjYmHqZcNag,568
 meta_reports/models/dbviews/on_study_missing_values/__init__.py,sha256=bxRAXRocUIdUCg9jARlztOE2co9LqgHbBOkU1Bykz9M,49
-meta_reports/models/dbviews/on_study_missing_values/qa_cases.py,sha256=pbs6VIY6_6gsz-zJqIQeu2U5TagcRmCCAV7OaZdy30A,1956
+meta_reports/models/dbviews/on_study_missing_values/qa_cases.py,sha256=NiqcSU5ZQD6zSgn08yPY0TEFqmeHSpH6DHFX8ns_XaI,1920
 meta_reports/models/dbviews/on_study_missing_values/unmanged_model.py,sha256=TQptzrx1Xv-sE_3ioO9BZ1ZE7CKZG8JWXsFD6-ZxI8k,632
 meta_reports/models/dbviews/on_study_missing_values/view_definition.py,sha256=W7MgZo51Y3nzQ7lUDtmZquRnC5ELdKGnpsscaCC9ouM,564
 meta_reports/models/dbviews/patient_history_missing_baseline_cd4/__init__.py,sha256=eIyKY9mdIE3-J2vtQtY7MOg_RQkwKj7aserwO5PBNQQ,62
@@ -686,7 +700,7 @@ meta_sites/models.py,sha256=DLA-hDdFszAVNCe1sZqVoLmIXifFW0HeZsipP9D1Ic4,46
 meta_sites/sites.py,sha256=H26Erar3_fLVl5wf2ILDM5C6wGEoi0dQbiSPmzb9OGw,1625
 meta_sites/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_sites/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meta_sites/tests/test_sites.py,sha256=yWzygYo1vQIBDv1-_ujNtNK6VxnSptf4s874vSAWlto,415
+meta_sites/tests/test_sites.py,sha256=WkI87TUqTsVxbIPh4wQdJ15FOoGE6R5oGPXqUpO0ntE,426
 meta_sites/tests/urls.py,sha256=_sVCnQeiAFRYKhxga3_DjoKj_4bgs1s2gjcynDiapvA,111
 meta_stats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meta_stats/incidence.py,sha256=59-BOn4nw-U79Ku4SxiPkJIse2pi467dOMTnLGmZvgI,540
@@ -912,7 +926,7 @@ meta_subject/migrations/0103_auto_20220324_0326.py,sha256=gBiNh4-CElPRQcGqb04t4Y
 meta_subject/migrations/0104_auto_20220412_2151.py,sha256=lruwZFW9lyRzAJ-13bJZh19ZhFYMKX6k-TUjuXWIZAY,966
 meta_subject/migrations/0105_auto_20220412_2310.py,sha256=wEJsJDk_cwh-JW8ZPxg9HGE3YKKtOPRQJTo6xywX5nk,1290
 meta_subject/migrations/0106_auto_20220414_1741.py,sha256=tUQQG1JgKa_XrTL2Paz83YaEs8LhIl9gph5OyiV22nk,772
-meta_subject/migrations/0107_auto_20220415_0043.py,sha256=8tI8HUNY0jUK5TmyUTMSJ5-HOPGLu8u79GzYXPSq4oc,1492
+meta_subject/migrations/0107_auto_20220415_0043.py,sha256=PWxsJHxonC9L0nTWJnNF-oc3dcZfzkJPNvI38DYDbD8,1718
 meta_subject/migrations/0108_auto_20220415_1747.py,sha256=4HHVMatXiqavoutbzbZY7TlTHxg32uQYP7gHWg27DX8,688
 meta_subject/migrations/0109_auto_20220415_1758.py,sha256=FNBIWr0sCmXCvzI0yNVeMSrPup7vMQJhnYxrzHu9DSA,556
 meta_subject/migrations/0110_auto_20220512_1811.py,sha256=iKRSR0qkKbgOGQUT3zyz7SWN7kyrfJtFH98c1QTu8gM,2516
@@ -931,16 +945,16 @@ meta_subject/migrations/0122_auto_20220708_2144.py,sha256=qEaeHaf0Ab3SwvlENZxP4H
 meta_subject/migrations/0123_auto_20220714_2136.py,sha256=4ZOX8z0-GjWDTNu9DkZNxZtKIyFcMaEHMdzL4zf_pwA,8262
 meta_subject/migrations/0124_auto_20220714_2303.py,sha256=M_QpUhj8K-LD5HLytzYH7n59bqlruHzCGpozKjPaCY0,1206
 meta_subject/migrations/0125_auto_20220719_2134.py,sha256=ijk0rLwlXCxft3tPptVpqfDrtuk6ud5Cxh_EFTZ8FW8,1568
-meta_subject/migrations/0126_auto_20220719_2142.py,sha256=56lSoGrf97pUjLmH4GajJKmwkevXtpVZ7QI3s_xTp8I,776
+meta_subject/migrations/0126_auto_20220719_2142.py,sha256=etZtba3l2cN_QQqEKEIrKpKOsotCifX85Y8P6ge2if4,784
 meta_subject/migrations/0127_auto_20220720_0053.py,sha256=YAJ2xlCKC-0oin-XxnfzyZcsAF9ozNx_a_5cP8WJ1i4,5488
 meta_subject/migrations/0128_auto_20220720_0055.py,sha256=voqWxaEfSrFSCzXglIfZLRdQpAx_MZ6GZIJmjMr9j50,778
 meta_subject/migrations/0129_auto_20220720_0108.py,sha256=XBant365dtOEYMtVcbs0yKgbCGP_GIg3azqvX2TGGc8,490
 meta_subject/migrations/0130_auto_20220720_0216.py,sha256=S7Q7TAl97ZCVpum2zmOtHqeeV4kmo4tbLa-hOKtO-rs,683
-meta_subject/migrations/0131_auto_20220722_0411.py,sha256=31XxxCy7ejTqeC9OjrCcb_6otTRb437PrFcxIhbcUgc,1932
-meta_subject/migrations/0132_auto_20220722_1825.py,sha256=z_wSesQHtoSTIcKTELb0oH_EhDnXL2HNlOpyhbAmqEI,843
+meta_subject/migrations/0131_auto_20220722_0411.py,sha256=h0fzn1OsT_tvx5LMDyrh9t3HUsXzcpGwA19regX_jO4,2153
+meta_subject/migrations/0132_auto_20220722_1825.py,sha256=TmWCNPi8rdNvA7qfWZ-iVAzlXBrN_FE5uATEzVNFxXY,979
 meta_subject/migrations/0133_auto_20220722_2140.py,sha256=Un8wWZeac9RdJ3cUUo43bAHsOAm489wyhXcaeTBeve4,28130
 meta_subject/migrations/0134_auto_20220722_2211.py,sha256=Ez2ur6gngrz2y82Hsgx-Ag3HJXr8htcsGS4BxnjX-eU,1806
-meta_subject/migrations/0135_auto_20220722_2212.py,sha256=5g2Odlht0qXpRu-ZAbIB97dXZd8QGDP-lDKArRKfR_Y,2263
+meta_subject/migrations/0135_auto_20220722_2212.py,sha256=34qNpdc0c-LkK0MhSh9ofJP50Ckut4c9yWwVyfU5fvY,2463
 meta_subject/migrations/0136_egfrdropnotification_creatinine_quantifier_and_more.py,sha256=4vWNQUmziJFlktyOekNqC_lx0ybywCx0FMaIE5_9oRE,8660
 meta_subject/migrations/0137_alter_egfrdropnotification_egfr_percent_change_and_more.py,sha256=OQA1uVxwReY4osMsbhT_MGVfOBaopBI4s7GW56ba3vU,1138
 meta_subject/migrations/0138_alter_glucose_fbg_datetime_and_more.py,sha256=JdZ1KW-PnapQm81_THgm-ty3_AeOmbujZoxfRE1cjY8,3531
@@ -955,7 +969,7 @@ meta_subject/migrations/0146_auto_20220907_0207.py,sha256=1va3UjUI5bD3yey08Fk3rp
 meta_subject/migrations/0147_auto_20220907_1505.py,sha256=kRJWQ81XsX_poQBS_u0tuiQBfRhnP4lQeNzfDTOeOmw,1906
 meta_subject/migrations/0148_auto_20220908_1826.py,sha256=iHN59ZuFFYQCbLYZAebF_kaiP8m-twUnwUAzrgtFOXU,1814
 meta_subject/migrations/0149_auto_20220913_2139.py,sha256=V27KGY9t6IV8Xzf0wgcLQseM1DBcXGXY3ReNC_iRUe0,1000
-meta_subject/migrations/0150_auto_20220914_0039.py,sha256=BmtWEsWQooijWvqQxTlTSq93GLfRM0kwDdUsJQaZEAQ,1222
+meta_subject/migrations/0150_auto_20220914_0039.py,sha256=qB-6YVz3lloQf6JbbwZACGyf68n2LtlGcFX8v_NY9Qc,1322
 meta_subject/migrations/0151_auto_20220918_0508.py,sha256=tcQ-eyK-2cIqTLDtL9QsfDi4F9fu8UGHVye6QSBDYLA,52998
 meta_subject/migrations/0152_auto_20220925_0509.py,sha256=Zd_1TRIXLzw323ccrwHT_k76HgEqVCEBqvqbjlNYCto,738
 meta_subject/migrations/0153_auto_20220928_0250.py,sha256=nmYfG7zYmrRW4JQXoZQlE3aQQBBehDJrtVRIb4AWtK0,1172
@@ -1123,9 +1137,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.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_edc-0.3.35.dist-info/AUTHORS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meta_edc-0.3.35.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+meta_edc-0.3.35.dist-info/METADATA,sha256=dDq2QH8-IJSAsrP9CH2CeRwlGMpaxNTgjYpVEu2pi3A,3015
+meta_edc-0.3.35.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+meta_edc-0.3.35.dist-info/top_level.txt,sha256=RkzjNXwRq2kg_uZ_1bDwPUntijSXoY2YBqtByDwvvrc,244
+meta_edc-0.3.35.dist-info/RECORD,,

{meta_edc-0.3.33.dist-info → meta_edc-0.3.35.dist-info}/WHEEL

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

meta_pharmacy/admin.py

@@ -0,0 +1,135 @@
+from django.contrib import admin
+from django_audit_fields.admin import audit_fieldset_tuple
+from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
+from edc_model_admin.history import SimpleHistoryAdmin
+from edc_model_admin.list_filters import ReportDateListFilter
+from edc_pharmacy.admin.list_filters import MedicationsListFilter
+from edc_sites.admin import SiteModelAdminMixin
+
+from .admin_site import meta_pharmacy_admin
+from .forms import RxForm, SubstitutionsForm
+from .models import Rx, Substitutions
+
+
+@admin.register(Substitutions, site=meta_pharmacy_admin)
+class SubstitutionsAdmin(
+    SiteModelAdminMixin,
+    ModelAdminSubjectDashboardMixin,
+    SimpleHistoryAdmin,
+):
+    """Admin class for meta_pharmacy.Substitutions"""
+
+    form = SubstitutionsForm
+
+    autocomplete_fields = ["rx"]
+
+    add_instructions = "This form is used to record any substitions made for IMP refills"
+
+    fieldsets = (
+        (
+            None,
+            {"fields": ("report_datetime",)},
+        ),
+        ("Original label on bottle", {"fields": ("sid", "visit_no")}),
+        (
+            "Substitution / Changed label",
+            {
+                "description": "The label on this bottle has been changed to the following",
+                "fields": ("dispensed_sid", "updated_visit_no"),
+            },
+        ),
+        (
+            "Subject",
+            {
+                "fields": ("rx",),
+            },
+        ),
+        audit_fieldset_tuple,
+    )
+
+    list_display = (
+        "sid",
+        "dispensed_sid",
+        "arm_match",
+        "subject_identifier",
+        "report_date",
+    )
+
+    radio_fields = {"arm_match": admin.VERTICAL}
+
+    list_filter = ("arm_match", ReportDateListFilter)
+
+    search_fields = ["subject_identifier", "sid", "dispensed_sid"]
+
+    @admin.display(description="Report date", ordering="report_datetime")
+    def report_date(self, obj) -> str | None:
+        if obj.report_datetime:
+            return obj.report_datetime.date()
+        return None
+
+
+@admin.register(Rx, site=meta_pharmacy_admin)
+class RxAdmin(ModelAdminSubjectDashboardMixin, admin.ModelAdmin):
+    """Admin class for proxy model of edc_pharmacy.Rx"""
+
+    show_object_tools = True
+
+    form = RxForm
+
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "subject_identifier",
+                    "report_datetime",
+                    "rx_name",
+                    "rx_date",
+                    "medications",
+                    "clinician_initials",
+                    "notes",
+                )
+            },
+        ),
+        (
+            "Randomization",
+            {
+                "fields": ("rando_sid", "randomizer_name", "weight_in_kgs"),
+            },
+        ),
+        audit_fieldset_tuple,
+    )
+
+    filter_horizontal = ("medications",)
+
+    list_display = (
+        "subject_identifier",
+        "dashboard",
+        "rx_medications",
+        "rando_sid",
+        "rx_date",
+        "weight_in_kgs",
+        "rx_name",
+    )
+
+    list_filter = ("report_datetime", MedicationsListFilter, "site")
+
+    search_fields = (
+        "id",
+        "subject_identifier",
+        "rando_sid",
+        "registered_subject__initials",
+        "medications__name",
+        "site__id",
+        "rx_name",
+    )
+
+    readonly_fields = (
+        "rando_sid",
+        "weight_in_kgs",
+        "rx_name",
+    )
+
+    @admin.display
+    def rx_medications(self, obj):
+        return ", ".join([obj.display_name for obj in obj.medications.all()])

meta_pharmacy/admin_site.py

@@ -0,0 +1,5 @@
+from edc_model_admin.admin_site import EdcAdminSite
+
+from .apps import AppConfig
+
+meta_pharmacy_admin = EdcAdminSite(name="meta_pharmacy_admin", app_label=AppConfig.name)

meta_pharmacy/apps.py

@@ -15,6 +15,9 @@ def post_migrate_populate_pharmacy_models(sender=None, **kwargs):  # noqa
 class AppConfig(DjangoAppConfig):
     name = "meta_pharmacy"
     verbose_name = "META Pharmacy"
+    include_in_administration_section = True
+    has_exportable_data = True
+    default_auto_field = "django.db.models.BigAutoField"
 
     def ready(self):
         post_migrate.connect(post_migrate_populate_pharmacy_models, sender=self)

meta_pharmacy/constants.py

@@ -1 +1,11 @@
+from edc_constants.constants import OK
+
 METFORMIN = "metformin"
+REVIEW = "REVIEW"
+MISSING_SUBJECT_IDENTIFIER = "MISSING_SUBJECT_IDENTIFIER"
+
+SUBSTITUTION_STATUS = (
+    (OK, "ok"),
+    (MISSING_SUBJECT_IDENTIFIER, "Missing Subject ID"),
+    (REVIEW, "review"),
+)

meta_pharmacy/forms.py

@@ -0,0 +1,65 @@
+from django import forms
+from django.core.exceptions import ObjectDoesNotExist
+from edc_form_validators.form_validator import FormValidator
+from edc_form_validators.form_validator_mixins import FormValidatorMixin
+from edc_model_form.mixins import BaseModelFormMixin
+from edc_offstudy.modelform_mixins import OffstudyNonCrfModelFormMixin
+from edc_prn.modelform_mixins import PrnFormValidatorMixin
+from edc_sites.forms import SiteModelFormMixin
+
+from .models import Rx, Substitutions
+
+
+class SubstitutionsFormValidator(PrnFormValidatorMixin, FormValidator):
+    pass
+
+
+class SubstitutionsForm(
+    SiteModelFormMixin,
+    OffstudyNonCrfModelFormMixin,
+    BaseModelFormMixin,
+    FormValidatorMixin,
+    forms.ModelForm,
+):
+    form_validator_cls = SubstitutionsFormValidator
+
+    def clean(self):
+        if self.cleaned_data.get("sid"):
+            try:
+                obj = Rx.objects.get(rando_sid=self.cleaned_data.get("sid"))
+            except ObjectDoesNotExist:
+                raise forms.ValidationError({"sid": "Unknown SID for this trial"})
+            else:
+                if obj.site.id != self.site.id:
+                    raise forms.ValidationError(
+                        {
+                            "sid": (
+                                "Unknown SID for this trial site. "
+                                f"Expected SITE {obj.site.id}."
+                            )
+                        }
+                    )
+        if self.cleaned_data.get("dispensed_sid"):
+            try:
+                Rx.objects.get(
+                    rando_sid=self.cleaned_data.get("dispensed_sid"),
+                )
+            except ObjectDoesNotExist:
+                raise forms.ValidationError({"dispensed_sid": "Unknown SID for this trial"})
+
+    class Meta:
+        model = Substitutions
+        fields = "__all__"
+
+
+class RxForm(forms.ModelForm):
+
+    subject_identifier = forms.CharField(
+        label="Subject Identifier",
+        required=False,
+        widget=forms.TextInput(attrs={"readonly": "readonly"}),
+    )
+
+    class Meta:
+        model = Rx
+        fields = "__all__"