renalware-core 2.0.148 → 2.0.149

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

@@ -9,11 +9,10 @@ module Renalware
       pattr_initialize [
         :patient!,
         :dir!,
-        :request_uuid!,
         :schema!,
         :changes_since,
         :logger,
-        :batch_number,
+        :batch,
         :renderer, # so we can pass a test renderer to bypass real rendering
         :log,
         :force_send
@@ -24,7 +23,7 @@ module Renalware
       # send. This is primarily for debugging and testing phases with UKRDC
       def call
         update_patient_to_indicated_we_checked_them_for_any_relevant_changes
-        UKRDC::TransmissionLog.with_logging(patient, request_uuid) do |log|
+        UKRDC::TransmissionLog.with_logging(patient: patient, batch: batch) do |log|
           @log = log
           logger.info "  Patient #{patient.ukrdc_external_id}"
           xml_payload = build_payload(log)
@@ -117,7 +116,7 @@ module Renalware
       end
 
       def xml_filepath
-        xml_filename = Filename.new(patient: patient, batch_number: batch_number).to_s
+        xml_filename = Filename.new(patient: patient, batch_number: batch.number).to_s
         File.join(dir, xml_filename)
       end
 

data/app/models/renalware/ukrdc/housekeeping/remove_old_export_archive_folders.rb

@@ -8,7 +8,7 @@ module Renalware
     module Housekeeping
       # Responsible for cleaning up old archive folders that are created each time the
       # ukrdc:export task has run. Each archive folder's name has a batch number in it which is the
-      # id of the UKRDC::BatchNumber model created at the start of each export. We can find the
+      # id of the UKRDC::Batch model created at the start of each export. We can find the
       # folders to remove by extracting the batch number from the folder name and deleting the
       # folder if that batch is no longer 'recent'.
       # Called from a housekeeping rake task.
@@ -64,12 +64,12 @@ module Renalware
           Renalware.config.ukrdc_number_of_archived_folders_to_keep.to_i
         end
 
-        # Returns the ids of a few of the most recent BatchNumbers rows (ie the batch number) that
+        # Returns the ids of a few of the most recent Batch rows (ie the batch number) that
         # we should not delete - these being the most recent ones we want to stick around in case we
         # need to inspect what was sent.
         def batch_numbers_to_keep
           @batch_numbers_to_keep ||= begin
-            BatchNumber
+            Batch
               .limit(number_of_archived_folders_to_keep)
               .order(created_at: :desc)
               .pluck(:id)

data/app/models/renalware/ukrdc/housekeeping/remove_stale_files.rb

@@ -53,11 +53,11 @@ module Renalware
           Renalware.config.ukrdc_number_of_archived_folders_to_keep.to_i
         end
 
-        # Returns the ids of a few of the most recent BatchNumbers rows (ie the batch number) that
+        # Returns the ids of a few of the most recent Batch rows (ie the batch number) that
         # we should not delete - these being the most recent ones
         def batch_numbers_to_keep
           @batch_numbers_to_keep ||= begin
-            BatchNumber
+            Batch
               .limit(number_of_batches_to_keep)
               .order(created_at: :desc)
               .pluck(:id)

data/app/models/renalware/ukrdc/incoming/import_surveys.rb

@@ -23,7 +23,6 @@ module Renalware
               FileUtils.mv filepath, paths.archive.join(filepath.basename)
               next
             end
-
             logger.info "Processing: #{filepath}"
             import_surveys_from_file(filepath)
           end
@@ -49,7 +48,7 @@ module Renalware
         def import_surveys_from_file(file)
           # Important to create the log before we do anything that might cause an error
           # eg parse the xml etc.
-          TransmissionLog.with_logging(nil, batch_uuid, log_options(file)) do |log|
+          TransmissionLog.with_logging(request_uuid: batch_uuid, **log_options(file)) do |log|
             doc = XmlDocument.new(file)
             patient = find_patient(doc.nhs_number)
             log.update!(patient_id: patient.id)

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

@@ -17,12 +17,13 @@ module Renalware
       }
       enum direction: { out: 0, in: 1 }
       scope :ordered, -> { order(sent_at: :asc) }
+      belongs_to :batch
 
-      def self.with_logging(patient, request_uuid, **options)
+      def self.with_logging(patient: nil, batch: nil, **options)
         log = new(
           patient: patient,
           sent_at: Time.zone.now,
-          request_uuid: request_uuid,
+          batch: batch,
           **options)
         yield log if block_given?
         log.save!

