renalware-core 2.0.157 → 2.0.162

data/app/views/renalware/letters/mailshots/mailshots/_form.html.slim

@@ -38,24 +38,28 @@
     br
     .panel
       h2
-        i.fas.fa-info-circle style="color: #00a499"
-        span(style="padding-left: 5px") Tips
-      p
-        | The list of patients to include in a mailshot it determined by the SQL View chosen above.
-        |  It is intended that a systems or database administrator create this view for you in the
-        |  renalware database. The view should have one column called 'patient_id' and return the ids
-        |  of all the patients you want to send this letter to.
-        |  You should ideally create the view in the hospital's
-        |  own postgres schema eg 'renalware_kch' in the case of Kings College Hospital.
-      p Here is a (somewhat pointless) example of a compatible SQL view definition:
-      p
-        code
-          | CREATE OR REPLACE VIEW
-          br
-          |  renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
-          br
-          |  SELECT id as patient_id
-          br
-          |  FROM patients
-          br
-          |  WHERE family_name like 'R%';
+        i.fas.fa-info-circle
+        span.pl-3 Help
+
+      markdown:
+        The list of patients to include in a mailshot it determined by the SQL View chosen above.
+        It is intended that a systems or database administrator create this view for you in the
+        renalware database. The view should have one column called 'patient_id' and return the ids
+        of all the patients you want to send this letter to.
+
+        You should ideally create the view in the hospital's
+        own postgres schema (eg 'renalware_kch' in the case of Kings College Hospital) in order to
+        indicate your view is hospital-specific.
+
+        **Note that in order for your view to appear in the dropdown above, its name must start
+        with `letter_mailshot_`**
+
+        Here is a (somewhat pointless) example of a compatible SQL view definition:
+
+        ```
+          CREATE OR REPLACE VIEW
+          renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
+          SELECT id as patient_id
+          FROM patients
+          WHERE family_name like 'R%';
+        ```

data/app/views/renalware/letters/parts/_allergies.html.slim

@@ -1,5 +1,5 @@
 .list.allergies
-  h3 Allergies:
+  b.subtitle Allergies:
   - if allergies.any?
     ul
       - allergies.each do |allergy|

data/app/views/renalware/letters/parts/_problems.html.slim

@@ -1,5 +1,5 @@
 .list.problems
-  h3 Problems
+  b.subtitle Problems
 
   - if problems.any?
     ul.indented

data/app/views/renalware/letters/parts/_recent_pathology_results.html.slim

@@ -1,3 +1,3 @@
 .list.investigations
-  h3 Recent Investigations
+  b.subtitle Recent Investigations
   p= recent_pathology_results.results || " None"

data/app/views/renalware/medications/home_delivery/events/_edit.html.slim

@@ -7,7 +7,7 @@
       remote: true,
       authenticity_token: true,
       method: :patch,
-      data: { target: "home-delivery-modal.form" },
+      data: { "home-delivery-modal-target" => "form" },
       as: :event) do |f|
 
     .modal__header
@@ -24,7 +24,7 @@
       / - the first is initially displayed and has the print options and a print button
       / - the second is displayed once Print has been clicked, and asked asks for feedback as to
       /   whether printing was successful or not. It it was successful we set
-      .form-fields data-target="home-delivery-modal.printOptions"
+      .form-fields data-home-delivery-modal-target="printOptions"
         - homecare_forms = Renalware::Drugs::HomecareForm.all
         = f.association :drug_type,
                   collection: Renalware::Drugs::Type.where(id: homecare_forms.map(&:drug_type_id)),
@@ -32,7 +32,7 @@
                   input_html: { \
                     data: { \
                       action: "change->home-delivery-modal#refreshForm", \
-                      target: "home-delivery-modal.drugtype" \
+                      "home-delivery-modal-target" => "drugtype" \
                     } \
                   },
                   wrapper: :horizontal_medium
@@ -59,7 +59,7 @@
                   data: { action: "click->home-delivery-modal#askForPrintFeedback" },
                   **disabled_args
 
-      .show-after-printing.visuallyhidden data-target="home-delivery-modal.printFeedback"
+      .show-after-printing.visuallyhidden data-home-delivery-modal-target="printFeedback"
 
         h2 Was printing successful?
         .right

data/app/views/renalware/medications/prescriptions/_current.html.slim

@@ -1,4 +1,4 @@
-h3 Current Medications
+b.subtitle Current Medications
 
 - if prescriptions.blank?
   p.prescription No medications listed

data/app/views/renalware/medications/prescriptions/_current_hd.html.slim

@@ -1,5 +1,5 @@
 - if prescriptions.any?
-  h3 Drugs to give on Haemodialysis
+  b.subtitle Drugs to give on Haemodialysis
 
   ul
       - prescriptions.each do |prescription|

