RubyGems - renalware-core - Versions diffs - 2.0.155 → 2.0.160 - Mend

renalware-core 2.0.155 → 2.0.160

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (199) hide show

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

@@ -39,5 +39,10 @@ module Renalware
     def self.configure
       yield config
     end
+    module APD
+      class NonUniqueOvernightVolumeError < StandardError
+      end
+    end
   end
 end

data/app/models/renalware/pd/{apd/exceptions.rb → apd.rb.dead} RENAMED

File without changes

data/app/models/renalware/pd/apd/available_overnight_volume.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/pd"
-require_dependency "renalware/pd/apd/exceptions"
 module Renalware
   module PD

data/app/models/renalware/pd/apd/regime_calculations.rb CHANGED

@@ -19,7 +19,7 @@ module Renalware
             calculated_overnight_volume,
             effective_last_fill_volume,
             effective_additional_manual_exchange_volume
-          ].compact.inject(0, :+)
+          ].compact.sum
           vol == 0 ? nil : vol
         end

data/app/models/renalware/pd/create_regime.rb CHANGED

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require_dependency "renalware/pd"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 module Renalware
   module PD
@@ -14,9 +14,9 @@ module Renalware
       def call(by:, params:)
         regime = patient.pd_regimes.new(params)
         if regime.valid? && save_regime(regime, by)
-          ::Renalware::Success.new(regime)
+          ::Success.new(regime)
         else
-          ::Renalware::Failure.new(regime)
+          ::Failure.new(regime)
         end
       end

data/app/models/renalware/pd/regimes_in_date_range_query.rb CHANGED

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "attr_extras"
 module Renalware
   module PD
     class RegimesInDateRangeQuery

data/app/models/renalware/pd/revise_regime.rb CHANGED

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require_dependency "renalware/pd"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 module Renalware
   module PD
@@ -14,13 +14,13 @@ module Renalware
       def call(by:, params:)
         Regime.transaction do
           regime.assign_attributes(params)
-          return ::Renalware::Success.new(regime) unless regime.anything_changed?
+          return ::Success.new(regime) unless regime.anything_changed?
           unless regime.valid?
-            return ::Renalware::Failure.new(regime.with_bag_destruction_marks_removed)
+            return ::Failure.new(regime.with_bag_destruction_marks_removed)
           end
           new_regime = revise_regime(by: by)
-          ::Renalware::Success.new(new_regime)
+          ::Success.new(new_regime)
         end
       end

data/{lib → app/models}/renalware/remembered_preferences.rb RENAMED

File without changes

data/app/models/renalware/research/study_participants_query.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/research"
-require "attr_extras"
 module Renalware
   module Research

data/app/models/renalware/transplants/create_donor_stage.rb CHANGED

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require_dependency "renalware/transplants"
-require_dependency "renalware/success"
-require_dependency "renalware/failure"
+require "success"
+require "failure"
 # Service object responsible for creating a new DonorStage and terminated the previous one
 # if found.
@@ -19,9 +19,9 @@ module Renalware
           terminate_current_stage if current_stage.present?
           stage = build_new_stage
           if stage.save
-            ::Renalware::Success.new(stage)
+            ::Success.new(stage)
           else
-            ::Renalware::Failure.new(stage)
+            ::Failure.new(stage)
           end
         end
       end

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

@@ -93,7 +93,7 @@ module Renalware
           when :suspended
             { current_status_in: :suspended }
           when :active_and_suspended
-            # note: array must be embedded in another array as mentioned here:
+            # NOTE: array must be embedded in another array as mentioned here:
             # https://github.com/activerecord-hackery/ransack#using-scopesclass-methods
             { current_status_in: [%w(active suspended)] }
           when :working_up

data/app/models/renalware/ukrdc.rb CHANGED

@@ -5,6 +5,7 @@ require_dependency "renalware"
 module Renalware
   module UKRDC
     class SurveyNotFoundError < StandardError; end
     class QuestionNotFoundError < StandardError; end
     def self.table_name_prefix

data/app/models/renalware/ukrdc/create_encrypted_patient_xml_files.rb CHANGED

@@ -11,7 +11,7 @@ module Renalware
     # which might for example be a symlink to an outgoing folder in /media/ukrdc which in turn
     # is mount on a remote share for example on an SFTP server.
     # rubocop:disable Metrics/ClassLength:
