renalware-core 2.0.160 → 2.0.165

data/app/views/renalware/hd/prescription_administrations/_form.html.slim

@@ -16,7 +16,7 @@
 
       = fpa.input :prescription_id, as: :hidden
 
-      .hd-drug-administration(data-target="hd-prescription-administration.container")
+      .hd-drug-administration(data-hd-prescription-administration-target="container")
         .summary
           .hd-drug
             .hd-drug--name= prescription.drug_name
@@ -40,7 +40,7 @@
                       label: false,
                       input_html: { \
                         data: { \
-                          target: "hd-prescription-administration.radio",
+                          "hd-prescription-administration-target" => "radio",
                           action: "change->hd-prescription-administration#toggleAdministered",
                         } \
                       }

data/app/views/renalware/hd/transmission_logs/index.html.slim

@@ -30,7 +30,8 @@
                 = link_to "...",
                         hd_transmission_log_path(log, format: :xml),
                         class: "button small_ellipsis_button",
-                        target: "_blank"
+                        target: "_blank",
+                        rel: "noopener"
             td
               span(title=log.filepath)
                 - filename = log.filepath && Pathname(log.filepath).basename

data/app/views/renalware/layouts/_patient.html.slim

@@ -17,6 +17,7 @@ nav.patient-side-nav.full-screenable
       ul
         = render "renalware/patients/alerts/list", patient: current_patient
         = render "renalware/research/alerts", patient: current_patient
+        = render "renalware/events/events/alerts", patient: current_patient
     = render "renalware/clinical/header", patient: current_patient
     .row.collapse
       - if local_assigns[:title].present?

data/app/views/renalware/letters/batches/_create.html.slim

@@ -4,14 +4,14 @@
     .percent_complete
   .modal__body
     .content
-      .batch_results_container(data={"poll-url" => renalware.letters_batch_status_path(batch)})
+      .batch_results_container(data={ "poll-url" => renalware.letters_batch_status_path(batch) })
         .preparing
           = image_tag("renalware/loading-gears-animation.gif", height: "116")
 
-
         .generated-batch-print-pdf-container(style="display:none")
           = link_to letters_batch_path(batch, format: :pdf),
                     target: "_blank",
+                    rel: "noopener",
                     class: "print-batch-letter",
                     data: { "modal-url" => new_letters_batch_completion_path(batch) } do
             i.far.fa-check-circle

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/_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/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/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/vaccination_types/_form.html.slim

@@ -0,0 +1,10 @@
+= simple_form_for type do |f|
+  = f.input :name
+  - if type.new_record?
+    = f.input :code, hint: "Will be converted to lower case with underscores"
+  - else
+    p.px-0.mb-5
+      ' Code:
+      code= type.code
+
+  = f.submit class: :button

data/app/views/renalware/virology/vaccination_types/edit.html.slim

@@ -0,0 +1,3 @@
+= within_new_admin_layout(title: "Edit",
+                          breadcrumbs: breadcrumb_for("Virology Vaccination Types", virology_vaccination_types_path)) do
+  = render "form", type: type

data/app/views/renalware/virology/vaccination_types/index.html.slim

@@ -0,0 +1,42 @@
+= content_for(:actions) do
+  = link_to t("new_record.link_title"),
+            new_virology_vaccination_type_path,
+            class: "button"
+
+= within_new_admin_layout(title: "Virology Vaccination Types") do
+  .rounded-md.bg-blue-100.px-3.py-2.flex.items-start.shadow.mb-5
+    i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+    ' Deleting a type sets the 'deleted at' date, preventing the type from
+    ' being used prospectively.
+    br
+    ' The type's code cannot be edited once set, just in case it has already been used.
+    br
+    ' Drag and drop the icon to change the sort order.
+
+  table.vaccination_types
+    thead
+      tr
+        th.actions.col-width-small
+        th Name
+        th Code
+        th.text-center Sort order
+        th.col-width-date-time Created at
+        th.col-width-date-time Deleted at
+    tbody.sortables(data-rel=sort_virology_vaccination_types_path)
+      - types.each do |type|
+        = content_tag_for(:tr, type, class: "sortable #{type.deleted? ? 'deleted' : ''}") do
+          td.actions
+            - unless type.deleted?
+              =link_to "Edit", edit_virology_vaccination_type_path(type)
+              =link_to "Delete",
+                        virology_vaccination_type_path(type),
+                        method: :delete,
+                        data: { confirm: "Are you sure you want to delete this type? Doing so will prevent it from being used prospectively."}
+
+          td= type.name
+          td= type.code
+          td.handle
+            - unless type.deleted?
+              i.fas.fa-bars
+          td= l(type.created_at)
+          td= l(type.deleted_at)

data/app/views/renalware/virology/vaccination_types/new.html.slim

@@ -0,0 +1,3 @@
+= within_new_admin_layout(title: "New",
+                          breadcrumbs: breadcrumb_for("Virology Vaccination Types", virology_vaccination_types_path)) do
+  = render "form", type: type

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, renalware.patient_virology_dashboard_path(event.patient)
+    span.date= l(event.date_time.to_date)

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

@@ -1,5 +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,7 +3,7 @@
 
 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: ":")

data/config/permissions.yml

@@ -8,6 +8,7 @@ super_admin:
   - Renalware::HD::CannulationType
   - Renalware::System::Download
   - Renalware::Pathology::ObservationDescription
+  - Renalware::Virology::VaccinationType
 admin:
   - Renalware::User
   - Renalware::BagType