data/app/views/renalware/medications/prescriptions/_form.html.slim

@@ -38,16 +38,16 @@ ruby:
                      required: false,
                      wrapper: :horizontal_datepicker
 
-      span(data-target= "prescriptions.providers")
+      span(data-prescriptions-target= "providers")
         = f.input :provider,
                   collection: provider_codes,
                   as: :inline_radio_buttons,
                   label_method: :to_label,
                   wrapper: :horizontal_medium,
-                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", target: "prescriptions.providers"} }
+                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", "prescriptions.target" => "providers"} }
 
       / Only show this if home_delivery provider is active/selected. See prescriptions stimulus controller.
-      .home_delivery_dates(style="display:none" data-target="prescriptions.homeDeliveryDates")
+      .home_delivery_dates(style="display:none" data-prescriptions-target="homeDeliveryDates")
         .row
           .small-12.medium-4.large-3.columns
           .small-12.medium-8.large-9.columns

data/app/views/renalware/medications/prescriptions/_prescription.html.slim

@@ -1,5 +1,4 @@
 - recently_changed = defined?(recently_changed) && recently_changed
-
 li.prescription class=("recently_changed" if recently_changed)
   = prescription.drug.name
   = blank_separator
@@ -8,6 +7,9 @@ li.prescription class=("recently_changed" if recently_changed)
   = prescription.medication_route.code
   = blank_separator
   = prescription.frequency
+  = blank_separator
+  i
+    b= prescription.provider_suffix
 
   / We pass in date_changed if the prescription is recently_changed or recently_stopped
   / It could be the prescribed_on or terminated_on date

data/app/views/renalware/medications/prescriptions/_recently_stopped.html.slim

@@ -1,4 +1,4 @@
-h3 Recently Stopped Medications
+b.subtitle Recently Stopped Medications
 
 - if prescriptions.blank?
   p.prescription None

data/app/views/renalware/system/downloads/index.html.slim

@@ -22,7 +22,7 @@
     - items.each do |item|
       .download
         .file
-          = link_to(system_download_path(item), target: "_blank") do
+          = link_to(system_download_path(item), target: "_blank", rel: "noopener") do
             i.far.fa-file-alt
         .details
           h3= link_to(item.name, system_download_path(item), target: "_blank")

data/app/views/renalware/system/messages/_form.html.slim

@@ -1,4 +1,4 @@
-- severities = Renalware::System::Message.severity.values.map{|val| [val&.humanize, val] }
+- severities = Renalware::System::Message.severity.values.map{ |val| [val&.humanize, val] }
 = simple_form_for(message,
                   as: :message,
                   html: { autocomplete: "off" }) do |f|

data/app/views/renalware/system/view_metadata/_columns_table.html.slim

@@ -28,9 +28,9 @@ table.sortables(style="list-style-type: none;")
           td.border-0
             code= col.code
           td.text-center.border-0
-            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden)
+            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden style="margin:0")
           td.border-0
-            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name)
+            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name style="margin:0")
           td.border-0
             select.m-0(name="view_metadata[columns][][width]")
               option(value="")

data/app/views/renalware/system/view_metadata/edit.html.slim

@@ -38,18 +38,18 @@ ruby:
       / Tabs - see also js stimulus tabs-controller
       div(data-controller="tabs" data-tabs-active-tab="-mb-px border-l border-t border-r rounded-t")
         ul.list-reset.flex.border-b.ml-0
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Columns
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Filters
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Previous versions
 
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "columns_table", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "filters_form", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "versions", view: view
 
     .modal__footer

data/app/views/renalware/virology/vaccinations/_alert.html.slim

@@ -0,0 +1,5 @@
+li.patient-alert.vaccination
+    i.fas.fa-syringe
+    - title = Renalware::Virology::VaccinationType.find_by(code: event.document&.type)&.name
+    span.title= link_to title, patient_virology_dashboard_path
+    span.date= l(event.date_time.to_date)

data/app/views/renalware/virology/vaccinations/_cell.html.slim

@@ -1,2 +1,2 @@
 / See Vaccination.to_partial_path etc
-= event.document.type.text
+= event.document.to_s

data/app/views/renalware/virology/vaccinations/_inputs.html.slim

@@ -1,4 +1,6 @@
 / See Vaccination.to_partial_path etc
 / Pulled into the New Event form via a js get to EventsController#new
 = f.simple_fields_for :document, event.document do |fd|
-  = fd.input :type, wrapper: :horizontal_medium
+  /= fd.input :type, wrapper: :horizontal_medium
+  = fd.input :type, wrapper: :horizontal_medium, collection: Renalware::Virology::VaccinationType.ordered.pluck(:name, :code)
+  = fd.input :drug, wrapper: :horizontal_medium, collection: Renalware::Drugs::Drug.for(:vaccine).pluck(:name, :name)

