renalware-core 2.0.151 → 2.0.157

data/app/controllers/renalware/users_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+# Note we rely on template inheritance with this MDM Base class i.e. subclasses (e.g.
+# HD::MDMPatientsController) can override templates and partials (e.g. add a _filters partial
+# or override the _patient partial to replace what is displayed in the table).
+# Otherwise the default template location is of course app/views/renalware/mdm_patients.
+module Renalware
+  class UsersController < BaseController
+    include Pagy::Backend
+
+    def index
+      query = params.fetch(:q, {})
+      query[:s] ||= "family_name"
+      search = User
+        .includes(:roles)
+        .where.not(username: [:rwdev, :systemuser])
+        .ransack(query)
+      pagy, users = pagy(search.result(distinct: true))
+      authorize users
+      render locals: { users: users, pagy: pagy, user_search: search }
+    end
+  end
+end

data/app/helpers/renalware/application_helper.rb

@@ -3,6 +3,7 @@
 require "inline_image"
 require "git_commit_sha"
 require "breadcrumb"
+require "renalware/version_number"
 
 module Renalware
   module ApplicationHelper
@@ -113,7 +114,7 @@ module Renalware
     end
 
     def semantic_app_version
-      "#{Renalware::VERSION}+sha.#{GitCommitSha.current}"
+      "#{Renalware::VersionNumber::VERSION}+sha.#{GitCommitSha.current}"
     end
   end
 end

data/app/helpers/renalware/drugs_helper.rb

@@ -11,6 +11,12 @@ module Renalware
       )
     end
 
+    # Now that we have a drug_types.colour column e.g. '#aaa' we can use here.
+    # Where the drug belongs to 2 drug types, we need to be sure to choose the colour of the most
+    # clinically significant drug type - eg 'ESA' wins over 'My other drug type'.
+    # This should be done by ordering a drugs types and taking the one with the highest value
+    # in the #weighting column - i.e. ESA will have a a large value in this column to ensure it
+    # trumps other types and its colour is used.
     def drug_types_colour_tag(drug_types)
       drug_names = drug_types.map(&:name)
       return "esa" if drug_names.include?("ESA")

data/app/helpers/renalware/layout_helper.rb

@@ -59,7 +59,7 @@ module Renalware
     # where Demographics is a link back in the navigation, like a true breadcrumb.
     # :breadcrumbs can be anchors or just a page name, and is single does not need to be an array.
     # :title is normally just a string as it represents the current page, and should not be a link.
