renalware-core 2.0.160 → 2.0.165

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/assets/stylesheets/renalware/partials/_tables.scss

@@ -409,6 +409,12 @@ table {
   }
 }
 
+tr.deleted {
+  td {
+    background-color: lighten($nhs-red, 53);
+  }
+}
+
 table.report {
   table-layout: auto;
 

data/app/components/renalware/medications/tabbed_prescriptions_list_component.html.slim

@@ -2,11 +2,11 @@ div(data-controller="tabs" data-tabs-active-tab="active")
   .tabs-container
     ul.list-reset.sub-nav
       - groups.each do |group|
-        li(data-target="tabs.tab" data-action="click->tabs#change")
+        li(data-tabs-target="tab" data-action="click->tabs#change")
           a(class="" href="#" data-trigger-masonry-refresh="true")= group.title
 
   - groups.each do |group|
-    .hidden(data-target="tabs.panel")
+    .hidden(data-tabs-target="panel")
       table.prescriptions-list
         thead
           tr

data/app/components/renalware/pathology/sparkline_component.html.slim

@@ -6,7 +6,7 @@
       / This is the stimulusjs version. See sparklines_controller.js
       div(data-controller="pathology-sparklines"
           data-pathology-sparklines-chart-data='[["2010-06-03T16:37:00.000+01:00","106"], ["2011-06-03T16:37:00.000+01:00","110"]]')
-        div(data-target="pathology-sparklines.chart")
+        div(data-pathology-sparklines-target="chart")
     - else
       / This implementation uses ChartKick to insert the chart javascript into the
       / page. It works fine, but when there are 50 path results on screen, we are

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -7,12 +7,12 @@
       .flex.justify-end
 
         .inline-flex
-          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-target="tabs.tab"
+          a.reset.opacity-50.bg-white.m-05.pt-px.pb-0.px-1(href="#" data-tabs-target="tab"
             data-action="click->tabs#change")
             svg.h-6.w-6.fill-current.text-black xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"
               path d="M1 4h2v2H1V4zm4 0h14v2H5V4zM1 9h2v2H1V9zm4 0h14v2H5V9zm-4 5h2v2H1v-2zm4 0h14v2H5v-2z"
 
-          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-target="tabs.tab" href="#"
+          a.reset.opacity-50.bg-white.m-0.pt-px.px-2(data-tabs-target="tab" href="#"
             data-action="click->tabs#change")
             svg.h-6.w-6.stroke-current.text-black viewBox="0 0 24 26"  stroke-width="3" stroke-linecap="round" stroke-linejoin="round"
               path d="M12 20V10M18 20V4M6 20v-4"
@@ -20,7 +20,7 @@
         = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
         = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
 
-    div#pet-results-table data-target="tabs.panel"
+    div#pet-results-table data-tabs-target="panel"
 
       = render "renalware/pd/pet_results/table",
                patient: patient,
@@ -28,7 +28,7 @@
                pagination: pagination,
                current_user: current_user
 
-    .chart.hidden.mt-5 data-target="tabs.panel"
+    .chart.hidden.mt-5 data-tabs-target="panel"
       div(style="display:block; position:relative; height: 400px; width: 100%; text-align: center; margin-bottom: 20px")
         #containerx(data-controller="pd-pet-chart"
                     data-pd-pet-chart-url=renalware.patient_pd_pet_results_path(patient, format: :json)

data/app/components/renalware/system/admin_menu_component.html.slim

@@ -24,6 +24,7 @@ ul.side-nav.side-nav--admin
   = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
   = super_admin_menu_item "OBX", renalware.pathology_observation_descriptions_path, %r{admin/pathology_observation_descriptions}
   = super_admin_menu_item "Pathology Code Groups", renalware.pathology_code_groups_path, %r{pathology/code_groups}
+  = super_admin_menu_item "Virology Vaccination Types", renalware.virology_vaccination_types_path, %r{virology/vaccination_types}
   = admin_menu_item "Mailshots", renalware.letters_mailshots_path, %r{letters/mailshots}
   = super_admin_menu_item "Playground", renalware.admin_playground_path, %r{admin/playground}
   = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path, %r{admin/123}

data/app/controllers/renalware/virology/vaccination_types_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationTypesController < BaseController
+      def index
+        types = VaccinationType.with_deleted.ordered
+        authorize types
+        render locals: { types: types }
+      end
+
+      def edit
+        type = find_and_authorise_type
+        render locals: { type: type }
+      end
+
+      def update
+        type = find_and_authorise_type
+        if type.update(type_params)
+          redirect_to virology_vaccination_types_path
+        else
+          render :edit, locals: { type: type }
+        end
+      end
+
+      def new
+        type = VaccinationType.new
+        authorize type
+        render locals: { type: type }
+      end
+
+      def create
+        type = VaccinationType.new(type_params)
+        authorize type
+        if type.save
+          redirect_to virology_vaccination_types_path
+        else
+          render :new, locals: { type: type }
+        end
+      end
+
+      def destroy
+        find_and_authorise_type.destroy!
+        redirect_to virology_vaccination_types_path
+      end
+
+      def sort
+        authorize VaccinationType, :sort?
+        ids = params[:virology_vaccination_type]
+        VaccinationType.sort(ids)
+        render json: ids
+      end
+
+      private
+
+      def find_and_authorise_type
+        VaccinationType.find(params[:id]).tap { |type| authorize type }
+      end
+
+      def type_params
+        params
+          .require("virology_vaccination_type")
+          .permit(:name, :code, :position)
+      end
+    end
+  end
+end

data/app/javascript/renalware/controllers/modal_controller.js

@@ -11,7 +11,7 @@
 //   <span>Open Modal</span>
 //  </a>
 //  <!-- Modal Container -->
-//  <div data-target="modal.container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
+//  <div data-modal-target="container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
 //    <!-- Modal Inner Container -->
 //    <div class="max-h-screen w-full max-w-lg relative">
 //      <!-- Modal Card -->

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/models/renalware/virology/vaccination.rb

@@ -17,12 +17,20 @@ module Renalware
       end
 
       class Document < Document::Embedded
-        attribute :type, ::Document::Enum # See i18n for options
+        attribute :type # This used to be a ::Document::Enum but now we load options from the db
         attribute :drug, String
         validates :type, presence: true
 
         def to_s
-          [type&.text, drug].reject(&:blank?).join(" - ")
+          [type_name, drug].reject(&:blank?).join(" - ")
+        end
+
+        # Try and find the proper name for the vaccination type - we only store the vaccination
+        # type code in the jsonb document. If no match found just display the code eg 'hbv_booster'.
+        # The Type mighjt have been deleted (has a deleted_at date) but we still want to display the
+        # actual name depite this, we include deleted rows when searching.
+        def type_name
+          VaccinationType.with_deleted.find_by(code: type)&.name || type
         end
       end
       has_document

data/app/models/renalware/virology/vaccination_type.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationType < ApplicationRecord
+      include Sortable
+
+      class UniquenessIncludingDeletedValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          return unless record.send(:"#{attribute}_changed?")
+
+          if record.class.with_deleted.exists?(attribute => value)
+            record.errors.add attribute, (options[:message] || "already used")
+          end
+        end
+      end
+      validates :name, presence: true, uniqueness_including_deleted: true
+      validates :code, presence: true, uniqueness_including_deleted: true
+      before_create :underscore_code
+
+      acts_as_paranoid
+
+      scope :ordered, -> { order(deleted_at: :desc, position: :asc, name: :asc) }
+
+      def self.policy_class
+        BasePolicy
+      end
+
+      def underscore_code
+        return if code.blank?
+
+        self.code = code.downcase.tr("  ", " ").tr(" ", "_")
+      end
+    end
+  end
+end

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/admin/playgrounds/show.html.slim

@@ -34,7 +34,7 @@ css:
                             url: pathology_chart_data_admin_playground_path,
                             wrapper: nil,
                             method: :get,
-                            data: { target: "charts.form", action: "ajax:success->charts#redisplay" }) do |f|
+                            data: { "charts-target" => "form", action: "ajax:success->charts#redisplay" }) do |f|
 
             = f.input :patient_id,
                       collection: [[form.patient_id, form.patient_id]],
@@ -52,7 +52,7 @@ css:
                       include_blank: false
             = f.submit "Refresh", class: :button
 
-      #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+      #chart1 style="height: 300px; width: 500px" data-charts-target="chart"
 
     / To test tailwindcss
     .max-w-sm.rounded.overflow-hidden.shadow-lg  

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")