renalware-core 2.0.109 → 2.0.110

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.109
+  version: 2.0.110
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -982,6 +982,7 @@ files:
 - app/assets/images/renalware/hd/avf_avg_assessment.jpg
 - app/assets/images/renalware/hd/mr_victor.jpg
 - app/assets/images/renalware/kidney.png
+- app/assets/images/renalware/loading-gears-animation.gif
 - app/assets/images/renalware/nhs_a4_letter_logo_black.png
 - app/assets/images/renalware/nhs_a4_letter_logo_blue.png
 - app/assets/images/renalware/print-button-example.png
@@ -1026,6 +1027,7 @@ files:
 - app/assets/javascripts/renalware/tabs.js
 - app/assets/javascripts/renalware/toggler.js
 - app/assets/javascripts/renalware/transplants.js
+- app/assets/pdf/blank_page.pdf
 - app/assets/stylesheets/renalware/application.scss
 - app/assets/stylesheets/renalware/base/_mixins.scss
 - app/assets/stylesheets/renalware/base/_variables.scss
@@ -1163,6 +1165,8 @@ files:
 - app/controllers/renalware/hospitals/wards_controller.rb
 - app/controllers/renalware/letters/approved_letters_controller.rb
 - app/controllers/renalware/letters/base_controller.rb
+- app/controllers/renalware/letters/batches_controller.rb
+- app/controllers/renalware/letters/completed_batches_controller.rb
 - app/controllers/renalware/letters/completed_letters_controller.rb
 - app/controllers/renalware/letters/contacts_controller.rb
 - app/controllers/renalware/letters/descriptions_controller.rb
@@ -1356,8 +1360,10 @@ files:
 - app/jobs/renalware/events/save_pdf_event_to_file_job.rb
 - app/jobs/renalware/hd/generate_monthly_statistics.rb
 - app/jobs/renalware/hd/generate_monthly_statistics_for_patient_job.rb
+- app/jobs/renalware/hd/update_rolling_patient_statistics_dj_job.rb
 - app/jobs/renalware/hd/update_rolling_patient_statistics_job.rb
 - app/jobs/renalware/letters/calculate_page_count_job.rb
+- app/jobs/renalware/letters/printing/batch_print_job.rb
 - app/jobs/renalware/letters/save_pdf_letter_to_file_job.rb
 - app/jobs/renalware/letters/save_rtf_letter_to_file_job.rb
 - app/jobs/renalware/reporting/refresh_audit_data_job.rb
@@ -1388,6 +1394,7 @@ files:
 - app/models/concerns/renalware/personable.rb
 - app/models/concerns/renalware/string_logging.rb
 - app/models/concerns/renalware/supersedeable.rb
+- app/models/concerns/renalware/using_temp_folder.rb
 - app/models/null_exception_notifier.rb
 - app/models/renalware.rb
 - app/models/renalware/accesses.rb
@@ -1538,6 +1545,8 @@ files:
 - app/models/renalware/letters/approve_letter.rb
 - app/models/renalware/letters/archive.rb
 - app/models/renalware/letters/author.rb
+- app/models/renalware/letters/batch.rb
+- app/models/renalware/letters/batch_item.rb
 - app/models/renalware/letters/complete_letter.rb
 - app/models/renalware/letters/contact.rb
 - app/models/renalware/letters/contact_description.rb
@@ -1563,6 +1572,7 @@ files:
 - app/models/renalware/letters/letter_params_processor.rb
 - app/models/renalware/letters/letter_query.rb
 - app/models/renalware/letters/letterhead.rb
+- app/models/renalware/letters/lists/form.rb
 - app/models/renalware/letters/part.rb
 - app/models/renalware/letters/part/allergies.rb
 - app/models/renalware/letters/part/clinical_observations.rb
@@ -1575,7 +1585,9 @@ files:
 - app/models/renalware/letters/pdf_letter_cache.rb
 - app/models/renalware/letters/pdf_renderer.rb
 - app/models/renalware/letters/primary_care_physician.rb
-- app/models/renalware/letters/printing/create_pdf_by_interleaving_address_sheet_and_letter_for_each_recipient.rb
+- app/models/renalware/letters/printing/batch_compile_pdfs.rb
+- app/models/renalware/letters/printing/complete_batch.rb
+- app/models/renalware/letters/printing/create_pdf_by_interleaving_address_sheet_and_letter_for_each_recipient.rb.dead
 - app/models/renalware/letters/printing/duplex_interleaved_pdf_renderer.rb
 - app/models/renalware/letters/printing/pdf_combining.rb
 - app/models/renalware/letters/printing/printable_recipients.rb
@@ -1634,7 +1646,7 @@ files:
 - app/models/renalware/pathology/clinic.rb
 - app/models/renalware/pathology/code_group.rb
 - app/models/renalware/pathology/code_group_membership.rb
-- app/models/renalware/pathology/consultant.rb
+- app/models/renalware/pathology/consultant.rb.dead
 - app/models/renalware/pathology/create_observation_requests.rb
 - app/models/renalware/pathology/create_observations_grouped_by_date_table.rb
 - app/models/renalware/pathology/current_observation.rb
@@ -1779,6 +1791,7 @@ files:
 - app/models/renalware/renal/aki_alert_action.rb
 - app/models/renalware/renal/aki_alert_query.rb
 - app/models/renalware/renal/aki_alert_search_form.rb
+- app/models/renalware/renal/consultant.rb
 - app/models/renalware/renal/patient.rb
 - app/models/renalware/renal/prd_description.rb
 - app/models/renalware/renal/prd_descriptions/search_query.rb
