renalware-core 2.0.110 → 2.0.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d299c658864be00fd2bb5e32766ca4bb07f92e4d1e3cac36536bbb351dc13132
-  data.tar.gz: d405e456e7f324d56d2d9b10cd4643dd7d20721967d1126461d4f287150b83e1
+  metadata.gz: fcb6fe2a9d36fece24e482f2cf318d89af11914dab2beb7b346bf3a6cba9c8b8
+  data.tar.gz: ecde69203a3b74dacc87163bb1b19bf103eb79b2a7e34742fe824d6a53e62f7d
 SHA512:
-  metadata.gz: 22d08baf9693562abd1048245c849a2015d1210594b1f7821f78820a626ac58b21442f742c702add9798b4dde1ea33e2b423703dee6e94622aa340c0ce4a689d
-  data.tar.gz: fcb3ddb0e16d5bc177dace948ea795659523d196086967a0743b0a98843561b325bcc9b148b2f31123324a00d9817c13ca4575d4f5bc096cab95fc0469b23544
+  metadata.gz: 878519c049773af3fe86eb79f5a20274b470d6cbc4c132c3db7c25c67f324bc32a77bb8d6e0d9a9c1270c5090adc6187031b366be4443d4d7df66e60f2d44742
+  data.tar.gz: 0f3cf22ee16a7737816afd2a0245aa0676d3cb3d1ab7c10b85c5873250c90da20e91e7ca96e7b2a1d32ce51231a71b85cdb43e9f0c2ee944da1d8d9da67a3836

data/app/assets/stylesheets/renalware/medications_pdf.scss

@@ -74,6 +74,12 @@ heading {
   .logo {
     float: right;
   }
+
+  .address {
+    float: right;
+    clear: right;
+    margin-top: .8rem
+  }
 }
 
 main {

data/app/assets/stylesheets/renalware/protocol_pdf.scss

@@ -288,3 +288,7 @@ h1 {
     }
   }
 }
+
+.nowrap {
+  white-space: nowrap;
+}

data/app/controllers/renalware/admin/users_controller.rb

@@ -53,7 +53,7 @@ module Renalware
     end
 
     def update_user
-      @service ||= System::UpdateUser.new(@user)
+      @update_user ||= System::UpdateUser.new(@user)
     end
   end
 end

data/app/controllers/renalware/base_controller.rb

@@ -22,6 +22,9 @@ module Renalware
 
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
+    class PatientNotFoundError < StandardError; end
+    rescue_from PatientNotFoundError, with: :patient_not_found
+
     # Expose a few attributes for use in the patient layout and its partials.
     # As a rule, we should be passing variables explicitly to all view using `locals`;
     # however, while not a fan of `helper_method`, exposing e.g. current_patient this (akin to
@@ -31,7 +34,11 @@ module Renalware
     alias_attribute :current_patient, :patient
 
     def patient
-      @patient ||= Renalware::Patient.find_by!(secure_id: params[:patient_id])
+      @patient ||= begin
+        Renalware::Patient.find_by(secure_id: params[:patient_id]).tap do |patient_|
+          raise PatientNotFoundError unless patient_
+        end
+      end
     end
 
     protected
@@ -73,5 +80,10 @@ module Renalware
       flash[:error] = "You are not authorized to perform this action."
       redirect_to dashboard_path
     end
+
+    def patient_not_found
+      flash[:error] = "Patient not found"
+      redirect_to dashboard_path
+    end
   end
 end

data/app/controllers/renalware/patients/patients_controller.rb

@@ -66,7 +66,11 @@ module Renalware
       end
 
       def patient
-        @patient ||= Renalware::Patient.find_by!(secure_id: params[:id])
+        @patient ||= begin
+          Renalware::Patient.find_by(secure_id: params[:id]).tap do |patient_|
+            raise PatientNotFoundError unless patient_
+          end
+        end
       end
 
       private

data/app/jobs/renalware/hd/update_rolling_patient_statistics_dj_job.rb

@@ -14,7 +14,7 @@ module Renalware
       end
 
       def max_attempts
-        3
+        2
       end
 
       def queue_name

