renalware-core 2.0.161 → 2.0.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc096586b16fb31366d250f5e89808e021822a56fed19237530c6abd9cbf0dd
-  data.tar.gz: 61359de738b4d48c4c4e301d8ff7e5a421aad80258e26387b86bbd525ee62f2d
+  metadata.gz: 7e885a02e30e38f6e267bfd16a39982e2df008d175f8d4c88c885f1fbd8514fc
+  data.tar.gz: 9ffca3aae6bafa903a4973b07c48496724254321aaa73d336655bcde8c4b6514
 SHA512:
-  metadata.gz: cafb016f3c443c10cddc2b1db2fd469f60b98bd0ad266350758e9e94127e9e8c036dcba451b415bb3497eb7eed28d12f848c2b153d4c2d6c1c42cc0bc78135df
-  data.tar.gz: 712f000b0e02727277097de9fa11f76966ca0163bcbf731e330dd4adee5a1d495044c2794a6a81defbdd44369e67c6ced3fc9b139bd920e3346017627ce59dcb
+  metadata.gz: aac008a83c72d83fb0c1c6029d1851686075537c58ebad5d74f1ccb2f6da1a413180f45697eb4ed1c635c36b358e7a5e7850c20917992a8eb93fac23bdb20fc9
+  data.tar.gz: a2cd067bcba52812a65d5f0f63a1a6dac985a1d093331a315e0152fe349bf1eb090eefd81f3018ae660937a62dabfa68aa0d860fdaaa87453d90d66368c46f7d

data/app/assets/stylesheets/renalware/modules/_clinical.scss