@@ -1877,6 +1890,7 @@ files:
 - app/models/renalware/virology/version.rb
 - app/models/renalware/zip_archive.rb
 - app/pdfs/renalware/events/event_pdf.rb
+- app/pdfs/renalware/letters/printing/recipient_address_page_pdf.rb
 - app/policies/application_policy.rb
 - app/policies/renalware/admin/cache_policy.rb
 - app/policies/renalware/admissions/admission_policy.rb
@@ -1903,6 +1917,7 @@ files:
 - app/policies/renalware/hd/station_policy.rb
 - app/policies/renalware/hospitals/ward_policy.rb
 - app/policies/renalware/letters/approved_letter_policy.rb
+- app/policies/renalware/letters/batch_policy.rb
 - app/policies/renalware/letters/completed_letter_policy.rb
 - app/policies/renalware/letters/draft_letter_policy.rb
 - app/policies/renalware/letters/electronic_receipt_policy.rb
@@ -2396,6 +2411,12 @@ files:
 - app/views/renalware/layouts/letter.pdf.slim
 - app/views/renalware/layouts/pdf.pdf.slim
 - app/views/renalware/letters/_summary_part.html.slim
+- app/views/renalware/letters/batches/_create.html.slim
+- app/views/renalware/letters/batches/create.js.erb
+- app/views/renalware/letters/batches/index.html.slim
+- app/views/renalware/letters/batches/show.html.slim
+- app/views/renalware/letters/completed_batches/create.js.erb
+- app/views/renalware/letters/completed_batches/new.html.slim
 - app/views/renalware/letters/completed_letters/create.js.erb
 - app/views/renalware/letters/completed_letters/new.html.slim
 - app/views/renalware/letters/contacts/_contact.html.slim
@@ -2444,6 +2465,9 @@ files:
 - app/views/renalware/letters/letters/show.html.slim
 - app/views/renalware/letters/lists/_letter.html.slim
 - app/views/renalware/letters/lists/_table.html.slim
+- app/views/renalware/letters/lists/_tabs.html.slim
+- app/views/renalware/letters/lists/index.html.slim.dead
+- app/views/renalware/letters/lists/index.html.slim.dead1
 - app/views/renalware/letters/lists/show.html.slim
 - app/views/renalware/letters/lists/show.js.erb
 - app/views/renalware/letters/parts/_allergies.html.slim
@@ -3556,11 +3580,20 @@ files:
 - db/migrate/20190823051014_add_hidden_colum_to_event_types.rb
 - db/migrate/20190823105642_add_asked_for_write_access_to_users.rb
 - db/migrate/20190830082736_add_pd_regime_columns_for_blt.rb
+- db/migrate/20190830153416_create_letter_batches.rb
+- db/migrate/20190902085216_create_letter_batch_items.rb
 - db/migrate/20190909084425_add_columns_to_support_data_migration.rb
 - db/migrate/20190915071451_add_unique_index_to_medication_routes.rb
 - db/migrate/20190915083424_create_pathology_request_sample_types.rb
 - db/migrate/20190916160231_add_hd_type_to_ukrdc_treatments.rb
 - db/migrate/20190917124204_add_priority_to_admission_consults.rb
+- db/migrate/20190919073410_add_filepath_to_letter_batches.rb
+- db/migrate/20190920063447_add_status_to_letter_batch_items.rb
+- db/migrate/20190925104902_remove_user_from_appointments.rb
+- db/migrate/20190925130052_add_telephone_to_renal_consultants.rb
+- db/migrate/20190925161724_change_path_request_consultant_id.rb
+- db/migrate/20190925173849_renal_consultants_changes.rb
+- db/migrate/20190928131032_add_some_more_missing_indexes.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3732,10 +3765,12 @@ files:
 - lib/tasks/cucumber.rake
 - lib/tasks/cucumber_web.rake
 - lib/tasks/db.rake
+- lib/tasks/demo_data.rake
 - lib/tasks/feeds/files.rake
 - lib/tasks/hd.rake
 - lib/tasks/ods.rake
 - lib/tasks/pathology.rake
+- lib/tasks/pd.rake
 - lib/tasks/reporting.rake
 - lib/tasks/ukrdc.rake
 - lib/templates/slim/scaffold/_form.html.slim
@@ -3815,7 +3850,6 @@ files:
 - spec/factories/modalities/modalities.rb
 - spec/factories/modalities/modality_descriptions.rb
 - spec/factories/modalities/modality_reasons.rb
-- spec/factories/pathology/consultant.rb
 - spec/factories/pathology/lab.rb
 - spec/factories/pathology/measurement_units.rb
 - spec/factories/pathology/observation_descriptions.rb
@@ -3859,6 +3893,7 @@ files:
 - spec/factories/problems/problems.rb
 - spec/factories/renal/aki_alert_actions.rb
 - spec/factories/renal/aki_alerts.rb
+- spec/factories/renal/consultants.rb
 - spec/factories/renal/patients.rb
 - spec/factories/renal/prd_description.rb
 - spec/factories/renal/profiles.rb
@@ -3909,6 +3944,7 @@ files:
 - spec/support/pages/admissions/consults_page.rb
 - spec/support/pages/letters/form.rb
 - spec/support/pages/letters/patient_letters.rb
+- spec/support/pages/medications/prescription_fom.rb
 - spec/support/pages/page_object.rb
 - spec/support/pathology_spec_helper.rb
 - spec/support/patients_spec_helper.rb

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

@@ -1,140 +0,0 @@
-# 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

data/spec/factories/pathology/consultant.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :pathology_consultant, class: "Renalware::Pathology::Consultant", parent: :user
-end