renalware-core 2.0.41 → 2.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4028a0511b757d40f892d8b53f96aad528c613903b72b565cdb3aaba0fb24475
-  data.tar.gz: 15c5b296ecf7ae47466c7e33480146b3cf00a6dfe88a4c3da0fc6e0dd1a40714
+  metadata.gz: cc71457e0667a1542f20348ec2d9a18f4c63771991d5ec1a04567d4c00998945
+  data.tar.gz: 3d125ec394cf34ae6fe52a7e31a1383e3a37e423ede66a73630677aecf7de36f
 SHA512:
-  metadata.gz: 4415c46fd5f27d2b770675aff7c2fe215605b3a538702a6ef605a0c89f62e15a02bd2cbf733333a3a2a4096450049b9b51e60caf0979c98d4c0d59c0df7e583f
-  data.tar.gz: fd3490bad516d1d04f5fb2c384537b83acc1d5c79fd8d4cc0aec949452dc3f62716ce7ce5839e780bf1c9e4efce7c70db365ba58d1c0a18a221be13ef0efa57d
+  metadata.gz: 7eff31ea5c1a1386c1a6b54004a8ea39822972febf28e2f15860f8d073ee7183028670d5c7ba78f65e2e68c8126c78790917bde0eefc5e37b462af28c977ca7e
+  data.tar.gz: c6fead2c420a33575453a89415ea5ec9fe2ce478797ac971b7ab4336f84ad797b9aedbe078dcdf0b76a29405a8991f3f58fd7f265a5cc1c27d8b97b60353fdb9

data/app/assets/javascripts/renalware/aki_alerts.js

@@ -0,0 +1,27 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.AkiAlerts = (function () {
+
+  var wireUpSetFilterDateToToday = function() {
+    $(document).on( "click", "a.set_filter_date_to_today", function(e) {
+      e.preventDefault();
+      $("#q_date").val(moment().format("DD-MMM-YYYY"))
+    });
+  };
+
+  var wireUpSetFilterDateAnyDate = function() {
+    $(document).on( "click", "a.set_filter_date_to_any_date", function(e) {
+      e.preventDefault();
+      $("#q_date").val("")
+    });
+  };
+
+  return {
+    init : function() {
+      wireUpSetFilterDateToToday();
+      wireUpSetFilterDateAnyDate();
+    }
+  }
+})();
+
+$(document).ready(Renalware.AkiAlerts.init);

data/app/assets/javascripts/renalware/application.js.erb

@@ -45,6 +45,7 @@
 //= require rails.validations
 //= require rails.validations.simple_form
 //= require renalware/print.min
+//= require renalware/moment.min
 //= require_tree .
 //
 
@@ -55,4 +56,3 @@ window.console = window.console || { log: function() {} };
 <% if Rails.env.test? %>
   $.fx.off = true;
 <% end %>
-

data/app/assets/javascripts/renalware/behaviours.js

@@ -7,4 +7,9 @@ $(document).ready(function() {
     e.preventDefault();
     $(this).closest('form').submit();
   });
+
+  $("[data-behaviour='submit_on_change']").on('change', function(e) {
+    e.preventDefault();
+    $(this).closest('form').submit();
+  });
 });

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