@@ -141,6 +141,7 @@ article.clinical-allergies {
 .patient-alerts {
   color: $white;
   background-color: transparent;
+  padding-top: .1rem;
 
   @media print {
     display: none;
@@ -199,6 +200,33 @@ article.clinical-allergies {
           }
         }
 
+        &.vaccination {
+          background-color: $nhs-aqua-green;
+
+          &:hover {
+            background-color: darken($nhs-aqua-green, 4);
+          }
+
+          .title a,
+          i:before {
+            color: $white;
+          }
+        }
+
+        &.event {
+          background-color: $nhs-yellow;
+
+          &:hover {
+            background-color: darken($nhs-yellow, 7);
+          }
+
+          .title a,
+          .date,
+          i:before {
+            color: $dark-grey;
+          }
+        }
+
         &.research-study-participant {
           background-color: darken($nhs-green, 3);
           color: $white;

data/app/models/renalware/events/alertable_events_query.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    # Query object that returns, for a patient, the most recent matching event (if any) for each
+    # event_type_alert_trigger row in the databse. The results are used to display
+    # alerts in the UI.
+    # For example given a vaccination Event::Type and an EventTypeAlertTrigger
+    # which is configured to find any vaccination event with the word "covid" in
+    # anywhere in the document, this query will return the most matching event.
+    # It is possible to have mltiple triggers rows for the same event type, so for eample one
+    # could display triggers for the most recent covid vaccination, and the most recent HBV
+    # vaccination.
+    class AlertableEventsQuery
+      def self.call(patient:)
+        Event
+          .for_patient(patient)
+          .joins(event_type: :alert_triggers)
+          .select("DISTINCT ON (events.patient_id, event_type_alert_triggers.id) events.*")
+          .where("(events.document::text ilike '%' || when_event_document_contains || '%') or (events.description ilike '%' || when_event_description_contains || '%')")
+          .order("events.patient_id, event_type_alert_triggers.id, events.created_at desc")
+      end
+    end
+  end
+end

data/app/models/renalware/events/event.rb

@@ -45,6 +45,10 @@ module Renalware
       end
       alias :to_input_partial_path :to_partial_path
 
+      def to_alert_partial_path
+        partial_for "alert"
+      end
+
       def to_cell_partial_path
         partial_for "cell"
       end

data/app/models/renalware/events/event_type_alert_trigger.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    # Used to defines conditions where, for a particular event type, if the there is e.g. a case-
+    # insensitive text match against the contents of the event document (eg 'COVID')
+    # then an alert will be displayed in the UI (for the most recent match is there are > 1).
+    class EventTypeAlertTrigger < ApplicationRecord
+      belongs_to :event_type, class_name: "Events::Type"
+      validates :event_type, presence: true
+    end
+  end
+end

data/app/models/renalware/events/type.rb

@@ -6,6 +6,13 @@ module Renalware
   module Events
     class Type < ApplicationRecord
       self.table_name = "event_types"
+      has_many(
+        :alert_triggers,
+        class_name: "EventTypeAlertTrigger",
+        foreign_key: :event_type_id,
+        dependent: :destroy
+      )
+
       DEFAULT_EVENT_CLASS_NAME = "Renalware::Events::Simple"
 
       acts_as_paranoid

data/app/models/renalware/letters/pdf_letter_cache.rb

@@ -40,7 +40,7 @@ module Renalware
         delegate :clear, to: :store
 
         def fetch(letter, **options)
-          store.fetch(cache_key_for(letter, **options)) { yield }
+          store.fetch(cache_key_for(letter, **options), expires_in: 4.weeks) { yield }
         end
 
         # Note the letter must be a LetterPresenter which has a #to_html method

data/app/views/renalware/admin/cache/show.html.slim

@@ -42,39 +42,3 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
             class: "button alert"
-
-  <label class="block">
-    <span class="text-gray-700">Name</span>
-    <input class="form-input mt-1 block w-full" placeholder="Jane Doe">
-  </label>
-
-  <div class="mt-4">
-    <span class="text-gray-700">Account Type</span>
-    <div class="mt-2">
-      <label class="inline-flex items-center">
-        <input type="radio" class="form-radio" name="accountType" value="personal">
-        <span class="ml-2">Personal</span>
-      </label>
-      <label class="inline-flex items-center ml-6">
-        <input type="radio" class="form-radio" name="accountType" value="busines">
-        <span class="ml-2">Business</span>
-      </label>
-    </div>
-  </div>
-
-  <label class="block mt-4">
-    <span class="text-gray-700">Requested Limit</span>
-    <select class="form-select mt-1 block w-full">
-      <option>$1,000</option>
-      <option>$5,000</option>
-      <option>$10,000</option>
-      <option>$25,000</option>
-    </select>
-  </label>
-
-  <div class="flex mt-6">
-    <label class="flex items-center">
-      <input type="checkbox" class="form-checkbox">
-      <span class="ml-2">I agree to the <span class="underline">privacy policy</span></span>
-    </label>
-  </div>

data/app/views/renalware/events/events/_alerts.html.slim

@@ -0,0 +1,3 @@
+- events = Renalware::Events::AlertableEventsQuery.call(patient: patient)
+- events.each do |event|
+  = render event.to_alert_partial_path, event: event

data/app/views/renalware/events/events/alert/_simple.html.slim

@@ -0,0 +1,5 @@
+/ The default markup for an alertable event
+li.patient-alert.event
+  i.fas.fa-exclamation-triangle
+  span.title= link_to event.description&.truncate(12), patient_events_path
+  span.date= l(event.date_time.to_date)

data/app/views/renalware/events/events/toggled_cell/_swab.html.slim

@@ -1,6 +1,6 @@
 - document = event.document
 dl.dl-horizontal
   dt= attr_name(document, :location, suffix: ":")
-  dd= document.location.present? ? document.location : t("unspecified")
+  dd= document.location.presence || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
   dd== event.notes

data/app/views/renalware/hd/dashboards/_page_actions.html.slim

@@ -1,7 +1,10 @@
 = link_to(patient_hd_mdm_path(patient), class: "button with-icon secondary") do
   i.fas.fa-users
   = t(".mdm")
-= link_to(patient_hd_protocol_path(patient), class: "button with-icon secondary", target: "_blank") do
+= link_to(patient_hd_protocol_path(patient),
+         class: "button with-icon secondary",
+         target: "_blank",
+         rel: "noopener") do
   i.fas.fa-print
   = t(".protocol")
 

data/app/views/renalware/hd/mdm_patients/_patient.html.slim

@@ -4,7 +4,7 @@
 
 tr
   td.actions
-    = link_to view_proc.call(patient), target: "_blank" do
+    = link_to view_proc.call(patient), target: "_blank", rel: "noopener" do
       i.fa.fa-external-link-square-alt
       |   
       = t(".view")

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/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/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/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/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.161"
+    VERSION = "2.0.162"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.161
+  version: 2.0.162
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-18 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
@@ -1677,12 +1677,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
@@ -2573,12 +2575,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
@@ -3326,6 +3330,7 @@ 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/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
@@ -4078,6 +4083,7 @@ files:
 - 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