data/config/routes/virology.rb

@@ -10,3 +10,9 @@ resources :patients, only: [] do
               defaults: { slug: :vaccinations }
   end
 end
+
+namespace :virology do
+  resources :vaccination_types do
+    post :sort, on: :collection
+  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[5.2]
+  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/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.160"
+    VERSION = "2.0.165"
   end
 end

data/spec/factories/virology/vaccination_types.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :vaccination_type, class: "Renalware::Virology::VaccinationType" do
+    code { "code" }
+    name { "name" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.160
+  version: 2.0.165
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -310,14 +310,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -664,14 +664,14 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
@@ -1455,6 +1455,7 @@ files:
 - app/controllers/renalware/virology/base_controller.rb
 - app/controllers/renalware/virology/dashboards_controller.rb
 - app/controllers/renalware/virology/profiles_controller.rb
+- app/controllers/renalware/virology/vaccination_types_controller.rb
 - app/controllers/renalware/virology/vaccinations_controller.rb
 - app/documents/document/attribute_initializer.rb
 - app/documents/document/attribute_initializer/active_model.rb
@@ -1677,12 +1678,14 @@ files:
 - app/models/renalware/drugs/type.rb
 - app/models/renalware/events.rb
 - app/models/renalware/events/advanced_care_plan.rb
+- app/models/renalware/events/alertable_events_query.rb
 - app/models/renalware/events/biopsy.rb
 - app/models/renalware/events/clinical_frailty_score.rb
 - app/models/renalware/events/create_event.rb
 - app/models/renalware/events/event.rb
 - app/models/renalware/events/event_list_query.rb
 - app/models/renalware/events/event_query.rb
+- app/models/renalware/events/event_type_alert_trigger.rb
 - app/models/renalware/events/investigation.rb
 - app/models/renalware/events/line_change_event_query.rb
 - app/models/renalware/events/lists/form.rb
@@ -2205,6 +2208,7 @@ files:
 - app/models/renalware/virology/patient.rb
 - app/models/renalware/virology/profile.rb
 - app/models/renalware/virology/vaccination.rb
+- app/models/renalware/virology/vaccination_type.rb
 - app/models/renalware/virology/version.rb
 - app/models/renalware/zip_archive.rb
 - app/pdfs/renalware/events/event_pdf.rb
@@ -2572,12 +2576,14 @@ files:
 - app/views/renalware/events/clinical_frailty_score/_cell.html.slim
 - app/views/renalware/events/clinical_frailty_score/_inputs.html.slim
 - app/views/renalware/events/clinical_frailty_score/_toggled_cell.html.slim
+- app/views/renalware/events/events/_alerts.html.slim
 - app/views/renalware/events/events/_event.html.slim
 - app/views/renalware/events/events/_filters.html.slim
 - app/views/renalware/events/events/_form.html.slim
 - app/views/renalware/events/events/_list.html.slim
 - app/views/renalware/events/events/_summary_part.html.slim
 - app/views/renalware/events/events/_table.html.slim
+- app/views/renalware/events/events/alert/_simple.html.slim
 - app/views/renalware/events/events/cell/_biopsy.html.slim
 - app/views/renalware/events/events/cell/_investigation.html.slim
 - app/views/renalware/events/events/cell/_simple.html.slim
@@ -3325,6 +3331,11 @@ files:
 - app/views/renalware/virology/dashboards/show.html.slim
 - app/views/renalware/virology/profiles/_summary.html.slim
 - app/views/renalware/virology/profiles/edit.html.slim
+- app/views/renalware/virology/vaccination_types/_form.html.slim
+- app/views/renalware/virology/vaccination_types/edit.html.slim
+- app/views/renalware/virology/vaccination_types/index.html.slim
+- app/views/renalware/virology/vaccination_types/new.html.slim
+- app/views/renalware/virology/vaccinations/_alert.html.slim
 - app/views/renalware/virology/vaccinations/_cell.html.slim
 - app/views/renalware/virology/vaccinations/_inputs.html.slim
 - app/views/renalware/virology/vaccinations/_list.html.slim
@@ -4076,6 +4087,8 @@ files:
 - db/migrate/20201023092859_remove_unused_indexes.rb
 - db/migrate/20201105153422_update_medication_current_prescriptions_view.rb
 - db/migrate/20201112152752_update_pd_mdm_patients_view1.rb
+- db/migrate/20210105163944_create_virology_vaccination_types.rb
+- db/migrate/20210115181817_create_event_type_alert_triggers.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -4167,6 +4180,8 @@ files:
 - db/seeds/default/ukrdc/modality_codes.csv
 - db/seeds/default/ukrdc/modality_codes.rb
 - db/seeds/default/ukrdc/seeds.rb
+- db/seeds/default/virology/seeds.rb
+- db/seeds/default/virology/vaccination_types.rb
 - db/seeds/seeds_helper.rb
 - db/triggers/feed_messages_preprocessing_trigger_v01.sql
 - db/triggers/update_current_observation_set_trigger_v01.sql
@@ -4442,6 +4457,7 @@ files:
 - spec/factories/transplants/rejection_treatments.rb
 - spec/factories/ukrdc/modality_codes.rb
 - spec/factories/virology/patients.rb
+- spec/factories/virology/vaccination_types.rb
 - spec/factories/virology/vaccinations.rb
 - spec/support/ajax_helpers.rb
 - spec/support/capybara_helper.rb
@@ -4530,7 +4546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Renalware core functionality as a mountable engine.