data/app/jobs/renalware/letters/calculate_page_count_job.rb

@@ -6,7 +6,7 @@ require "attr_extras"
 
 module Renalware
   module Letters
-    # This class is both a Wispler listener (subscribing to ApproveLetter events) and an ActiveJob.
+    # This class is both a Wisper listener (subscribing to ApproveLetter events) and an ActiveJob.
     # Should be configured in the broadcast_subscription_map to listen to events from ApproveLetter
     # and be invoked aysnchronously via a background queue ie delayed_job.
     #

data/app/models/renalware/feeds.rb

@@ -7,6 +7,8 @@ module Renalware
   module Feeds
     module_function
 
+    class DuplicateMessageReceivedError < StandardError; end
+
     def table_name_prefix
       "feed_"
     end

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

@@ -46,6 +46,8 @@ module Renalware
         # - so that any error in the listener has its own try mechansim and does not cause the
         # current job to retry,
         broadcast(:message_processed, feed_message: feed_message)
+      rescue Feeds::DuplicateMessageReceivedError => e
+        Rails.logger.warn("Rejected duplicate HL7 message: #{e.message}")
       rescue StandardError => e
         notify_exception(e)
         raise e

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

@@ -16,6 +16,12 @@ module Renalware
           body_hash: Digest::MD5.hexdigest(hl7_message.to_s),
           patient_identifier: hl7_message.patient_identification&.internal_id
         )
+      rescue ActiveRecord::RecordNotUnique => e
+        # If a duplicate messages comes in (we have calculated the body_hash for the message and it
+        # turns out that body_hash is not unique in the database, meaning the message is already
+        # stored) then raise a custom error so it can be handled upstream - ie we can choose to
+        # ignore it.
+        raise Feeds::DuplicateMessageReceivedError, e.message
       end
     end
   end

data/app/policies/renalware/user_policy.rb

@@ -6,6 +6,17 @@ module Renalware
       super && !user_update_self?
     end
 
+    def assign_role?(role)
+      return false if role.hidden
+
+      can_assign_role = case role.name
+                        when "devops", "super_admin" then false
+                        when "admin" then user_is_super_admin?
+                        else true
+                        end
+      can_assign_role && update?
+    end
+
     private
 
     def user_update_self?

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

@@ -43,13 +43,15 @@ module Renalware
 
       def sessions
         @sessions ||= begin
-          hd_sessions = Sessions::ProtocolSessionsQuery.new(patient: patient).call
+          hd_sessions =
+            Sessions::ProtocolSessionsQuery.new(patient: patient)
+              .call.includes(:patient, :signed_on_by, :signed_off_by)
           ::CollectionPresenter.new(hd_sessions, Protocol::SessionPresenter, view_context)
         end
       end
 
       def prescriptions
-        prescriptions = patient.prescriptions.to_be_administered_on_hd
+        prescriptions = patient.prescriptions.includes(:drug).to_be_administered_on_hd
         ::CollectionPresenter.new(prescriptions, ::Renalware::Medications::PrescriptionPresenter)
       end
 

data/app/presenters/renalware/mdm_presenter.rb

@@ -23,12 +23,12 @@ module Renalware
       @pathology ||= pathology_for_codes
     end
 
-    def pathology_for_codes(codes = nil)
+    def pathology_for_codes(codes = nil, per_page: 10, page: 1)
       Pathology::CreateObservationsGroupedByDateTable.new(
         patient: patient,
         observation_descriptions: pathology_descriptions_for_codes(codes),
-        page: 1,
-        per_page: 10
+        page: page,
+        per_page: per_page
       ).call
     end
 

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

@@ -10,7 +10,7 @@ module Renalware
       end
 
       def cmvdna_pathology
-        @cmvdna_pathology ||= pathology_for_codes("CMVD")
+        @cmvdna_pathology ||= pathology_for_codes("CMVD", per_page: 6)
       end
     end
   end

data/app/views/renalware/admin/users/edit.html.slim

@@ -24,12 +24,13 @@
 
     br
     br
-    - Renalware::Role.all.each_with_index do |role, index|
+    - Renalware::Role.all.order(id: :asc).each_with_index do |role, index|
       - element_id = "user_role_ids_#{index}"
