renalware-core 2.0.16 → 2.0.17

data/app/inputs/inline_radio_buttons_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InlineRadioButtonsInput < SimpleForm::Inputs::CollectionRadioButtonsInput
   def input_type
     "radio_buttons"

data/app/inputs/multiple_select_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MultipleSelectInput < SimpleForm::Inputs::CollectionSelectInput
   def input_type
     :multiple_select

data/app/inputs/select_container_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SelectContainerInput < SimpleForm::Inputs::Base
   def input(wrapper_options)
     options_html = input_options.delete(:options_html)

data/app/inputs/simple_time_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SimpleTimeInput < SimpleForm::Inputs::StringInput
   def input(_wrapper_options)
     template.content_tag(:div, class: "row collapse datepicker-wrapper") do

data/app/inputs/user_picker_input.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserPickerInput < SimpleForm::Inputs::CollectionSelectInput
   def input_type
     :user_picker

data/app/jobs/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # :nocov:
   # :nocov:

data/app/jobs/feed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # To create outside of Rails, insert a row with values for the following columns
 # into the `delayed_jobs` table:
 #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module HD
     class GenerateMonthlyStatisticsForPatientJob < ApplicationJob

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This job when executed will store a snapshot of last month's HD session statistics
 # for each HD patient.
 module Renalware

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # When executed this job updates rolling statistics for a patient's
 # last past 12 HD sessions.
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require "fileutils"
 

data/app/jobs/renalware/reporting/refresh_audit_data_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/reporting"
 
 module Renalware

data/app/mailers/renalware/admin/user_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class Admin::UserMailer < ApplicationMailer
     def approval(user)

data/app/mailers/renalware/letters/delivery/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/mailers/renalware/letters/delivery/practice_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 require "attr_extras"
 require_relative "./errors"

data/app/mailers/renalware/previews/user_mailer_preview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class Admin::UserMailerPreview < ActionMailer::Preview
     def approval

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

@@ -59,11 +59,12 @@ module Renalware
         end
 
         # This is fluid removed (ml) / HD time in hours eg 3.75 / dry weight (kg)
-        # The result is in ml/hr/kg
+        # The result is in ml/hr/kg.
+        # Note that fluid removed is entered in L so we need to convert to ml here.
         def ufr
           return nil unless measured_dry_weight > 0 && duration > 0 && fluid_removed > 0
 
-          fluid_removed / duration_as_hours / measured_dry_weight
+          (fluid_removed * 1000) / duration_as_hours / measured_dry_weight
         end
 
         private

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

@@ -27,7 +27,7 @@ module Renalware
             .extending(ModalityScopes)
             .extending(NamedFilterScopes)
             .with_current_pathology
-            .left_joins(:current_observation_set)
+            .left_outer_joins(:current_observation_set)
             .with_current_modality_of_class(LowClearance::ModalityDescription)
             .public_send(named_filter.to_s)
             .search(query)

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

@@ -46,13 +46,13 @@ module Renalware
                 in: DoseUnit.codes,
                 i18n_scope: "enumerize.renalware.medications.prescription.dose_unit"
 
-      scope :ordered, -> { includes(:drug).order("drugs.name") }
+      scope :ordered, -> { joins(:drug).order("drugs.name") }
       scope :with_medication_route, -> { includes(:medication_route) }
       scope :with_drugs, -> { includes(drug: :drug_types) }
       scope :with_classifications, -> { includes(drug: :classifications) }
       scope :with_termination, -> { includes(termination: [:created_by]) }
       scope :current, lambda { |date = Date.current|
-        eager_load(:termination)
+        left_outer_joins(:termination)
           .where("terminated_on IS NULL OR terminated_on > ?", date)
       }
       scope :terminated, lambda { |date = Date.current|

data/app/models/renalware/pd/capd_regime.rb

@@ -12,9 +12,7 @@ module Renalware
         500, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2200, 2500
       ].freeze
 