-    class CreateEncryptedPatientXMLFiles
+    class CreateEncryptedPatientXmlFiles
       attr_reader(
         :patient_ids,
         :changed_since,
@@ -106,7 +106,7 @@ module Renalware
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
       def create_xml_file(patient:, schema:)
-        CreatePatientXMLFile.new(
+        CreatePatientXmlFile.new(
           patient: patient,
           dir: paths.timestamped_xml_folder,
           changes_since: changed_since,

data/app/models/renalware/ukrdc/create_patient_xml_file.rb CHANGED

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC
-    class CreatePatientXMLFile
+    class CreatePatientXmlFile
       pattr_initialize [
         :patient!,
         :dir!,

data/app/models/renalware/ukrdc/export_summary.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/housekeeping/remove_old_export_archive_folders.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/incoming/file_list.rb CHANGED

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "attr_extras"
 module Renalware
   module UKRDC
     module Incoming

data/app/models/renalware/ukrdc/incoming/import_survey.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/incoming/xml_document.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/pathology_observation_requests_query.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC
@@ -18,7 +17,7 @@ module Renalware
         Pathology::ObservationRequest
           .where(id: Pathology::ObservationRequest.distinct_for_patient_id(patient_id))
           .where("requested_at >= ?", effective_changes_since)
-          .where("loinc_code is not null")
+          .where("loinc_code is not null") # NOTE: fails using where.not(loinc_code: nil)
           .eager_load(
             :description,
             observations: { description: :measurement_unit }

data/app/models/renalware/ukrdc/treatment_timeline/generate_timeline.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 require "benchmark"
 module Renalware

data/app/models/renalware/ukrdc/treatment_timeline/generator_factory.rb CHANGED

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 require "benchmark"
 module Renalware

data/app/models/renalware/ukrdc/treatment_timeline/hd/generator.rb CHANGED

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 module Renalware
   module UKRDC

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/pd/regime_decorator.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/transfer_out/generator.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 module Renalware
   module UKRDC

data/app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/ukrdc"
-require "attr_extras"
 # QBL   TXT   Description
 # "20"  "20"  "Transplant ; Cadaver donor"

data/app/models/renalware/ukrdc/xml_renderer.rb CHANGED

@@ -9,11 +9,11 @@ module Renalware
       DEFAULT_TEMPLATE = "/renalware/api/ukrdc/patients/show"
       attr_reader :template, :errors, :locals, :schema
-      class Success < Renalware::Success
+      class Success < ::Success
         alias xml object
       end
-      class Failure < Renalware::Failure
+      class Failure < ::Failure
         alias validation_errors object
       end

data/app/models/renalware/virology/vaccination.rb CHANGED

@@ -18,7 +18,12 @@ module Renalware
       class Document < Document::Embedded
         attribute :type, ::Document::Enum # See i18n for options
+        attribute :drug, String
         validates :type, presence: true
+        def to_s
+          [type&.text, drug].reject(&:blank?).join(" - ")
+        end
       end
       has_document
     end

data/app/presenters/renalware/accesses/dashboard_presenter.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/accesses"
-require "attr_extras"
 module Renalware
   module Accesses

data/app/presenters/renalware/clinical/header_presenter.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware"
-require "attr_extras"
 module Renalware
   module Clinical

data/app/presenters/renalware/letters/letter_presenter.rb CHANGED

@@ -83,7 +83,7 @@ module Renalware
         if archived?
           archive.content
         else
-          @content ||= HTMLRenderer.new.call(self)
+          @content ||= HtmlRenderer.new.call(self)
         end
       end

data/app/presenters/renalware/letters/part_class_filter.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require "renalware/letters"
-require "attr_extras"
 module Renalware
   module Letters

data/app/presenters/renalware/letters/practice_email_meta_data.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/letters"
-require "attr_extras"
 module Renalware
   module Letters

data/app/presenters/renalware/low_clearance/dashboard_presenter.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/low_clearance"
-require "attr_extras"
 module Renalware
   module LowClearance

data/app/presenters/renalware/medications/prescription_presenter.rb CHANGED

@@ -47,6 +47,13 @@ module Renalware
         ].compact.join(" - ")
       end
+      def provider_suffix
+        case __getobj__.provider&.to_s
+        when "gp" then "GP"
+        when "hospital", "home_delivery" then "HOSP"
+        end
+      end
       private
       def translated_dose_unit

data/app/presenters/renalware/pathology/observations_diff.rb CHANGED

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-require "attr_extras"
 require_dependency "renalware/pathology"
 # Compares two hashes of pathology observations (OBXs).

data/app/presenters/renalware/renal/clinical_summary_presenter.rb CHANGED

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require_dependency "renalware/renal"
-require "attr_extras"
 module Renalware
   module Renal

data/app/presenters/renalware/summary_part.rb CHANGED

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require "attr_extras"
 module Renalware
   # A base class for Summary presenters in other name-spaces. SummaryParts can be composed into
   # reporting dashboards or summary pages. The Clinical Summary for instance comprises an array