+      - policy = Pundit.policy(current_user, @user)
       = check_box_tag "user[role_ids][]",
                       role.id,
                       @user.has_role?(role.name),
-                      disabled: role.hidden,
+                      disabled: !(policy.assign_role?(role)),
                       id: element_id,
                       class: "inline"
       = label_tag element_id, role.name.humanize

data/app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder

@@ -15,7 +15,10 @@ if measurement.present? && measurement.to_f.nonzero?
       xml.Description I18n.t("loinc.#{i18n_key}.description")
     end
 
-    xml.ObservationValue measurement
+    # Only take the first 20 characters, and then strip leading and trailing space.
+    # This is to allow for rogue values like
+    # '615                       615'
+    xml.ObservationValue measurement.to_s[0, 19].strip
     xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
 
     xml.Clinician do

data/app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder

@@ -27,7 +27,10 @@ observation_times = {
           xml.Description I18n.t("loinc.#{i18n_key}.description")
         end
 
-        xml.ObservationValue value
+        # Only take the first 20 characters, and then strip leading and trailing space.
+        # This is to allow for rogue values like
+        # '615                       615'
+        xml.ObservationValue value.to_s[0, 19].strip
         xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
         xml.PrePost pre_post.to_s.upcase # eg PRE or POST
       end

data/app/views/renalware/hd/protocols/_profile.html.slim

@@ -46,3 +46,5 @@ dl
   dd= profile.transport_type&.text
   dt= t(".transport.decided_on")
   dd= profile.transport_decided_on
+  dt= t(".on_worryboard")
+  dd= yes_no(profile.patient.worry.present?)

data/app/views/renalware/hd/protocols/_recent_pathology.html.slim

@@ -3,12 +3,12 @@ table.recent-pathology
     tr
       th.code HGB
       td.result= recent_pathology.hgb_result
-      td.observed_at= (l(recent_pathology.hgb_observed_at))
+      td.nowrap.observed_at= (l(recent_pathology.hgb_observed_at))
     tr
       th.code PLT
       td.result= recent_pathology.plt_result
-      td.observed_at= (l(recent_pathology.plt_observed_at))
+      td.nowrap.observed_at= (l(recent_pathology.plt_observed_at))
     tr
       th.code CRP
       td.result= recent_pathology.crp_result
-      td.observed_at= (l(recent_pathology.crp_observed_at))
+      td.nowrap.observed_at= (l(recent_pathology.crp_observed_at))

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

@@ -1,6 +1,5 @@
 / An empty session table row for use in the printed protocol (data-entry form)
 tr.empty-session-row.first
-  td(rowspan=2)
   td(rowspan=2)
   td
   td
@@ -9,7 +8,8 @@ tr.empty-session-row.first
   td
   td
   td
-  td(rowspan=2)
+  td
+  td
   td(rowspan=2)
   td(rowspan=2)
   td(rowspan=2)
@@ -20,6 +20,7 @@ tr.empty-session-row.first
   td(rowspan=2)
   td(rowspan=2)
   td
+  td
 tr.empty-session-row
   td
   td
@@ -29,3 +30,6 @@ tr.empty-session-row
   td
   td
   td
+  td
+  td
+  td

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

@@ -14,16 +14,16 @@ tr.hd-session-row(class=[session.state, stripe_class])
   td= session.before_measurement_for(:pulse)
   td= session.before_measurement_for(:temperature)
   td= session.before_measurement_for(:respiratory_rate)
-  td= session.before_measurement_for(:bm_stix)
-  td= session.before_measurement_for(:blood_pressure)
-  td(rowspan=2)= session.arterial_pressure
-  td(rowspan=2)= session.venous_pressure
-  td(rowspan=2)= session.blood_flow
-  td(rowspan=2)= session.litres_processed
-  td(rowspan=2)= session.fluid_removed
-  td(rowspan=2)= session.machine_no
-  td(rowspan=2)= session.machine_ktv
-  td(rowspan=2)= session.machine_urr
+  td.nowrap= session.before_measurement_for(:bm_stix)
+  td.nowrap= session.before_measurement_for(:blood_pressure)
+  td.nowrap(rowspan=2)= session.arterial_pressure
+  td.nowrap(rowspan=2)= session.venous_pressure
+  td.nowrap(rowspan=2)= session.blood_flow
+  td.nowrap(rowspan=2)= session.litres_processed
+  td.nowrap(rowspan=2)= session.fluid_removed
+  td.nowrap(rowspan=2)= session.machine_no
+  td.nowrap(rowspan=2)= session.machine_ktv
+  td.nowrap(rowspan=2)= session.machine_urr
   td.print-only(rowspan=2)
   td.print-only(rowspan=2)= session.notes
   td.print-only= session.signed_on_by
@@ -31,15 +31,15 @@ tr.hd-session-row(class=[session.state, stripe_class])
 tr(class=[session.state, stripe_class])
   td= tooltip(label: session.summarised_access_used, content: session.access_used)
   td= session.end_time
-  td
+  td.nowrap
     = session.after_measurement_for(:weight)
     - if (change = session.change_in(:weight))
       i=" (#{change})"
-  td= session.after_measurement_for(:pulse)
-  td= session.after_measurement_for(:temperature)
-  td= session.after_measurement_for(:respiratory_rate)
-  td= session.after_measurement_for(:bm_stix)
-  td= session.after_measurement_for(:blood_pressure)
+  td.nowrap= session.after_measurement_for(:pulse)
+  td.nowrap= session.after_measurement_for(:temperature)
+  td.nowrap= session.after_measurement_for(:respiratory_rate)
+  td.nowrap= session.after_measurement_for(:bm_stix)
+  td.nowrap= session.after_measurement_for(:blood_pressure)
   td.print-only= session.signed_off_by
 = content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
   td(colspan=19)

data/app/views/renalware/medications/home_delivery/prescriptions/index.pdf.slim

@@ -8,7 +8,11 @@ html
     = wicked_pdf_stylesheet_link_tag "renalware/medications_pdf"
   heading
     .our-ref= "RW ref: #{patient.hospital_identifier}"
-    span.logo= wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
+    span.logo
+      = wicked_pdf_image_tag "renalware/NHS-Black.jpg", width: 50
+    .address
+      = Renalware.config.hospital_address.split(",").join("<br>").html_safe
+
   main
     h1 Home Delivery Medication List
     = "As at #{l(Time.zone.now)}"

data/config/locales/renalware/hd/protocol.en.yml

@@ -3,6 +3,7 @@ en:
     hd:
       protocols:
         profile:
+          on_worryboard: "On Worryboard"
           site: "Site:"
           schedule: "Schedule:"
           prescribed_time: "Prescribed time:"

data/lib/renalware/configuration.rb

@@ -22,7 +22,8 @@ module Renalware
     Dotenv::Railtie.load
 
     config_accessor(:site_name) { "Renalware" }
-    config_accessor(:hospital_name) { "KINGS COLLEGE HOSPITAL" }
+    config_accessor(:hospital_name) { ENV.fetch("HOSPITAL_NAME", "KINGS COLLEGE HOSPITAL") }
+    config_accessor(:hospital_address) { ENV.fetch("HOSPITAL_ADDRESS", "") } # comma-delimited
     config_accessor(:delay_after_which_a_finished_session_becomes_immutable) { 6.hours }
     config_accessor(:new_clinic_visit_deletion_window) { 24.hours }
     config_accessor(:new_clinic_visit_edit_window) { 7.days }
@@ -84,7 +85,6 @@ module Renalware
     config_accessor(:render_pdf_as_html_for_debugging) { false }
 
     config_accessor(:hd_session_prescriptions_require_signoff) { true }
-
     config_accessor(:batch_printing_enabled) { true }
 
     # A host app can override this to add/remove/re-order the clinical summary display

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.110"
+  VERSION = "2.0.111"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.110
+  version: 2.0.111
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.1.0
+        version: '16.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 14.1.0
+        version: '16.0'
 - !ruby/object:Gem::Dependency
   name: client_side_validations-simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.10.0
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: clipboard-rails
   requirement: !ruby/object:Gem::Requirement
@@ -772,14 +772,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement