meta-edc 0.3.7__py3-none-any.whl → 0.3.50__py3-none-any.whl

Sign up to get free protection for your applications and to get access to all the features.
Files changed (411) hide show
  1. meta_ae/action_items.py +2 -2
  2. meta_ae/migrations/0017_auto_20221130_2257.py +12 -7
  3. meta_ae/tests/holidays.csv +1 -1
  4. meta_analytics/README.rst +17 -0
  5. meta_analytics/dataframes/__init__.py +19 -0
  6. meta_analytics/dataframes/constants.py +33 -0
  7. meta_analytics/dataframes/enrolled/__init__.py +1 -0
  8. meta_analytics/dataframes/enrolled/get_glucose_df.py +122 -0
  9. meta_analytics/dataframes/get_eos_df.py +26 -0
  10. meta_analytics/dataframes/get_last_imp_visits_df.py +101 -0
  11. meta_analytics/dataframes/glucose_endpoints/__init__.py +2 -0
  12. meta_analytics/dataframes/glucose_endpoints/endpoint_by_date.py +183 -0
  13. meta_analytics/dataframes/glucose_endpoints/glucose_endpoints_by_date.py +531 -0
  14. meta_analytics/dataframes/screening/__init__.py +2 -0
  15. meta_analytics/dataframes/screening/get_glucose_tested_only_df.py +20 -0
  16. meta_analytics/dataframes/screening/get_screening_df.py +163 -0
  17. meta_analytics/dataframes/utils.py +65 -0
  18. meta_analytics/get_tables.py +81 -0
  19. meta_analytics/tables/__init__.py +2 -0
  20. meta_analytics/tables/eligible.py +106 -0
  21. meta_analytics/tables/enrolled/__init__.py +0 -0
  22. meta_analytics/tables/enrolled/glucose.py +28 -0
  23. meta_analytics/tables/has_dm.py +61 -0
  24. meta_analytics/tests/__init__.py +0 -0
  25. meta_analytics/tests/test_endpoints_by_date.py +94 -0
  26. meta_auth/auth_objects.py +32 -3
  27. meta_auth/auths.py +18 -3
  28. meta_consent/action_items.py +18 -1
  29. meta_consent/admin/__init__.py +1 -0
  30. meta_consent/admin/subject_consent_v1_ext_admin.py +45 -0
  31. meta_consent/baker_recipes.py +5 -4
  32. meta_consent/consents.py +21 -2
  33. meta_consent/constants.py +1 -0
  34. meta_consent/forms/__init__.py +1 -0
  35. meta_consent/forms/subject_consent_v1_ext_form.py +16 -0
  36. meta_consent/locale/lg/LC_MESSAGES/django.po +69 -0
  37. meta_consent/locale/sw/LC_MESSAGES/django.po +12 -12
  38. meta_consent/migrations/0025_alter_historicalsubjectconsent_first_name_and_more.py +151 -0
  39. meta_consent/migrations/0026_historicalsubjectconsentv1ext_subjectconsentv1ext.py +544 -0
  40. meta_consent/migrations/0027_auto_20250111_0344.py +30 -0
  41. meta_consent/models/__init__.py +1 -0
  42. meta_consent/models/signals.py +34 -13
  43. meta_consent/models/subject_consent_v1.py +1 -3
  44. meta_consent/models/subject_consent_v1_ext.py +29 -0
  45. meta_consent/tests/holidays.csv +1 -1
  46. meta_consent/tests/tests/test_form_validators.py +1 -1
  47. meta_dashboard/locale/lg/LC_MESSAGES/django.po +30 -0
  48. meta_dashboard/locale/sw/LC_MESSAGES/django.po +11 -2
  49. meta_dashboard/navbars.py +3 -1
  50. meta_dashboard/templates/meta_dashboard/bootstrap3/buttons/eligibility_button.html +1 -1
  51. meta_dashboard/templates/meta_dashboard/bootstrap3/buttons/screening_button.html +1 -1
  52. meta_dashboard/templates/meta_dashboard/bootstrap3/screening/listboard.html +4 -4
  53. meta_dashboard/templates/meta_dashboard/bootstrap3/subject/dashboard/sidebar.html +24 -0
  54. meta_dashboard/templates/meta_dashboard/bootstrap3/subject/dashboard.html +3 -0
  55. meta_dashboard/templates/meta_dashboard/bootstrap3/subject/listboard.html +1 -2
  56. meta_dashboard/templatetags/meta_dashboard_extras.py +1 -1
  57. meta_dashboard/tests/holidays.csv +1 -1
  58. meta_dashboard/tests/urls.py +0 -1
  59. meta_dashboard/view_utils/__init__.py +6 -0
  60. meta_dashboard/view_utils/subject_screening_button.py +2 -2
  61. meta_dashboard/views/subject/dashboard/dashboard_view.py +38 -0
  62. meta_edc/__init__.py +7 -0
  63. meta_edc/celery.py +4 -13
  64. meta_edc/celery_live.py +18 -0
  65. meta_edc/celery_uat.py +24 -0
  66. meta_edc/management/commands/update_forms_reference.py +6 -2
  67. meta_edc/migrations/__init__.py +0 -0
  68. meta_edc/navbars.py +2 -1
  69. meta_edc/settings/debug.py +17 -9
  70. meta_edc/settings/defaults.py +82 -60
  71. meta_edc/settings/live.py +1 -9
  72. meta_edc/settings/uat.py +1 -14
  73. meta_edc/templates/meta_edc/bootstrap3/home.html +13 -7
  74. meta_edc/tests/tests/test_endpoints.py +22 -19
  75. meta_edc/urls.py +5 -2
  76. meta_edc/wsgi.py +1 -1
  77. meta_edc/wsgi_live.py +1 -1
  78. meta_edc/wsgi_uat.py +1 -1
  79. meta_edc-0.3.50.dist-info/AUTHORS +0 -0
  80. meta_edc-0.3.50.dist-info/METADATA +766 -0
  81. {meta_edc-0.3.7.dist-info → meta_edc-0.3.50.dist-info}/RECORD +400 -157
  82. {meta_edc-0.3.7.dist-info → meta_edc-0.3.50.dist-info}/WHEEL +1 -1
  83. {meta_edc-0.3.7.dist-info → meta_edc-0.3.50.dist-info}/top_level.txt +1 -0
  84. meta_pharmacy/admin/__init__.py +2 -0
  85. meta_pharmacy/admin/rx_admin.py +75 -0
  86. meta_pharmacy/admin/substitutions_admin.py +67 -0
  87. meta_pharmacy/admin_site.py +9 -0
  88. meta_pharmacy/apps.py +5 -0
  89. meta_pharmacy/constants.py +10 -0
  90. meta_pharmacy/forms/__init__.py +2 -0
  91. meta_pharmacy/forms/rx_form.py +16 -0
  92. meta_pharmacy/forms/substitutions_form.py +54 -0
  93. meta_pharmacy/label_configs.py +30 -0
  94. meta_pharmacy/labels/__init__.py +5 -0
  95. meta_pharmacy/labels/draw_label_for_subject_with_barcode.py +62 -0
  96. meta_pharmacy/labels/draw_label_for_subject_with_code128.py +14 -0
  97. meta_pharmacy/labels/draw_label_with_test_data.py +26 -0
  98. meta_pharmacy/labels/label_data.py +14 -0
  99. meta_pharmacy/labels/print_sheets.py +97 -0
  100. meta_pharmacy/list_data.py +8 -0
  101. meta_pharmacy/management/__init__.py +0 -0
  102. meta_pharmacy/management/commands/__init__.py +0 -0
  103. meta_pharmacy/management/commands/update_initial_pharmacy_data.py +10 -0
  104. meta_pharmacy/migrations/0002_initial.py +695 -0
  105. meta_pharmacy/migrations/0003_auto_20240909_2335.py +64 -0
  106. meta_pharmacy/migrations/0004_alter_historicalsubstitutions_report_datetime_and_more.py +23 -0
  107. meta_pharmacy/migrations/0005_auto_20240911_0352.py +17 -0
  108. meta_pharmacy/migrations/0006_lotnumber_label.py +289 -0
  109. meta_pharmacy/migrations/0007_lotnumber_medication.py +24 -0
  110. meta_pharmacy/migrations/0008_remove_lotnumber_medication_and_more.py +390 -0
  111. meta_pharmacy/migrations/0009_remove_historicalrx_slug.py +17 -0
  112. meta_pharmacy/models/__init__.py +3 -0
  113. meta_pharmacy/models/label_data.py +38 -0
  114. meta_pharmacy/models/rx.py +18 -0
  115. meta_pharmacy/models/rx_label.py +39 -0
  116. meta_pharmacy/models/substitutions.py +88 -0
  117. meta_pharmacy/urls.py +8 -0
  118. meta_pharmacy/utils/__init__.py +1 -0
  119. meta_pharmacy/utils/update_initial_pharmacy_data.py +146 -0
  120. meta_prn/action_items.py +52 -2
  121. meta_prn/admin/__init__.py +3 -0
  122. meta_prn/admin/dm_referral_admin.py +49 -0
  123. meta_prn/admin/offschedule_dm_referral_admin.py +47 -0
  124. meta_prn/admin/onschedule_dm_referral_admin.py +39 -0
  125. meta_prn/admin/pregnancy_notification_admin.py +6 -2
  126. meta_prn/baker_recipes.py +8 -1
  127. meta_prn/choices.py +2 -1
  128. meta_prn/constants.py +4 -1
  129. meta_prn/forms/__init__.py +2 -0
  130. meta_prn/forms/dm_referral_form.py +40 -0
  131. meta_prn/forms/offschedule_dm_referral_form.py +35 -0
  132. meta_prn/forms/offschedule_form.py +6 -0
  133. meta_prn/migrations/0034_auto_20220630_1110.py +3 -3
  134. meta_prn/migrations/0035_auto_20220630_1140.py +59 -56
  135. meta_prn/migrations/0057_historicalonscheduledmreferral_and_more.py +1156 -0
  136. meta_prn/migrations/0058_dmreferral_referral_note_and_more.py +29 -0
  137. meta_prn/migrations/0059_alter_historicaloffstudymedication_reason_and_more.py +53 -0
  138. meta_prn/models/__init__.py +13 -2
  139. meta_prn/models/dm_referral.py +39 -0
  140. meta_prn/models/offschedule.py +15 -1
  141. meta_prn/models/onschedule.py +6 -0
  142. meta_prn/models/signals.py +41 -1
  143. meta_prn/tests/tests/test_dm_referral.py +203 -0
  144. meta_reports/__init__.py +1 -0
  145. meta_reports/admin/__init__.py +15 -0
  146. meta_reports/admin/dbviews/__init__.py +14 -0
  147. meta_reports/admin/dbviews/glucose_summary_admin.py +116 -0
  148. meta_reports/admin/dbviews/imp_substitutions_admin.py +101 -0
  149. meta_reports/admin/dbviews/missing_screening_ogtt_admin/__init__.py +2 -0
  150. meta_reports/admin/dbviews/missing_screening_ogtt_admin/note_model_admin.py +53 -0
  151. meta_reports/admin/dbviews/missing_screening_ogtt_admin/unmanaged_model_admin.py +84 -0
  152. meta_reports/admin/dbviews/on_study_missing_lab_values_admin/__init__.py +1 -0
  153. meta_reports/admin/dbviews/on_study_missing_lab_values_admin/unmanaged_model_admin.py +13 -0
  154. meta_reports/admin/dbviews/on_study_missing_values_admin/__init__.py +1 -0
  155. meta_reports/admin/dbviews/on_study_missing_values_admin/unmanaged_model_admin.py +13 -0
  156. meta_reports/admin/dbviews/patient_history_missing_baseline_cd4_admin.py +58 -0
  157. meta_reports/admin/dbviews/unattended_three_in_row2_admin.py +47 -0
  158. meta_reports/admin/dbviews/unattended_three_in_row_admin.py +35 -0
  159. meta_reports/admin/dbviews/unattended_two_in_row_admin.py +34 -0
  160. meta_reports/admin/endpoints_admin.py +14 -0
  161. meta_reports/admin/endpoints_all_admin.py +13 -0
  162. meta_reports/admin/last_imp_refill_admin.py +181 -0
  163. meta_reports/admin/list_filters.py +30 -0
  164. meta_reports/admin/modeladmin_mixins.py +112 -0
  165. meta_reports/admin_site.py +5 -0
  166. meta_reports/apps.py +1 -16
  167. meta_reports/forms/__init__.py +1 -0
  168. meta_reports/forms/missing_ogtt_note_form.py +33 -0
  169. meta_reports/management/__init__.py +0 -0
  170. meta_reports/management/commands/__init__.py +0 -0
  171. meta_reports/management/commands/generate_endpoints.py +13 -0
  172. meta_reports/migrations/0001_initial.py +87 -0
  173. meta_reports/migrations/0002_patienthistorymissingbaselinecd4_and_more.py +64 -0
  174. meta_reports/migrations/0003_auto_20240618_0505.py +12 -0
  175. meta_reports/migrations/0004_alter_patienthistorymissingbaselinecd4_table.py +17 -0
  176. meta_reports/migrations/0005_endpoints.py +47 -0
  177. meta_reports/migrations/0006_endpoints_baseline_datetime.py +18 -0
  178. meta_reports/migrations/0007_alter_endpoints_endpoint_label_and_more.py +43 -0
  179. meta_reports/migrations/0008_alter_endpoints_endpoint_label.py +18 -0
  180. meta_reports/migrations/0009_alter_endpoints_options.py +21 -0
  181. meta_reports/migrations/0010_alter_patienthistorymissingbaselinecd4_options_and_more.py +49 -0
  182. meta_reports/migrations/0011_auto_20240813_0156.py +54 -0
  183. meta_reports/migrations/0012_auto_20240813_1516.py +48 -0
  184. meta_reports/migrations/0013_auto_20240813_1516.py +48 -0
  185. meta_reports/migrations/0014_auto_20240813_1517.py +48 -0
  186. meta_reports/migrations/0015_alter_endpoints_site.py +22 -0
  187. meta_reports/migrations/0016_missingscreeningogtt.py +47 -0
  188. meta_reports/migrations/0017_auto_20240819_1711.py +166 -0
  189. meta_reports/migrations/0018_auto_20240819_1713.py +54 -0
  190. meta_reports/migrations/0019_auto_20240819_1721.py +54 -0
  191. meta_reports/migrations/0020_auto_20240819_1811.py +54 -0
  192. meta_reports/migrations/0021_auto_20240819_1817.py +54 -0
  193. meta_reports/migrations/0022_auto_20240819_1832.py +54 -0
  194. meta_reports/migrations/0023_endpoints_meta_report_subject_a56b22_idx.py +20 -0
  195. meta_reports/migrations/0024_glucosesummary.py +38 -0
  196. meta_reports/migrations/0025_auto_20240822_0115.py +87 -0
  197. meta_reports/migrations/0026_auto_20240822_0120.py +54 -0
  198. meta_reports/migrations/0027_auto_20240822_0140.py +54 -0
  199. meta_reports/migrations/0028_alter_glucosesummary_options.py +22 -0
  200. meta_reports/migrations/0029_auto_20240822_0149.py +54 -0
  201. meta_reports/migrations/0030_auto_20240822_1637.py +54 -0
  202. meta_reports/migrations/0031_endpointsproxy.py +25 -0
  203. meta_reports/migrations/0032_alter_endpointsproxy_options.py +21 -0
  204. meta_reports/migrations/0033_auto_20240823_0012.py +54 -0
  205. meta_reports/migrations/0034_auto_20240823_1642.py +54 -0
  206. meta_reports/migrations/0035_historicalmissingogttnote_missingogttnote.py +457 -0
  207. meta_reports/migrations/0036_historicalmissingogttnote_fasting_and_more.py +86 -0
  208. meta_reports/migrations/0037_historicalmissingogttnote_result_status_and_more.py +51 -0
  209. meta_reports/migrations/0038_alter_historicalmissingogttnote_fasting_and_more.py +33 -0
  210. meta_reports/migrations/0039_onstudymissingvalues.py +44 -0
  211. meta_reports/migrations/0040_auto_20240824_0412.py +282 -0
  212. meta_reports/migrations/0041_auto_20240828_2229.py +14 -0
  213. meta_reports/migrations/0042_onstudymissinglabvalues.py +43 -0
  214. meta_reports/migrations/0043_auto_20240828_2309.py +88 -0
  215. meta_reports/migrations/0044_auto_20240828_2323.py +93 -0
  216. meta_reports/migrations/0045_auto_20240829_0248.py +54 -0
  217. meta_reports/migrations/0046_auto_20240829_0250.py +54 -0
  218. meta_reports/migrations/0047_impsubstitutions.py +56 -0
  219. meta_reports/migrations/0048_auto_20240909_2338.py +48 -0
  220. meta_reports/migrations/0049_auto_20240911_0327.py +54 -0
  221. meta_reports/migrations/0050_alter_endpoints_created.py +19 -0
  222. meta_reports/migrations/0051_remove_endpoints_baseline_datetime_and_more.py +40 -0
  223. meta_reports/migrations/0052_lastimpvisit.py +57 -0
  224. meta_reports/migrations/0053_rename_lastimpvisit_lastimprefill_and_more.py +31 -0
  225. meta_reports/models/__init__.py +16 -0
  226. meta_reports/models/dbviews/README +14 -0
  227. meta_reports/models/dbviews/__init__.py +9 -0
  228. meta_reports/models/dbviews/glucose_summary/__init__.py +2 -0
  229. meta_reports/models/dbviews/glucose_summary/unmanaged_model.py +35 -0
  230. meta_reports/models/dbviews/glucose_summary/view_definition.py +28 -0
  231. meta_reports/models/dbviews/imp_substitutions/__init__.py +1 -0
  232. meta_reports/models/dbviews/imp_substitutions/unmanaged_model.py +41 -0
  233. meta_reports/models/dbviews/imp_substitutions/view_definition.py +21 -0
  234. meta_reports/models/dbviews/missing_screening_ogtt/__init__.py +2 -0
  235. meta_reports/models/dbviews/missing_screening_ogtt/note_model.py +57 -0
  236. meta_reports/models/dbviews/missing_screening_ogtt/unmanaged_model.py +41 -0
  237. meta_reports/models/dbviews/missing_screening_ogtt/view_definition.py +20 -0
  238. meta_reports/models/dbviews/on_study_missing_lab_values/__init__.py +1 -0
  239. meta_reports/models/dbviews/on_study_missing_lab_values/qa_cases.py +53 -0
  240. meta_reports/models/dbviews/on_study_missing_lab_values/unmanged_model.py +20 -0
  241. meta_reports/models/dbviews/on_study_missing_lab_values/view_definition.py +17 -0
  242. meta_reports/models/dbviews/on_study_missing_values/__init__.py +1 -0
  243. meta_reports/models/dbviews/on_study_missing_values/qa_cases.py +54 -0
  244. meta_reports/models/dbviews/on_study_missing_values/unmanged_model.py +20 -0
  245. meta_reports/models/dbviews/on_study_missing_values/view_definition.py +17 -0
  246. meta_reports/models/dbviews/patient_history_missing_baseline_cd4/__init__.py +1 -0
  247. meta_reports/models/dbviews/patient_history_missing_baseline_cd4/unmanaged_model.py +31 -0
  248. meta_reports/models/dbviews/patient_history_missing_baseline_cd4/view_definition.py +21 -0
  249. meta_reports/models/dbviews/unattended_three_in_row/__init__.py +1 -0
  250. meta_reports/models/dbviews/unattended_three_in_row/unmanaged_model.py +29 -0
  251. meta_reports/models/dbviews/unattended_three_in_row/view_definition.py +31 -0
  252. meta_reports/models/dbviews/unattended_three_in_row2/__init__.py +1 -0
  253. meta_reports/models/dbviews/unattended_three_in_row2/unmanaged_model.py +29 -0
  254. meta_reports/models/dbviews/unattended_three_in_row2/view_definition.py +50 -0
  255. meta_reports/models/dbviews/unattended_two_in_row/__init__.py +1 -0
  256. meta_reports/models/dbviews/unattended_two_in_row/unmanaged_model.py +27 -0
  257. meta_reports/models/dbviews/unattended_two_in_row/view_definition.py +30 -0
  258. meta_reports/models/endpoints.py +31 -0
  259. meta_reports/models/endpoints_proxy.py +11 -0
  260. meta_reports/models/last_imp_refill.py +34 -0
  261. meta_reports/tasks.py +12 -0
  262. meta_reports/templates/meta_reports/columns/subject_identifier_column.html +1 -0
  263. meta_reports/templates/meta_reports/endpoints_all_change_list_note.html +12 -0
  264. meta_reports/templates/meta_reports/endpoints_change_list_note.html +12 -0
  265. meta_reports/tests/test_sql_gen.py +5 -0
  266. meta_reports/urls.py +8 -0
  267. meta_reports/utils.py +0 -0
  268. meta_screening/admin/subject_screening_admin.py +1 -0
  269. meta_screening/form_validators/screening_part_two.py +1 -1
  270. meta_screening/migrations/0062_remove_icpreferral_site_and_more.py +27 -0
  271. meta_screening/migrations/0063_alter_historicalscreeningpartone_fasting_duration_str_and_more.py +184 -0
  272. meta_screening/migrations/0064_remove_historicalscreeningpartone_fasting_duration_minutes_and_more.py +126 -0
  273. meta_screening/migrations/0065_auto_20240516_0352.py +31 -0
  274. meta_screening/migrations/0066_alter_historicalscreeningpartone_fasting_duration_delta_and_more.py +103 -0
  275. meta_screening/migrations/0067_alter_historicalscreeningpartone_report_datetime_and_more.py +84 -0
  276. meta_screening/models/__init__.py +1 -1
  277. meta_screening/tests/holidays.csv +1 -1
  278. meta_screening/tests/meta_test_case_mixin.py +17 -2
  279. meta_screening/tests/options.py +3 -3
  280. meta_sites/__init__.py +0 -1
  281. meta_sites/sites.py +8 -7
  282. meta_sites/tests/test_sites.py +1 -1
  283. meta_subject/action_items.py +25 -2
  284. meta_subject/admin/__init__.py +2 -1
  285. meta_subject/admin/birth_outcome_admin.py +4 -3
  286. meta_subject/admin/blood_results/__init__.py +1 -1
  287. meta_subject/admin/blood_results/{blood_results_lipid_admin.py → blood_results_lipids_admin.py} +7 -7
  288. meta_subject/admin/delivery_admin.py +0 -1
  289. meta_subject/admin/diabetes/__init__.py +2 -0
  290. meta_subject/admin/diabetes/dm_endpoint_admin.py +35 -0
  291. meta_subject/admin/{dm_referral_followup_admin.py → diabetes/dm_followup_admin.py} +15 -8
  292. meta_subject/admin/glucose_admin.py +1 -1
  293. meta_subject/admin/glucose_fbg_admin.py +38 -8
  294. meta_subject/admin/other_arv_regimens_admin.py +2 -0
  295. meta_subject/admin/study_medication_admin.py +10 -0
  296. meta_subject/admin/subject_visit_admin.py +4 -1
  297. meta_subject/baker_recipes.py +6 -0
  298. meta_subject/choices.py +8 -0
  299. meta_subject/constants.py +2 -1
  300. meta_subject/form_validators/__init__.py +2 -1
  301. meta_subject/form_validators/dm_endpoint_form_validator.py +35 -0
  302. meta_subject/form_validators/{dm_referral_followup_form_validator.py → dm_followup_form_validator.py} +41 -2
  303. meta_subject/forms/__init__.py +2 -1
  304. meta_subject/forms/blood_results/__init__.py +1 -1
  305. meta_subject/forms/blood_results/{blood_results_lipid_form.py → blood_results_lipids_form.py} +5 -5
  306. meta_subject/forms/diabetes/__init__.py +2 -0
  307. meta_subject/forms/diabetes/dm_endpoint_form.py +13 -0
  308. meta_subject/forms/diabetes/dm_followup_form.py +25 -0
  309. meta_subject/forms/glucose_fbg_form.py +38 -16
  310. meta_subject/forms/study_medication_form.py +35 -0
  311. meta_subject/forms/subject_visit_form.py +16 -0
  312. meta_subject/locale/lg/LC_MESSAGES/django.po +470 -0
  313. meta_subject/locale/sw/LC_MESSAGES/django.po +191 -89
  314. meta_subject/metadata_rules/metadata_rules.py +21 -0
  315. meta_subject/metadata_rules/predicates.py +67 -8
  316. meta_subject/migrations/0107_auto_20220415_0043.py +28 -22
  317. meta_subject/migrations/0126_auto_20220719_2142.py +4 -4
  318. meta_subject/migrations/0131_auto_20220722_0411.py +28 -23
  319. meta_subject/migrations/0132_auto_20220722_1825.py +10 -6
  320. meta_subject/migrations/0135_auto_20220722_2212.py +39 -35
  321. meta_subject/migrations/0150_auto_20220914_0039.py +15 -11
  322. meta_subject/migrations/0181_dmreferralfollowup_action_identifier_and_more.py +143 -0
  323. meta_subject/migrations/0182_rename_dmreferralfollowup_dmfollowup_and_more.py +54 -0
  324. meta_subject/migrations/0183_alter_dmfollowup_on_dm_medications_and_more.py +31 -0
  325. meta_subject/migrations/0184_alter_glucose_options_and_more.py +31 -0
  326. meta_subject/migrations/0185_alter_bloodresultsins_fasting_duration_str_and_more.py +82 -0
  327. meta_subject/migrations/0186_healtheconomicsupdate_singleton_field_and_more.py +55 -0
  328. meta_subject/migrations/0187_dmdiagnosis_historicaldmdiagnosis_dmdxresult_and_more.py +451 -0
  329. meta_subject/migrations/0188_historicaldmdxresult_dmdxresult.py +403 -0
  330. meta_subject/migrations/0189_alter_dmdxresult_options_and_more.py +116 -0
  331. meta_subject/migrations/0190_dmdiagnosis_dx_no_tmg_reason_and_more.py +65 -0
  332. meta_subject/migrations/0191_alter_dmdiagnosis_dx_no_tmg_reason_and_more.py +70 -0
  333. meta_subject/migrations/0192_rename_glucose_quantifier_glucosefbg_fbg_quantifier_and_more.py +44 -0
  334. meta_subject/migrations/0193_alter_glucosefbg_fbg_value_and_more.py +44 -0
  335. meta_subject/migrations/0194_remove_glucosefbg_assay_datetime_and_more.py +166 -0
  336. meta_subject/migrations/0195_alter_glucosefbg_fbg_datetime_and_more.py +27 -0
  337. meta_subject/migrations/0196_glucosefbg_fbg_not_performed_reason_and_more.py +49 -0
  338. meta_subject/migrations/0197_glucosefbg_fasting_duration_estimated_and_more.py +33 -0
  339. meta_subject/migrations/0198_alter_glucosefbg_fasting_duration_estimated_and_more.py +33 -0
  340. meta_subject/migrations/0199_auto_20240516_0247.py +18 -0
  341. meta_subject/migrations/0200_rename_fasting_duration_minutes_bloodresultsins_fasting_duration_delta_and_more.py +43 -0
  342. meta_subject/migrations/0201_alter_bloodresultsins_fasting_duration_delta_and_more.py +58 -0
  343. meta_subject/migrations/0202_auto_20240516_0315.py +32 -0
  344. meta_subject/migrations/0203_alter_bloodresultsins_fasting_duration_delta_and_more.py +67 -0
  345. meta_subject/migrations/0204_glucosefbg_repeat_fbg_date_and_more.py +27 -0
  346. meta_subject/migrations/0205_historicalsubjectrequisition_crf_status_and_more.py +80 -0
  347. meta_subject/migrations/0206_bloodresultsfbc_crf_status_and_more.py +62 -0
  348. meta_subject/migrations/0207_alter_historicalphysicalexam_waist_circumference_and_more.py +46 -0
  349. meta_subject/migrations/0208_birthoutcomes_crf_status_and_more.py +62 -0
  350. meta_subject/migrations/0209_remove_historicaldmdxresult_dm_diagnosis_and_more.py +37 -0
  351. meta_subject/migrations/0210_remove_dmdxresult_dm_diagnosis_and_more.py +123 -0
  352. meta_subject/migrations/0211_dmendpoint_endpoint_reached_and_more.py +45 -0
  353. meta_subject/migrations/0212_auto_20240827_2222.py +23 -0
  354. meta_subject/migrations/0213_rename_bloodresultslipid_bloodresultslipids_and_more.py +35 -0
  355. meta_subject/migrations/0214_historicalstudymedication_stock_codes_and_more.py +44 -0
  356. meta_subject/migrations/0215_alter_historicalstudymedication_stock_codes_and_more.py +46 -0
  357. meta_subject/model_mixins/arv_history_model_mixin.py +3 -3
  358. meta_subject/models/__init__.py +3 -2
  359. meta_subject/models/birth_outcomes.py +6 -1
  360. meta_subject/models/blood_results/__init__.py +1 -1
  361. meta_subject/models/blood_results/blood_results_fbc.py +3 -2
  362. meta_subject/models/blood_results/blood_results_hba1c.py +2 -0
  363. meta_subject/models/blood_results/blood_results_ins.py +2 -0
  364. meta_subject/models/blood_results/blood_results_lft.py +2 -0
  365. meta_subject/models/blood_results/{blood_results_lipid.py → blood_results_lipids.py} +5 -3
  366. meta_subject/models/blood_results/blood_results_rft.py +2 -0
  367. meta_subject/models/diabetes/__init__.py +2 -0
  368. meta_subject/models/diabetes/dm_endpoint.py +61 -0
  369. meta_subject/models/{dm_referral_followup.py → diabetes/dm_followup.py} +18 -6
  370. meta_subject/models/glucose.py +7 -14
  371. meta_subject/models/glucose_fbg.py +40 -51
  372. meta_subject/models/health_economics/health_economics_update.py +2 -0
  373. meta_subject/models/physical_exam.py +1 -0
  374. meta_subject/models/signals.py +19 -0
  375. meta_subject/models/subject_requisition.py +3 -4
  376. meta_subject/models/todo.txt +1 -1
  377. meta_subject/static/meta_subject/slider.css +1 -1
  378. meta_subject/templates/meta_subject/endpoint_review_instructions.html +1 -1
  379. meta_subject/templates/meta_subject/widgets/slider.html +0 -1
  380. meta_subject/tests/holidays.csv +1 -1
  381. meta_subject/tests/tests/test_egfr.py +6 -5
  382. meta_subject/tests/tests/test_medication_adherence.py +5 -1
  383. meta_subject/tests/tests/test_metadata_rules.py +34 -4
  384. meta_subject/tests/tests/test_mnsi.py +212 -121
  385. meta_subject/tests/tests/test_sf12.py +0 -12
  386. meta_visit_schedule/constants.py +7 -1
  387. meta_visit_schedule/tests/tests/test_schedule.py +4 -0
  388. meta_visit_schedule/visit_schedules/phase_three/crfs.py +87 -14
  389. meta_visit_schedule/visit_schedules/phase_three/requisitions.py +12 -0
  390. meta_visit_schedule/visit_schedules/phase_three/schedule.py +65 -2
  391. meta_visit_schedule/visit_schedules/phase_three/schedule_dm_referral.py +60 -0
  392. meta_visit_schedule/visit_schedules/phase_three/visit_schedule.py +2 -0
  393. tests/etc/randomization_list.csv +1 -1
  394. {meta_edc/tests → tests}/etc/randomization_list_phase_three.csv +4 -4
  395. tests/holidays.csv +1 -1
  396. tests/test_settings.py +186 -0
  397. meta_edc/tests/etc/user-aes-local.key +0 -1
  398. meta_edc/tests/etc/user-aes-restricted.key +0 -0
  399. meta_edc/tests/etc/user-rsa-local-private.pem +0 -27
  400. meta_edc/tests/etc/user-rsa-local-public.pem +0 -9
  401. meta_edc/tests/etc/user-rsa-restricted-private.pem +0 -27
  402. meta_edc/tests/etc/user-rsa-restricted-public.pem +0 -9
  403. meta_edc/tests/etc/user-salt-local.key +0 -0
  404. meta_edc/tests/etc/user-salt-restricted.key +0 -0
  405. meta_edc-0.3.7.dist-info/METADATA +0 -87
  406. meta_reports/tests/holidays.csv +0 -15
  407. meta_subject/forms/dm_referral_followup.py +0 -18
  408. /meta_edc-0.3.7.dist-info/AUTHORS → /meta_analytics/__init__.py +0 -0
  409. /meta_pharmacy/models.py → /meta_analytics/constants.py +0 -0
  410. /meta_reports/models.py → /meta_analytics/notebooks/cleaning/__init__.py +0 -0
  411. {meta_edc-0.3.7.dist-info → meta_edc-0.3.50.dist-info}/LICENSE +0 -0