data/app/presenters/renalware/user_session_presenter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+module Renalware
+  class UserSessionPresenter
+    # Returns a hash to be splatted into the body attributes in a layout e.g. application.html.slim
+    # e.g.
+    #
+    #  body(class="..." *Renalware::UserSessionPresenter.session_controller_data_attributes)
+    #
+    # renders:
+    #
+    # <body class="..."
+    #       data-controller="session"
+    #       data-session-check-alive-path="/check_session_expired"
+    #       data-session-debug="true"
+    #       data-session-keep-alive-path="/keep_session_alive"
+    #       data-session-login-path="/users/sign_in"
+    #       data-session-polling-interval="60"
+    #       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: {
+          controller: "session",
+          session: {
+            "login-path": urls.new_user_session_path,
+            "check-alive-path": urls.check_session_expired_path,
+            "keep-alive-path": urls.keep_session_alive_path,
+            debug: Rails.env.development?.to_s,
+            "register-user-activity-after":
+              Renalware.config.session_register_user_user_activity_after.to_i,
+            timeout: ::Devise.timeout_in
+          }
+        }
+      }
+    end
+  end
+  # rubocop:enable Metrics/MethodLength
+end

data/app/views/renalware/admissions/consults/_form.html.slim

@@ -8,7 +8,7 @@
   / selected yet) otherwise it will display the selected patient who will always be
   / at option index 1.
   = f.input :patient_id,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             collection: [[consult.patient&.to_s(:long), consult.patient&.id]],
             selected: 1,
             input_html: { \
@@ -19,38 +19,39 @@
 
   = f.input :consult_site_id,
             collection: Renalware::Admissions::ConsultSite.all,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             include_blank: "Select local site (or enter other site below)",
             label: "Site"
 
   = ward_dropdown_grouped_by_hospital_unit(f,
     :hospital_ward_id,
-    include_blank: "Select local ward (or enter other ward below)")
+    include_blank: "Select local ward (or enter other ward below)",
+    wrapper: :hz_md)
 
-  = f.input :other_site_or_ward, wrapper: :horizontal_medium
-  = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :e_alert
+  = f.input :other_site_or_ward, wrapper: :hz_md
+  = f.input :started_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :e_alert, wrapper: :hz_md
   = f.association(:specialty,
-                  wrapper: :horizontal_medium,
+                  wrapper: :hz_md,
                   collection: Renalware::Admissions::Specialty.ordered)
-  = f.input :consult_type, wrapper: :horizontal_medium
-  = f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small
+  = f.input :consult_type, wrapper: :hz_md
+  = f.input :decided_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :transfer_priority, include_blank: false, wrapper: :hz_sm
   = f.input :priority,
             include_blank: true,
             collection: Renalware::Admissions::Consult::PRIORITY_VALUES,
-            wrapper: :horizontal_tiny
-  = f.input :transferred_on, as: :date_picker, wrapper: :horizontal_datepicker
+            wrapper: :hz_xs
+  = f.input :transferred_on, as: :date_picker, wrapper: :hz_datepicker
   = f.association :seen_by,
                   as: :user_picker,
                   collection: Renalware::User.ordered,
-                  wrapper: :horizontal_medium
-  = f.input :contact_number, wrapper: :horizontal_medium
+                  wrapper: :hz_md
+  = f.input :contact_number, wrapper: :hz_md
 
-  = f.input :aki_risk, include_blank: "Please select", wrapper: :horizontal_small
-  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :rrt, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :description, wrapper: :horizontal_large, input_html: { rows: 10 }
+  = f.input :aki_risk, include_blank: "Please select", wrapper: :hz_sm
+  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :rrt, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :description, wrapper: :hz_lg, input_html: { rows: 10 }
 
   = f.submit class: :button
   '  or

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

@@ -44,7 +44,7 @@
                       }
 
         .recorded-on
-          = fpa.input :recorded_on, as: :date_picker, wrapper: :hz_tiny, input_html: { autocomplete: "off" }
+          = fpa.input :recorded_on, as: :date_picker, wrapper: :hz_xs, input_html: { autocomplete: "off" }
 
         .notes(style="display: block")
           = fpa.label :notes

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

@@ -15,7 +15,7 @@ tbody(class=(administration.authorised? ? "authorised" : "unauthorised"))
           i.fa.fa-check-circle
         - else
           = link_to "Sign-off",