-      before_save :set_glucose_volume_low_strength
-      before_save :set_glucose_volume_medium_strength
-      before_save :set_glucose_volume_high_strength
+      before_save :calculate_daily_average_glucose_volumes
 
       def pd_type
         :capd
@@ -22,52 +20,48 @@ module Renalware
 
       private
 
-      # rubocop:disable Metrics/MethodLength
-      def match_bag_type
-        @match_bag_type ||= begin
-          glucose_types = [[], [], []]
+      def calculate_daily_average_glucose_volumes
+        strengths = build_hash_of_glucose_strengths_and_bag_glucose_volumes
+        persist_daily_average_glucose_volume_for_each_strength(strengths)
+      end
+
+      def build_hash_of_glucose_strengths_and_bag_glucose_volumes
+        strengths = initialise_hash_of_glucose_strengths
+        assign_weekly_glucose_volume_for_each_bag_to_corresponding_strength(strengths)
+        strengths
+      end
 
-          bags.each do |bag|
-            weekly_total = bag.weekly_total_glucose_ml_per_bag
-            case bag.bag_type.glucose_strength.to_sym
-            when :low then glucose_types[0] << weekly_total
-            when :medium then glucose_types[1] << weekly_total
-            when :high then glucose_types[2] << weekly_total
-            else glucose_types
-            end
-          end
-          glucose_types
+      def persist_daily_average_glucose_volume_for_each_strength(strengths)
+        strengths.each do |name, strength|
+          strength_setter = :"glucose_volume_#{name}_strength="
+          send(strength_setter, strength.daily_average) if respond_to?(strength_setter)
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
-      def set_glucose_volume_low_strength
-        if match_bag_type[0].empty?
-          0
-        else
-          per_week_total = match_bag_type[0].inject{ |sum, v| sum + v }
-          glucose_daily_average = per_week_total / 7.to_f
-          self.glucose_volume_low_strength = glucose_daily_average.round
+      def initialise_hash_of_glucose_strengths
+        BagType.glucose_strength.values.each_with_object({}) do |strength, hash|
+          hash[strength.to_sym] = GlucoseStrength.new
         end
       end
 
-      def set_glucose_volume_medium_strength
-        if match_bag_type[1].empty?
-          0
-        else
-          per_week_total = match_bag_type[1].inject{ |sum, v| sum + v }
-          glucose_daily_average = per_week_total / 7.to_f
-          self.glucose_volume_medium_strength = glucose_daily_average.round
+      def assign_weekly_glucose_volume_for_each_bag_to_corresponding_strength(strengths)
+        bags.each do |bag|
+          weekly_total = bag.weekly_total_glucose_ml_per_bag
+          bag_strength = bag.bag_type.glucose_strength.to_sym
+          strengths[bag_strength].weekly_totals << weekly_total
         end
       end
 
-      def set_glucose_volume_high_strength
-        if match_bag_type[2].empty?
-          0
-        else
-          per_week_total = match_bag_type[2].inject{ |sum, v| sum + v }
-          glucose_daily_average = per_week_total / 7.to_f
-          self.glucose_volume_high_strength = glucose_daily_average.round
+      class GlucoseStrength
+        attr_reader :weekly_totals
+
+        def initialize
+          @weekly_totals = []
+        end
+
+        def daily_average
+          per_week_total = weekly_totals.inject(0.0){ |sum, volume| sum + volume }
+          per_week_total / 7.to_f
         end
       end
     end

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

@@ -26,7 +26,7 @@ module Renalware
             .extending(PatientPathologyScopes)
             .with_current_modality_matching(MODALITY_NAMES)
             .with_current_pathology
-            .left_joins(:current_observation_set)
+            .left_outer_joins(:current_observation_set)
             .search(q)
         end
       end

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

@@ -33,7 +33,7 @@ module Renalware
             .extending(NamedFilterScopes)
             .with_current_modality_matching(MODALITY_NAMES)
             .with_current_pathology
-            .left_joins(:current_observation_set)
+            .left_outer_joins(:current_observation_set)
             .public_send(named_filter.to_s)
             .search(q)
         end