@@ -19,9 +19,10 @@ from edc_sites.utils import add_or_update_django_sites
19
19
  from edc_visit_tracking.constants import SCHEDULED
20
20
  from model_bakery import baker
21
21
 
22
+ from meta_consent.models import SubjectConsent, SubjectConsentV1Ext
22
23
  from meta_edc.meta_version import PHASE_THREE
23
24
  from meta_pharmacy.prepare_meta_pharmacy import prepare_meta_pharmacy
24
- from meta_sites import fqdn
25
+ from meta_sites.sites import domain_suffix
25
26
  from meta_subject.models import SubjectVisit
26
27
  from meta_visit_schedule.constants import DAY1
27
28
 
@@ -40,7 +41,7 @@ from .options import (
40
41
 
41
42
 
42
43
  class MetaTestCaseMixin(AppointmentTestCaseMixin):
43
- fqdn = fqdn
44
+ fqdn = domain_suffix
44
45
 
45
46
  default_sites = sites.get_by_country("tanzania", aslist=True)
46
47
 
@@ -143,6 +144,20 @@ class MetaTestCaseMixin(AppointmentTestCaseMixin):
143
144
  consent_datetime=consent_datetime or subject_screening.report_datetime,
144
145
  )
145
146
 
147
+ @staticmethod
148
+ def get_subject_consent_extended(
149
+ subject_consent: SubjectConsent,
150
+ consent_datetime: datetime = None,
151
+ ):
152
+ return SubjectConsentV1Ext.objects.create(
153
+ subject_consent=subject_consent,
154
+ report_datetime=consent_datetime,
155
+ agrees_to_extension=YES,
156
+ user_created="erikvw",
157
+ user_modified="erikvw",
158
+ site=subject_consent.site,
159
+ )
160
+
146
161
  def get_subject_visit(
147
162
  self,
148
163
  visit_code: str | None = None,
@@ -54,18 +54,18 @@ def get_part_one_eligible_options():
54
54
  return options
55
55
 
56
56
 
57
- def get_part_two_eligible_options():
57
+ def get_part_two_eligible_options(report_datetime: datetime = None) -> dict:
58
58
  options = dict(
59
59
  acute_condition=NO,
60
60
  acute_metabolic_acidosis=NO,
61
61
  advised_to_fast=YES,
62
62
  alcoholism=NO,
63
63
  already_fasted=NO,
64
- appt_datetime=now + relativedelta(days=10),
64
+ appt_datetime=report_datetime or (now + relativedelta(days=10)),
65
65
  congestive_heart_failure=NO,
66
66
  liver_disease=NO,
67
67
  metformin_sensitivity=NO,
68
- part_two_report_datetime=now,
68
+ part_two_report_datetime=report_datetime or now,
69
69
  renal_function_condition=NO,
70
70
  tissue_hypoxia_condition=NO,
71
71
  has_dm=NO,
meta_sites/__init__.py CHANGED
@@ -1 +0,0 @@
1
- from .sites import all_sites, fqdn # noqa
meta_sites/sites.py CHANGED
@@ -1,7 +1,8 @@
1
+ from django.conf import settings
1
2
  from edc_sites.single_site import SingleSite
2
3
  from edc_sites.site import sites as site_sites
3
4
 
4
- fqdn = "meta3.clinicedc.org"
5
+ domain_suffix = settings.EDC_SITES_DOMAIN_SUFFIX
5
6
  languages = ["sw", "en", "mas"]
6
7
 
7
8
  all_sites = [
@@ -11,7 +12,7 @@ all_sites = [
11
12
  title="Hindu Mandal Hospital",
12
13
  country="tanzania",
13
14
  country_code="tz",
14
- domain=f"hindu-mandal.tz.{fqdn}",
15
+ domain=f"hindu-mandal.tz.{domain_suffix}",
15
16
  language_codes=languages,
16
17
  ),
17
18
  SingleSite(
@@ -20,7 +21,7 @@ all_sites = [
20
21
  title="Amana Hospital",
21
22
  country="tanzania",
22
23
  country_code="tz",
23
- domain=f"amana.tz.{fqdn}",
24
+ domain=f"amana.tz.{domain_suffix}",
24
25
  language_codes=languages,
25
26
  ),
26
27
  SingleSite(
@@ -29,7 +30,7 @@ all_sites = [
29
30
  title="Temeke Hospital",
30
31
  country="tanzania",
31
32
  country_code="tz",
32
- domain=f"temeke.tz.{fqdn}",
33
+ domain=f"temeke.tz.{domain_suffix}",
33
34
  language_codes=languages,
34
35
  ),
35
36
  SingleSite(
@@ -39,7 +40,7 @@ all_sites = [
39
40
  country="tanzania",
40
41
  country_code="tz",
41
42
  language_codes=languages,
42
- domain=f"mwananyamala.tz.{fqdn}",
43
+ domain=f"mwananyamala.tz.{domain_suffix}",
43
44
  ),
44
45
  SingleSite(
45
46
  50,
@@ -48,7 +49,7 @@ all_sites = [
48
49
  country="tanzania",
49
50
  country_code="tz",
50
51
  language_codes=languages,
51
- domain=f"mbagala.tz.{fqdn}",
52
+ domain=f"mbagala.tz.{domain_suffix}",
52
53
  ),
53
54
  SingleSite(
54
55
  60,
@@ -57,7 +58,7 @@ all_sites = [
57
58
  country="tanzania",
58
59
  country_code="tz",
59
60
  language_codes=languages,
60
- domain=f"mnazi-moja.tz.{fqdn}",
61
+ domain=f"mnazi-moja.tz.{domain_suffix}",
61
62
  ),
62
63
  ]
63
64
 
@@ -1,5 +1,5 @@
1
1
  from django.test import TestCase
2
- from edc_sites import InvalidSiteError
2
+ from edc_sites.exceptions import InvalidSiteError
3
3
  from edc_sites.site import sites
4
4
 
5
5
 
@@ -8,7 +8,7 @@ from edc_lab_results.action_items import (
8
8
  BloodResultsFbcAction,
9
9
  BloodResultsHba1cAction,
10
10
  BloodResultsLftAction,
11
- BloodResultsLipidAction,
11
+ BloodResultsLipidsAction,
12
12
  )
13
13
  from edc_lab_results.action_items import (
14
14
  BloodResultsRftAction as BaseBloodResultsRftAction,
@@ -20,12 +20,15 @@ from edc_visit_schedule.utils import is_baseline
20
20
  from edc_visit_tracking.constants import MISSED_VISIT
21
21
 
22
22
  from meta_prn.constants import (
23
+ DM_REFFERAL_ACTION,
24
+ OFFSCHEDULE_DM_REFERRAL_ACTION,
23
25
  OFFSCHEDULE_PREGNANCY_ACTION,
24
26
  PREGNANCY_NOTIFICATION_ACTION,
25
27
  )
26
28
 
27
29
  from .constants import (
28
30
  DELIVERY_ACTION,
31
+ DM_FOLLOWUP_ACTION,
29
32
  FOLLOWUP_EXAMINATION_ACTION,
30
33
  MISSED_VISIT_ACTION,
31
34
  URINE_PREGNANCY_ACTION,
@@ -150,10 +153,29 @@ class EgfrDropNotificationAction(ActionWithNotification):
150
153
  return self.reference_obj.report_status != NEW
151
154
 
152
155
 
156
+ class DmFollowAction(ActionWithNotification):
157
+ name = DM_FOLLOWUP_ACTION
158
+ display_name = "Diabetes Followup"
159
+ notification_display_name = "Diabetes Followup"
160
+ parent_action_names = [DM_REFFERAL_ACTION]
161
+ reference_model = "meta_subject.dmfollowup"
162
+ show_link_to_changelist = True
163
+ show_link_to_add = False
164
+ show_on_dashboard = False
165
+ create_by_user = False
166
+ create_by_action = True
167
+ admin_site_name = "meta_subject_admin"
168
+ priority = HIGH_PRIORITY
169
+
170
+ def get_next_actions(self):
171
+ next_actions = [OFFSCHEDULE_DM_REFERRAL_ACTION]
172
+ return next_actions
173
+
174
+
153
175
  def register_actions():
154
176
  for action_item_cls in [
155
177
  BloodResultsFbcAction,
156
- BloodResultsLipidAction,
178
+ BloodResultsLipidsAction,
157
179
  BloodResultsLftAction,
158
180
  BloodResultsRftAction,
159
181
  BloodResultsHba1cAction,
@@ -162,6 +184,7 @@ def register_actions():
162
184
  UrinePregnancyAction,
163
185
  DeliveryAction,
164
186
  EgfrDropNotificationAction,
187
+ DmFollowAction,
165
188
  ]:
166
189
  try:
167
190
  site_action_items.register(action_item_cls)
@@ -3,13 +3,14 @@ from .birth_outcome_admin import BirthOutcomesAdmin
3
3
  from .blood_results import (
4
4
  BloodResultsFbcAdmin,
5
5
  BloodResultsLftAdmin,
6
+ BloodResultsLipidsAdmin,
6
7
  BloodResultsRftAdmin,
7
8
  )
8
9
  from .complications_admin import ComplicationsAdmin
9
10
  from .complications_glycemia_admin import ComplicationsGlycemiaAdmin
10
11
  from .concomitant_medication_admin import ConcomitantMedicationAdmin
11
12
  from .delivery_admin import DeliveryAdmin
12
- from .dm_referral_followup_admin import DmReferralFollowupAdmin
13
+ from .diabetes import DmEndpointAdmin, DmFollowupAdmin
13
14
  from .egfr_drop_notification_admin import EgfrDropNotificationAdmin
14
15
  from .eq5d3l_admin import Eq5d3lAdmin
15
16
  from .followup_examination_admin import FollowupExaminationAdmin
@@ -5,6 +5,7 @@ from django.core.exceptions import ObjectDoesNotExist
5
5
  from django.template.loader import render_to_string
6
6
  from django.urls import NoReverseMatch, reverse
7
7
  from django_audit_fields.admin import audit_fieldset_tuple
8
+ from edc_crf.fieldset import crf_status_fieldset
8
9
  from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
9
10
  from edc_model_admin.history import SimpleHistoryAdmin
10
11
  from edc_registration.models import RegisteredSubject
@@ -35,6 +36,7 @@ class BirthOutcomesAdmin(
35
36
  )
36
37
  },
37
38
  ),
39
+ crf_status_fieldset,
38
40
  audit_fieldset_tuple,
39
41
  )
40
42
 
@@ -60,15 +62,14 @@ class BirthOutcomesAdmin(
60
62
  def get_search_fields(self, request) -> Tuple[str, ...]:
61
63
  fields = super().get_search_fields(request)
62
64
  custom_fields = (
63
- "delivery__action_identifier__subject_visit__subject_identifier",
65
+ "delivery__subject_visit__subject_identifier",
64
66
  "delivery__action_identifier",
65
- "delivery__tracking_identifier",
66
67
  )
67
68
  return tuple(set(fields + custom_fields))
68
69
 
69
70
  @admin.display
70
71
  def delivery_report(self, obj=None, label=None):
71
- url = reverse("meta_prn_admin:meta_prn_delivery_changelist")
72
+ url = reverse("meta_subject_admin:meta_subject_delivery_changelist")
72
73
  url = f"{url}?q={obj.subject_identifier}"
73
74
  context = dict(title="Delivery", url=url, label="Delivery")
74
75
  return render_to_string("dashboard_button.html", context=context)
@@ -2,5 +2,5 @@ from .blood_results_fbc_admin import BloodResultsFbcAdmin
2
2
  from .blood_results_hba1c_admin import BloodResultsHba1cAdmin
3
3
  from .blood_results_ins_admin import BloodResultsInsAdmin
4
4
  from .blood_results_lft_admin import BloodResultsLftAdmin
5
- from .blood_results_lipid_admin import BloodResultsLipidAdmin
5
+ from .blood_results_lipids_admin import BloodResultsLipidsAdmin
6
6
  from .blood_results_rft_admin import BloodResultsRftAdmin
@@ -5,19 +5,19 @@ from edc_lab_results.fieldsets import BloodResultFieldset
5
5
  from edc_model_admin.history import SimpleHistoryAdmin
6
6
 
7
7
  from ...admin_site import meta_subject_admin
8
- from ...forms import BloodResultsLipidForm
9
- from ...models import BloodResultsLipid
8
+ from ...forms import BloodResultsLipidsForm
9
+ from ...models import BloodResultsLipids
10
10
  from ..modeladmin import CrfModelAdminMixin
11
11
 
12
12
 
13
- @admin.register(BloodResultsLipid, site=meta_subject_admin)
14
- class BloodResultsLipidAdmin(
13
+ @admin.register(BloodResultsLipids, site=meta_subject_admin)
14
+ class BloodResultsLipidsAdmin(
15
15
  BloodResultsModelAdminMixin, CrfModelAdminMixin, SimpleHistoryAdmin
16
16
  ):
17
- form = BloodResultsLipidForm
17
+ form = BloodResultsLipidsForm
18
18
  fieldsets = BloodResultFieldset(
19
- BloodResultsLipid.lab_panel,
20
- model_cls=BloodResultsLipid,
19
+ BloodResultsLipids.lab_panel,
20
+ model_cls=BloodResultsLipids,
21
21
  extra_fieldsets=[
22
22
  (-1, action_fieldset_tuple),
23
23
  ],
@@ -109,7 +109,6 @@ class DeliveryAdmin(
109
109
  search_fields = (
110
110
  "subject_visit__subject_identifier",
111
111
  "action_identifier",
112
- "tracking_identifier",
113
112
  )
114
113
 
115
114
  @admin.display
@@ -0,0 +1,2 @@
1
+ from .dm_endpoint_admin import DmEndpointAdmin
2
+ from .dm_followup_admin import DmFollowupAdmin
@@ -0,0 +1,35 @@
1
+ from django.contrib import admin
2
+ from django_audit_fields.admin import audit_fieldset_tuple
3
+ from edc_crf.fieldset import crf_status_fieldset
4
+ from edc_form_label.form_label_modeladmin_mixin import FormLabelModelAdminMixin
5
+ from edc_model_admin.history import SimpleHistoryAdmin
6
+
7
+ from ...admin_site import meta_subject_admin
8
+ from ...forms import DmEndpointForm
9
+ from ...models import DmEndpoint
10
+ from ..modeladmin import CrfModelAdminMixin
11
+
12
+
13
+ @admin.register(DmEndpoint, site=meta_subject_admin)
14
+ class DmEndpointAdmin(
15
+ CrfModelAdminMixin,
16
+ FormLabelModelAdminMixin,
17
+ SimpleHistoryAdmin,
18
+ ):
19
+ form = DmEndpointForm
20
+
21
+ fieldsets = (
22
+ (None, {"fields": ("subject_visit", "report_datetime")}),
23
+ (
24
+ "Endpoint reached",
25
+ {
26
+ "fields": ("endpoint_reached", "comments"),
27
+ },
28
+ ),
29
+ crf_status_fieldset,
30
+ audit_fieldset_tuple,
31
+ )
32
+
33
+ list_filter = ["endpoint_reached"]
34
+
35
+ radio_fields = {"endpoint_reached": admin.VERTICAL}
@@ -1,21 +1,25 @@
1
1
  from django.contrib import admin
2
2
  from django_audit_fields.admin import audit_fieldset_tuple
3
+ from edc_action_item import ActionItemModelAdminMixin, action_fieldset_tuple
3
4
  from edc_adherence.model_admin_mixin import get_visual_score_fieldset_tuple
4
5
  from edc_crf.fieldset import crf_status_fieldset
5
6
  from edc_form_label.form_label_modeladmin_mixin import FormLabelModelAdminMixin
6
7
  from edc_model_admin.history import SimpleHistoryAdmin
7
8
 
8
- from ..admin_site import meta_subject_admin
9
- from ..forms.dm_referral_followup import DmReferralFollowupForm
10
- from ..models import DmReferralFollowup
11
- from .modeladmin import CrfModelAdminMixin
9
+ from ...admin_site import meta_subject_admin
10
+ from ...forms import DmFollowupForm
11
+ from ...models import DmFollowup
12
+ from ..modeladmin import CrfModelAdminMixin
12
13
 
13
14
 
14
- @admin.register(DmReferralFollowup, site=meta_subject_admin)
15
- class DmReferralFollowupAdmin(
16
- CrfModelAdminMixin, FormLabelModelAdminMixin, SimpleHistoryAdmin
15
+ @admin.register(DmFollowup, site=meta_subject_admin)
16
+ class DmFollowupAdmin(
17
+ CrfModelAdminMixin,
18
+ FormLabelModelAdminMixin,
19
+ ActionItemModelAdminMixin,
20
+ SimpleHistoryAdmin,
17
21
  ):
18
- form = DmReferralFollowupForm
22
+ form = DmFollowupForm
19
23
 
20
24
  fieldsets = (
21
25
  (None, {"fields": ("subject_visit", "report_datetime")}),
@@ -49,6 +53,7 @@ class DmReferralFollowupAdmin(
49
53
  "Diabetes treatment",
50
54
  {
51
55
  "fields": (
56
+ "treatment_prescribed",
52
57
  "dm_treatments",
53
58
  "on_dm_medications",
54
59
  "dm_medications_init_date",
@@ -68,6 +73,7 @@ class DmReferralFollowupAdmin(
68
73
  ),
69
74
  get_visual_score_fieldset_tuple(),
70
75
  crf_status_fieldset,
76
+ action_fieldset_tuple,
71
77
  audit_fieldset_tuple,
72
78
  )
73
79
 
@@ -86,4 +92,5 @@ class DmReferralFollowupAdmin(
86
92
  "on_dm_medications": admin.VERTICAL,
87
93
  "medications_adherent": admin.VERTICAL,
88
94
  "last_missed_pill": admin.VERTICAL,
95
+ "treatment_prescribed": admin.VERTICAL,
89
96
  }
@@ -32,7 +32,7 @@ class GlucoseAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
32
32
  },
33
33
  ),
34
34
  (
35
- "FBG",
35
+ "Blood Glucose",
36
36
  {
37
37
  "fields": (
38
38
  "fbg_performed",
@@ -4,6 +4,8 @@ from typing import Type
4
4
 
5
5
  from django.contrib import admin
6
6
  from django.contrib.admin import SimpleListFilter
7
+ from django_audit_fields import audit_fieldset_tuple
8
+ from edc_crf.fieldset import crf_status_fieldset
7
9
  from edc_model_admin.history import SimpleHistoryAdmin
8
10
 
9
11
  from ..admin_site import meta_subject_admin
@@ -19,27 +21,55 @@ class GlucoseFbgAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
19
21
 
20
22
  fieldsets = [
21
23
  (None, {"fields": ("subject_visit", "report_datetime")}),
22
- ("Fasting", {"fields": ["fasting"]}),
23
- ("Result", {"fields": ["assay_datetime", "glucose_value", "glucose_units"]}),
24
+ (
25
+ "Fasting",
26
+ {
27
+ "fields": (
28
+ "fasting",
29
+ "fasting_duration_str",
30
+ )
31
+ },
32
+ ),
33
+ (
34
+ "Blood Glucose",
35
+ {
36
+ "fields": (
37
+ "fbg_performed",
38
+ "fbg_not_performed_reason",
39
+ "fbg_datetime",
40
+ "fbg_value",
41
+ "fbg_units",
42
+ )
43
+ },
44
+ ),
45
+ (
46
+ "Confirmation appointment",
47
+ {
48
+ "description": (
49
+ "If blood glucose value is >= 7.0 mmol/L, schedule an "
50
+ "appointment within 1 week to confirm"
51
+ ),
52
+ "fields": ("repeat_fbg_date",),
53
+ },
54
+ ),
55
+ crf_status_fieldset,
56
+ audit_fieldset_tuple,
24
57
  ]
25
58
 
26
59
  radio_fields = {
27
60
  "fasting": admin.VERTICAL,
28
- "glucose_units": admin.VERTICAL,
61
+ "fbg_units": admin.VERTICAL,
62
+ "fbg_performed": admin.VERTICAL,
29
63
  }
30
64
 
31
65
  @admin.display(description="FBG", ordering="fbg_value")
32
66
  def fbg(self, obj=None):
33
67
  return obj.fbg_value
34
68
 
35
- @admin.display(description="OGTT", ordering="ogtt_value")
36
- def ogtt(self, obj=None):
37
- return obj.ogtt_value
38
-
39
69
  def get_list_display(self, request) -> tuple[str, ...]:
40
70
  list_display = super().get_list_display(request)
41
71
  list_display = list(list_display)
42
- list_display.insert(3, "ogtt")
72
+ # list_display.insert(3, "ogtt")
43
73
  list_display.insert(3, "fbg")
44
74
  list_display = tuple(list_display)
45
75
  return list_display
@@ -1,5 +1,6 @@
1
1
  from django.contrib import admin
2
2
  from django_audit_fields.admin import audit_fieldset_tuple
3
+ from edc_crf.fieldset import crf_status_fieldset
3
4
  from edc_model_admin.history import SimpleHistoryAdmin
4
5
  from edc_model_admin.mixins import TabularInlineMixin
5
6
 
@@ -43,6 +44,7 @@ class OtherArvRegimensAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
43
44
 
44
45
  fieldsets = (
45
46
  (None, {"fields": ("subject_visit", "report_datetime", "has_other_regimens")}),
47
+ crf_status_fieldset,
46
48
  audit_fieldset_tuple,
47
49
  )
48
50
 
@@ -64,6 +64,16 @@ class StudyMedicationAdmin(CrfModelAdminMixin, SimpleHistoryAdmin):
64
64
  ),
65
65
  },
66
66
  ),
67
+ (
68
+ "Dispensed medication",
69
+ {
70
+ "description": (
71
+ "Type in the stock code on the medication "
72
+ "bottle or bottles. Separate by comma."
73
+ ),
74
+ "fields": ("stock_codes",),
75
+ },
76
+ ),
67
77
  crf_status_fieldset,
68
78
  audit_fieldset_tuple,
69
79
  )
@@ -1,6 +1,7 @@
1
1
  from django.contrib import admin
2
2
  from django_audit_fields.admin import audit_fieldset_tuple
3
3
  from edc_model_admin.history import SimpleHistoryAdmin
4
+ from edc_sites.admin import SiteModelAdminMixin
4
5
  from edc_visit_schedule.fieldsets import visit_schedule_fieldset_tuple
5
6
  from edc_visit_tracking.modeladmin_mixins import VisitModelAdminMixin
6
7
 
@@ -11,7 +12,9 @@ from .modeladmin import ModelAdminMixin
11
12
 
12
13
 
13
14
  @admin.register(SubjectVisit, site=meta_subject_admin)
14
- class SubjectVisitAdmin(VisitModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin):
15
+ class SubjectVisitAdmin(
16
+ VisitModelAdminMixin, SiteModelAdminMixin, ModelAdminMixin, SimpleHistoryAdmin
17
+ ):
15
18
  show_dashboard_in_list_display_pos = 2
16
19
 
17
20
  form = SubjectVisitForm
@@ -11,6 +11,7 @@ from .models import (
11
11
  BirthOutcomes,
12
12
  Delivery,
13
13
  FollowupExamination,
14
+ HealthEconomicsUpdate,
14
15
  MedicationAdherence,
15
16
  SubjectRequisition,
16
17
  SubjectVisit,
@@ -103,3 +104,8 @@ birthoutcomes = Recipe(
103
104
  birth_outcome=LIVE_AT_TERM,
104
105
  birth_weight=320,
105
106
  )
107
+
108
+ healtheconomicsupdate = Recipe(
109
+ HealthEconomicsUpdate,
110
+ report_datetime=get_utcnow(),
111
+ )
meta_subject/choices.py CHANGED
@@ -10,6 +10,7 @@ from edc_constants.constants import (
10
10
  OPEN,
11
11
  OTHER,
12
12
  PATIENT,
13
+ PENDING,
13
14
  PRESENT,
14
15
  PRESENT_WITH_REINFORCEMENT,
15
16
  YES,
@@ -80,6 +81,13 @@ DYSLIPIDAEMIA_RX_CHOICES = (
80
81
  (NOT_APPLICABLE, _("Not applicable")),
81
82
  )
82
83
 
84
+ ENDPOINT_CHOICES = (
85
+ (YES, _(YES)),
86
+ (PENDING, _("No. A repeat FBG will be scheduled")),
87
+ (NO, _(NO)),
88
+ (NOT_APPLICABLE, _("Not applicable")),
89
+ )
90
+
83
91
  FEELING_DURATION_CHOICES = (
84
92
  (ALL_OF_THE_TIME, _("All of the time")),
85
93
  (MOST_OF_THE_TIME, _("Most of the time")),
meta_subject/constants.py CHANGED
@@ -1,9 +1,11 @@
1
1
  from datetime import date
2
2
 
3
3
  ALL_OF_THE_TIME = "all_of_the_time"
4
+ AMENDMENT_DATE = date(2023, 11, 24)
4
5
  APPT = "appt"
5
6
  APPT_OTHER = "other_routine_appt"
6
7
  DELIVERY_ACTION = "delivery_action"
8
+ DM_FOLLOWUP_ACTION = "dm_followup_action"
7
9
  FOLLOWUP_EXAMINATION_ACTION = "followup-examination-ae"
8
10
  GOOD_BIT_OF_THE_TIME = "good_bit_of_the_time"
9
11
  LITTLE_OF_THE_TIME = "little_of_the_time"
@@ -16,4 +18,3 @@ NONE_OF_THE_TIME = "none_of_the_time"
16
18
  NO_COMPLICATIONS = "no_complications"
17
19
  SOME_OF_THE_TIME = "some_of_the_time"
18
20
  URINE_PREGNANCY_ACTION = "urine_pregnancy_action"
19
- AMENDMENT_DATE = date(2023, 11, 24)
@@ -1,6 +1,7 @@
1
1
  from .birth_outcomes_form_validator import BirthOutcomesFormValidator
2
2
  from .delivery_form_validator import DeliveryFormValidator
3
- from .dm_referral_followup_form_validator import DmReferralFollowupFormValidator
3
+ from .dm_endpoint_form_validator import DmEndpointFormValidator
4
+ from .dm_followup_form_validator import DmFollowupFormValidator
4
5
  from .egfr_drop_notification_form_validator import EgfrDropNotificationFormValidator
5
6
  from .followup_examination_form_validator import FollowupExaminationFormValidator
6
7
  from .glucose_form_validator import GlucoseFormValidator
@@ -0,0 +1,35 @@
1
+ from django.core.exceptions import ObjectDoesNotExist
2
+ from django.template.loader import render_to_string
3
+ from django.urls import reverse
4
+ from django.utils.html import format_html
5
+ from edc_crf.crf_form_validator import CrfFormValidator
6
+ from edc_form_validators import INVALID_ERROR
7
+
8
+ from meta_reports.models import Endpoints
9
+ from meta_reports.tasks import update_endpoints_table
10
+
11
+
12
+ class DmEndpointFormValidator(CrfFormValidator):
13
+ def clean(self):
14
+ # recalc from endpoint report to confirm the endpoint has been reached
15
+ update_endpoints_table(subject_identifiers=[self.subject_identifier])
16
+ try:
17
+ Endpoints.objects.get(subject_identifier=self.subject_identifier)
18
+ except ObjectDoesNotExist:
19
+ url = reverse("meta_reports_admin:meta_reports_glucosesummary_changelist")
20
+ link = render_to_string(
21
+ "meta_reports/columns/subject_identifier_column.html",
22
+ {
23
+ "subject_identifier": self.subject_identifier,
24
+ "url": url,
25
+ "label": "Glucose Summary",
26
+ },
27
+ )
28
+ self.raise_validation_error(
29
+ {
30
+ "__all__": format_html(
31
+ f"Subject has not reached the protocol endpoint. See {link}"
32
+ )
33
+ },
34
+ INVALID_ERROR,
35
+ )