-                    edit_hd_prescription_administration_witness_path(administration),
+                    edit_hd_prescription_administration_witness_path(administration, format: :html),
                     data: { "reveal-id" => "hd-prescription-administration-modal", "reveal-ajax" => "true" }
     td.col-width-medium-with-ellipsis.show-for-large-up= administration.notes
   tr

data/app/views/renalware/hd/prescription_administrations/new.js.erb

@@ -1,5 +1,5 @@
 // Render this to re-display the form with errors after an unsuccessful save
 var modal = $("#hd-prescription-administration-modal")
 $(modal).html("<%=
-  j(render 'form', prescription_administration: prescription_administration, url: hd_prescription_administrations_path)
+  j(render 'form', prescription_administration: prescription_administration, url: hd_prescription_administrations_path, format: :html)
 %>");

data/app/views/renalware/hd/protocols/_protocol.pdf.slim

@@ -3,42 +3,43 @@
 - content_for(:head) do
   = wicked_pdf_stylesheet_link_tag "renalware/protocol_pdf"
 
-- protocol.with_format("html") do
-  .protocol
-    = render "renalware/patients/header", patient: protocol.patient
-    table.protocol-patient-summary
-      thead
-        tr
-          th.protocol-hd-profile HD Profile
-          th.protocol-allergies
-            | Allergies
-            - if clinical_patient.allergy_status_updated_at
-              span.allergy_status_updated_at
-                = " #{l(clinical_patient.allergy_status_updated_at&.to_date)}"
-          th.protocol-prescriptions Prescriptions on HD
-          th.protocol-recent-pathology Recent Pathology
-      tbody
-        tr
-          td
-            = render "profile", profile: protocol.profile
-          td
-            = render "allergies", patient: protocol.patient
-            = render "virology", protocol: protocol
-          td
-            = render "prescriptions", prescriptions: protocol.prescriptions
-          td
-            = render "recent_pathology", recent_pathology: protocol.recent_pathology
-            = render "latest_dry_weight", latest_dry_weight: protocol.latest_dry_weight
+  /- protocol.with_format("html") do
+.protocol
+  = render "renalware/patients/header", patient: protocol.patient, formats: :html
+  table.protocol-patient-summary
+    thead
+      tr
+        th.protocol-hd-profile HD Profile
+        th.protocol-allergies
+          | Allergies
+          - if clinical_patient.allergy_status_updated_at
+            span.allergy_status_updated_at
+              = " #{l(clinical_patient.allergy_status_updated_at&.to_date)}"
+        th.protocol-prescriptions Prescriptions on HD
+        th.protocol-recent-pathology Recent Pathology
+    tbody
+      tr
+        td
+          = render "profile", profile: protocol.profile, formats: :html
+        td
+          = render "allergies", patient: protocol.patient, formats: :html
+          = render "virology", protocol: protocol, formats: :html
+        td
+          = render "prescriptions", prescriptions: protocol.prescriptions, formats: :html
+        td
+          = render "recent_pathology", recent_pathology: protocol.recent_pathology, formats: :html
+          = render "latest_dry_weight", latest_dry_weight: protocol.latest_dry_weight, formats: :html
 
-    .row.collapse
-      .small-12.columns
-        table.auto-layout.protocol-sessions
-          = render "renalware/hd/sessions/thead"
-          tbody
-            - 1..3.times do
-              = render "renalware/hd/sessions/empty_row"
-            - protocol.sessions.each_with_index do |session, index|
-              - stripe_class = index % 2 == 0 ? "even" : "odd"
-              = render "renalware/hd/sessions/row",
-                       session: session,
-                       stripe_class: stripe_class
+  .row.collapse
+    .small-12.columns
+      table.auto-layout.protocol-sessions
+        = render "renalware/hd/sessions/thead", formats: :html
+        tbody
+          - 1..3.times do
+            = render "renalware/hd/sessions/empty_row", formats: :html
+          - protocol.sessions.each_with_index do |session, index|
+            - stripe_class = index % 2 == 0 ? "even" : "odd"
+            = render "renalware/hd/sessions/row",
+                      session: session,
+                      stripe_class: stripe_class,
+                      formats: :html

data/app/views/renalware/hd/scheduling/diary_slots/_slot.html.slim

@@ -17,5 +17,6 @@ td*{ "data-slot-id" => slot.id.present? && slot.id,
               new_hd_scheduling_diary_slot_path(diary_id: slot.diary_id,
                                      station_id: slot.station_id,
                                      diurnal_period_code_id: slot.diurnal_period_code_id,
-                                     day_of_week: slot.day_of_week),
+                                     day_of_week: slot.day_of_week,
+                                     format: :html),
               data: { "reveal-id" => "add-patient-to-diary-modal", "reveal-ajax" => "true" }

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

@@ -32,10 +32,10 @@
       = f.input :user_id,
                 as: :user_picker,
                 collection: Renalware::User.ordered,
-                wrapper: :hz_small
+                wrapper: :hz_sm
       = f.input :password,
                 as: :password,
-                wrapper: :hz_small
+                wrapper: :hz_sm
 
     .modal__footer
       .right

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

@@ -6,5 +6,5 @@
   td= contact.notes
   td
     = link_to("Edit",
-                edit_patient_letters_contact_path(patient, contact),
+                edit_patient_letters_contact_path(patient, contact, format: :html),
                 data: { "reveal-id" => "edit-patient-contact-modal", "reveal-ajax" => "true" })

data/app/views/renalware/letters/letters/index.html.slim

@@ -4,3 +4,7 @@
 
 = within_patient_layout(title: "Letters") do
   = render "table", letters: letters, patient: patient
+
+  / If the host app has a views/renalware/letters/_legacy_letters.html.slim partial
+  / then render it - provides a way for the host app a change to augment this page.
+  = render_if_exists "legacy_letters", patient: patient

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

@@ -14,7 +14,7 @@
   | 
 
   / link to open the modal
-  = link_to new_patient_medications_home_delivery_event_path(patient),
+  = link_to new_patient_medications_home_delivery_event_path(patient, format: :html),
             class: "button secondary with-icon",
             data: { "reveal-id" => "print-home-delivery-drugs-modal", "reveal-ajax" => "true" } do
     i.fa.fa-print

data/app/views/renalware/navigation/_sign_out.html.slim

@@ -1,2 +1,6 @@
 li
-  = link_to "Log out", destroy_user_session_path, class: "right", method: :delete
+  = link_to "Log out",
+            destroy_user_session_path,
+            class: "right",
+            method: :delete,
+            data: { action: "click->session#sendLogoutMessageToAnyOpenTabs" }

data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim

@@ -10,7 +10,7 @@ article
                         confirm: "Are you sure you want to remove the patient's GP and practice?" }
 
     = link_to "Change",
