renalware-core 2.0.64 → 2.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f543b009735c78575b8f6d11ae1ee251b3ff595550118d737a6447891b887c4
-  data.tar.gz: 6ed8c8373cd2fc474cd3804156dba4b65c1e3c7dc7222330daa3724d00c4b011
+  metadata.gz: bf634cea697775671cc9b95511d93c3927bfaef385d14257daffa16ca86086bb
+  data.tar.gz: da6403cbe24ea79e5690cb0e767bf83fd3931495950ad2135ffc9b08cad32ce6
 SHA512:
-  metadata.gz: 0fad1d755a7fef154aa5256d05f44ce2521d88da460bc52034daf78053ad1971901af7f5d4ae4019f10aba8299ea180e3475dbc7fe0391543d73961824edff5b
-  data.tar.gz: 3839ac94706e0c7df71351f97694254cf62a151e563f5c194e8e621693d5bb240aa309240fdde97c90bdb71898bc4094f7b1112452ffe01043cb74e77a1e653b
+  metadata.gz: d2d4668c9ce60c07e2d66bd2676270342c087292d32737a03a4a5db0f953b6f3339573f1815ba4e0efc939979c67b2de3e5f0192f5d3a4fd7250b9de10b95580
+  data.tar.gz: 51c70c6a5b0d163669a13f5c3674afabb6dbdfd22093951521210b80d42d860c248a438c13c994b1f4a4cb103ea3969e1d856fd79c5631fb6f73557bb763b160

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

@@ -37,7 +37,7 @@
 //= require foundation-datepicker
 //= require renalware/clockpicker
 //= require cocoon
-//= require renalware/mousetrap
+//= require mousetrap
 //= require renalware/iframeResizer
 //= require chosen-jquery
 //= require clipboard
@@ -45,7 +45,7 @@
 //= require rails.validations
 //= require rails.validations.simple_form
 //= require renalware/print.min
-//= require renalware/moment.min
+//= require moment
 //= require_tree .
 //
 

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

@@ -10,7 +10,7 @@ module Renalware
       search = User
         .includes(:roles)
         .where.not(username: :systemuser)
-        .search(query)
+        .ransack(query)
       users = search.result(distinct: true).page(page).per(per_page)
       authorize users
       render locals: { users: users, user_search: search }

data/app/controllers/renalware/api/ukrdc/patients_controller.rb

@@ -10,16 +10,25 @@ module Renalware
 
         def show
           respond_to do |format|
-            format.xml do
-              render locals: {
-                patient: patient_presenter
-              }
-            end
+            format.xml { render xml: patient_ukrdc_xml }
           end
         end
 
         private
 
+        def patient_ukrdc_xml
+          result = attempt_to_generate_patient_ukrdc_xml
+          if result.failure?
+            result.validation_errors.to_xml
+          else
+            result.xml
+          end
+        end
+
+        def attempt_to_generate_patient_ukrdc_xml
+          Renalware::UKRDC::XmlRenderer.new(locals: { patient: patient_presenter }).call
+        end
+
         def patient_presenter
           patient = Renalware::Patient.find_by!(secure_id: params[:id])
           authorize patient
@@ -30,65 +39,3 @@ module Renalware
     end
   end
 end
