renalware-core 2.0.111 → 2.0.112

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+require "attr_extras"
+
+module Renalware
+  module UKRDC
+    module Incoming
+      class ImportSurveys
+        pattr_initialize [:paths, :logger]
+        attr_reader :batch_uuid
+
+        def initialize(paths: nil, logger: nil)
+          @paths = paths || Renalware::UKRDC::Incoming::Paths.new
+          @logger = logger || Rails.logger
+          @batch_uuid = SecureRandom.uuid # to group logging output
+        end
+
+        def call
+          Incoming::FileList.new(paths: paths).each_file do |filepath|
+            import_surveys_from_file(filepath)
+          end
+        rescue StandardError => e
+          Renalware::Engine.exception_notifier.notify(e)
+          raise e
+        end
+
+        private
+
+        # Import all surverys (they will be for the same patient) in the XML file.
+        # Note that #with_logging yields a block that will catch and save any error to
+        # ukrdc_transmission_logs
+        # rubocop:disable Lint/HandleExceptions, Metrics/AbcSize
+        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|
+            doc = XmlDocument.new(file)
+            patient = find_patient(doc.nhs_number)
+            log.update!(patient_id: patient.id)
+            doc.surveys.each do |survey_hash|
+              import_survey(survey_hash, patient)
+            end
+            log.update!(status: :imported)
+          end
+        rescue StandardError
+          # noop - errors have been logged inside with_logging
+        ensure
+          FileUtils.mv file, paths.archive.join(file.basename)
+        end
+        # rubocop:enable Lint/HandleExceptions, Metrics/AbcSize
+
+        def import_survey(survey_hash, patient)
+          ImportSurvey.new(
+            patient: patient,
+            survey_hash: survey_hash
+          ).call
+        end
+
+        def find_patient(nhs_number)
+          Renalware::Patient.find_by!(nhs_number: nhs_number)
+        end
+
+        # rubocop:disable Style/RescueModifier
+        def log_options(file)
+          {
+            status: :undefined,
+            file_path: file.to_s,
+            direction: :in,
+            payload: (File.read(file) rescue nil)
+          }
+        end
+        # rubocop:enable Style/RescueModifier
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+
+module Renalware
+  module UKRDC
+    module Incoming
+      class Paths
+        def initialize
+          FileUtils.mkdir_p incoming
+          FileUtils.mkdir_p archive
+        end
+
+        def incoming
+          @incoming ||= working_path.join("incoming")
+        end
+
+        def archive
+          @archive ||= working_path.join("archive", "incoming")
+        end
+
+        private
+
+        def working_path
+          Pathname(Renalware.config.ukrdc_working_path)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+require "attr_extras"
+
+module Renalware
+  module UKRDC
+    module Incoming
+      # Encapsulates the structure of the UKRDC XML Document.
+      # Assumes one patient per file.
+      class XmlDocument
+        XPATHS = {
+          dob: "string(Patient[1]/BirthTime)",
+          family_name: "string(Patient[1]/Names[1]/Name/Family)",
+          nhs_number: <<-XPATH.squish
+            string(
+              Patient[1]/
+                PatientNumbers/
+                  PatientNumber[Organization[text()='NHS']][NumberType[text()='MRN']][1]/
+                    Number
+            )
+          XPATH
+        }.freeze
+
+        attr_reader :root
+
+        def initialize(file)
+          xml_document = File.open(file) { |f| Nokogiri::XML(f) }
+          @root = xml_document.root
+        end
+
+        # Accessing eg XmlDocument.new(file).nhs_number will search the document with looked-up
+        # entry in the XPATHS constant, to save us having to write attributes for the things we
+        # need.
+        def method_missing(method_name, *_args, &_block)
+          xpath = XPATHS[method_name]
+          return root.xpath(xpath) if xpath
+
+          super
+        end
+
+        def respond_to_missing?(method_name, *_args)
+          XPATHS.key?(method_name)
+        end
+
+        # Turn the surveys XML into a hash becuase it is easier to consume
+        def surveys
+          root.xpath("Surveys/Survey").each_with_object([]) do |survey_node, arr|
+            hash = {}
+            hash[:code] = survey_node.xpath("string(SurveyType/Code)")
+            hash[:time] = survey_node.xpath("string(SurveyTime)")
+            hash[:responses] = question_hash_from(survey_node)
+            arr << hash
+          end
+        end
+
+        def question_hash_from(survey_node)
+          question_nodes = survey_node.xpath("Questions/Question")
+          question_nodes.each_with_object({}) do |question_node, responses|
+            code = question_node.xpath("string(QuestionType/Code)")
+            response = question_node.xpath("string(Response)")
+            responses[code] = response
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,22 @@ module Renalware
       validates :sent_at, presence: true
       validates :status, presence: true
       belongs_to :patient, class_name: "Renalware::Patient"