-              edit_patient_primary_care_physician_path(patient),
+              edit_patient_primary_care_physician_path(patient, format: :html),
               class: "button change-gp",
               data: { "reveal-id" => "change-gp-modal", "reveal-ajax" => "true" }
 

data/app/views/renalware/transplants/wait_lists/show.html.slim

@@ -11,7 +11,7 @@
           .small-10.columns
             = f.input :ukt_recipient_number,
                       class: "radius",
-                      wrapper: :hz_large,
+                      wrapper: :hz_lg,
                       label: "UKT recipient number"
           .small-2.columns
             = button_tag(type: "submit",

data/config/initializers/paper_trail.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-PaperTrail.config.track_associations = false
+# PaperTrail.config.track_associations = false

data/config/initializers/simple_form_wrappers.rb

@@ -2,13 +2,6 @@
 
 SimpleForm.setup do |config|
   def configure_label(b)
-    b.use :html5
-    b.use :placeholder
-    b.optional :maxlength
-    b.optional :pattern
-    b.optional :min_max
-    b.optional :readonly
-
     b.wrapper :label_wrapper, tag: :div, class: "wrapper__label" do |ba|
       ba.use :label
     end
@@ -24,14 +17,20 @@ SimpleForm.setup do |config|
 
   # Configure various sized wrappers. We use CSS to style the label and inputs within the top div
   # with classes of e.g. "row wrapper-medium"
-  %i(tiny small medium large).each do |size|
+  %i(xs sm md lg).each do |size|
     config.wrappers(
-      :"hz_#{size}", # eg hz_medium
+      :"hz_#{size}", # eg hz_md
       tag: "div",
       class: "row wrapper wrapper_style_horizontal wrapper_size_#{size}",
       hint_class: :field_with_hint,
       error_class: :error
     ) do |b|
+      b.use :html5
+      b.use :placeholder
+      b.optional :maxlength
+      b.optional :pattern
+      b.optional :min_max
+      b.optional :readonly
       configure_label(b)
       configure_input(b)
     end
@@ -44,6 +43,12 @@ SimpleForm.setup do |config|
     hint_class: :field_with_hint,
     error_class: :error
   ) do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
     configure_label(b)
 
     b.wrapper :right_input_wrapper, tag: :div, class: "wrapper__input" do |ba|