data/app/views/renalware/virology/vaccinations/_toggled_cell.html.slim

@@ -3,6 +3,8 @@
 
 dl.dl-horizontal
   dt= attr_name(document, :type, suffix: ":")
-  dd= document.type&.text || t("unspecified")
+  dd= document.type_name.presence || t("unspecified")
+  dt= attr_name(document, :drug, suffix: ":")
+  dd= document.drug.presence || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
   dd= event.notes&.html_safe || t("unspecified")

data/config/initializers/core_extensions.rb

@@ -5,7 +5,7 @@ require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"
 # require "core_extensions/active_record/sort"
 require "core_extensions/date"
-require "core_extensions/active_support/duration"
+require "core_extensions/active_support/duration_additions"
 require "core_extensions/scenic"
 require "core_extensions/hash"
 require "core_extensions/active_record/migration_helpers"

data/config/initializers/inflections.rb

@@ -32,6 +32,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "CCs"
   inflect.acronym "CM"
   inflect.acronym "CSV"
+  inflect.acronym "CRF"
   inflect.acronym "DNA"
   inflect.acronym "EDTA"
   inflect.acronym "ESRF"
@@ -55,6 +56,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "EQ5D"
   inflect.acronym "EQ5D5L"
   inflect.acronym "POS"
+  inflect.acronym "YAML"
   inflect.irregular "feedback", "feedback"
   inflect.acronym "NHS"
   inflect.uncountable %w(cache)

data/config/locales/renalware/virology/virology.en.yml

@@ -24,4 +24,8 @@ en:
         hbv3: HBV Vaccination 3
         hbv4: HBV Vaccination 4
         hbv_booster: HBV Booster
+        influenza: Influenza
+        pneumococcus: Pneumococcus
+        covid19_1: COVID-19 1
+        covid19_2: COVID-19 2
         patient_refused: Patient Refused

data/db/migrate/20201105153422_update_medication_current_prescriptions_view.rb

@@ -0,0 +1,7 @@
+class UpdateMedicationCurrentPrescriptionsView < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      replace_view :medication_current_prescriptions, version: 2, revert_to_version: 1
+    end
+  end
+end

data/db/migrate/20201112152752_update_pd_mdm_patients_view1.rb

@@ -0,0 +1,7 @@
+class UpdatePDMDMPatientsView1 < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      update_view :pd_mdm_patients, version: 3, revert_to_version: 2
+    end
+  end
+end

data/db/migrate/20210105163944_create_virology_vaccination_types.rb

@@ -0,0 +1,13 @@
+class CreateVirologyVaccinationTypes < ActiveRecord::Migration[5.2]
+  within_renalware_schema do
+    def change
+      create_table :virology_vaccination_types do |t|
+        t.string :code, null: false, index: { unique: true }
+        t.string :name, null: false, index: { unique: true }
+        t.integer :position, null: false, default: 0
+        t.datetime :deleted_at
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/migrate/20210115181817_create_event_type_alert_triggers.rb

@@ -0,0 +1,15 @@
+class CreateEventTypeAlertTriggers < ActiveRecord::Migration[6.0]
+  def change
+    within_renalware_schema do
+      create_table(
+        :event_type_alert_triggers,
+        comment: "Matching alerts are displayed on patient pages"
+      ) do |t|
+        t.references :event_type, foreign_key: true, null: false
+        t.text :when_event_document_contains
+        t.text :when_event_description_contains
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/seeds/default/seeds.rb

@@ -20,3 +20,4 @@ require_relative "./practices/seeds"
 require_relative "./pd/seeds"
 require_relative "./renal/seeds"
 require_relative "./transplants/seeds"
+require_relative "./virology/seeds"

data/db/seeds/default/virology/seeds.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "./vaccination_types"

data/db/seeds/default/virology/vaccination_types.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Virology
+    log "Adding virology vaccination types" do
+      {
+        hbv1: "HBV Vaccination 1",
+        hbv2: "HBV Vaccination 2",
+        hbv3: "HBV Vaccination 3",
+        hbv4: "HBV Vaccination 4",
+        hbv_booster: "HBV Booster",
+        influenza: "Influenza",
+        pneumococcus: "Pneumococcus",
+        covid19_1: "COVID-19 1",
+        covid19_2: "COVID-19 2",
+        patient_refused: "Patient Refused",
+        patient_refused_covid19: "Patient refused Covid-19 vaccine",
+        patient_refused_covid19_pfizer: "Patient refused Covid-19 vaccine Pfizer",
+        patient_refused_covid19_astrazenica: "Patient refused Covid-19 vaccine Astra Zeneca"
+      }.each do |code, name|
+        VaccinationType.find_or_create_by!(code: code, name: name)
+      end
+    end
+  end
+end