-
-# An alternative xml rendering implementation - moved to a template based approach
-# for now as its provides clarity
-#
-
-# class Base
-#   include ActiveModel::Serializers::Xml
-#   include Virtus::Model
-# end
-
-# class PatientNumber < Base
-#   attribute :number, String
-#   attribute :organisation, String
-
-#   def self.build_nhs_number(number)
-#     new(number: number, organisation: "NHS")
-#   end
-# end
-
-# class Name < Base
-#   attribute :prefix, String
-#   attribute :family, String
-#   attribute :given, String
-#   attribute :suffix, String
-#   attribute :use, String
-# end
-
-# class Patient < Base
-#   attribute :gender, String # 0=Not Known 1=Male 2=Female 9=Not Specified.
-#   attribute :birth_time, DateTime
-#   attribute :death_time, DateTime
-#   attribute :patient_numbers, Array(PatientNumber)
-#   attribute :name, Name
-#   attribute :country_of_birth, String # ISO 3166-1 3-char alphabetic code
-# end
-
-# rdc_patient = UKRDC::Patient.new(
-#   gender: patient.sex&.code,
-#   birth_time: patient.born_on,
-#   death_time: patient.died_on,
-#   country_of_birth: "???"
-# )
-
-# rdc_patient.name = Name.new(
-#   prefix: patient.title,
-#   family: patient.family_name,
-#   given: patient.given_name,
-#   suffix: patient.suffix
-# )
-
-# rdc_patient.patient_numbers << UKRDC::PatientNumber.build_nhs_number(patient.nhs_number)
-# Renalware.config.patient_hospital_identifiers.each do |_key, field|
-#   number = patient.public_send(field)
-#   unless number.blank?
-#     patient_number = UKRDC::PatientNumber.new(number: number, organisation: "LOCALHOSP")
-#     rdc_patient.patient_numbers << patient_number
-#   end
-# end
-
-# # Render XML
-# respond_with rdc_patient, camelize: true
-#

data/app/controllers/renalware/drugs/drugs_controller.rb

@@ -78,7 +78,7 @@ module Renalware
 
       def prepare_drugs_search
         search_params = params.fetch(:q, {})
-        @drugs_search = Drug.search(search_params)
+        @drugs_search = Drug.ransack(search_params)
         @drugs_search.sorts = "name"
       end
     end

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

@@ -43,7 +43,7 @@ module Renalware
           footer: {
             font_size: 8
           },
-          show_as_html: Rails.env.development? && params.key?("debug")
+          show_as_html: (Rails.env.development? || Rails.env.test?) && params.key?("debug")
         }
       end
 

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

@@ -3,16 +3,19 @@
 module Renalware
   module Patients
     class BookmarksController < BaseController
+      include Concerns::Pageable
       before_action :load_patient, only: :create
 
       # Display the user's bookmarks
       def index
-        bookmarks = Patients.cast_user(current_user)
-          .bookmarks
-          .ordered
-          .includes(patient: [current_modality: :description])
+        search = BookmarksQuery.new(
+          default_relation: Patients.cast_user(current_user).bookmarks,
+          params: params[:q]
+        ).search
+
+        bookmarks = search.result.page(page).per(per_page)
         authorize bookmarks
-        render locals: { bookmarks: bookmarks }
+        render locals: { bookmarks: bookmarks, search: search }
       end
 
       # idempotent
@@ -25,6 +28,7 @@ module Renalware
       end
 
       # idempotent
+      # rubocop:disable Metrics/AbcSize
       def destroy
         bookmark = user.bookmarks.find_by(id: params[:id])
         patient = bookmark&.patient
@@ -38,6 +42,7 @@ module Renalware
         redirect_back(fallback_location: patient_path(fallback_location),
                       notice: success_msg_for("bookmark"))
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -48,6 +53,12 @@ module Renalware
       def bookmark_params
         params.require(:patients_bookmark).permit(:notes, :urgent, :tags)
       end
+
+      def search_params
+        hash = params[:q] || {}
+        hash[:s] ||= "created_at desc"
+        hash
+      end
     end
   end
 end

data/app/controllers/renalware/snippets/snippets_controller.rb

@@ -8,7 +8,7 @@ module Renalware
       def index
         authorize Snippet, :index?
         snippets = snippets_for_author(author)
-        search = snippets.search(params[:q])
+        search = snippets.ransack(params[:q])
         search.sorts = ["times_used desc", "last_used_on desc"] if search.sorts.empty?
         snippets = paginate(search.result, default_per_page: 10)
         render locals: { snippets: snippets, search: search, author: author }

data/app/controllers/renalware/system/user_feedback_controller.rb

@@ -27,7 +27,7 @@ module Renalware
         search = UserFeedback
           .includes(:author)
           .order(created_at: :desc)
-          .search(search_params)
+          .ransack(search_params)
 
         feedback_msgs = search.result.page(page).per(per_page)
         authorize feedback_msgs

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

@@ -101,6 +101,7 @@ module Renalware
 
       class Complications < Document::Embedded
         attribute :access_site_status, Document::Enum
+        attribute :line_exit_site_status, Document::Enum
         attribute :was_dressing_changed, Document::Enum, enums: %i(yes no), default: :no
         attribute :had_mrsa_swab, Document::Enum, enums: %i(yes no), default: :no
         attribute :had_mssa_swab, Document::Enum, enums: %i(yes no), default: :no

data/app/models/renalware/admissions/consult_query.rb

@@ -21,7 +21,7 @@ module Renalware
       # It might be better to refactor PatientsRansackHelper so we can include where required
       # eg below using .extending(PatientsRansackHelper) rather than relying on it being in
       # included in the model file.
-      # note that adding .includes(:created_by) her creates an ambigous column
+      # note that adding .includes(:created_by) here creates an ambigous column
       # 'family_name' error
       # rubocop:disable Metrics/MethodLength
       def search

data/app/models/renalware/clinical/dry_weight.rb

@@ -25,6 +25,10 @@ module Renalware
       def self.policy_class
         BasePolicy
       end
+
+      def self.latest
+        ordered.first
+      end
     end
   end
 end

data/app/models/renalware/clinical/patient.rb

@@ -6,6 +6,7 @@ module Renalware
   module Clinical
     class Patient < ActiveType::Record[Renalware::Patient]
       has_many :allergies, dependent: :restrict_with_exception
+      has_many :dry_weights, dependent: :restrict_with_exception
 
       # These statuses match NHS standards for the display of recorded allergy status.
       # Note that
@@ -18,6 +19,10 @@ module Renalware
                        no_known_allergies
                        unavailable),
                 default: "unrecorded"
+
+      def latest_dry_weight
+        @latest_dry_weight ||= dry_weights.latest
+      end
     end
   end
 end

data/app/models/renalware/clinical/patient_dry_weights_query.rb

@@ -14,7 +14,7 @@ module Renalware
       end
 
       def search
-        @search ||= DryWeight.where(patient: @patient).search(@search_params)
+        @search ||= DryWeight.where(patient: @patient).ransack(@search_params)
       end
     end
   end

data/app/models/renalware/directory/person_query.rb

@@ -13,7 +13,7 @@ module Renalware
       end
 
       def search
-        @search ||= QueryablePerson.search(@q)
+        @search ||= QueryablePerson.ransack(@q)
       end
 
       class QueryablePerson < ActiveType::Record[Person]

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

@@ -34,7 +34,7 @@ module Renalware
             .with_current_pathology
             .with_registration_statuses
             .with_current_modality_matching(MODALITY_NAMES)
-            .search(params)
+            .ransack(params)
         end
       end
       # rubocop:enable Metrics/MethodLength

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

@@ -26,6 +26,12 @@ module Renalware
           modality_descriptions.exists?(type: "Renalware::HD::ModalityDescription")
       end
 
+      def current_modality_hd?
+        return false if current_modality.blank?
+
+        current_modality.description.is_a?(HD::ModalityDescription)
+      end
+
       def __getobj__
         self
       end

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

@@ -7,6 +7,14 @@ module Renalware
         nullify_significant_hd_profile_attributes(patient, by: actor)
       end
 
+      def request_default_electronic_cc_recipients_for_use_in_letters(patient:, array_of_user_ids:)
+        patient = HD.cast_patient(patient)
+        if patient.current_modality_hd?
+          named_nurse_id = patient.hd_profile&.named_nurse&.id
+          array_of_user_ids.push(named_nurse_id) if named_nurse_id.present?
+        end
+      end
+
       private
 
       def nullify_significant_hd_profile_attributes(patient, by:)

data/app/models/renalware/hd/sessions/ongoing_query.rb

@@ -13,7 +13,7 @@ module Renalware
         end
 
         def search
-          @search ||= Session::Open.search(@q)
+          @search ||= Session::Open.ransack(@q)
         end
       end
     end

data/app/models/renalware/hd/sessions/patient_query.rb

@@ -14,7 +14,7 @@ module Renalware
         end
 
         def search
-          @search ||= Session.where(patient: @patient).search(@q)
+          @search ||= Session.where(patient: @patient).ransack(@q)
         end
       end
     end