-    def breadcrumbs_and_title(breadcrumbs: [], title:)
+    def breadcrumbs_and_title(title:, breadcrumbs: [])
       safe_join(Array(breadcrumbs).map(&:anchor).append(title), " / ")
     end
 

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Sortable
+    extend ActiveSupport::Concern
+
+    # Assumes that the model has the #position attribute and adds 2 features to a model that
+    # includes it:
+    # 1. Set the :position to the next highest value when a new row is added. If the model has a
+    #    position_sorting_scope scope or class method, this is used to narrow the range of records
+    #    searched when finding the current max position
+    # 2. Add ability to sort rows based on an array of ids.
+
+    included do
+      before_create :set_position
+    end
+
+    class_methods do
+      # A controller #sort action might for instance invoke this class method on an object.
+      # The array of ids are the model to sort, and sorting is done by updating each model's
+      # position to reflect their place in the array.
+      def sort(ids)
+        Array(ids).each_with_index do |id, index|
+          where(id: id).update_all(["position=?", index + 1])
+        end
+      end
+    end
+
+    # Invoked by the callback when a record is created to set the initial value of #position.
+    # If no position_sorting_scope is defined on the model class, we set position to the max
+    # position in the whole table. If position_sorting_scope is provided we use it to refine the
+    # grouping and hence the max(position) found - for example to get the max position where
+    # patient_id = 123
+    #
+    # Example scope in a model:
+    #   scope :position_sorting_scope, ->(problem) { where(patient_id: problem.patient.id) }
+    #
+    def set_position
+      return unless respond_to?(:position)
+
+      scope = if self.class.respond_to?(:position_sorting_scope)
+                self.class.position_sorting_scope(self)
+              else
+                self.class
+              end
+      self.position = (scope.maximum(:position) || 0) + 1
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Renalware
       end
 
       scope :with_current_plan, lambda {
-        joins(<<-SQL)
+        joins(<<-SQL.squish)
           left outer join access_plans on access_plans.patient_id = patients.id
             and access_plans.terminated_at is null
           left outer join access_plan_types
@@ -31,7 +31,7 @@ module Renalware
       # needs to choose just one, otherwise queries that merge in this scope
       # can have duplicates, or worse, broken pagination.
       scope :with_profile, lambda {
-        joins(<<-SQL)
+        joins(<<-SQL.squish)
           left outer join (
             select distinct on (patient_id) * from access_profiles
               where

data/app/models/renalware/accesses/plan.rb

@@ -9,7 +9,7 @@ module Renalware
 
       belongs_to :patient, touch: true
       belongs_to :plan_type
-      belongs_to :decided_by, class_name: "User", foreign_key: "decided_by_id"
+      belongs_to :decided_by, class_name: "User"
 
       validates :plan_type, presence: true
       validates :decided_by, presence: true

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

@@ -7,6 +7,7 @@ module Renalware
     class Request < ApplicationRecord
       include Accountable
       extend Enumerize
+      include Sortable
 
       acts_as_paranoid
 

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

@@ -16,7 +16,7 @@ module Renalware
       }
 
       belongs_to :patient, class_name: "Renalware::Clinical::Patient", touch: true
-      belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
+      belongs_to :assessor, class_name: "User"
       belongs_to :modality_description, class_name: "Modalities::Description"
 
       has_paper_trail(

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

@@ -10,7 +10,7 @@ module Renalware
       include Accountable
 
       belongs_to :patient, class_name: "Renalware::Clinical::Patient", touch: true
-      belongs_to :assessor, class_name: "User", foreign_key: "assessor_id"
+      belongs_to :assessor, class_name: "User"
 
       has_paper_trail(
         versions: { class_name: "Renalware::Clinical::Version" },

data/app/models/renalware/clinics/clinic_visit.rb

@@ -39,10 +39,7 @@ module Renalware
 
       before_save :calculate_body_surface_area
       before_save :calculate_total_body_water
-
-      def bmi
-        BMI.new(weight: weight, height: height).to_f
-      end
+      before_save :calculate_bmi
 
       def bp
         return unless systolic_bp.present? && diastolic_bp.present?
@@ -92,6 +89,10 @@ module Renalware
           sex: patient.sex
         )
       end
+
+      def calculate_bmi
+        self.bmi = BMI.new(weight: weight, height: height).to_f
+      end
     end
   end
 end

data/app/models/renalware/feeds/files/create_feed_file.rb

@@ -34,7 +34,7 @@ module Renalware
         end
 
         def uploads_dir
-          Rails.root.join("tmp", "uploads").tap do |uploads_path|
+          Rails.root.join("tmp/uploads").tap do |uploads_path|
             warn "using upload path #{uploads_path}"
             Dir.mkdir(uploads_path) unless Dir.exist?(uploads_path)
           end

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

@@ -11,7 +11,7 @@ module Renalware
       has_many :prescription_administrations
       scope :with_profile, lambda {
         includes(hd_profile: :hospital_unit)
-        .joins(<<-SQL)
+        .joins(<<-SQL.squish)
           LEFT OUTER JOIN hd_profiles ON hd_profiles.patient_id = patients.id
           LEFT OUTER JOIN hospital_units ON hd_profiles.hospital_unit_id = hospital_units.id
         SQL

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

@@ -10,7 +10,7 @@ module Renalware
 
       belongs_to :patient, touch: true
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
-      belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
+      belongs_to :schedule_definition
 
       has_paper_trail(
         versions: { class_name: "Renalware::HD::Version" },

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

@@ -14,10 +14,10 @@ module Renalware
       belongs_to :patient, touch: true
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
       belongs_to :dialysate
-      belongs_to :prescriber, class_name: "User", foreign_key: "prescriber_id"
-      belongs_to :named_nurse, class_name: "User", foreign_key: "named_nurse_id"
-      belongs_to :transport_decider, class_name: "User", foreign_key: "transport_decider_id"
-      belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
+      belongs_to :prescriber, class_name: "User"
+      belongs_to :named_nurse, class_name: "User"
+      belongs_to :transport_decider, class_name: "User"
+      belongs_to :schedule_definition
       has_document class_name: "Renalware::HD::ProfileDocument"
 
       has_paper_trail(

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

@@ -23,7 +23,7 @@ module Renalware
       ABBREV_DAY_NAMES = %w(Mon Tue Wed Thu Fri Sat Sun).freeze
       validates :days, presence: true
       validates :diurnal_period_id, presence: true
-      belongs_to :diurnal_period, class_name: "DiurnalPeriodCode", foreign_key: :diurnal_period_id
+      belongs_to :diurnal_period, class_name: "DiurnalPeriodCode"
       scope :ordered, -> { order(days: :asc) }
 
       # Render the schedule definition to a human friendly format e.g. "Mon, Wed, Fri AM"

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

@@ -24,8 +24,8 @@ module Renalware
       belongs_to :modality_description, class_name: "Modalities::Description"
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
       belongs_to :dialysate
-      belongs_to :signed_on_by, class_name: "User", foreign_key: "signed_on_by_id"
-      belongs_to :signed_off_by, class_name: "User", foreign_key: "signed_off_by_id"
+      belongs_to :signed_on_by, class_name: "User"
+      belongs_to :signed_off_by, class_name: "User"
       has_many :prescription_administrations,
                class_name: "PrescriptionAdministration",
                foreign_key: "hd_session_id",

data/app/models/renalware/hd/session_forms/batch_compile_pdfs.rb

@@ -72,7 +72,7 @@ module Renalware
         end
 
         def working_folder
-          Rails.root.join("tmp", "batched_hd_session_forms").tap do |folder|
+          Rails.root.join("tmp/batched_hd_session_forms").tap do |folder|
             FileUtils.mkdir_p folder
           end
         end

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

@@ -6,7 +6,8 @@ module Renalware
   module HD
     class Station < ApplicationRecord
       include Accountable
-      belongs_to :location, class_name: "HD::StationLocation", foreign_key: :location_id
+      include Sortable
+      belongs_to :location, class_name: "HD::StationLocation"
       validates :hospital_unit_id, presence: true
       validates :name, uniqueness: { scope: :hospital_unit_id }
 

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

@@ -8,6 +8,8 @@ module Renalware
       validates :text, presence: true
 
       has_many :letters, dependent: :restrict_with_exception
+
+      scope :ordered, -> { order(position: :asc, text: :asc) }
     end
   end
 end

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

@@ -35,7 +35,7 @@ module Renalware
                through: :electronic_receipts,
                source: :recipient
       has_one :signature, dependent: :destroy
-      has_one :archive, foreign_key: "letter_id", inverse_of: :letter
+      has_one :archive, inverse_of: :letter
       serialize :pathology_snapshot, Pathology::ObservationsJsonbSerializer
 
       accepts_nested_attributes_for :main_recipient

data/app/models/renalware/letters/part/prescriptions.rb

@@ -22,12 +22,17 @@ module Renalware
       def prescriptions
         presenter_klass = ::Renalware::Medications::PrescriptionPresenter
         ::OpenStruct.new(
-          current: present(current_prescriptions, presenter_klass),
+          current: present(current_non_hd, presenter_klass),
           recently_changed: present(recently_changed_current_prescriptions, presenter_klass),
-          recently_stopped: present(recently_stopped_prescriptions, presenter_klass)
+          recently_stopped: present(recently_stopped_prescriptions, presenter_klass),
+          current_hd: present(current_hd, presenter_klass)
         )
       end
 
+      def current_non_hd
+        @current_non_hd ||= current_prescriptions.where.not(administer_on_hd: true)
+      end
+
       def current_prescriptions
         @current_prescriptions ||= patient_prescriptions.current
       end
@@ -36,7 +41,7 @@ module Renalware
       # Because we terminated a prescription if the dosage changes, and create a new one,
       # we just need to search for prescriptions created in the last 14 days.
       def recently_changed_current_prescriptions
-        @recently_changed_prescriptions ||= begin
+        @recently_changed_current_prescriptions ||= begin
           current_prescriptions.prescribed_between(from: 14.days.ago, to: ::Time.zone.now)
         end
       end
@@ -51,6 +56,10 @@ module Renalware
         end
       end
 
+      def current_hd
+        @current_hd ||= current_prescriptions.where(administer_on_hd: true)
+      end
+
       def patient_prescriptions
         @patient_prescriptions ||= begin
           @patient.prescriptions

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

@@ -56,7 +56,7 @@ module Renalware
         end
 
         def cache_path
-          Rails.root.join("tmp", "pdf_letter_cache")
+          Rails.root.join("tmp/pdf_letter_cache")
         end
 
         def store

data/app/models/renalware/letters/printing/batch_compile_pdfs.rb

@@ -43,7 +43,7 @@ module Renalware
         attr_reader :batch, :dir, :user
 
         def append_files
-          folder = Rails.root.join("tmp", "batched_letters")
+          folder = Rails.root.join("tmp/batched_letters")
           FileUtils.mkdir_p folder
           pdf_file = folder.join("#{batch.id}.pdf")
           glob = Dir.glob(dir.join("*.pdf"))

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

@@ -55,7 +55,7 @@ module Renalware
       def fetch_contact(params)
         return if params[:addressee_id].blank?
 
-        @patient.contacts.find_by!(id: params[:addressee_id])
+        @patient.contacts.find(params[:addressee_id])
       end
     end
   end

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

@@ -89,10 +89,6 @@ module Renalware
         ["drug_name asc", "prescribed_on desc"]
       end
 
-      def self.policy_class
-        BasePolicy
-      end
-
       # @section attributes
       #
       def terminated_by

data/app/models/renalware/messaging/internal/message_form.rb

@@ -17,6 +17,7 @@ module Renalware
         attribute :urgent, Boolean, default: false
         attribute :recipient_ids, Array, default: []
         attribute :replying_to_message_id
+        attribute :public, Boolean, default: true
 
         validates :body, presence: true
         validates :subject, presence: true

data/app/models/renalware/messaging/internal/message_form_builder.rb

@@ -22,7 +22,8 @@ module Renalware
           MessageForm.new(
             subject: build_subject,
             recipient_ids: build_recipient_ids,
-            replying_to_message_id: replying_to_message_id
+            replying_to_message_id: replying_to_message_id,
+            public: true
           )
         end
 

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

@@ -42,17 +42,17 @@ module Renalware
         # the same.
         Observation
           .includes(:description)
-          .select(<<-SQL)
+          .select(<<-SQL.squish)
             DISTINCT ON (pathology_observation_descriptions.id)
             pathology_observations.*,
             pathology_observation_descriptions.code AS description_code,
             pathology_observation_descriptions.name AS description_name
           SQL
-          .joins(<<-SQL)
+          .joins(<<-SQL.squish)
             LEFT JOIN pathology_observation_requests
             ON pathology_observations.request_id = pathology_observation_requests.id
           SQL
-          .joins(<<-SQL)
+          .joins(<<-SQL.squish)
             RIGHT JOIN pathology_observation_descriptions
             ON pathology_observations.description_id = pathology_observation_descriptions.id
           SQL

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

@@ -7,6 +7,19 @@ module Renalware
     class MeasurementUnit < ApplicationRecord
       validates :name, presence: true
       has_many :observation_descriptions, inverse_of: :measurement_unit
+      belongs_to :ukrdc_measurement_unit, class_name: "Renalware::UKRDC::MeasurementUnit"
+
+      def self.for_collection_select
+        order(:name).select(:id, :name, :description).map { |row| [row.title, row.id] }
+      end
+
+      # A friendly string containing name and description (if present) in parentheses
+      # e.g. "l (litres)"
+      def title
+        return name if description.blank? || name == description
+
+        "#{name} (#{description})"
+      end
     end
   end
 end