@@ -1,3 +1,12 @@
+table.stripeless {
+  // .session_import_success {
+  //   background-color: lightgreen !important;
+  // }
+
+  .session_import_error {
+    background-color: #FFE5E5 !important;
+  }
+}
 
 .hd-unit-diaries {
   .current-week {

data/app/assets/stylesheets/renalware/partials/_button.scss

@@ -1,3 +1,7 @@
+.button.small_ellipsis_button {
+  margin: 0;
+  padding: .1rem .3rem;
+}
 
 .fa-link-annotation {
   width: 1.4rem;

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -1,3 +1,9 @@
+table.stripeless {
+  tr:nth-of-type(even),
+  tr:nth-of-type(odd) {
+    background-color: transparent;
+  }
+}
 
 table td.actions-dropdown {
   padding-top: 0.3rem;

data/app/controllers/renalware/events/events_controller.rb

@@ -36,7 +36,7 @@ module Renalware
 
       def index
         events_query = EventQuery.new(patient: patient, query: query_params)
-        events = events_query.call
+        events = events_query.call.page(page).per(per_page)
         authorize events
         events = EventsPresenter.new(patient, events)
 
@@ -93,15 +93,6 @@ module Renalware
 
       private
 
-      def events
-        @events ||= Event.for_patient(patient)
-                         .includes(:event_type)
-                         .includes(:created_by)
-                         .page(page)
-                         .per(per_page)
-                         .ordered
-      end
-
       def disable_selection_of_event_type?
         event_type_slug.present? && event_type.present?
       end
@@ -145,8 +136,7 @@ module Renalware
       end
 
       def document_attributes
-        params.require(:events_event)
-              .fetch(:document, nil).try(:permit!)
+        params.require(:events_event).fetch(:document, nil).try(:permit!)
       end
 
       def new_event_for_patient(params = {})
@@ -176,9 +166,7 @@ module Renalware
       end
 
       def query_params
-        params
-          .fetch(:q, {})
-          .merge(page: page, per_page: per_page || 20)
+        params.fetch(:q, {})
       end
     end
   end

data/app/controllers/renalware/hd/transmission_logs_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+require "collection_presenter"
+
+module Renalware
+  module HD
+    class TransmissionLogsController < BaseController
+      include PresenterHelper
+      include Renalware::Concerns::Pageable
+
+      # NB be sure not to select the payload as this will slow things down.
+      # The payload is loaded by clicking on a link in the table
+      def index
+        logs = TransmissionLog
+          .order(created_at: :desc)
+          .select(TransmissionLog.attribute_names - [:payload])
+          .page(page).per(per_page)
+        authorize logs
+        render locals: { logs: logs }
+      end
+
+      def show
+        log = TransmissionLog.find(params[:id])
+        authorize log
+        respond_to do |format|
+          format.xml { render xml: log.payload }
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/renal/aki_alerts_controller.rb

@@ -27,7 +27,7 @@ module Renalware
       def update
         authorize alert
         if alert.update(aki_alert_params.merge(by: current_user))
-          redirect_to renal_filtered_aki_alerts_path(named_filter: :today)
+          redirect_to renal_aki_alerts_path(named_filter: :today)
         else
           render_edit(alert)
         end
@@ -85,7 +85,7 @@ module Renalware
       def search_params
         params
           .require(:q) {}
-          .permit(:term, :on_hotlist, :action, :hospital_unit_id, :hospital_ward_id, :s)
+          .permit(:date, :term, :on_hotlist, :action, :hospital_unit_id, :hospital_ward_id, :s)
       end
 
       def path_params

data/app/controllers/renalware/research/study_participants_controller.rb

@@ -12,6 +12,11 @@ module Renalware
         render locals: { study: study, participants: participants }
       end
 
+      def show
+        authorize StudyParticipant, :show?
+        redirect_to research_study_participants_path(study)
+      end
+
       def create
         participant = study.participants.build(participant_params)
         participant.joined_on ||= Time.zone.today

data/app/documents/renalware/hd/session_document.rb

@@ -113,6 +113,19 @@ module Renalware
         attribute :had_blood_transfusion, Document::Enum, enums: %i(yes no), default: :no
       end
       attribute :complications, Complications
+
+      # rubocop:disable Metrics/AbcSize
+      def error_messages
+        [
+          observations_before.errors.full_messages,
+          observations_after.errors.full_messages,
+          dialysis.errors.full_messages,
+          info.errors.full_messages,
+          complications.errors.full_messages,
+          hdf.errors.full_messages
+        ].flatten.compact
+      end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/app/jobs/feed_job.rb

@@ -13,6 +13,9 @@
 #
 FeedJob = Struct.new(:raw_message) do
   def perform
-    Renalware::Feeds.message_processor.call(raw_message)
+    Renalware::Feeds
+      .message_processor
+      .broadcasting_to_configured_subscribers
+      .call(raw_message)
   end
 end

data/app/models/concerns/renalware/patients_ransack_helper.rb

@@ -10,6 +10,10 @@ module Renalware
     included do
       class_eval do
         scope :identity_match, ->(identity = 1) { where(sql_and_params(identity)) }
+
+        ransacker :family_name_case_insensitive, type: :string do
+          arel_table[:family_name].lower
+        end
       end
     end
 

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

@@ -19,7 +19,6 @@ module Renalware
                      .eager_load(:event_type)
                      .includes(:created_by)
                      .eager_load(:created_by)
-                     .page(query[:page]).per(query[:per_page])
                      .ordered
       end
 

data/app/models/renalware/feeds/message_processor.rb

@@ -8,14 +8,38 @@ module Renalware
     # Responsible for coordinating the processing sequences of a raw HL7 message.
     #
     class MessageProcessor
+      include Broadcasting
+
+      # For SubscriptionRegistry only, may not be needed as also inc in Broadcasting module
       include Wisper::Publisher
 
       def call(raw_message)
+        broadcast_args = nil
+
+        # We want to wrap message processing in a transaction because if message processing
+        # fails we don't want to leave an unprocessed message in the feed_messages table.
+        # If we did, and the same FeedJob retires a few minutes later, if will try to save to
+        # feed_messages with the same MD5 body_hash (the message is identical to one already saved)
+        # resulting in unique key violation.
+        # Using a transaction here prevents any orphaned records if there is an error.
+        # However we should be aware that any listeners raising an error will prevent successful
+        # in all other listeners. So a listener should be careful to catch errors and not re-raise
+        # them, or use the :message_processed message (lower down) which is safer.
         ActiveRecord::Base.transaction do
-          message_payload = parse_message(raw_message)
-          persist_message(message_payload)
-          broadcast(:message_processed, message_payload)
+          hl7_message = build_hl7_object_from(raw_message)
+          feed_message = persist_message(hl7_message)
+          broadcast_args = { hl7_message: hl7_message, feed_message: feed_message }
+          broadcast(:message_arrived, broadcast_args)
         end
+
+        # Another event, this one letting anyone interested know that a message been successfully
+        # processed. They might want to forward the message on somewhere else for instance.
+        # Think Diaverum.
+        # The crucial difference here is that an exception raised by a listener does not prevent the
+        # main processing of the HL7 message from being rolled back.
+        # They could use this for message processing but we'd rather it was used for post-processing
+        # e.g. forwarding, logging etc.
+        broadcast(:message_processed, broadcast_args)
       rescue StandardError => exception
         notify_exception(exception)
         raise exception
@@ -23,7 +47,7 @@ module Renalware
 
       private
 
-      def parse_message(raw_message)
+      def build_hl7_object_from(raw_message)
         MessageParser.new.parse(raw_message)
       end
 
@@ -32,8 +56,8 @@ module Renalware
       # same message payload is saved twice - in this case we exit #call early, the broadcast
       # is not issued and therefore the message is not processed. The message will go back into
       # the delayed_job queue and retry, failing until it finally gives up!
-      def persist_message(message_payload)
-        PersistMessage.new.call(message_payload)
+      def persist_message(hl7_message)
+        PersistMessage.new.call(hl7_message)
       end
 
       def notify_exception(exception)

data/app/models/renalware/feeds/persist_message.rb

@@ -5,15 +5,16 @@ require_dependency "renalware/feeds"
 module Renalware
   module Feeds
     class PersistMessage
-      # message_payload is an HL7Message (a decorator around ::HL7::Message)
+      # hl7_message is an HL7Message (a decorator around ::HL7::Message)
       # If the same message is persisted twice we'll get an ActiveRecord::RecordNotUnique error
       # but that's fine as we don't want to process the same HL7 message twice.
-      def call(message_payload)
+      def call(hl7_message)
         Message.create!(
-          event_code: message_payload.type,
-          header_id: message_payload.header_id,
-          body: message_payload.to_s,
-          body_hash: Digest::MD5.hexdigest(message_payload.to_s)
+          event_code: hl7_message.type,
+          header_id: hl7_message.header_id,
+          body: hl7_message.to_s,
+          body_hash: Digest::MD5.hexdigest(hl7_message.to_s),
+          patient_identifier: hl7_message.patient_identification&.internal_id
         )
       end
     end

data/app/models/renalware/hd/provider.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    # An HD::Provider is a company managing dialysers for example Diaverum or Fresenius
+    class Provider < ApplicationRecord
+      validates :name, presence: true
+    end
+  end
+end

data/app/models/renalware/hd/provider_unit.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    # An HD::Provider is a company managing dialysers for example Diaverum or Fresenius
+    class ProviderUnit < ApplicationRecord
+      belongs_to :hd_provider, class_name: "HD::Provider"
+      belongs_to :hospital_unit, class_name: "Hospitals::Unit"
+      validates :hd_provider, presence: true
+      validates :hospital_unit, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    # Tracks the import of incoming HD Session data from an integrated dialysis provider
+    # and the outgoing data back to that provider, for example HL7 messages.
+    class TransmissionLog < ApplicationRecord
+      belongs_to :hd_provider_unit, class_name: "ProviderUnit"
+      belongs_to :patient, class_name: "Renalware::Patient"
+      belongs_to :session
+      validates :direction, presence: true
+      validates :format, presence: true
+      has_many :children,
+               class_name: "TransmissionLog",
+               foreign_key: "parent_id",
+               dependent: :destroy
+      belongs_to :parent, class_name: "TransmissionLog"
+
+      def self.policy_class
+        BasePolicy
+      end
+    end
+  end
+end

data/app/models/renalware/letters/letter/pending_review.rb

@@ -29,7 +29,14 @@ module Renalware
       def generate_archive(by:, presenter: default_presenter)
         becomes!(Approved).tap do |letter|
           letter.by = by
-          letter.build_archive(by: by, content: presenter.content)
+          # Note there is no need to set letter_id: id here but there is an
+          # intermittent issue where (oddly) build_archive fails because letter_id not
+          # present, so in attempt to fix this we are setting it here explicitly.
+          # Using self.id rather than letter.id in case the becomes! has lost the id
+          # for some reason. Also moved presenter.content to a new line so we can more easily see
+          # if that is causing the error as it does a lot of processing to build the letter.
+          achived_letter_content = presenter.content
+          letter.build_archive(by: by, content: achived_letter_content, letter_id: id)
         end
       end
 

data/app/models/renalware/medications/prescriptions_by_drug_type_query.rb

@@ -19,7 +19,6 @@ module Renalware
         @search ||= begin
           Prescription
             .current
-            .ordered
             .includes(:medication_route, :drug)
             .includes(patient: { current_modality: :description })
             .eager_load(drug: [:drug_types])

data/app/models/renalware/pathology/message_listener.rb

@@ -3,29 +3,29 @@
 require_dependency "renalware/pathology"
 
 #
-# When subscribed to HL7 `message_processed` messages, gets notified of incoming HL7 messages
+# When subscribed to HL7 `message_arrived` messages, gets notified of incoming HL7 messages
 # and creates the observations contained therein provided the patient exists.
 #
 module Renalware
   module Pathology
     class MessageListener
       # Note: We are already inside a transaction here
-      def message_processed(message_payload)
-        pathology_params = parse_pathology_params(message_payload)
+      def message_arrived(hl7_message:, **)
+        pathology_params = parse_pathology_params(hl7_message)
         create_observation_requests_and_their_child_observations_from(pathology_params)
         #
-        # Note: The the current_observation_set for the patient is updated by a trigger here
+        # Note: The current_observation_set for the patient is updated by a trigger here!
         #
       end
 
       private
 
-      def parse_pathology_params(message_payload)
-        ObservationRequestsAttributesBuilder.new(message_payload).parse
+      def parse_pathology_params(hl7_message)
+        ObservationRequestsAttributesBuilder.new(hl7_message).parse
       end
 
       def create_observation_requests_and_their_child_observations_from(pathology_params)
-        return if pathology_params.nil? # eg patient does not exist
+        return if pathology_params.nil? # e.g. patient does not exist
         CreateObservationRequests.new.call(pathology_params)
       end
     end

data/app/models/renalware/pathology/observation_requests_attributes_builder.rb

@@ -12,13 +12,13 @@ module Renalware
     #   directly - this would remove the extra level of indirection that this class introduces.
     class ObservationRequestsAttributesBuilder
       DEFAULT_REQUESTOR_NAME = "UNKNOWN"
-      delegate :patient_identification, :observation_requests, to: :message_payload
+      delegate :patient_identification, :observation_requests, to: :hl7_message
       delegate :internal_id, to: :patient_identification
       alias_attribute :requests, :observation_requests
 
-      # message_payload is an HL7Message (a decorator around an ::HL7::Message)
-      def initialize(message_payload, logger = Delayed::Worker.logger)
-        @message_payload = message_payload
+      # hl7_message is an HL7Message (a decorator around an ::HL7::Message)
+      def initialize(hl7_message, logger = Delayed::Worker.logger)
+        @hl7_message = hl7_message
         @logger = logger
       end
 
@@ -40,7 +40,7 @@ module Renalware
 
       private
 
-      attr_reader :message_payload, :logger
+      attr_reader :hl7_message, :logger
 
       def build_patient_params
         patient = find_patient(internal_id)

data/app/models/renalware/pathology/observations_jsonb_serializer.rb

@@ -24,7 +24,6 @@ module Renalware
           super
         end
       end
-      # rubocop:enable Style/MethodMissing
 
       # From eg hgb_result, returns
       # [:HGB, "result"]

data/app/models/renalware/patients/message_param_parser.rb

@@ -8,8 +8,8 @@ module Renalware
     # that can be persisted by Patient.
     #
     class MessageParamParser
-      def parse(message_payload)
-        pi = message_payload.patient_identification
+      def parse(hl7_message)
+        pi = hl7_message.patient_identification
 
         {
           patient: {

data/app/models/renalware/patients/patient_search.rb

@@ -7,8 +7,8 @@ module Renalware
         Renalware::Patient
           .includes(current_modality: [:description])
           .search(params[:patient_search]).tap do |search|
-          search.sorts = %w(family_name given_name)
-        end
+            search.sorts = %w(family_name_case_insensitive given_name)
+          end
       end
     end
   end

data/app/models/renalware/renal/aki_alert.rb

@@ -17,6 +17,10 @@ module Renalware
 
       scope :today, ->{ where(created_at: Time.zone.today.all_day) }
       scope :hotlist, ->{ where(hotlist: true) }
+
+      ransacker :created_at_casted do |_parent|
+        Arel.sql("date(renal_aki_alerts.created_at)")
+      end
     end
   end
 end

data/app/models/renalware/renal/aki_alert_query.rb

@@ -27,7 +27,6 @@ module Renalware
             .joins(:patient) # required for PatientsRansackHelper - see Admission
             .includes(:patient, :updated_by, :action, hospital_ward: :hospital_unit)
             .eager_load(patient: [current_modality: :description])
-            .public_send(query[:named_filter].to_s)
             .ransack(query)
         end
       end

data/app/models/renalware/renal/aki_alert_search_form.rb

@@ -8,7 +8,7 @@ module Renalware
       include ActiveModel::Model
       include Virtus::Model
 
-      attribute :hospital_unit_id, Integer
+      attribute :date, Date
       attribute :hospital_ward_id, Integer
       attribute :action, String
       attribute :term, String
@@ -19,9 +19,9 @@ module Renalware
       def query
         @query ||= begin
           options = {
+            created_at_casted_date_equals: date,
             identity_match: term,
             hospital_ward_id_eq: hospital_ward_id,
-            hospital_ward_hospital_unit_id_eq: hospital_unit_id,
             action_id_eq: action,
             hotlist_eq: on_hotlist,
             s: s,

data/app/models/renalware/renal.rb

@@ -4,8 +4,6 @@ require_dependency "renalware"
 
 module Renalware
   module Renal
-    AKI_ALERT_FILTERS = %w(today all hotlist).freeze
-
     def self.table_name_prefix
       "renal_"
     end

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

@@ -0,0 +1,42 @@
+= within_admin_layout(title: "HD Transmission Logs") do
+  .hd_transmission_logs
+    table.stripeless
+      thead
+        tr
+          th.col-width-date-time Date
+          th.col-width-tiny Direction
+          th.col-width-tiny Format
+          th.col-width-tiny Payload
+          th.col-width-large Filename
+          th Patient
+          th.col-width-small Ext Session Id
+          th.col-width-small Session Id
+          th.col-width-tiny Result
+          th Errors
+      tbody
+        - logs.each do |log|
+          ruby:
+            klass = if log.parent_id.present?
+                      log.session_id.present? ? "session_import_success" : "session_import_error"
+                    else
+                      ""
+                    end
+          tr(class=klass)
+            td= l(log.created_at)
+            td= log.direction
+            td= log.format
+            td= link_to "...",
+                        hd_transmission_log_path(log, format: :xml),
+                        class: "button small_ellipsis_button",
+                        target: "_blank"
+            td
+              span(title=log.filepath)= log.filepath && Pathname(log.filepath).basename
+            td= log.patient && link_to(log.patient, patient_hd_sessions_path(log.patient))
+            td= log.external_session_id
+            th
+              - if log.patient && log.session
+                = link_to log.session_id, patient_hd_session_path(log.patient, log.session)
+            td= log.result
+            td= log.error_messages.compact.uniq.join("<br>").html_safe
+
+    = paginate logs

data/app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim

@@ -10,9 +10,7 @@
     method: :get do |f|
     /= search_form_for(search, url: medications_esa_prescriptions_path) do |f|
     .small-6.columns
-      /= f.search_field search_scope, placeholder: t(".search_prompt")
-      = f.input :patient_given_name_or_patient_family_name_or_drug_name_or_patient_local_patient_id_cont,
-                label: t(".search_prompt")
+      = f.input search_scope, label: t(".search_prompt")
     .small-3.columns
       = f.input :provider_eq,
                 include_blank: true,

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

@@ -3,10 +3,9 @@ li.has-dropdown
   ul.dropdown
     li= link_to "Users", admin_users_path
     li= link_to "Hospital Units", hospitals_units_path
-    li= link_to "HD Cannulation Types", hd_cannulation_types_path
-    li= link_to "HD Dialysers", hd_dialysers_path
     li= link_to "Request Form Print History", pathology_requests_requests_path
     li= link_to "Pathology Requesting Configuration", pathology_requests_rules_path
+    li= link_to "HD Transmission Logs", hd_transmission_logs_path
     - unless Rails.env.production?
       li
         = link_to "Email Templates", system_email_templates_path