renalware-core 2.0.136 → 2.0.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c7978456dae11f60a6ca87a0b3e88cf781a0959535db5df4d54731eb449e80
-  data.tar.gz: c8edce70496e7e88c44f2925c37ac2a7ce27cb37fd01aeda67fb3f1971b94568
+  metadata.gz: 81d09134cf1a4ea4796c62cae9f367d2e336ee1d65e4707efcb49d7c58c7dcb4
+  data.tar.gz: 7cb276e32f591a30a8e94874e6d51330c765720acc9800d3c34828d85052e996
 SHA512:
-  metadata.gz: 9e2ba6a179f1e8d00b29e86f9d8d2635fe269a2249e1bdfd1ae3d7a5932a81eafe69d31f1c0599a678925fce5db310b7e333c96a9c94b46b142b138399f1ddc1
-  data.tar.gz: 6200892dd7a1d8ab0bc0ff3a5b7b28c362208d83b0e638c27f1dc8de5bbadfc60db3ca7fbf22a629f2986baf9ab72c5ef8cffeff57e28bafc8f6e2173c0c553c
+  metadata.gz: 7a8927c295304770d15f255702c1ad63cfeeb84a730745de3cd18bb438e6170c687f005d80019d434ea5170a5e84fe3c3935790fa3ea0fa181903f8ef163dfa4
+  data.tar.gz: 9c15f68020b3f733a6883ce21982057541d882b2ccd1432e3613970cfcf72229ef181a721abf9b600e1d49a4ffb190895d49bd682f333b2352a21f4d6eca6654

data/app/components/renalware/application_component.rb

@@ -5,10 +5,10 @@ module Renalware
     include Renalware::Engine.routes.url_helpers
     include Pundit::Helper
 
-    # Not sure why include Renalware::Engine.routes.url_helpers does not make the 
-    # engine urls visible in the views (seems to resolve alwatys to /assets?..) 
-    # so we expose routes here so inside a component html file we can use 
-    # e.g. renalware.bookmarks_path 
+    # Not sure why include Renalware::Engine.routes.url_helpers does not make the
+    # engine urls visible in the views (seems to resolve alwatys to /assets?..)
+    # so we expose routes here so inside a component html file we can use
+    # e.g. renalware.bookmarks_path
     def renalware
       Renalware::Engine.routes.url_helpers
     end
@@ -19,4 +19,4 @@ module Renalware
       current_user && Pundit.policy(current_user, record)
     end
   end
-end
+end

data/app/components/renalware/letters/letters_in_progress_component.rb

@@ -4,7 +4,7 @@ module Renalware
   module Letters
     class LettersInProgressComponent < ApplicationComponent
       attr_reader :current_user
-      
+
       def initialize(current_user:)
         @current_user = current_user
       end
@@ -22,8 +22,8 @@ module Renalware
         end
       end
 
-      private 
-      
+      private
+
       def present_letters(letters)
         CollectionPresenter.new(letters, Letters::LetterPresenterFactory)
       end

data/app/controllers/renalware/feeds/hl7_test_messages_controller.rb

@@ -11,7 +11,7 @@ module Renalware
         render locals: { form: HL7TestForm.new, test_messages: test_messages }
       end
 
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
       def create
         authorize [:renalware, :admin, :devops], :create?
         body = replace_placeholders_in_hl7_message(form_params[:body])
@@ -29,7 +29,7 @@ module Renalware
             }
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         # # Delayed::Job.enqueue job
         # redirect_to(

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

@@ -28,7 +28,6 @@ module Renalware
       end
 
       # idempotent
-      # rubocop:disable Metrics/AbcSize
       def destroy
         bookmark = user.bookmarks.find_by(id: params[:id])
         patient = bookmark&.patient
@@ -42,7 +41,6 @@ module Renalware
         redirect_back(fallback_location: patient_path(fallback_location),
                       notice: success_msg_for("bookmark"))
       end
-      # rubocop:enable Metrics/AbcSize
 
       private
 