data/db/views/medication_current_prescriptions_v01.sql

@@ -1,4 +1,5 @@
- SELECT mp.id,
+ SELECT
+    mp.id,
     mp.patient_id,
     mp.drug_id,
     mp.treatable_type,

data/db/views/medication_current_prescriptions_v02.sql

@@ -0,0 +1,30 @@
+ SELECT distinct on (mp.patient_id, mp.id)
+     mp.id,
+    mp.patient_id,
+    mp.drug_id,
+    mp.treatable_type,
+    mp.treatable_id,
+    mp.dose_amount,
+    mp.dose_unit,
+    mp.medication_route_id,
+    mp.route_description,
+    mp.frequency,
+    mp.notes,
+    mp.prescribed_on,
+    mp.provider,
+    mp.created_at,
+    mp.updated_at,
+    mp.created_by_id,
+    mp.updated_by_id,
+    mp.administer_on_hd,
+    mp.last_delivery_date,
+    drugs.name as drug_name,
+    drug_types.code AS drug_type_code,
+    drug_types.name AS drug_type_name
+  FROM medication_prescriptions mp
+  left outer join medication_prescription_terminations mpt ON mpt.prescription_id = mp.id
+  inner JOIN drugs ON drugs.id = mp.drug_id
+  left outer join drug_types_drugs ON drug_types_drugs.drug_id = drugs.id
+  left outer join drug_types ON drug_types_drugs.drug_type_id = drug_types.id
+  where (mpt.terminated_on IS NULL OR mpt.terminated_on > current_date)
+  order by mp.patient_id asc, mp.id asc;

data/db/views/pd_mdm_patients_v03.sql

@@ -0,0 +1,50 @@
+select
+  distinct on (P.id)
+  P.id,
+  P.secure_id,
+  (upper(P.family_name) || ', ' || P.given_name) as "patient_name",
+  P.nhs_number,
+  P.local_patient_id as hospital_numbers,
+  P.sex,
+  P.born_on,
+  date_part('year', age(P.born_on)) as "age",
+  RPROF.esrf_on,
+  Mx.modality_name,
+  case
+    when pw.id > 0 then true
+    else false
+    end as on_worryboard,
+  TXRSD."name" tx_status,
+  case pr.type
+    when 'Renalware::PD::APDRegime' then 'APD'
+    when 'Renalware::PD::CAPDRegime' then 'CAPD'
+    end as pd_type,
+   (select
+       date(date_time)
+       from events e
+       inner join event_types et on et.id = e.event_type_id
+       where et.slug = 'pd_line_changes'
+       and e.patient_id  = P.id
+       order by date_time desc limit 1) as last_line_change_date,
+  pesi.diagnosis_date as last_esi_date,
+  ppe.diagnosis_date as last_peritonitis_date,
+  (select bmi from clinic_visits cv2 where cv2.patient_id = P.id and bmi > 0 order by date desc limit 1) as bmi,
+  PA.values -> 'HGB' ->> 'result' as hgb,
+  (PA.values -> 'HGB' ->> 'observed_at')::date as hgb_date,
+  PA.values -> 'URE' ->> 'result' as ure,
+  (PA.values -> 'URE' ->> 'observed_at')::date as ure_date,
+  PA.values -> 'CRE' ->> 'result' as cre,
+  (PA.values -> 'CRE' ->> 'observed_at')::date as cre_date,
+  PA.values -> 'EGFR' ->> 'result' as egfr
+from renalware.patients P
+left outer join patient_worries pw on pw.patient_id = p.id
+left outer join renalware.pathology_current_observation_sets PA on PA.patient_id = P.id
+left outer join renalware.renal_profiles RPROF on RPROF.patient_id = P.id
+left outer join renalware.transplant_registrations TXR on TXR.patient_id = P.id
+left outer join renalware.transplant_registration_statuses TXRS on TXRS.registration_id = TXR.id AND TXRS.terminated_on IS NULL
+left outer join renalware.transplant_registration_status_descriptions TXRSD on TXRSD.id = TXRS.description_id
+left outer join renalware.pd_regimes pr on pr.patient_id = P.id and pr.start_date <= current_date and pr.end_date is null
+left outer join renalware.pd_exit_site_infections pesi on pesi.patient_id = P.id
+left outer join pd_peritonitis_episodes ppe on ppe.patient_id = P.id
+inner join renalware.patient_current_modalities Mx on Mx.patient_id = P.id and Mx.modality_code = 'pd'
+order by P.id, pr.start_date desc, pr.created_at desc, pesi.diagnosis_date desc, ppe.diagnosis_date desc;