renalware-core 2.0.145 → 2.0.151

Sign up to get free protection for your applications and to get access to all the features.
Files changed (468) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +23 -2
  3. data/app/assets/config/renalware/core/manifest.js +1 -0
  4. data/app/assets/images/renalware/icons/align-justify.svg +3 -0
  5. data/app/assets/images/renalware/icons/bar-chart.svg +1 -0
  6. data/app/assets/images/renalware/icons/chart-bar.svg +1 -0
  7. data/app/assets/images/renalware/icons/chart.svg +3 -0
  8. data/app/assets/images/renalware/icons/list-bullet.svg +1 -0
  9. data/app/assets/images/renalware/icons/list.svg +8 -0
  10. data/app/assets/javascripts/renalware/README.md +25 -1
  11. data/app/assets/javascripts/renalware/charting.js +1 -1
  12. data/app/assets/javascripts/renalware/components/ajax_errors.js +3 -2
  13. data/app/assets/javascripts/renalware/components/dialogs.js.erb +5 -3
  14. data/app/assets/javascripts/renalware/components/hd.js +2 -2
  15. data/app/assets/javascripts/renalware/components/letters.js +1 -1
  16. data/app/assets/javascripts/renalware/components/masonry.run.js +2 -2
  17. data/app/assets/javascripts/renalware/components/patient_menu.js +1 -1
  18. data/app/assets/javascripts/renalware/components/session_timeout_redirect.js.erb +26 -18
  19. data/app/assets/javascripts/renalware/components/toggler.js +1 -1
  20. data/app/assets/javascripts/renalware/core.js.erb +2 -0
  21. data/app/assets/javascripts/renalware/rollup_compiled.css +87457 -0
  22. data/app/assets/javascripts/renalware/rollup_compiled.js +3440 -7
  23. data/app/assets/stylesheets/renalware/core.scss +1 -0
  24. data/app/assets/stylesheets/renalware/modules/_hd.scss +8 -4
  25. data/app/assets/stylesheets/renalware/modules/_letters.scss +17 -0
  26. data/app/assets/stylesheets/renalware/modules/_pathology.scss +8 -1
  27. data/app/assets/stylesheets/renalware/modules/_pd.scss +35 -0
  28. data/app/assets/stylesheets/renalware/modules/_surveys.scss +5 -0
  29. data/app/assets/stylesheets/renalware/partials/_charting.scss +17 -0
  30. data/app/assets/stylesheets/renalware/partials/_forms.scss +10 -1
  31. data/app/assets/stylesheets/renalware/partials/_simple_form.scss +10 -2
  32. data/app/assets/stylesheets/renalware/partials/_utilities.scss +12 -0
  33. data/app/assets/stylesheets/tailwind/tailwind.css +3 -0
  34. data/app/components/renalware/application_component.rb +2 -1
  35. data/app/components/renalware/events/{biopsies_component.html.slim → event_list_component.html.slim} +5 -4
  36. data/app/components/renalware/events/event_list_component.rb +77 -0
  37. data/app/components/renalware/hd/administer_prescription_dropdown_component.html.slim +1 -1
  38. data/app/components/renalware/hd/administer_prescription_dropdown_component.rb +1 -5
  39. data/app/components/renalware/hd/prescription_last_administration_component.html.slim +0 -1
  40. data/app/components/renalware/hd/prescription_last_administration_component.rb +8 -7
  41. data/app/components/renalware/letters/unread_electronic_ccs_component.rb +1 -0
  42. data/app/components/renalware/pathology/chart_component.html.slim +5 -0
  43. data/app/components/renalware/pathology/chart_component.rb +40 -0
  44. data/app/components/renalware/pathology/sparkline_component.html.slim +15 -0
  45. data/app/components/renalware/pathology/sparkline_component.rb +135 -0
  46. data/app/components/renalware/patients/side_menu_component.rb +2 -11
  47. data/app/components/renalware/pd/adequacy_results_component.html.slim +9 -0
  48. data/app/components/renalware/pd/adequacy_results_component.rb +39 -0
  49. data/app/components/renalware/pd/pet_results_component.html.slim +37 -0
  50. data/app/components/renalware/pd/pet_results_component.rb +84 -0
  51. data/app/{views/renalware/surveys/_eq5d_summary_part.html.slim → components/renalware/surveys/eq5d_component.html.slim} +5 -5
  52. data/app/{models/renalware/surveys/eq5d_summary_part.rb → components/renalware/surveys/eq5d_component.rb} +7 -5
  53. data/app/{views/renalware/surveys/_pos_s_summary_part.html.slim → components/renalware/surveys/pos_s_component.html.slim} +8 -9
  54. data/app/{models/renalware/surveys/pos_s_summary_part.rb → components/renalware/surveys/pos_s_component.rb} +11 -7
  55. data/app/components/renalware/system/admin_menu_component.html.slim +2 -0
  56. data/app/components/renalware/system/admin_menu_component.rb +2 -2
  57. data/app/components/renalware/system/article_component.html.slim +3 -0
  58. data/app/components/renalware/system/article_component.rb +9 -0
  59. data/app/controllers/renalware/admin/playgrounds_controller.rb +65 -0
  60. data/app/controllers/renalware/admissions/consults_controller.rb +1 -1
  61. data/app/controllers/renalware/base_controller.rb +3 -3
  62. data/app/controllers/renalware/concerns/pdf_renderable.rb +1 -1
  63. data/app/controllers/renalware/deaths_controller.rb +6 -5
  64. data/app/controllers/renalware/hd/scheduling/diaries_controller.rb +1 -1
  65. data/app/controllers/renalware/letters/mailshots/mailshots_controller.rb +53 -0
  66. data/app/controllers/renalware/letters/mailshots/patient_previews_controller.rb +41 -0
  67. data/app/controllers/renalware/medications/home_delivery/events_controller.rb +0 -3
  68. data/app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb +43 -0
  69. data/app/controllers/renalware/medications/prescriptions_controller.rb +1 -1
  70. data/app/controllers/renalware/pathology/charts_controller.rb +21 -0
  71. data/app/controllers/renalware/pathology/current_observation_results_controller.rb +1 -1
  72. data/app/controllers/renalware/pathology/historical_observation_results_controller.rb +1 -1
  73. data/app/controllers/renalware/pathology/nearest_observation_results_controller.rb +52 -0
  74. data/app/controllers/renalware/pathology/observation_requests_controller.rb +1 -1
  75. data/app/controllers/renalware/pathology/observations_controller.rb +26 -2
  76. data/app/controllers/renalware/pathology/requests/requests_controller.rb +7 -5
  77. data/app/controllers/renalware/patients/primary_care_physician_controller.rb +6 -0
  78. data/app/controllers/renalware/pd/adequacy_completions_controller.rb +18 -0
  79. data/app/controllers/renalware/pd/adequacy_results_controller.rb +98 -0
  80. data/app/controllers/renalware/pd/pet_completions_controller.rb +18 -0
  81. data/app/controllers/renalware/pd/pet_results_controller.rb +122 -0
  82. data/app/controllers/renalware/pd/unified_pet_adequacies_controller.rb +102 -0
  83. data/app/controllers/renalware/renal/aki_alerts_controller.rb +1 -1
  84. data/app/controllers/renalware/renal/registry_preflight_checks_controller.rb +55 -19
  85. data/app/controllers/renalware/session_timeout_controller.rb +20 -17
  86. data/app/documents/renalware/age.rb +3 -1
  87. data/app/helpers/renalware/application_helper.rb +7 -7
  88. data/app/helpers/renalware/article_helper.rb +3 -3
  89. data/app/helpers/renalware/boolean_helper.rb +15 -0
  90. data/app/helpers/renalware/clipboard_helper.rb +2 -3
  91. data/app/helpers/renalware/dashboards_helper.rb +2 -2
  92. data/app/helpers/renalware/definition_list_helper.rb +3 -3
  93. data/app/helpers/renalware/devise_helper.rb +1 -1
  94. data/app/helpers/renalware/form_helper.rb +2 -2
  95. data/app/helpers/renalware/letters_helper.rb +1 -1
  96. data/app/helpers/renalware/link_helper.rb +1 -1
  97. data/app/helpers/renalware/mdm_helper.rb +1 -0
  98. data/app/helpers/renalware/navigation_helper.rb +1 -1
  99. data/app/helpers/renalware/patient_helper.rb +2 -2
  100. data/app/helpers/renalware/snippets_helper.rb +9 -10
  101. data/app/helpers/renalware/toggle_helper.rb +6 -6
  102. data/app/helpers/renalware/tooltip_helper.rb +14 -16
  103. data/app/inputs/clock_picker_input.rb +3 -3
  104. data/app/inputs/date_picker_input.rb +3 -3
  105. data/app/inputs/simple_time_input.rb +3 -3
  106. data/app/inputs/trix_editor_input.rb +2 -0
  107. data/app/javascript/renalware/controllers/blas_controller.js +37 -0
  108. data/app/javascript/renalware/controllers/charts_controller.js +52 -0
  109. data/app/javascript/renalware/controllers/medications/prescriptions_controller.js +24 -0
  110. data/app/javascript/renalware/controllers/modal_controller.js +137 -0
  111. data/app/javascript/renalware/controllers/pathology/sparklines_controller.js +206 -0
  112. data/app/javascript/renalware/controllers/pd/pet_charts_controller.js +169 -0
  113. data/app/javascript/renalware/controllers/session_controller.js +223 -0
  114. data/app/javascript/renalware/controllers/simple_toggle_controller.js +17 -0
  115. data/app/javascript/renalware/controllers/tabs_controller.js +43 -0
  116. data/app/javascript/renalware/controllers/toggle_controller.js +2 -2
  117. data/app/javascript/renalware/index.js +18 -0
  118. data/app/jobs/renalware/letters/mailshots/create_mailshot_letters_job.rb +27 -0
  119. data/app/models/concerns/renalware/patients_ransack_helper.rb +2 -0
  120. data/app/models/renalware/accesses/assessment.rb +5 -1
  121. data/app/models/renalware/accesses/procedure.rb +4 -1
  122. data/app/models/renalware/accesses/profile.rb +4 -1
  123. data/app/models/renalware/clinical/body_composition.rb +4 -1
  124. data/app/models/renalware/clinical/dry_weight.rb +4 -1
  125. data/app/models/renalware/clinics/body_surface_area.rb +40 -0
  126. data/app/models/renalware/clinics/clinic_visit.rb +26 -2
  127. data/app/models/renalware/clinics/total_body_water.rb +63 -0
  128. data/app/models/renalware/events/advanced_care_plan.rb +24 -0
  129. data/app/models/renalware/events/clinical_frailty_score.rb +24 -0
  130. data/app/models/renalware/feeds/hl7_message.rb +1 -0
  131. data/app/models/renalware/hd/preference_set.rb +4 -1
  132. data/app/models/renalware/hd/prescription_last_administration_query.rb +4 -0
  133. data/app/models/renalware/hd/profile.rb +5 -2
  134. data/app/models/renalware/hd/session.rb +4 -1
  135. data/app/models/renalware/hd/session_forms/pdf_renderer.rb +1 -1
  136. data/app/models/renalware/hd/sessions/auditable_session_collection.rb +4 -1
  137. data/app/models/renalware/letters.rb +6 -0
  138. data/app/models/renalware/letters/draft_letter.rb +1 -0
  139. data/app/models/renalware/letters/html_renderer.rb +1 -1
  140. data/app/models/renalware/letters/letter_factory.rb +1 -1
  141. data/app/models/renalware/letters/mailshots/data_source.rb +20 -0
  142. data/app/models/renalware/letters/mailshots/item.rb +17 -0
  143. data/app/models/renalware/letters/mailshots/mailshot.rb +117 -0
  144. data/app/models/renalware/letters/printing/duplex_interleaved_pdf_renderer.rb +1 -1
  145. data/app/models/renalware/letters/recipient_address_pdf_renderer.rb +1 -1
  146. data/app/models/renalware/low_clearance/profile.rb +5 -2
  147. data/app/models/renalware/medications.rb +2 -0
  148. data/app/models/renalware/medications/delivery/prescriptions_due_for_delivery_query.rb +53 -0
  149. data/app/models/renalware/medications/prescription.rb +4 -2
  150. data/app/models/renalware/pathology/code_group.rb +3 -1
  151. data/app/models/renalware/pathology/code_group_membership.rb +4 -1
  152. data/app/models/renalware/pathology/nearest_observations_query.rb +44 -0
  153. data/app/models/renalware/pathology/observations_jsonb_serializer.rb +1 -1
  154. data/app/models/renalware/patient.rb +24 -2
  155. data/app/models/renalware/patients/alert.rb +1 -0
  156. data/app/models/renalware/patients/clear_patient_ukrdc_data.rb +6 -1
  157. data/app/models/renalware/patients/deceased_patients_query.rb +42 -0
  158. data/app/models/renalware/patients/ingestion/update_master_patient_index.rb +1 -0
  159. data/app/models/renalware/patients/patient_hospital_identifiers.rb +1 -0
  160. data/app/models/renalware/patients/worry.rb +5 -1
  161. data/app/models/renalware/pd.rb +2 -0
  162. data/app/models/renalware/pd/adequacy_calculated_attributes.rb +159 -0
  163. data/app/models/renalware/pd/adequacy_result.rb +76 -0
  164. data/app/models/renalware/pd/apd/glucose_calculator.rb +1 -0
  165. data/app/models/renalware/pd/patient.rb +4 -0
  166. data/app/models/renalware/pd/pet_dextrose_concentration.rb +17 -0
  167. data/app/models/renalware/pd/pet_result.rb +92 -0
  168. data/app/models/renalware/pd/unified_pet_adequacy_form.rb +46 -0
  169. data/app/models/renalware/problems/problem.rb +5 -1
  170. data/app/models/renalware/renal/aki_alert.rb +4 -1
  171. data/app/models/renalware/renal/profile.rb +4 -1
  172. data/app/models/renalware/renal/registry/preflight_checks/missing_esrf_query.rb +50 -0
  173. data/app/models/renalware/snippets/duplicate_snippet_title_generator.rb +1 -0
  174. data/app/models/renalware/surveys/question.rb +4 -0
  175. data/app/models/renalware/transplants/donation.rb +4 -2
  176. data/app/models/renalware/transplants/donor_followup.rb +4 -2
  177. data/app/models/renalware/transplants/donor_operation.rb +4 -2
  178. data/app/models/renalware/transplants/donor_workup.rb +4 -2
  179. data/app/models/renalware/transplants/recipient_followup.rb +5 -2
  180. data/app/models/renalware/transplants/recipient_operation.rb +5 -2
  181. data/app/models/renalware/transplants/recipient_workup.rb +5 -2
  182. data/app/models/renalware/transplants/recipient_workup_builder.rb +1 -0
  183. data/app/models/renalware/transplants/registration.rb +5 -2
  184. data/app/models/renalware/transplants/registration_status.rb +1 -1
  185. data/app/models/renalware/transplants/rejection_episode.rb +1 -1
  186. data/app/models/renalware/ukrdc/{batch_number.rb → batch.rb} +1 -1
  187. data/app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb +49 -24
  188. data/app/models/renalware/ukrdc/create_patient_xml_file.rb +4 -5
  189. data/app/models/renalware/ukrdc/housekeeping/remove_old_export_archive_folders.rb +3 -3
  190. data/app/models/renalware/ukrdc/housekeeping/remove_stale_files.rb +2 -2
  191. data/app/models/renalware/ukrdc/incoming/import_surveys.rb +1 -2
  192. data/app/models/renalware/ukrdc/outgoing/rendering/patient_number.rb +1 -1
  193. data/app/models/renalware/ukrdc/transmission_log.rb +3 -2
  194. data/app/models/renalware/user.rb +10 -0
  195. data/app/pdfs/renalware/events/event_pdf.rb +1 -0
  196. data/app/policies/renalware/events/advanced_care_plan_policy.rb +10 -0
  197. data/app/policies/renalware/events/clinical_frailty_score_policy.rb +10 -0
  198. data/app/policies/renalware/letters/mailshots/mailshot_policy.rb +21 -0
  199. data/app/policies/renalware/pd/adequacy_result_policy.rb +15 -0
  200. data/app/policies/renalware/pd/pet_result_policy.rb +15 -0
  201. data/app/policies/renalware/renal/registry_preflight_check_policy.rb +4 -0
  202. data/app/presenters/renalware/clinical/profile_presenter.rb +1 -0
  203. data/app/presenters/renalware/hd/dashboard_presenter.rb +1 -0
  204. data/app/presenters/renalware/hd/profile_presenter.rb +1 -0
  205. data/app/presenters/renalware/hd/scheduling/diary_presenter.rb +1 -0
  206. data/app/presenters/renalware/hd/session_presenter.rb +1 -0
  207. data/app/presenters/renalware/hd/unmet_preferences_presenter.rb +1 -1
  208. data/app/presenters/renalware/mdm_patients_presenter.rb +1 -0
  209. data/app/presenters/renalware/pd/dashboard_presenter.rb +10 -2
  210. data/app/presenters/renalware/ukrdc/patient_presenter.rb +1 -0
  211. data/app/presenters/renalware/user_session_presenter.rb +44 -0
  212. data/app/validators/renalware/patients/nhs_number_validator.rb +88 -0
  213. data/app/values/renalware/address.rb +1 -0
  214. data/app/views/renalware/accesses/assessments/_form.html.slim +2 -2
  215. data/app/views/renalware/accesses/assessments/show.html.slim +1 -1
  216. data/app/views/renalware/accesses/plans/new.html.slim +1 -1
  217. data/app/views/renalware/accesses/procedures/_form.html.slim +2 -2
  218. data/app/views/renalware/accesses/procedures/show.html.slim +1 -1
  219. data/app/views/renalware/accesses/profiles/_form.html.slim +2 -2
  220. data/app/views/renalware/accesses/profiles/show.html.slim +1 -1
  221. data/app/views/renalware/admin/cache/show.html.slim +36 -0
  222. data/app/views/renalware/admin/playgrounds/pathology_chart_data.js.erb +1 -0
  223. data/app/views/renalware/admin/playgrounds/show.html.slim +62 -0
  224. data/app/views/renalware/admin/users/_filters.html.slim +1 -1
  225. data/app/views/renalware/admin/users/edit.html.slim +1 -1
  226. data/app/views/renalware/admissions/admissions/_filters.html.slim +1 -1
  227. data/app/views/renalware/admissions/admissions/_form.html.slim +1 -1
  228. data/app/views/renalware/admissions/admissions/index.html.slim +2 -2
  229. data/app/views/renalware/admissions/consults/_filters.html.slim +1 -1
  230. data/app/views/renalware/admissions/consults/_form.html.slim +20 -19
  231. data/app/views/renalware/admissions/consults/index.html.slim +2 -2
  232. data/app/views/renalware/admissions/requests/_form.html.slim +1 -1
  233. data/app/views/renalware/clinical/allergies/_new.html.slim +1 -1
  234. data/app/views/renalware/clinical/body_compositions/_form.html.slim +1 -1
  235. data/app/views/renalware/clinical/dry_weights/_form.html.slim +1 -1
  236. data/app/views/renalware/clinical/profiles/edit.html.slim +1 -1
  237. data/app/views/renalware/clinical/profiles/show.html.slim +11 -1
  238. data/app/views/renalware/clinics/clinic_visits/_table.html.slim +2 -0
  239. data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim +2 -0
  240. data/app/views/renalware/clinics/clinic_visits/new.html.slim +1 -1
  241. data/app/views/renalware/clinics/visits/_filters.html.slim +1 -1
  242. data/app/views/renalware/dashboard/letters/_letter.html.slim +1 -1
  243. data/app/views/renalware/deaths/edit.html.slim +1 -1
  244. data/app/views/renalware/deaths/index.html.slim +18 -10
  245. data/app/views/renalware/directory/people/_filters.html.slim +1 -1
  246. data/app/views/renalware/directory/people/_form.html.slim +1 -1
  247. data/app/views/renalware/directory/people/show.html.slim +1 -1
  248. data/app/views/renalware/drugs/drugs/_filters.html.slim +1 -1
  249. data/app/views/renalware/drugs/drugs/_form.html.slim +1 -1
  250. data/app/views/renalware/events/advanced_care_plans/_cell.html.slim +2 -0
  251. data/app/views/renalware/events/advanced_care_plans/_inputs.html.slim +4 -0
  252. data/app/views/renalware/events/advanced_care_plans/_toggled_cell.html.slim +8 -0
  253. data/app/views/renalware/events/clinical_frailty_score/_cell.html.slim +2 -0
  254. data/app/views/renalware/events/clinical_frailty_score/_inputs.html.slim +4 -0
  255. data/app/views/renalware/events/clinical_frailty_score/_toggled_cell.html.slim +8 -0
  256. data/app/views/renalware/events/events/_filters.html.slim +1 -1
  257. data/app/views/renalware/events/events/_form.html.slim +1 -1
  258. data/app/views/renalware/events/events/_table.html.slim +1 -1
  259. data/app/views/renalware/events/events/toggled_cell/_biopsy.html.slim +1 -1
  260. data/app/views/renalware/events/events/toggled_cell/_simple.html.slim +1 -1
  261. data/app/views/renalware/events/events/toggled_cell/_swab.html.slim +1 -1
  262. data/app/views/renalware/events/lists/_filters.html.slim +1 -1
  263. data/app/views/renalware/events/types/_form.html.slim +1 -1
  264. data/app/views/renalware/hd/cannulation_types/_form.html.slim +1 -1
  265. data/app/views/renalware/hd/current_profile/_form.html.slim +2 -2
  266. data/app/views/renalware/hd/current_profile/_show.html.slim +1 -1
  267. data/app/views/renalware/hd/current_profile/show.html.slim +1 -1
  268. data/app/views/renalware/hd/dialysates/_form.html.slim +1 -1
  269. data/app/views/renalware/hd/dialysers/_form.html.slim +1 -1
  270. data/app/views/renalware/hd/mdm_patients/_filters.html.slim +1 -1
  271. data/app/views/renalware/hd/ongoing_sessions/_filters.html.slim +1 -1
  272. data/app/views/renalware/hd/preference_sets/_form.html.slim +1 -1
  273. data/app/views/renalware/hd/prescription_administrations/_form.html.slim +4 -2
  274. data/app/views/renalware/hd/prescription_administrations/_row.html.slim +1 -1
  275. data/app/views/renalware/hd/prescription_administrations/new.js.erb +1 -1
  276. data/app/views/renalware/hd/protocols/_protocol.pdf.slim +39 -38
  277. data/app/views/renalware/hd/scheduling/diary_slots/_slot.html.slim +2 -1
  278. data/app/views/renalware/hd/sessions/_form_actions.html.slim +1 -1
  279. data/app/views/renalware/hd/sessions/_show.html.slim +1 -1
  280. data/app/views/renalware/hd/stations/_form.html.slim +1 -1
  281. data/app/views/renalware/hd/transmission_logs/index.html.slim +1 -2
  282. data/app/views/renalware/hd/unmet_preferences/_filters.html.slim +1 -1
  283. data/app/views/renalware/hd/witnesses/_form.html.slim +5 -3
  284. data/app/views/renalware/hospitals/units/_form.html.slim +1 -1
  285. data/app/views/renalware/letters/contacts/_contact.html.slim +1 -1
  286. data/app/views/renalware/letters/contacts/_edit.html.slim +1 -1
  287. data/app/views/renalware/letters/contacts/_new_person.html.slim +1 -1
  288. data/app/views/renalware/letters/contacts/_person_from_directory.html.slim +1 -1
  289. data/app/views/renalware/letters/electronic_receipts/_table.html.slim +1 -1
  290. data/app/views/renalware/letters/letters/_form.html.slim +2 -2
  291. data/app/views/renalware/letters/letters/index.html.slim +4 -0
  292. data/app/views/renalware/letters/lists/show.html.slim +1 -1
  293. data/app/views/renalware/letters/mailshots/mailshots/_form.html.slim +61 -0
  294. data/app/views/renalware/letters/mailshots/mailshots/index.html.slim +31 -0
  295. data/app/views/renalware/letters/mailshots/mailshots/new.html.slim +2 -0
  296. data/app/views/renalware/letters/mailshots/patient_previews/_index.html.slim +26 -0
  297. data/app/views/renalware/letters/mailshots/patient_previews/index.js.erb +1 -0
  298. data/app/views/renalware/low_clearance/dashboards/show.html.slim +10 -0
  299. data/app/views/renalware/low_clearance/profiles/edit.html.slim +1 -1
  300. data/app/views/renalware/mdm/_pathology.html.slim +0 -1
  301. data/app/views/renalware/mdm/show.html.slim +1 -1
  302. data/app/views/renalware/mdm_patients/_patient.html.slim +1 -2
  303. data/app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim +1 -3
  304. data/app/views/renalware/medications/home_delivery/prescriptions/index.html.slim +51 -0
  305. data/app/views/renalware/medications/prescriptions/_filter_form.html.slim +1 -1
  306. data/app/views/renalware/medications/prescriptions/_form.html.slim +21 -13
  307. data/app/views/renalware/medications/prescriptions/index.html.slim +1 -1
  308. data/app/views/renalware/medications/terminations/_form.html.slim +1 -1
  309. data/app/views/renalware/messaging/internal/messages/_form.html.slim +1 -1
  310. data/app/views/renalware/modalities/descriptions/_form.html.slim +1 -1
  311. data/app/views/renalware/modalities/modalities/new.html.slim +1 -1
  312. data/app/views/renalware/navigation/_menu.html.slim +1 -0
  313. data/app/views/renalware/navigation/_pd.html.slim +5 -0
  314. data/app/views/renalware/navigation/_renal.html.slim +2 -0
  315. data/app/views/renalware/navigation/_sign_out.html.slim +5 -1
  316. data/app/views/renalware/pathology/charts/show.html.slim +11 -0
  317. data/app/views/renalware/pathology/current_observation_results/index.html.slim +6 -0
  318. data/app/views/renalware/pathology/historical_observation_results/_table.html.slim +4 -3
  319. data/app/views/renalware/pathology/historical_observation_results/index.html.slim +1 -1
  320. data/app/views/renalware/pathology/observation_requests/_filters.html.slim +1 -1
  321. data/app/views/renalware/pathology/observations/_diff.html.slim +1 -1
  322. data/app/views/renalware/pathology/patient_rules/_form.html.slim +1 -1
  323. data/app/views/renalware/pathology/requests/requests/index.html.slim +1 -1
  324. data/app/views/renalware/patients/_header.html.slim +1 -1
  325. data/app/views/renalware/patients/alerts/_alert.html.slim +1 -1
  326. data/app/views/renalware/patients/alerts/_form.html.slim +2 -2
  327. data/app/views/renalware/patients/bookmarks/_new.html.slim +1 -1
  328. data/app/views/renalware/patients/patients/_form.html.slim +1 -2
  329. data/app/views/renalware/patients/patients/new.html.slim +6 -5
  330. data/app/views/renalware/patients/patients/show.html.slim +1 -1
  331. data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim +10 -2
  332. data/app/views/renalware/patients/primary_care_physician/destroy.js.erb +1 -0
  333. data/app/views/renalware/patients/primary_care_physicians/_form.html.slim +1 -1
  334. data/app/views/renalware/patients/worries/_new.html.slim +1 -1
  335. data/app/views/renalware/patients/worryboard/_filters.html.slim +1 -1
  336. data/app/views/renalware/pd/_exit_site_infections.html.slim +4 -0
  337. data/app/views/renalware/pd/_peritonitis_episodes.html.slim +3 -0
  338. data/app/views/renalware/pd/adequacy_completions/_filters.html.slim +19 -0
  339. data/app/views/renalware/pd/adequacy_completions/index.html.slim +4 -0
  340. data/app/views/renalware/pd/adequacy_results/_form_fields.html.slim +9 -0
  341. data/app/views/renalware/pd/adequacy_results/_table.html.slim +72 -0
  342. data/app/views/renalware/pd/adequacy_results/edit.html.slim +89 -0
  343. data/app/views/renalware/pd/adequacy_results/index.js.erb +1 -0
  344. data/app/views/renalware/pd/adequacy_results/new.html.slim +8 -0
  345. data/app/views/renalware/pd/assessments/_form.html.slim +1 -1
  346. data/app/views/renalware/pd/bag_types/_form.html.slim +1 -1
  347. data/app/views/renalware/pd/dashboards/show.html.slim +3 -0
  348. data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim +16 -2
  349. data/app/views/renalware/pd/exit_site_infections/_form.html.slim +1 -1
  350. data/app/views/renalware/pd/exit_site_infections/edit.html.slim +1 -1
  351. data/app/views/renalware/pd/exit_site_infections/new.html.slim +1 -1
  352. data/app/views/renalware/pd/exit_site_infections/show.html.slim +1 -1
  353. data/app/views/renalware/pd/infection_organisms/_form.html.slim +1 -1
  354. data/app/views/renalware/pd/peritonitis_episodes/_form.html.slim +1 -1
  355. data/app/views/renalware/pd/peritonitis_episodes/edit.html.slim +1 -1
  356. data/app/views/renalware/pd/peritonitis_episodes/new.html.slim +1 -1
  357. data/app/views/renalware/pd/peritonitis_episodes/show.html.slim +1 -1
  358. data/app/views/renalware/pd/pet_adequacy_results/_form.html.slim +1 -1
  359. data/app/views/renalware/pd/pet_completions/_filters.html.slim +24 -0
  360. data/app/views/renalware/pd/pet_completions/index.html.slim +4 -0
  361. data/app/views/renalware/pd/pet_results/_form_fields.html.slim +12 -0
  362. data/app/views/renalware/pd/pet_results/_pathology_results.html.slim +36 -0
  363. data/app/views/renalware/pd/pet_results/_table.html.slim +62 -0
  364. data/app/views/renalware/pd/pet_results/edit.html.slim +35 -0
  365. data/app/views/renalware/pd/pet_results/index.js.erb +1 -0
  366. data/app/views/renalware/pd/pet_results/new.html.slim +8 -0
  367. data/app/views/renalware/pd/regimes/edit.html.slim +1 -1
  368. data/app/views/renalware/pd/regimes/new.html.slim +1 -1
  369. data/app/views/renalware/pd/training_sessions/_form.html.slim +1 -1
  370. data/app/views/renalware/pd/unified_pet_adequacies/_form.html.slim +22 -0
  371. data/app/views/renalware/pd/unified_pet_adequacies/new.html.slim +2 -0
  372. data/app/views/renalware/problems/notes/_form.html.slim +1 -1
  373. data/app/views/renalware/problems/problems/edit.html.slim +1 -1
  374. data/app/views/renalware/problems/problems/new.html.slim +1 -1
  375. data/app/views/renalware/renal/aki_alerts/_filters.html.slim +1 -1
  376. data/app/views/renalware/renal/aki_alerts/edit.html.slim +1 -1
  377. data/app/views/renalware/renal/profiles/edit.html.slim +2 -2
  378. data/app/views/renalware/renal/profiles/show.html.slim +1 -1
  379. data/app/views/renalware/renal/registry_preflight_checks/_filters.html.slim +6 -4
  380. data/app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim +1 -0
  381. data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim +2 -1
  382. data/app/views/renalware/renal/registry_preflight_checks/missing_esrf.html.slim +12 -0
  383. data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim +1 -2
  384. data/app/views/renalware/reporting/audits/edit.html.slim +1 -3
  385. data/app/views/renalware/research/_alert.html.slim +1 -1
  386. data/app/views/renalware/research/studies/_filters.html.slim +1 -1
  387. data/app/views/renalware/research/study_participants/_filters.html.slim +1 -1
  388. data/app/views/renalware/snippets/snippets/_row.html.slim +3 -4
  389. data/app/views/renalware/surveys/dashboards/show.html.slim +2 -2
  390. data/app/views/renalware/system/downloads/index.html.slim +3 -4
  391. data/app/views/renalware/transplants/donations/_form.html.slim +2 -2
  392. data/app/views/renalware/transplants/donor_followups/_form.html.slim +2 -2
  393. data/app/views/renalware/transplants/donor_operations/_form.html.slim +2 -2
  394. data/app/views/renalware/transplants/donor_stages/new.html.slim +1 -1
  395. data/app/views/renalware/transplants/donor_workups/_form.html.slim +2 -2
  396. data/app/views/renalware/transplants/donor_workups/show.html.slim +1 -1
  397. data/app/views/renalware/transplants/live_donors/_filters.html.slim +2 -2
  398. data/app/views/renalware/transplants/mdm/_bottom.html.slim +3 -1
  399. data/app/views/renalware/transplants/recipient_followups/_form.html.slim +2 -2
  400. data/app/views/renalware/transplants/recipient_followups/show.html.slim +1 -1
  401. data/app/views/renalware/transplants/recipient_operations/_form.html.slim +2 -2
  402. data/app/views/renalware/transplants/recipient_operations/show.html.slim +1 -1
  403. data/app/views/renalware/transplants/recipient_workups/_form.html.slim +2 -2
  404. data/app/views/renalware/transplants/recipient_workups/show.html.slim +1 -1
  405. data/app/views/renalware/transplants/registration_statuses/_form.html.slim +1 -1
  406. data/app/views/renalware/transplants/registrations/_form.html.slim +2 -2
  407. data/app/views/renalware/transplants/registrations/show.html.slim +1 -1
  408. data/app/views/renalware/transplants/wait_lists/show.html.slim +1 -1
  409. data/app/views/renalware/virology/profiles/edit.html.slim +1 -1
  410. data/config/initializers/groupdate.rb +3 -0
  411. data/config/initializers/inflections.rb +8 -0
  412. data/config/initializers/paper_trail.rb +1 -1
  413. data/config/initializers/simple_form_wrappers.rb +14 -9
  414. data/config/initializers/wicked_pdf.rb +12 -0
  415. data/config/locales/en-GB.yml +1 -1
  416. data/config/locales/renalware/events/advanced_care_plan.en.yml +12 -0
  417. data/config/locales/renalware/events/biopsy.en.yml +2 -0
  418. data/config/locales/renalware/events/clinical_frailty_score.en.yml +16 -0
  419. data/config/locales/renalware/events/clinical_frailty_score_component.en.yml +8 -0
  420. data/config/locales/renalware/medications/prescription.yml +2 -1
  421. data/config/locales/renalware/navigation/renal.en.yml +1 -0
  422. data/config/locales/renalware/nhs_number.en.yml +6 -0
  423. data/config/locales/renalware/pd/adequacy_result.en.yml +9 -0
  424. data/config/locales/renalware/pd/dashboard.en.yml +3 -0
  425. data/config/locales/renalware/pd/pet_result.en.yml +23 -0
  426. data/config/locales/renalware/renal/registry.en.yml +1 -0
  427. data/config/routes/admin.rb +5 -0
  428. data/config/routes/letters.rb +5 -0
  429. data/config/routes/medications.rb +5 -0
  430. data/config/routes/pathology.rb +6 -0
  431. data/config/routes/patients.rb +1 -1
  432. data/config/routes/pd.rb +5 -0
  433. data/config/routes/renal.rb +1 -0
  434. data/config/routes/system.rb +2 -1
  435. data/db/functions/generate_secure_id_v01.sql +1 -1
  436. data/db/functions/pathology_chart_data_v01.sql +13 -0
  437. data/db/migrate/20200226145010_add_unique_indexes.rb +46 -0
  438. data/db/migrate/20200313120655_create_pathology_chart_data_function.rb +13 -0
  439. data/db/migrate/20200318134807_create_letter_mailshots.rb +50 -0
  440. data/db/migrate/20200320103052_add_status_to_letter_mailshot_mailshots.rb +14 -0
  441. data/db/migrate/20200401115705_add_label_abbrv_to_survey_questions.rb +12 -0
  442. data/db/migrate/20200408131217_associate_batch_with_ukrdc_transmission_log.rb +15 -0
  443. data/db/migrate/20200421082715_add_body_surface_area_to_clinic_visits.rb +8 -0
  444. data/db/migrate/20200421132911_create_pd_pet_dextrose_concentrations.rb +13 -0
  445. data/db/migrate/20200421143546_create_pet_results.rb +66 -0
  446. data/db/migrate/20200427123229_create_adequacy_results.rb +54 -0
  447. data/db/migrate/20200616115709_add_height_weight_to_pd_adequacy_results.rb +8 -0
  448. data/db/migrate/20200618144228_add_feature_flags_to_users.rb +14 -0
  449. data/db/seeds/default/events/event_types.csv +2 -0
  450. data/db/seeds/seeds_helper.rb +8 -2
  451. data/lib/renalware/configuration.rb +6 -0
  452. data/lib/renalware/engine.rb +7 -3
  453. data/lib/renalware/version_number.rb +11 -0
  454. data/lib/tasks/renalware.rake +7 -1
  455. data/spec/factories/accesses/profiles.rb +1 -0
  456. data/spec/factories/events/events_types.rb +12 -0
  457. data/spec/factories/patients/patients.rb +22 -1
  458. data/spec/factories/pd/adequacy_results.rb +16 -0
  459. data/spec/factories/pd/pet_results.rb +9 -0
  460. data/spec/support/pages/letters/mailshots/form.rb +58 -0
  461. data/spec/support/pages/medications/prescription_fom.rb +2 -2
  462. data/spec/support/shared_examples/supersedable_examples.rb +2 -2
  463. data/vendor/assets/javascripts/renalware/highcharts.js +505 -0
  464. data/vendor/assets/javascripts/renalware/highcharts.js.map +1 -0
  465. metadata +184 -35
  466. data/app/components/renalware/events/biopsies_component.rb +0 -20
  467. data/app/views/renalware/medications/home_delivery/prescriptions/index.pdf.slim +0 -103
  468. data/lib/renalware/version.rb +0 -5