data/app/controllers/renalware/pd/pet_adequacy_results_controller.rb

@@ -14,7 +14,6 @@ module Renalware
         render locals: { pet_adequacy_result: result, patient: patient }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def create
         result = patient.pet_adequacy_results.new(pet_adequacy_result_params)
         authorize result
@@ -25,13 +24,11 @@ module Renalware
           render :new, locals: { pet_adequacy_result: result, patient: patient }
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def edit
         render locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def update
         pet_adequacy_result.assign_attributes(pet_adequacy_result_params)
         if pet_adequacy_result.save
@@ -41,7 +38,6 @@ module Renalware
           render :edit, locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def show
         render locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }

data/app/controllers/renalware/pd/regimes_controller.rb

@@ -34,7 +34,6 @@ module Renalware
         }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def create
         result = CreateRegime.new(patient: patient)
                              .call(by: current_user, params: pd_regime_params)
@@ -49,7 +48,6 @@ module Renalware
           }
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def edit
         render :edit, locals: {
@@ -58,7 +56,6 @@ module Renalware
         }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def update
         result = ReviseRegime.new(pd_regime).call(by: current_user, params: pd_regime_params)
 
@@ -73,7 +70,6 @@ module Renalware
           }
         end
       end
-      # rubocop:enable Metrics/AbcSize
 
       def show
         render :show, locals: {

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

@@ -129,8 +129,6 @@ module Renalware
         attribute :safe_to_use, Document::Enum, default: :Y
       end
       attribute :avf_avg_assessment, AvfAvgAssessment
-
-      # rubocop:disable Metrics/AbcSize
       def error_messages
         [
           observations_before.errors.full_messages,
@@ -141,7 +139,6 @@ module Renalware
           hdf.errors.full_messages
         ].flatten.compact
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/app/inputs/date_picker_input.rb

@@ -16,7 +16,6 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
     end
   end
 
-  # rubocop:disable Metrics/AbcSize
   def input_column(_wrapper_options = {})
     html_options = input_html_options
     html_options[:class] ||= []
@@ -27,7 +26,6 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
       template.concat @builder.text_field(attribute_name, html_options.merge(value: value))
     end
   end
-  # rubocop:enable Metrics/AbcSize
 
   def icon_calendar
     "<span class='prefix'><i class='far fa-calendar'></i></span>".html_safe

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

@@ -28,12 +28,12 @@ module Renalware
       }
 
       # Because the database allows multiple current access profiles, this scope
