renalware-core 2.0.46 → 2.0.47

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

@@ -13,6 +13,7 @@ module Renalware
 
       def call(limit: 1)
         return [] if event_type.nil?
+
         Event.for_patient(patient)
              .where(event_type_id: event_type.id)
              .order(date_time: :desc)

data/app/models/renalware/feeds/files/practices/convert_xml_to_csv.rb

@@ -127,6 +127,7 @@ module Renalware
 
               if (PRACTICE_ROLES & org.roles).any?
                 fail unless org.code&.length == 6
+
                 practices_count += 1
                 if org.skip
                   Rails.logger.warn(

data/app/models/renalware/feeds/files/practices/country_map.rb

@@ -22,6 +22,7 @@ module Renalware
 
           def map(country)
             return if country.blank?
+
             if UK_COUNTRIES.include?(country.upcase.strip)
               Country.new(country: "United Kingdom", region: country.strip.titleize)
             else

data/app/models/renalware/feeds/files/practices/xml_parser.rb

@@ -76,6 +76,7 @@ module Renalware
 
           def for_element(name, &block)
             return unless self.name == name and is_start?
+
             self.instance_eval(&block)
           end
 
@@ -88,6 +89,7 @@ module Renalware
 
             @node.each do
               return if self.name == name and is_end? and @node.depth == depth
+
               self.instance_eval(&block)
             end
           end

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

@@ -20,6 +20,7 @@ module Renalware
 
       def create_patient_statistics(sessions)
         return unless sessions.any?
+
         stats = build_patient_statistics
         stats.hospital_unit = most_recently_used_hospital_unit(sessions)
         stats.assign_attributes(auditable_sessions(sessions).to_h)
@@ -73,6 +74,7 @@ module Renalware
         # }
         def to_h
           return {} if observation_set.blank?
+
           observation_set.values.select { |code, _| CODES.include?(code.to_s) }
         end
 

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

@@ -27,6 +27,7 @@ module Renalware
       # Convert e.g. "[1,2,3]" to [1,2,3]
       def schedule_definition_ids_array
         return if schedule_definition_ids.blank?
+
         schedule_definition_ids.scan(/\d+/).map(&:to_i)
       end
     end

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

@@ -25,13 +25,14 @@ module Renalware
         @search ||= begin
           HD::Patient
             .include(QueryablePatient)
+            .extending(PatientTransplantScopes)
             .merge(Accesses::Patient.with_current_plan)
             .merge(Accesses::Patient.with_profile)
-            .merge(Transplants::Patient.with_registration_statuses)
             .eager_load(hd_profile: [:hospital_unit])
             .extending(ModalityScopes)
             .extending(PatientPathologyScopes)
             .with_current_pathology
+            .with_registration_statuses
             .with_current_modality_matching(MODALITY_NAMES)
             .search(params)
         end
@@ -59,10 +60,6 @@ module Renalware
           ransacker :current_access, type: :string do
             Arel.sql("access_types.name")
           end
-
-          ransacker :transplant_registration_status do
-            Arel.sql("transplant_registration_status_descriptions.name")
-          end
         end
       end
     end

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

@@ -28,6 +28,7 @@ module Renalware
 
         def to_s
           return default_name if patient.blank? || unit_code.blank?
+
           "#{default_name} (#{unit_code})"
         end
 

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

@@ -12,6 +12,7 @@ module Renalware
       def nullify_significant_hd_profile_attributes(patient, by:)
         hd_profile = HD.cast_patient(patient).hd_profile
         return if hd_profile.nil?
+
         hd_profile.hospital_unit = nil
         hd_profile.schedule_definition = nil
         hd_profile.save_by!(by)

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

@@ -39,6 +39,7 @@ module Renalware
 
       def to_s
         return "Last #{session_count} sessions" if rolling?
+
         if year > 0 && month > 0
           Date.new(year, month).strftime("%b %Y")
         end

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

@@ -14,6 +14,7 @@ module Renalware
 
       def call
         return [] if schedule_definition_ids.empty?
+
         Patient
           .eager_load(hd_profile: [:hospital_unit, { schedule_definition: [:diurnal_period] }])
           .where(

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

@@ -12,7 +12,7 @@ module Renalware
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
       belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
 
-      has_paper_trail class_name: "Renalware::HD::Version"
+      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
 
       validates :patient, presence: true
       validates :entered_on, timeliness: { type: :date, allow_blank: true }

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

@@ -20,7 +20,7 @@ module Renalware
       belongs_to :schedule_definition, foreign_key: "schedule_definition_id"
 
       has_document class_name: "Renalware::HD::ProfileDocument"
-      has_paper_trail class_name: "Renalware::HD::Version"
+      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
 
       validates :patient, presence: true
       validates :prescriber, presence: true

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

@@ -5,6 +5,7 @@ module Renalware
     class ReviseHDProfile
       def initialize(profile)
         raise(ArgumentError, "Cannot revise a new Profile") unless profile.persisted?
+
         @profile = profile
       end
 
@@ -12,8 +13,8 @@ module Renalware
         profile.assign_attributes(params)
         return true unless profile.changed?
         return false unless profile.valid?
-        profile.restore_attributes
 
+        profile.restore_attributes
         profile.supersede!(params)
       end
 

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

@@ -29,7 +29,7 @@ module Renalware
                dependent: :destroy
       accepts_nested_attributes_for :prescription_administrations
 
-      has_paper_trail class_name: "Renalware::HD::Version"
+      has_paper_trail class_name: "Renalware::HD::Version", on: [:create, :update, :destroy]
 
       before_create :assign_modality
       before_save :compute_duration

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

@@ -23,6 +23,7 @@ module Renalware
 
       def immutable?
         return true unless persisted?
+
         temporary_editing_window_has_elapsed?
       end
 

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

@@ -21,6 +21,7 @@ module Renalware
 
       def immutable?
         return true unless persisted?
+
         temporary_editing_window_has_elapsed?
       end
 

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

@@ -54,6 +54,7 @@ module Renalware
 
       def set_default_access(session) # rubocop:disable Naming/AccessorMethodName
         return if dna_session?
+
         accesses_patient = Renalware::Accesses.cast_patient(patient)
         if (profile = accesses_patient.current_profile)
           session.document.info.access_type = profile.type.name
@@ -63,6 +64,7 @@ module Renalware
 
       def build_prescription_administrations(session)
         return unless session.new_record?
+
         patient.prescriptions.to_be_administered_on_hd.map do |prescription|
           session.prescription_administrations.build(prescription: prescription)
         end

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

@@ -30,6 +30,7 @@ module Renalware
 
         def document
           return SessionDocument.new if dna?
+
           super || SessionDocument.new
         end
 
@@ -42,6 +43,7 @@ module Renalware
 
         def dialysis_minutes_shortfall_percentage
           return 0.0 if dialysis_minutes_shortfall == 0
+
           (dialysis_minutes_shortfall.to_f / prescribed_time.to_f) * 100.0
         end
 
@@ -55,6 +57,7 @@ module Renalware
 
         def weight_loss_as_percentage_of_body_weight
           return unless measured_dry_weight > 0
+
           (weight_loss / measured_dry_weight) * 100.0
         end
 

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

@@ -41,6 +41,7 @@ module Renalware
         def parse_params(params)
           @session_type = params.delete(:type)
           raise(ArgumentError, "Missing type in session params") if session_type.blank?
+
           params
         end
 
@@ -92,8 +93,10 @@ module Renalware
 
         def lookup_access_type_abbreviation(session)
           return unless session.document&.respond_to?(:info)
+
           access_type = Accesses::Type.find_by(name: session.document.info.access_type)
           return unless access_type
+
           session.document.info.access_type_abbreviation = access_type.abbreviation
         end
 

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

@@ -9,6 +9,7 @@ module Renalware
 
       def call
         return unless recent_sessions.any?
+
         stats = rolling_stats_for_this_patient
         stats.hospital_unit = most_recently_used_hospital_unit
         stats.assign_attributes(auditable_sessions.to_h)

data/app/models/renalware/hospitals/ward.rb

@@ -11,6 +11,7 @@ module Renalware
       validates :name, presence: true, uniqueness: { scope: :hospital_unit_id }
 
       scope :ordered, -> { order(:name) }
+      scope :active, ->{ where(active: true) }
 
       def self.policy_class
         BasePolicy

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

@@ -14,7 +14,7 @@ module Renalware
       validates :other_description, presence: true, if: -> { unspecified_description? }
 
       delegate :salutation, to: :person
-      delegate :address, :to_s, :family_name, to: :person
+      delegate :address, :to_s, :family_name, :full_name, to: :person
       delegate :name, to: :address, prefix: true
 
       accepts_nested_attributes_for :person

data/app/models/renalware/letters/delivery/email_letter_to_practice.rb

@@ -21,6 +21,7 @@ module Renalware
         #   false: the patient does not have a practice or the practice has no email address
         def call
           return false unless email_letter_to_practice?
+
           email_letter_to_the_patients_practice
           true
         end

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

@@ -19,6 +19,7 @@ module Renalware
 
       def part_classes
         return clinical_part_classes if clinical?
+
         {}
       end
 

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

@@ -2,6 +2,9 @@
 
 module Renalware
   module Letters
+    # Note we cannot use a partial layout with render_to_string as it will always expect
+    # the location to be in views/layouts and its not possible in Rails 5.1 to specify
+    # another or absolute path
     class HTMLRenderer
       def call(letter)
         context = LettersController.new

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

@@ -56,7 +56,7 @@ module Renalware
       }
       singleton_class.send(:alias_method, :in_progress, :pending)
 
-      scope :reverse, -> { order("#{effective_date_sort} asc")  }
+      scope :reversed, -> { order("#{effective_date_sort} asc")  }
       scope :ordered, -> { order("#{effective_date_sort} desc") }
       scope :with_letterhead, -> { includes(:letterhead) }
       scope :with_main_recipient, -> { includes(main_recipient: [:address, :addressee]) }

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

@@ -44,6 +44,7 @@ module Renalware
       # practice address but the GP's name as the salutation.
       def include_primary_care_physician_as_default_main_recipient
         return if letter.main_recipient.present?
+
         if patient.primary_care_physician.present? && patient.practice_id.present?
           letter.build_main_recipient(person_role: :primary_care_physician)
         else
@@ -68,6 +69,7 @@ module Renalware
       # the parent letter is saved.
       def build_electronic_ccs
         return if electronic_cc_recipient_ids.blank?
+
         electronic_cc_recipient_ids.reject(&:blank?).map do |user_id|
           letter.electronic_receipts.build(recipient_id: user_id)
         end

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

@@ -28,6 +28,7 @@ module Renalware
         OBSERVATION_ATTRS.each_with_object([]) do |observation, arr|
           value = send(observation)
           next if value.blank?
+
           arr << [
             label_for(observation),
             enum_text_or_raw_value_for(value),

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

@@ -18,6 +18,7 @@ module Renalware
         @results ||= begin
           snapshot = letter.pathology_snapshot.dup
           return if snapshot.blank?
+
           groups = group_snapshot_by_code_and_date(snapshot)
           format_groups_into_string(groups)
         end
@@ -47,6 +48,7 @@ module Renalware
           match = snapshot[obs_desc.code.to_sym]
           next if match.nil?
           next if match[:observed_at].nil?
+
           date = I18n.l(Date.parse(match[:observed_at]))
           dates[date] ||= {}
           dates[date][obs_desc.code] = match[:result]
@@ -75,6 +77,7 @@ module Renalware
 
       def format_code_and_result_string(code, result)
         return "(#{code} #{result})" if code.casecmp?("EGFR")
+
         "#{code} #{result}"
       end
     end

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

@@ -39,8 +39,8 @@ module Renalware
       class << self
         delegate :clear, to: :store
 
-        def fetch(letter)
-          store.fetch(cache_key_for(letter)) { yield }
+        def fetch(letter, **options)
+          store.fetch(cache_key_for(letter, **options)) { yield }
         end
 
         # Note the letter must be a LetterPresenter which has a #to_html method
@@ -48,10 +48,11 @@ module Renalware
         # html including surrounding layout with inline css and images. This way if the
         # layout changes or the image is changed for example, the cache for the pdf is no longer
         # valid and a new key and cache entry will be created.
-        def cache_key_for(letter)
+        def cache_key_for(letter, **options)
           timestamp = letter&.updated_at&.strftime("%Y%m%d%H%M%S")
           pat_id = letter.patient.id
-          "letter-pdf-#{letter.id}-#{pat_id}-#{timestamp}-#{Digest::MD5.hexdigest(letter.to_html)}"
+          "letter-pdf-#{letter.id}-#{pat_id}-#{timestamp}-" \
+          "#{Digest::MD5.hexdigest(letter.to_html(**options))}"
         end
 
         def cache_path

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

@@ -17,12 +17,12 @@ module Renalware
         encoding: "UTF-8"
       }.freeze
 
-      def self.call(letter)
+      def self.call(letter, **options)
         unless letter.respond_to?(:to_html)
           letter = LetterPresenterFactory.new(letter)
         end
-        PdfLetterCache.fetch(letter) do
-          WickedPdf.new.pdf_from_string(letter.to_html, OPTIONS)
+        PdfLetterCache.fetch(letter, **options) do
+          WickedPdf.new.pdf_from_string(letter.to_html(**options), OPTIONS)
         end
       end
     end

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

@@ -10,6 +10,7 @@ module Renalware
 
       def cc_on_letter?(letter)
         return false unless letter.patient.assigned_to_primary_care_physician?(self)
+
         letter.main_recipient.patient? || letter.main_recipient.contact?
       end
     end

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

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/letters"
+require "attr_extras"
+
+module Renalware
+  module Letters
+    module Printing
+      # Build PDF for printing. We are targetting an envelope stuffer so there will be an address
+      # cover sheet in front of each letter.
+      # So for a letter where the patient is the main recipient, and we CC to the GP (no practice
+      # email address so snail mailing) and 1 extra CC (a contact) the output will look like
+      # this:
+      #
+      # 1. Patient address cover sheet
+      # 2. Letter
+      # 3. GP address cover sheet
+      # 2. Letter
+      # 5. Contact address cover sheet
+      # 2. Letter
+      #
+      # Note however the we always pad each item (address sheet, letter) with blank pages to make
+      # sure duplex printing does not cause the next page recipient's content to be rendered on the
+      # back of the ast page of the previous letter for example/
+      #
+      # Compiles print content for all input letters and outputs the merged PDF to output_file.
+      # Allows batch printing if you want to print say all 2 page letters together.
+      # The caller may choose for example to send the output_file could be sent back to the browser
+      # for manual printing using (eg using send_file) or copy the merged PDF to a folder for
+      # automated printing.
+      class CreatePdfByInterleavingAddressSheetAndLetterForEachRecipient
+        pattr_initialize [:letters!, :output_file!]
+
+        def call
+          # There is a choice of two methods of building the merged PDF. See pros and cons.
+          # The other is UsingSeparatePdfForEachLetterSection.
+          UsingOnePdfForAllLetterSections.new(
+            letters: letters,
+            output_file: output_file
+          ).call
+        end
+
+        # For each letter, uses whkhtmltopdf to build the entire print content, ie all address
+        # sheets and required instance of the letter are created as one fresh pdf (no cache will be
+        # used).
+        #
+        # Pros:
+        # - Quicker: For each letter only one PDF is generated, and although the generation is slow
+        #   as it does not use the previously cached letter PDF, and it has to render all the letter
+        #   sections, including the letter itself, for every recipient, its stil faster then
+        #   rendering separate PDFs fo each section.
+        # Cons:
+        #  - wastes some resources because it does not use the cache and renders same letter
+        #    multiple times in the views
+        #  - cannot be 100% sure the number of pages in the final PDF will be extactly what we
+        #    predict, so requires a check to load the pdf into a reader and validate the page_count
+        class UsingOnePdfForAllLetterSections
+          include PdfCombining
+          pattr_initialize [:letters!, :output_file!]
+
+          def call
+            in_a_temporary_folder do |dir|
+              Array(letters).each do |letter|
+                if letter.page_count.to_i < 1
+                  raise(ArgumentError, "letter.page_count not set on letter.id=#{letter.id}")
+                end
+                letter_filename = create_letter_pdf_in(dir, letter)
+                files << letter_filename
+              end
+              combine_multiple_pdfs_into_one(dir, output_file)
+              # For debuging:
+              # FileUtils.cp output_file, "/Users/tim/Desktop/x.pdf"
+              # `open /Users/tim/Desktop/x.pdf`
+            end
+          end
+
+          private
+
+          def create_letter_pdf_in(dir, letter)
+            filename = "letter_#{letter.id}.pdf"
+            path = dir.join(filename)
+            File.open(path, "wb") { |file| file.write(DuplexInterleavedPdfRenderer.call(letter)) }
+            filename
+          end
+        end
+
+        # This approach generates a PDF for each address cover sheet and each
+        # letter. It shells to ghostscript to merge the PDFs together in
+        # the right order.
+        #
+        # Pros:
+        # - uses the letter PDF already in the cache from when we rendered it to deduce the page
+        #   count after the letter was archived
+        # - uses very little memory as PDF concatenation done on disk
+        # - concatentation itslef reasonable fast
+        #
+        # Cons:
+        # - slow because it shells to wkhtmltopdf for each cover sheet, and these are unklikely to
+        #   be found in tha cache. So for main recip and 2 CCs it wil call wkhtmltopdf 3 times to
+        #   render the address cover sheets, and the letter PDF should be pulled from cache so that
+        #   is quick at least.
+        #
+        class UsingSeparatePdfForEachLetterSection
+          include PdfCombining
+          pattr_initialize [:letters!, :output_file!]
+
+          def call
+            in_a_temporary_folder do |dir|
+              Array(letters).each do |letter|
+                letter_filename = create_letter_pdf_in(dir, letter)
+                PrintableRecipients.for(letter).each do |recipient|
+                  files << create_cover_sheet_for(recipient, letter, dir)
+                  files << letter_filename
+                end
+              end
+              combine_multiple_pdfs_into_one(dir, output_file)
+            end
+          end
+
+          private
+
+          def create_letter_pdf_in(dir, letter)
+            filename = "letter_#{letter.id}.pdf"
+            path = dir.join(filename)
+            File.open(path, "wb") { |file| file.write(PdfRenderer.call(letter)) }
+            filename
+          end
+
+          def create_cover_sheet_for(recipient, _letter, dir)
+            filename = "recipient_#{recipient.id}.pdf"
+            path = dir.join(filename)
+            File.open(path, "wb") { |file| file.write(RecipientAddressPdfRenderer.call(recipient)) }
+            filename
+          end
+        end
+      end
+    end
+  end
+end