-      enum status: { undefined: 0, error: 1, unsent_no_change_since_last_send: 2, sent: 3 }
+      enum status: {
+        undefined: 0,
+        error: 1,
+        unsent_no_change_since_last_send: 2,
+        sent: 3,
+        imported: 4
+      }
+      enum direction: [:out, :in]
       scope :ordered, -> { order(sent_at: :asc) }
 
-      def self.with_logging(patient, request_uuid)
-        log = new(patient: patient, sent_at: Time.zone.now, request_uuid: request_uuid)
+      def self.with_logging(patient, request_uuid, **options)
+        log = new(
+          patient: patient,
+          sent_at: Time.zone.now,
+          request_uuid: request_uuid,
+          **options)
         yield log if block_given?
         log.save!
       rescue StandardError => e

data/app/policies/renalware/hd/session_forms/batch_policy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    module SessionForms
+      class BatchPolicy < BasePolicy
+        def status?
+          show?
+        end
+      end
+    end
+  end
+end

data/app/policies/renalware/surveys/survey_policy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/surveys"
+
+module Renalware
+  module Surveys
+    class SurveyPolicy < BasePolicy
+    end
+  end
+end

data/app/presenters/renalware/hd/session_presenter.rb

@@ -100,7 +100,7 @@ module Renalware
         when ::Float then (post - pre).round(1)
         when ::Integer then (post - pre)
         end
-      rescue StandardError => e
+      rescue StandardError
         nil
       end
 

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -6,7 +6,7 @@
         method: :get do |f|
       .row
         .medium-3.large-2.columns
-          = f.input :starts_at_eq, as: :date_picker, label: "Date"
+          = f.input :starts_on_eq, as: :date_picker, label: "Date"
         .medium-3.large-3.columns
           = f.input :clinic_id_eq, collection: clinics, label: "Clinic"
         .medium-3.large-3.columns
@@ -40,21 +40,32 @@
             |
             = link_to "(Uncheck all)", "#", id: "uncheck_all_appointments_link"
           th.col-width-medium-ish
-          th.col-width-date
-            = sort_link([:renalware, query], :starts_at, "Date", default_order: :asc)
-          th.col-width-time
-            = sort_link([:renalware, query], :start_time, "Time", default_order: :asc)
+          th.col-width-date-time
+            = sort_link([:renalware, query], :starts_at, "Date and Time", default_order: :asc)
           th.col-width-medium
-            = sort_link([:renalware, query], :patient_family_name, "Patient", default_order: :asc)
+            = sort_link([:renalware, query],
+                        :patient_family_name,
+                        [:patient_family_name, "starts_at asc"],
+                        "Patient",
+                        default_order: :asc)
           th.col-width-tiny Sex
           th.col-width-tiny Age
-          th.col-width-small
+          th.col-width-medium
             = sort_link([:renalware, query],
                        :patient_current_modality_description_name,
+                       [:patient_current_modality_description_name, "starts_at asc"],
                        "Modality",
                        default_order: :asc)
-          th= sort_link([:renalware, query], :clinic_name, "Clinic", default_order: :asc)
-          th= sort_link([:renalware, query], :user_family_name, "Consultant", default_order: :asc)
+          th= sort_link([:renalware, query],
+                        :clinic_name,
+                        [:clinic_name, "starts_at asc"],
+                        "Clinic",
+                        default_order: :asc)
+          th= sort_link([:renalware, query],
+                        :consultant_name,
+                        [:consultant_name, "starts_at asc"],
+                        "Consultant",
+                        default_order: :asc)
           th.show-for-large-up Outcome notes
           th.show-for-large-up DNA notes
 
@@ -77,8 +88,8 @@
                   i.fas.fa-pencil-alt
                   = " Create Clinic Visit"
 
-            td= I18n.l appointment.starts_on
-            td= appointment.start_time
+            td= I18n.l appointment.starts_at
+            /td= appointment.start_time
             td= default_patient_link(appointment.patient)
             td= appointment.patient.sex.code
             td= appointment.patient.age

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

@@ -1,7 +1,7 @@
 = 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") do