-      # needs to choose just one, otherwise queries that merge in this scope 
+      # 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)
           left outer join (
-            select distinct on (patient_id) * from access_profiles 
+            select distinct on (patient_id) * from access_profiles
               where
                 access_profiles.terminated_on is null
                 and access_profiles.started_on <= current_date

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_dependency "renalware/pdf_friendly_validator"
 require_dependency "renalware/events"
 
 module Renalware
@@ -22,6 +23,8 @@ module Renalware
       validates :date_time, presence: true
       validates :event_type_id, presence: true
       validates :date_time, timeliness: { type: :datetime }
+      validates :notes, "renalware/pdf_friendly": true
+      validates :description, "renalware/pdf_friendly": true
 
       scope :ordered, -> { order(date_time: :desc, updated_at: :desc) }
 

data/app/models/renalware/feeds/files/practice_memberships/import_job.rb

@@ -10,8 +10,6 @@ module Renalware
           include StringLogging
           include Feeds::Job
           FILE_TO_EXTRACT_FROM_ARCHIVE = /epracmem.csv/.freeze
-
-          # rubocop:disable Metrics/AbcSize
           # TODO: refactor
           def perform(file)
             logging_to_stringio(strio = StringIO.new)
@@ -27,7 +25,6 @@ module Renalware
           ensure
             file.update!(status: status, result: strio.string, time_taken: elapsed_ms)
           end
-          # rubocop:enable Metrics/AbcSize
 
           private
 

data/app/models/renalware/feeds/files/primary_care_physicians/import_job.rb

@@ -11,8 +11,6 @@ module Renalware
           include Feeds::Job
 
           FILE_TO_EXTRACT_FROM_ARCHIVE = /^egpcur.csv$/.freeze
-
-          # rubocop:disable Metrics/AbcSize
           def perform(file)
             logging_to_stringio(strio = StringIO.new)
             log "PrimaryCarePhysician count before update: #{primary_care_physician_count}"
@@ -27,7 +25,6 @@ module Renalware
           ensure
             file.update!(status: status, result: strio.string, time_taken: elapsed_ms)
           end
-          # rubocop:enable Metrics/AbcSize
 
           private
 

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

@@ -20,7 +20,7 @@ module Renalware
         search.result
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def search
         @search ||= begin
           HD::Patient
@@ -39,7 +39,7 @@ module Renalware
             .ransack(params)
         end
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
 
       # Module to allow us to mixin ransackers
       module QueryablePatient

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

@@ -25,7 +25,6 @@ module Renalware
           Rails.logger.info "Compiling letter PDFs for batch #{batch.id} in folder #{dir}"
         end
 
-        # rubocop:disable Metrics/AbcSize
         def call
           batch.status = :processing
           batch.save_by!(user)
@@ -38,7 +37,6 @@ module Renalware
           batch.status = :awaiting_printing
           batch.save_by!(user)
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

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

@@ -31,7 +31,7 @@ module Renalware
     class CodeGroup < ApplicationRecord
       include Accountable
       has_paper_trail(
-        class_name: "Renalware::Pathology::Version", 
+        class_name: "Renalware::Pathology::Version",
         on: [:create, :update, :destroy]
       )
       validates :name, presence: true, uniqueness: true
@@ -50,7 +50,7 @@ module Renalware
         group = CodeGroup.find_by(name: name)
         return [] if group.nil?
 
-        group 
+        group
           .observation_descriptions
           .order(subgroup: :asc, position_within_subgroup: :asc)
       end

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

@@ -31,14 +31,14 @@ module Renalware
       serialize :values, ObservationsJsonbSerializer
 
       # Select values frm the set where the code matches the code or array of codes
-      # requested. 
+      # requested.
       # When the code is not found in the set, return an empty hash for that code.
-      # When the patient has no current_observation_set, return an empty hash for each code. 
+      # When the patient has no current_observation_set, return an empty hash for each code.
       # We need to be sure to extend the HashWithIndifferentAccess returned from
       # #select with the ObservationSetMethods so a user can call eg {..}.hgb_date
       # or {..}.plt etc without error
       def values_for_codes(codes)
-        hash = Array(codes).each_with_object(HashWithIndifferentAccess.new) do |code, hash| 
+        hash = Array(codes).each_with_object(HashWithIndifferentAccess.new) do |code, hash|
           hash[code] = values[code] || CurrentObservationSet.null_values_hash
         end
         hash.extend(ObservationSetMethods)
@@ -54,7 +54,7 @@ module Renalware
         ObservationsJsonbSerializer.load(HashWithIndifferentAccess.new)
       end
 
-      def values_for_codes(codes)
+      def values_for_codes(_codes)
         CurrentObservationSet.null_values_hash
       end
     end

data/app/models/renalware/pd/apd/calculate_volumes.rb

@@ -13,7 +13,6 @@ module Renalware
           @regime = decorate(regime)
         end
 
-        # rubocop:disable Metrics/AbcSize
         def call
           regime.overnight_volume = regime.calculated_overnight_volume
           regime.daily_volume = regime.calculated_daily_volume
@@ -21,7 +20,6 @@ module Renalware
           regime.glucose_volume_medium_strength = regime.volume_of_glucose_at_strength(:medium)
           regime.glucose_volume_high_strength = regime.volume_of_glucose_at_strength(:high)
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 

data/app/models/renalware/renal/registry/preflight_checks/patients_query.rb

@@ -73,7 +73,6 @@ module Renalware
 
           # Putting this here for now so all incomplete data criteria is all in one place.
           # Build an array of symbols for all missing data identified by the above query
-          # rubocop:disable Metrics/AbcSize
           def self.missing_data_for(patient)
             renal_profile = Renal.cast_patient(patient).profile
             missing = []
@@ -85,7 +84,6 @@ module Renalware
             end
             missing
           end
-          # rubocop:enable Metrics/AbcSize
 
           module QueryablePatient
             extend ActiveSupport::Concern

data/app/models/renalware/system/update_user.rb

@@ -20,7 +20,6 @@ module Renalware
 
       private
 
-      # rubocop:disable Metrics/AbcSize
       def update!(params)
         User.transaction do
           approve if can_approve?(params)
@@ -34,7 +33,6 @@ module Renalware
       rescue ActiveRecord::RecordInvalid
         false
       end
-      # rubocop:enable Metrics/AbcSize
 
       def notify!
         notifications.each { |n| n.public_send(delivery_method) } if notifications.any?

data/app/models/renalware/ukrdc/incoming/import_surveys.rb

@@ -23,7 +23,7 @@ module Renalware
               FileUtils.mv filepath, paths.archive.join(filepath.basename)
               next
             end
-            
+
             logger.info "Processing: #{filepath}"
             import_surveys_from_file(filepath)
           end
@@ -38,7 +38,7 @@ module Renalware
         # This assumes filenames are unique across time, which they should be.
         # Note we match on the whole file path, so if the location of the folder changes
         # and we are presented with familiar files, then they will be imported again. Its unlikely
-        # those two things will happen together though. 
+        # those two things will happen together though.
         def already_imported?(filepath)
           TransmissionLog.exists?(file_path: filepath.to_s, status: :imported)
         end
@@ -46,7 +46,6 @@ module Renalware
         # Import all surverys (they will be for the same patient) in the XML file.
         # Note that #with_logging yields a block that will catch and save any error to
         # ukrdc_transmission_logs
-        # rubocop:disable Metrics/AbcSize
         def import_surveys_from_file(file)
           # Important to create the log before we do anything that might cause an error
           # eg parse the xml etc.
@@ -64,7 +63,6 @@ module Renalware
         ensure
           FileUtils.mv file, paths.archive.join(file.basename)
         end
-        # rubocop:enable Metrics/AbcSize
 
         def import_survey(survey_hash, patient)
           ImportSurvey.new(

data/app/models/renalware/ukrdc/treatment_timeline/generate_treatments.rb

@@ -32,7 +32,7 @@ module Renalware
         def generate_treatments
           PrepareTables.call
           Rails.logger.info "#{patient_scope.count} patients"
-          patient_scope.find_each.with_index do |patient, index|
+          patient_scope.find_each.with_index do |patient, _index|
             print "\n#{patient.id}: "
             GenerateTimeline.new(patient).call
             # Start gargbage collection periodically to prevent server ram issues.

data/app/models/renalware/ukrdc/treatment_timeline/pd/generator.rb

@@ -79,7 +79,7 @@ module Renalware
             create_treatment(regime, start_date, end_date)
           end
 
-          # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          # rubocop:disable Metrics/MethodLength
           def create_treatment(regime, start_date, end_date)
             treatments << Treatment.create!(
               patient: patient,
@@ -99,7 +99,7 @@ module Renalware
               previous_treatment.update!(ended_on: start_date)
             end
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+          # rubocop:enable Metrics/MethodLength
 
           def treatments
             @treatments ||= []

data/app/models/renalware/user.rb

@@ -92,7 +92,6 @@ module Renalware
       OpenSSL::HMAC.hexdigest(digest, key, id.to_s)
     end
 
-
     # We implement a simple can? method ion the use because in places we pass a current user
     # from an ActionView::Component to a partial, and in the specs the partial says it cannot
     # Example usage user.can?(:edit, letter)