@@ -27,5 +27,11 @@ module Renalware
27
27
 
28
28
  module Delivery
29
29
  end
30
+
31
+ module Mailshots
32
+ def self.table_name_prefix
33
+ "letter_mailshot_"
34
+ end
35
+ end
30
36
  end
31
37
  end
@@ -18,6 +18,7 @@ module Renalware
18
18
  letter.save!
19
19
  letter.reload
20
20
  broadcast(:draft_letter_successful, letter)
21
+ letter
21
22
  rescue ActiveRecord::RecordInvalid
22
23
  broadcast(:draft_letter_failed, letter)
23
24
  end
@@ -8,7 +8,7 @@ module Renalware
8
8
  class HTMLRenderer
9
9
  def call(letter)
10
10
  context = LettersController.new
11
- context.render_to_string(
11
+ context.render_to_string_with_wicked_pdf(
12
12
  partial: "/renalware/letters/formatted_letters/letter",
13
13
  locals: { letter: letter },
14
14
  encoding: "UTF-8"
@@ -54,7 +54,7 @@ module Renalware
54
54
  Letter::Draft.new(params.merge!(type: Letter::Draft.name, patient: patient))
55
55
  end
56
56
 
57
- # note both practice and gp need to be present before we can the pcp - we'll use the
57
+ # note both practice and gp need to be present before we can send to the pcp - we'll use the
58
58
  # practice address but the GP's name as the salutation.
59
59
  def include_primary_care_physician_as_default_main_recipient
60
60
  return if letter.main_recipient.present?
@@ -0,0 +1,20 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "renalware/letters"
4
+
5
+ module Renalware
6
+ module Letters
7
+ module Mailshots
8
+ # A list of SQL views with a name startingwith "letters_mailshot_"
9
+ # along with some metadata about the view
10
+ class DataSource < ApplicationRecord
11
+ self.table_name = "pg_catalog.pg_views"
12
+
13
+ default_scope lambda {
14
+ where(Arel.sql("schemaname like 'renalware%'"))
15
+ .where(Arel.sql("viewname like 'letter_mailshot_%'"))
16
+ }
17
+ end
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,17 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "renalware/letters"
4
+
5
+ module Renalware
6
+ module Letters
7
+ module Mailshots
8
+ class Item < ApplicationRecord
9
+ belongs_to :letter
10
+ belongs_to :mailshot
11
+
12
+ validates :letter, presence: true
13
+ validates :mailshot, presence: true
14
+ end
15
+ end
16
+ end
17
+ end
@@ -0,0 +1,117 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "renalware/letters"
4
+
5
+ module Renalware
6
+ module Letters
7
+ module Mailshots
8
+ class Mailshot < ApplicationRecord
9
+ include Accountable
10
+ # This maps to a PG enum called background_job_status
11
+ enum status: {
12
+ queued: "queued",
13
+ processing: "processing",
14
+ success: "success",
15
+ failure: "failure"
16
+ }
17
+
18
+ belongs_to :author, class_name: "User"
19
+ belongs_to :letterhead
20
+ has_many :items, dependent: :destroy
21
+ has_many :letters, through: :items
22
+
23
+ validates :description, presence: true
24
+ validates :sql_view_name, presence: true
25
+ validates :body, presence: true
26
+ validates :author, presence: true
27
+ validates :letterhead, presence: true
28
+
29
+ # The sql view should ideally only have one column - 'patient_id' because we use this
30
+ # to filter the patients we want.
31
+ def recipient_patients
32
+ @recipient_patients ||= begin
33
+ return Patient.none if sql_view_name.blank?
34
+
35
+ Patient
36
+ .where(Arel.sql("id in (select distinct patient_id from #{sql_view_name})"))
37
+ .order(:family_name, :given_name)
38
+ end
39
+ end
40
+
41
+ # Called usually by a background job, creates all the letters in the mailshot.
42
+ # The patients to create letters for are defined by the SQL view output.
43
+ # The other data items required for creating the letters are stored in the mailshot
44
+ # object
45
+ def create_letters
46
+ Mailshot.transaction do
47
+ recipient_patients.each do |patient|
48
+ letter = MailshotLetterFactory.new(
49
+ patient: patient,
50
+ current_user: created_by,
51
+ letter_attributes: common_letter_attributes
52
+ ).create
53
+ items.create!(letter: letter)
54
+ end
55
+ end
56
+ end
57
+
58
+ # These attributes apply to all letters in the mailshot
59
+ # rubocop:disable Metrics/MethodLength
60
+ def common_letter_attributes
61
+ @common_letter_attributes ||= begin
62
+ {
63
+ letterhead_id: letterhead_id,
64
+ description: description,
65
+ body: body,
66
+ author_id: author_id,
67
+ issued_on: Time.zone.now,
68
+ main_recipient_attributes: {
69
+ person_role: :patient,
70
+ id: nil,
71
+ addressee_id: nil
72
+ }
73
+ }
74
+ end
75
+ end
76
+ # rubocop:enable Metrics/MethodLength
77
+ end
78
+
79
+ # Factory class responsible for creating a mailshot letter by moving it
80
+ # through its 'state machine' states until it is approved and ready to print.
81
+ # Doing it this ways ensures all pub/sub events, callbacks etc happen in
82
+ # correctly and in order.
83
+ class MailshotLetterFactory
84
+ pattr_initialize [:patient!, :current_user!, :letter_attributes!]
85
+ attr_reader :letter
86
+
87
+ def create
88
+ draft
89
+ submit_for_review
90
+ approve
91
+ letter
92
+ end
93
+
94
+ def draft
95
+ @letter = LetterFactory
96
+ .new(patient, letter_attributes)
97
+ .with_contacts_as_default_ccs
98
+ .build
99
+ letter.save_by!(current_user)
100
+ end
101
+
102
+ def submit_for_review
103
+ letter.submit(by: current_user) # now pending review
104
+ letter.save!
105
+ @letter = Letters::Letter::PendingReview.find(letter.id)
106
+ end
107
+
108
+ def approve
109
+ ApproveLetter
110
+ .build(letter)
111
+ .broadcasting_to_configured_subscribers
112
+ .call(by: current_user)
113
+ end
114
+ end
115
+ end
116
+ end
117
+ end
@@ -24,7 +24,7 @@ module Renalware
24
24
  # using a hex digest of the interleaved letter but currently would not be.
25
25
  # PdfLetterCache.fetch(letter) do
26
26
  WickedPdf.new.pdf_from_string(
27
- LettersController.new.render_to_string(
27
+ LettersController.new.render_to_string_with_wicked_pdf(
28
28
  template: "/renalware/letters/printable_letters/show",
29
29
  locals: { letter: letter, recipients: PrintableRecipients.for(letter) },
30
30
  encoding: "UTF-8"
@@ -13,7 +13,7 @@ module Renalware
13
13
  recipient = RecipientPresenter::WithCurrentAddress.new(recipient)
14
14
  end
15
15
  WickedPdf.new.pdf_from_string(
16
- LettersController.new.render_to_string(
16
+ LettersController.new.render_to_string_with_wicked_pdf(
17
17
  partial: "/renalware/letters/formatted_letters/recipient_address_cover_sheet",
18
18
  locals: { recipient: recipient },
19
19
  encoding: "UTF-8"
@@ -12,8 +12,11 @@ module Renalware
12
12
  belongs_to :patient, touch: true
13
13
  belongs_to :referrer
14
14
  has_document class_name: "Renalware::LowClearance::ProfileDocument"
15
- has_paper_trail class_name: "Renalware::LowClearance::Version",
16
- on: [:create, :update, :destroy]
15
+
16
+ has_paper_trail(
17
+ versions: { class_name: "Renalware::LowClearance::Version" },
18
+ on: [:create, :update, :destroy]
19
+ )
17
20
  end
18
21
  end
19
22
  end
@@ -9,6 +9,8 @@ module Renalware
9
9
  end
10
10
 
11
11
  module Delivery
12
+ DRUG_TYPE_FILTERS = %i(esa immunosuppressant).freeze
13
+
12
14
  def self.table_name_prefix
13
15
  "medication_delivery_"
14
16
  end
@@ -0,0 +1,53 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "renalware/medications"
4
+
5
+ module Renalware
6
+ module Medications
7
+ module Delivery
8
+ # Find current home delivery prescriptions with a next_delivery_date falling
9
+ # within the specified range.
10
+ class PrescriptionsDueForDeliveryQuery
11
+ attr_reader :drug_type_code, :from, :to, :query, :modality_description_id
12
+
13
+ def initialize(
14
+ drug_type_code: nil,
15
+ from: nil,
16
+ to: nil,
17
+ modality_description_id: nil,
18
+ query: {}
19
+ )
20
+ @from = (from || 4.weeks.ago).beginning_of_day
21
+ @to = (to || 2.weeks.since).end_of_day
22
+ @drug_type_code = drug_type_code
23
+ @query = query
24
+ @modality_description_id = modality_description_id
25
+ end
26
+
27
+ def call
28
+ query = search.result
29
+ .current
30
+ .includes(:patient)
31
+ .eager_load(drug: [:classifications, :drug_types])
32
+ .joins("inner join patient_current_modalities pcm on pcm.patient_id = patients.id")
33
+ .where(provider: :home_delivery)
34
+ .where(next_delivery_date: (from..to))
35
+ .order(next_delivery_date: :asc)
36
+
37
+ if drug_type_code.present?
38
+ query = query.where("lower(drug_types.code) = ?", drug_type_code)
39
+ end
40
+
41
+ if modality_description_id.present?
42
+ query = query.where("pcm.modality_description_id = ?", modality_description_id)
43
+ end
44
+ query
45
+ end
46
+
47
+ def search
48
+ @search ||= Medications::Prescription.ransack(query)
49
+ end
50
+ end
51
+ end
52
+ end
53
+ end
@@ -10,8 +10,10 @@ module Renalware
10
10
 
11
11
  attr_accessor :drug_select
12
12
 
13
- has_paper_trail class_name: "Renalware::Medications::PrescriptionVersion",
14
- on: [:create, :update]
13
+ has_paper_trail(
14
+ versions: { class_name: "Renalware::Medications::PrescriptionVersion" },
15
+ on: [:create, :update]
16
+ )
15
17
 
16
18
  belongs_to :patient, touch: true
17
19
 
@@ -30,10 +30,12 @@ module Renalware
30
30
  # M.position_within_subgroup;
31
31
  class CodeGroup < ApplicationRecord
32
32
  include Accountable
33
+
33
34
  has_paper_trail(
34
- class_name: "Renalware::Pathology::Version",
35
+ versions: { class_name: "Renalware::Pathology::Version" },
35
36
  on: [:create, :update, :destroy]
36
37
  )
38
+
37
39
  validates :name, presence: true, uniqueness: true
38
40
  validates :description, presence: true
39
41
  has_many(
@@ -11,7 +11,10 @@ module Renalware
11
11
  # determines its order in the subgroup.
12
12
  class CodeGroupMembership < ApplicationRecord
13
13
  include Accountable
14
- has_paper_trail class_name: "Renalware::Pathology::Version", on: [:create, :update, :destroy]
14
+ has_paper_trail(
15
+ versions: { class_name: "Renalware::Pathology::Version" },
16
+ on: [:create, :update, :destroy]
17
+ )
15
18
  validates :position_within_subgroup, presence: true
16
19
  validates :subgroup, presence: true
17
20
  belongs_to :code_group
@@ -0,0 +1,44 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_dependency "renalware/pathology"
4
+
5
+ module Renalware
6
+ module Pathology
7
+ class NearestObservationsQuery
8
+ pattr_initialize [:patient!, :date!, :code_group!, look_behind_days!: 2]
9
+
10
+ # rubocop:disable Metrics/MethodLength
11
+ def call
12
+ pathology_patient
13
+ .observations
14
+ .joins(:description)
15
+ .where(description_id: observation_description_ids)
16
+ .where("observed_at >= ?", (date - look_behind_days.days).beginning_of_day)
17
+ .select(
18
+ :observed_at,
19
+ :result,
20
+ :description_id,
21
+ "pathology_observation_descriptions.code as code"
22
+ )
23
+ .map do |row|
24
+ {
25
+ code: row.code,
26
+ observed_on: row.observed_at.to_date,
27
+ result: row.result
28
+ }
29
+ end
30
+ end
31
+ # rubocop:enable Metrics/MethodLength
32
+
33
+ private
34
+
35
+ def pathology_patient
36
+ Pathology.cast_patient(patient)
37
+ end
38
+
39
+ def observation_description_ids
40
+ @observation_description_ids ||= code_group.memberships.pluck(:observation_description_id)
41
+ end
42
+ end
43
+ end
44
+ end
@@ -34,7 +34,7 @@ module Renalware
34
34
 
35
35
  def observation_hash_or_hash_element_for(code, suffix)
36
36
  obs_hash = self[code]
37
- return nil if obs_hash.blank? # the patient may not have this code in the set, or it might be {}
37
+ return nil if obs_hash.blank? # patient may not have this code in the set, or it might be {}
38
38
  return obs_hash[:result] if suffix == "_result"
39
39
  return Date.parse(obs_hash[:observed_at]) if suffix == "_observed_at"
40
40
 
@@ -18,6 +18,7 @@ module Renalware
18
18
  # is a default new uuid value on the secure_id column
19
19
  before_create { self.secure_id ||= SecureRandom.uuid }
20
20
  before_save :upcase_local_patient_ids
21
+ # before_validation :strip_spaces_from_nhs_number
21
22
  friendly_id :secure_id, use: [:finders]
22
23
 
23
24
  # For compactness in urls, remove the dashes, so that
@@ -34,7 +35,10 @@ module Renalware
34
35
 
35
36
  enumerize :marital_status, in: %i(married single divorced widowed)
36
37
 
37
- has_paper_trail class_name: "Renalware::Patients::Version", on: [:create, :update, :destroy]
38
+ has_paper_trail(
39
+ versions: { class_name: "Renalware::Patients::Version" },
40
+ on: [:create, :update, :destroy]
41
+ )
38
42
 
39
43
  serialize :sex, Gender
40
44
 
@@ -73,6 +77,10 @@ module Renalware
73
77
  -> { order(started_on: :desc).where(state: "current") },
74
78
  class_name: "Modalities::Modality"
75
79
 
80
+ has_one :previous_modality,
81
+ -> { order(ended_on: :desc, created_at: :desc).where.not(ended_on: nil) },
82
+ class_name: "Modalities::Modality"
83
+
76
84
  has_one :modality_description,
77
85
  through: :current_modality,
78
86
  class_name: "Modalities::Description",
@@ -83,9 +91,10 @@ module Renalware
83
91
  accepts_nested_attributes_for :current_address
84
92
 
85
93
  validates :nhs_number,
86
- length: { minimum: 10, maximum: 10 },
94
+ "renalware/patients/nhs_number" => true,
87
95
  uniqueness: { case_sensitive: false },
88
96
  allow_blank: true
97
+
89
98
  validates :local_patient_id, uniqueness: { case_sensitive: false }, allow_blank: true
90
99
  validates :local_patient_id_2, uniqueness: { case_sensitive: false }, allow_blank: true
91
100
  validates :local_patient_id_3, uniqueness: { case_sensitive: false }, allow_blank: true
@@ -100,6 +109,7 @@ module Renalware
100
109
  validates :email, email: true, allow_blank: true
101
110
 
102
111
  attr_accessor :skip_death_validations
112
+
103
113
  with_options if: :validate_death_attributes?, on: :update do
104
114
  validates :died_on, presence: true
105
115
  validates :died_on, timeliness: { type: :date }
@@ -118,6 +128,12 @@ module Renalware
118
128
  document&.diabetes&.diagnosis == true
119
129
  end
120
130
 
131
+ # Add spacing to an NHS number e.g. "7465613493" => "746 561 3493"
132
+ # Although this is arguably a view concern, formati
133
+ def nhs_number_formatted
134
+ nhs_number&.gsub(/(\d{3})(\d{3})(\d{4})/, '\1 \2 \3')
135
+ end
136
+
121
137
  # Overrides Personable mixin
122
138
  def to_s(format = :default)
123
139
  title_suffix = " (#{title})" if has_title?
@@ -158,6 +174,12 @@ module Renalware
158
174
 
159
175
  private
160
176
 
177
+ def strip_spaces_from_nhs_number
178
+ return if nhs_number.blank?
179
+
180
+ self.nhs_number = nhs_number.delete(" ")
181
+ end
182
+
161
183
  # Before saving, convert all the local patient ids to upper case
162
184
  # TODO: Use a constant for the max number of local patient ids
163
185
  def upcase_local_patient_ids