renalware-core 2.0.157 → 2.0.162

data/app/models/renalware/ukrdc/treatment_timeline/hd/generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
-require "attr_extras"
+
 # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/pd/generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/pd/regime_decorator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/transfer_out/generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 
 # QBL   TXT   Description
 # "20"  "20"  "Transplant ; Cadaver donor"

data/app/models/renalware/ukrdc/xml_renderer.rb

@@ -9,11 +9,11 @@ module Renalware
       DEFAULT_TEMPLATE = "/renalware/api/ukrdc/patients/show"
       attr_reader :template, :errors, :locals, :schema
 
-      class Success < Renalware::Success
+      class Success < ::Success
         alias xml object
       end
 
-      class Failure < Renalware::Failure
+      class Failure < ::Failure
         alias validation_errors object
       end
 

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

@@ -17,8 +17,21 @@ 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_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
     end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationType < ApplicationRecord
+      validates :name, presence: true, uniqueness: true
+      validates :code, presence: true, uniqueness: true
+
+      acts_as_paranoid
+
+      scope :ordered, -> { order(position: :asc, name: :asc) }
+    end
+  end
+end

data/app/presenters/renalware/accesses/dashboard_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/accesses"
-require "attr_extras"
 
 module Renalware
   module Accesses

data/app/presenters/renalware/clinical/header_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware"
-require "attr_extras"
 
 module Renalware
   module Clinical

data/app/presenters/renalware/letters/letter_presenter.rb

@@ -83,7 +83,7 @@ module Renalware
         if archived?
           archive.content
         else
-          @content ||= HTMLRenderer.new.call(self)
+          @content ||= HtmlRenderer.new.call(self)
         end
       end
 

data/app/presenters/renalware/letters/part_class_filter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/presenters/renalware/letters/practice_email_meta_data.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

data/app/presenters/renalware/low_clearance/dashboard_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/low_clearance"
-require "attr_extras"
 
 module Renalware
   module LowClearance

data/app/presenters/renalware/medications/prescription_presenter.rb

@@ -47,6 +47,13 @@ module Renalware
         ].compact.join(" - ")
       end
 
+      def provider_suffix
+        case __getobj__.provider&.to_s
+        when "gp" then "GP"
+        when "hospital", "home_delivery" then "HOSP"
+        end
+      end
+
       private
 
       def translated_dose_unit

data/app/presenters/renalware/pathology/observations_diff.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
 require_dependency "renalware/pathology"
 
 # Compares two hashes of pathology observations (OBXs).

data/app/presenters/renalware/renal/clinical_summary_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/renal"
-require "attr_extras"
 
 module Renalware
   module Renal

data/app/presenters/renalware/summary_part.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   # A base class for Summary presenters in other name-spaces. SummaryParts can be composed into
   # reporting dashboards or summary pages. The Clinical Summary for instance comprises an array

data/app/presenters/renalware/transplants/donor_dashboard_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module Transplants

data/app/presenters/renalware/transplants/recipient_dashboard_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module Transplants

data/app/presenters/renalware/ukrdc/transplant_operation_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module UKRDC

data/app/presenters/renalware/user_session_presenter.rb

@@ -21,8 +21,6 @@ module Renalware
     #       data-session-timeout="3600">
     # rubocop:disable Metrics/MethodLength
     def self.session_controller_data_attributes
-      return {} if Renalware.config.session_expiry_use_previous_mechansim
-
       urls = Renalware::Engine.routes.url_helpers
       {
         data: {
@@ -39,6 +37,6 @@ module Renalware
         }
       }
     end
+    # rubocop:enable Metrics/MethodLength
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/app/values/renalware/bmi.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   # Value object representing Body Mass Index. Accepts only meters and kg
   #

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

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/letters/contacts/_new_person.html.slim

@@ -10,7 +10,7 @@
                   class: "button secondary",
                   data: { behaviour: "toggle-section" }
       .right
-        = f.submit t(".save"), class: "button"
+        = f.submit t(".save"), class: "button", data: { disable_with: false }
         '  or
         = link_to t(".cancel"),
                "#",

data/app/views/renalware/letters/contacts/_person_from_directory.html.slim

@@ -16,7 +16,7 @@
   .row
     .large-12.columns
       br
-      = f.submit t(".save"), class: "button"
+      = f.submit t(".save"), class: "button", data: { disable_with: false }
       '  or
       = link_to t(".cancel"),
                "#",

data/app/views/renalware/letters/formatted_letters/_letter.html.slim

@@ -4,6 +4,10 @@ scss:
     font-family: Helvetica, Arial;
   }
 
+  .subtitle {
+    font-size: .9rem;
+  }
+
   .addressee {
     width: 50%;
     float: left;
@@ -153,12 +157,11 @@ scss:
     }
 
     .allergies {
-      margin-bottom: 1rem;
       float: left;
       clear: left;
       width: 50%;
 
-      h3 {
+      h3, b {
         padding-right: 1rem;
       }
 
@@ -221,10 +224,9 @@ scss:
     }
 
     .message {
-      margin-top: 30px;
-      margin-bottom: 20px;
+      margin-top: 20px;
+      margin-bottom: 0px;
       clear: both;
-
       p {
         margin-bottom: 15px;
       }
@@ -235,9 +237,6 @@ scss:
     }
 
     .author-signature {
-      .author-name {
-        font-weight: bold;
-      }
       margin-bottom: 20px;
     }
   }
@@ -320,10 +319,10 @@ scss:
       p= render "patient_summary", patient: letter.patient
 
     = render letter.parts, patient: letter.patient, letter: letter
-
-    .message
-      = letter.body&.html_safe
-
+    / empty small here is for RTF spacing
+    small  
+    .message= letter.body&.html_safe
+    br
     p Yours sincerely
 
     .signature.nobreak
@@ -332,7 +331,7 @@ scss:
 
       .author-signature
         p
-          span.author-name= letter.author.signature
+          b= letter.author.signature
           br
           = letter.author.professional_position
 
@@ -340,7 +339,7 @@ scss:
 
   .footer
     .ccs
-      h3 cc:
+      b cc:
 
       ul.electronic
         - letter.electronic_cc_recipients.each do |user|