+= link_to(patient_hd_protocol_path(patient), class: "button with-icon secondary", target: "_blank") do
   i.fas.fa-print
   = t(".protocol")
 a.button.dropdown.with-icon(href="#"

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

@@ -87,9 +87,6 @@ javascript:
 
     function resizeSelect2ToFitModalWidth(container) {
       $('.select2', container).css('width', "100%");
-      $('#tabs').on('tabsactivate', function(event, ui) {
-        $('.select2').css('width', "100%");
-      });
     }
 
     function refreshSelect2s(change_type) {

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

@@ -28,3 +28,14 @@
       = f.submit t("helpers.submit.filter"), class: "button", name: nil
       span= " or "
       = link_to t("helpers.reset"), filter_form.url
+
+- if Renalware.config.batch_printing_enabled
+  = simple_form_for batch_print_form,
+                    as: :batch,
+                    url: hd_session_forms_batches_path,
+                    method: :post,
+                    remote: true do |f|
+        = f.input :patient_ids, as: :hidden
+        = f.submit "Batch Print #{presenter.patients.total_count} HD Session Forms",
+                  class: "button",
+                  disabled: presenter.patients.none?

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

@@ -1,5 +1,11 @@
+/ = content_for(:actions) do
+/   = render "page_actions", presenter: presenter, form: filter_form
+
 = content_for(:filters) do
-  = render_if_exists "filters", presenter: presenter, filter_form: filter_form
+  = render "filters",
+           presenter: presenter,
+           filter_form: filter_form,
+           batch_print_form: batch_print_form
 
 = content_for(:tabs) do
   = render_if_exists "tabs", presenter: presenter
@@ -7,3 +13,5 @@
 = within_admin_layout(title: presenter.page_title)
   = render "table", presenter: presenter
   = paginate presenter.patients
+
+  #hd-session-form-batch-print-modal.reveal-modal.small(data-reveal)

data/app/views/renalware/hd/protocols/{show.pdf.slim → _protocol.pdf.slim}

@@ -37,15 +37,9 @@
           = render "renalware/hd/sessions/thead"
           tbody
             - 1..3.times do
-              = render "renalware/hd/sessions/empty_row", session: session
+              = 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
-
-.page-break
-
-- protocol.with_format("html") do
-  .protocol
-    h2 Acute observations

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

@@ -0,0 +1,4 @@
+- protocols.each_with_index do |protocol, index|
+  = render "protocol", protocol: protocol
+  - if (index + 1) < protocols.size
+    .page-break

data/app/views/renalware/hd/session_forms/batches/_create.html.slim

@@ -0,0 +1,25 @@
+.modal
+  .modal__header
+    h1= "Compiling #{batch.batch_items_count} HD Session Forms"
+    .percent_complete
+  .modal__body
+    .content
+      .batch_results_container
+        .preparing
+          = image_tag("renalware/loading-gears-animation.gif", height: "116")
+
+        .generated-batch-print-pdf-container(style="display:none")
+          = link_to hd_session_forms_batch_path(batch, format: :pdf),
+                    target: "_blank",
+                    class: "print-batch-letter" do
+            i.far.fa-check-circle
+            | Open PDF in a new tab
+
+  .modal__footer
+    .left
+      = "##{batch.id}"
+    .right
+      = link_to "Cancel",
+        "#",
+        "aria-label" => "Close",
+        class: "reveal-modal-close cancel-link"

data/app/views/renalware/hd/session_forms/batches/create.js.erb

@@ -0,0 +1,3 @@
+<%= refresh("#hd-session-form-batch-print-modal", partial: "create", locals: local_assigns) %>
+$("#hd-session-form-batch-print-modal").foundation('reveal', 'open');
+Renalware.HD.pollBatchStatus('<%= hd_session_forms_batch_status_path(batch) %>');

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

@@ -5,7 +5,7 @@ tr.hd-session-row(class=[session.state, stripe_class])
               data: { behaviour: "toggler" })
     = pipe_separator
     = session.edit_or_view_url
-  td.text-left(rowspan=2)= session.performed_on
+  td.col-width-date(rowspan=2)= session.performed_on
   td= session.hospital_unit_unit_code
 
   td= session.start_time

data/app/views/renalware/hd/sessions/_thead.html.slim

@@ -4,7 +4,7 @@ thead
     th.col-width-date(rowspan=3 valign="top")= t(".date")
     th.col-width-small= t(".site")
     th.col-width-time.text-center= t(".time")
-    th.col-width-tiny(rowspan=3)= t(".duration")
+    th.col-width-time(rowspan=3)= t(".duration")
     th.col-width-tiny= t(".weight")
     th.col-width-tiny= t(".pulse")
     th.col-width-tiny= t(".temperature")

data/app/views/renalware/pathology/historical_observation_results/_table.html.slim

@@ -14,7 +14,7 @@ table#observations.column_hover
         - table.observation_descriptions.each do |desc|
           - code = desc.code
           - if row.comment_for(code).present?
-            td(class=code.downcase data-balloon=row.comment_for(code) data-balloon-pos="up")
+            td(class=code.downcase aria-label=row.comment_for(code) data-balloon-pos="up")
               .triangle-top-right
               = row.result_for(code)
           - else