data/app/models/renalware/transplants/registrations/wait_list_query.rb

@@ -22,8 +22,8 @@ module Renalware
           @search ||= begin
             query = query_for_filter(named_filter).merge(q)
             QueryableRegistration
-              .includes(patient: [current_modality: :description])
-              .includes(current_status: :description)
+              .eager_load(patient: [current_modality: :description])
+              .eager_load(current_status: :description)
               .merge(HD::Patient.with_profile)
               .merge(Renal::Patient.with_profile)
               .search(query).tap do |s|

data/app/models/renalware/user.rb

@@ -31,7 +31,7 @@ module Renalware
     scope :ordered, -> { order(:family_name, :given_name) }
     scope :excluding_system_user, -> { where.not(username: SystemUser.username) }
     scope :with_no_role, lambda {
-      left_joins(:roles)
+      left_outer_joins(:roles)
         .distinct("roles_users.user_id")
         .where("roles_users.user_id is null")
     }

data/app/policies/renalware/letters/letter_policy.rb

@@ -32,7 +32,19 @@ module Renalware
       end
 
       def destroy?
-        record.state.downcase.to_sym != :approved
+        return false if user_is_read_only?
+        return false if %i(approved completed).include?(letter_state)
+
+        user_is_admin? ||
+          user_is_super_admin? ||
+          letter.author == user ||
+          letter.created_by == user
+      end
+
+      private
+
+      def letter_state
+        record.state.downcase.to_sym
       end
     end
   end

data/app/policies/renalware/system/user_feedback_policy.rb

@@ -5,6 +5,9 @@ require_dependency "renalware/snippets"
 module Renalware
   module System
     class UserFeedbackPolicy < BasePolicy
+      def index?
+        user_is_super_admin?
+      end
     end
   end
 end

data/app/presenters/renalware/mdm_presenter.rb

@@ -132,7 +132,6 @@ module Renalware
            .with_medication_route
            .with_drugs
            .with_classifications
-           .with_termination
            .eager_load(drug: [:drug_types])
            .map { |prescrip| Medications::PrescriptionPresenter.new(prescrip) }
     end

data/app/validators/concerns/renalware/numeric_range_validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 module Renalware

data/app/validators/concerns/renalware/numeric_scale_validations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware"
 
 module Renalware

data/app/validators/renalware/address_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class AddressValidator < ActiveModel::Validator
     def validate(address)

data/app/validators/renalware/letters/author_signature_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Letters
     class AuthorSignatureValidator < ActiveModel::Validator

data/app/validators/renalware/patients/blood_pressure_presence_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This validator is used somewhat unconventionally from the parent object (e.g. a
 # the HD::SessionDocument::Dialysis class) to allow us to conditionally validate
 # the presence of the BloodPressure fields only if a condition external to the BloodPressure

data/app/validators/renalware/patients/blood_pressure_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class BloodPressureValidator < ActiveModel::Validator

data/app/validators/renalware/patients/bm_stix_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class BmStixValidator < ActiveModel::EachValidator

data/app/validators/renalware/patients/hdf_presence_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This HDF validator is used somewhat unconventionally from the parent object (e.g. a
 # the HD::SessionDocument to allow us to conditionally validate the presence of the HDF fields
 # only if a condition external to the HDF class is met.

data/app/validators/renalware/patients/height_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class HeightValidator < ActiveModel::EachValidator

data/app/validators/renalware/patients/primary_care_physicians/address_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/patients"
 
 module Renalware

data/app/validators/renalware/patients/pulse_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class PulseValidator < ActiveModel::EachValidator

data/app/validators/renalware/patients/temperature_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class TemperatureValidator < ActiveModel::EachValidator

data/app/validators/renalware/patients/weight_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   module Patients
     class WeightValidator < ActiveModel::EachValidator

data/app/values/renalware/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   class Address < ApplicationRecord
     belongs_to :country, class_name: "System::Country"

data/app/values/renalware/bmi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "attr_extras"
 
 module Renalware