data/app/models/renalware/letters/descriptions/search_query.rb

@@ -16,7 +16,7 @@ module Renalware
         end
 
         def search
-          @search ||= Description.search(@search_params)
+          @search ||= Description.ransack(@search_params)
         end
       end
     end

data/app/models/renalware/letters/letter_factory.rb

@@ -5,11 +5,13 @@ require_dependency "renalware/letters"
 module Renalware
   module Letters
     # Build a new draft letter.
-    # Used e.g from .
+    # Used e.g from:
     # - LettersController#new - when building the initial letter form
     #   (in which case params are those suppplied in #new)
     # - LettersController#create via DraftLetter.build - before saving the letter, in which case
     #   params is the posted hash of letter attributes from the html form.
+    # TODO: think about spitting this into 2 classes, one for build (new/get) and one for creating
+    # (create/post)?
     class LetterFactory
       def initialize(patient, params = {})
         @params = LetterParamsProcessor.new(patient).call(params)
@@ -18,13 +20,19 @@ module Renalware
       end
 
       def build
-        @electronic_cc_recipient_ids = params.delete(:electronic_cc_recipient_ids)
+        # *Important this line is here and not in initialize. If moved to initialize we will get
+        # two copies of eCCs because of the way .with_contacts_as_default_ccs can be called
+        # before .build
+        @electronic_cc_recipient_ids = params.delete(:electronic_cc_recipient_ids) # see *
+
         @letter = build_letter
         build_electronic_ccs
         include_primary_care_physician_as_default_main_recipient
         assign_default_ccs
         build_salutation
         letter.pathology_timestamp = Time.zone.now
+        stub_letter_electronic_cc_recipient_ids_using_patients_default_eccs
+
         letter
       end
 
@@ -81,6 +89,51 @@ module Renalware
         end
       end
 
+      # Here we are doing thwo things:
+      #
+      # 1 We overwrite the ActiveRecord-generated 'electronic_cc_recipient_ids' property that would,
+      #   if any electronic_cc_recipients where saved against the letter, return the ids of those
+      #   recipients. This property is used in the letter form when displaying the selected eCC
+      #   users in a multi-select list. It works as expected when editing
+      #   letters that have a saved set of eCC recipients. But for the case when we are creating a
+      #   new letter, where there are no saved eCC recipients BUT we want to *pre-select* zero or
+      #   more default eCCs, ovewriting this property lets us spoof what AR would have done but
+      #   instead of returning user ids resolved through the AR relationship (which would require
+      #   those records to be saved) we return our own array. More on this next...
+      #
+      # 2 Inside our replacement #electronic_cc_recipient_ids property we resolve (collate, gather)
+      #   the complete set of default eCC users (as an array of user ids) and return them.
+      #   This lets us pre-select the default eCCs in the eCC multi-select
+      #   UI component in the new letter form. The array of user ids is resolved by raising an
+      #   event and asking any listeners to addd in their eCC suggestions.
+      #   See ResolveDefaultElectronicCCs for details.
+      def stub_letter_electronic_cc_recipient_ids_using_patients_default_eccs
+        return unless building_new_letter?
+
+        letter.define_singleton_method(:electronic_cc_recipient_ids) do
+          ResolveDefaultElectronicCCs
+            .for(patient)
+            .broadcasting_to_configured_subscribers
+            .call
+        end
+      end
+
+      # We operate in two modes:
+      # 1. building a skeleton letter (with defaults) to display in new letter form
+      # 2. building the letter after an http post (ie in the controller create action in which case
+      #    params will be fully populated.
+      # This helper method resolves which mode we are in.
+      # As letterhead_id is never passed when building a letter ready for display in the new form,
+      # we assume that if it is present it is because it is in the posted html form params ie
+      # we are going to go on and save the letter once built.
+      def building_letter_ready_to_save?
+        params.key?(:letterhead_id)
+      end
+
+      def building_new_letter?
+        !building_letter_ready_to_save?
+      end
+
       def build_salutation
         letter.salutation ||= begin
           main_recipient = letter.main_recipient