renalware-core 2.0.139 → 2.0.140

data/db/migrate/20200301124300_create_medication_delivery_event_prescriptions.rb

@@ -0,0 +1,35 @@
+class CreateMedicationDeliveryEventPrescriptions < ActiveRecord::Migration[5.2]
+  def change
+    # rubocop:disable Rails/CreateTableWithTimestamps
+    within_renalware_schema do
+      create_table(
+        :medication_delivery_event_prescriptions,
+        comment: "A cross reference table between delivery_events and prescriptions"
+      ) do |t|
+        t.references(
+          :event,
+          foreign_key: { to_table: :medication_delivery_events },
+          index: false,
+          null: false
+        )
+        t.references(
+          :prescription,
+          foreign_key: { to_table: :medication_prescriptions },
+          index: false,
+          null: false
+        )
+      end
+      # rubocop:enable Rails/CreateTableWithTimestamps
+
+      add_index(
+        :medication_delivery_event_prescriptions,
+        [
+          :event_id,
+          :prescription_id
+        ],
+        unique: true,
+        name: :idx_medication_delivery_event_prescriptions
+      )
+    end
+  end
+end

data/db/migrate/20200306183423_add_next_delivery_date_to_prescriptions.rb

@@ -0,0 +1,7 @@
+class AddNextDeliveryDateToPrescriptions < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :medication_prescriptions, :next_delivery_date, :date
+    end
+  end
+end

data/lib/renalware/configuration.rb

@@ -99,6 +99,13 @@ module Renalware
     config_accessor(:generate_pathology_request_forms_from_hd_mdm_listing) { true }
     config_accessor(:disable_inputs_controlled_by_tissue_typing_feed) { false }
     config_accessor(:disable_inputs_controlled_by_demographics_feed) { false }
+    config_accessor(:medication_delivery_purchase_order_prefix) { "R" }
+    config_accessor(:medication_homecare_pdf_forms) do
+      # esa: { provider: :generic, version: 1 },
+      {
+        immunosuppressant: { provider: :generic, version: 1 }
+      }
+    end
 
     # A host app can override this to add/remove/re-order the clinical summary display
     # Note these have to be strings - they mapped to constants in ClinicalSummaryPresenter.

data/lib/renalware/engine.rb

@@ -45,6 +45,7 @@ require "puma"
 require "pundit"
 require "ransack"
 require "record_tag_helper"
+require "renalware/forms"
 require "pandoc-ruby"
 require "rack/attack"
 require "ruby-hl7"

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.139"
+  VERSION = "2.0.140"
 end

data/spec/factories/drugs/homecare_forms.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :homecare_form, class: "Renalware::Drugs::HomecareForm" do
+    association :supplier, factory: :drug_supplier
+    drug_type
+    form_name { "form_name" }
+    form_version { "form_version" }
+    prescription_durations { [1, 3, 6] }
+    prescription_duration_default { 3 }
+    prescription_duration_unit { "month" }
+  end
+end

data/spec/factories/drugs/suppliers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :drug_supplier, class: "Renalware::Drugs::Supplier" do
+    name { "Generic" }
+  end
+end

data/spec/factories/medications/delivery/events.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :medication_delivery_event, class: "Renalware::Medications::Delivery::Event" do
+    homecare_form factory: :homecare_form
+    patient
+    accountable
+    printed { false }
+    reference_number { Time.zone.now.to_i }
+    drug_type
+    prescription_duration { 1 }
+  end
+end

data/spec/support/pages/medications/home_delivery_dialog.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require_relative "../page_object"
+require "capybara-select-2"
+
+module Pages
+  module Medications
+    class HomeDeliveryDialog < PageObject
+      include CapybaraSelect2
+      pattr_initialize [:patient!]
+
+      def path
+        patient_prescriptions_path(
+          patient,
+          treatable_type: patient.class.to_s,
+          treatable_id: patient
+        )
+      end
+
+      def open
+        visit path
+        within ".page-actions" do
+          click_on "Print home delivery drugs"
+        end
+      end
+
+      def drug_type
+        within("#print-home-delivery-drugs-modal") do
+          find("#event_drug_type_id").find("option[selected]").text
+        end
+      end
+
+      def prescription_duration
+        within("#print-home-delivery-drugs-modal") do
+          find("#event_prescription_duration").find("option[selected]").text
+        end
+      end
+
+      def print
+        within("#print-home-delivery-drugs-modal") do
+          click_on "Print"
+        end
+      end
+
+      def drug_type_css
+        "#print-home-delivery-drugs-modal #event_drug_type_id"
+      end
+
+      def prescription_duration_css
+        "#print-home-delivery-drugs-modal #event_prescription_duration"
+      end
+
+      def indicate_printing_was_succesful
+        within("#print-home-delivery-drugs-modal") do
+          click_on "Yes - mark as printed"
+        end
+      end
+
+      def visible?
+        page.has_css?("#print-home-delivery-drugs-modal .modal", visible: true)
+      end
+
+      def has_enabled_print_button?
+        within("#print-home-delivery-drugs-modal") do
+          has_css?("a.home-delivery--print:not([disabled])")
+        end
+      end
+
+      def has_no_prescriptions_error?
+        within("#print-home-delivery-drugs-modal") do
+          has_content?("There are no home delivery prescriptions for this drug type")
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.139
+  version: 2.0.140
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -766,6 +766,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: renalware-forms
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: ruby-hl7
   requirement: !ruby/object:Gem::Requirement
@@ -1288,7 +1302,7 @@ files:
 - app/controllers/renalware/mdm_controller.rb
 - app/controllers/renalware/mdm_patients_controller.rb
 - app/controllers/renalware/medications/drug_types/prescriptions_controller.rb
-- app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb
+- app/controllers/renalware/medications/home_delivery/events_controller.rb
 - app/controllers/renalware/medications/prescriptions_controller.rb
 - app/controllers/renalware/medications/terminations_controller.rb
 - app/controllers/renalware/messaging/internal/messages_controller.rb
@@ -1458,7 +1472,9 @@ files:
 - app/inputs/simple_time_input.rb
 - app/inputs/user_picker_input.rb
 - app/javascript/renalware/controllers/another_test_controller.js
+- app/javascript/renalware/controllers/foundation_modal_controller.js
 - app/javascript/renalware/controllers/hd/prescription_administration_controller.js
+- app/javascript/renalware/controllers/medications/home_delivery_modal_controller.js
 - app/javascript/renalware/controllers/test_controller.js
 - app/javascript/renalware/controllers/toggle_controller.js
 - app/javascript/renalware/index.js
@@ -1566,6 +1582,8 @@ files:
 - app/models/renalware/drugs.rb
 - app/models/renalware/drugs/classification.rb
 - app/models/renalware/drugs/drug.rb
+- app/models/renalware/drugs/homecare_form.rb
+- app/models/renalware/drugs/supplier.rb
 - app/models/renalware/drugs/type.rb
 - app/models/renalware/events.rb
 - app/models/renalware/events/biopsy.rb
@@ -1714,7 +1732,6 @@ files:
 - app/models/renalware/letters/primary_care_physician.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
@@ -1736,12 +1753,17 @@ files:
 - app/models/renalware/low_clearance/referrer.rb
 - app/models/renalware/low_clearance/version.rb
 - app/models/renalware/medications.rb
+- app/models/renalware/medications/delivery/event.rb
+- app/models/renalware/medications/delivery/event_prescription.rb
+- app/models/renalware/medications/delivery/homecare_forms_adapter.rb
+- app/models/renalware/medications/delivery/purchase_order_number.rb
 - app/models/renalware/medications/dose_unit.rb
 - app/models/renalware/medications/medication_route.rb
 - app/models/renalware/medications/patient_listener.rb
 - app/models/renalware/medications/prescription.rb
 - app/models/renalware/medications/prescription_termination.rb
 - app/models/renalware/medications/prescription_version.rb
+- app/models/renalware/medications/prescriptions_by_drug_type_id_query.rb
 - app/models/renalware/medications/prescriptions_by_drug_type_query.rb
 - app/models/renalware/medications/prescriptions_query.rb
 - app/models/renalware/medications/provider.rb
@@ -1774,7 +1796,6 @@ 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.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
@@ -1844,7 +1865,6 @@ files:
 - app/models/renalware/pathology/requests/sample_type.rb
 - app/models/renalware/pathology/results.rb
 - app/models/renalware/pathology/version.rb
-- app/models/renalware/pathology/view_observation_results.rb.dead
 - app/models/renalware/patient.rb
 - app/models/renalware/patients.rb
 - app/models/renalware/patients/abridgement.rb
@@ -1863,7 +1883,6 @@ files:
 - app/models/renalware/patients/ingestion/message_mapper.rb
 - app/models/renalware/patients/ingestion/message_mappers/patient.rb
 - app/models/renalware/patients/ingestion/update_master_patient_index.rb
-- app/models/renalware/patients/ingestion/update_master_patient_index_job.rb.dead
 - app/models/renalware/patients/language.rb
 - app/models/renalware/patients/last_successful_practice_sync_date_query.rb
 - app/models/renalware/patients/mdm_list_query.rb
@@ -2170,7 +2189,6 @@ files:
 - app/presenters/renalware/address_presenter/block.rb
 - app/presenters/renalware/address_presenter/short.rb
 - app/presenters/renalware/address_presenter/single_line.rb
-- app/presenters/renalware/admin/users/summary_part.rb.dead
 - app/presenters/renalware/admissions/admission_presenter.rb
 - app/presenters/renalware/admissions/consult_presenter.rb
 - app/presenters/renalware/admissions/consult_summary_part.rb
@@ -2256,7 +2274,6 @@ files:
 - app/presenters/renalware/transplants/patient_presenter.rb
 - app/presenters/renalware/transplants/recipient_dashboard_presenter.rb
 - app/presenters/renalware/transplants/wait_list_registration_presenter.rb
-- app/presenters/renalware/ukrdc/modality_presenter.rb.dead
 - app/presenters/renalware/ukrdc/pathology_observation_presenter.rb
 - app/presenters/renalware/ukrdc/pathology_observation_request_presenter.rb
 - app/presenters/renalware/ukrdc/patient_presenter.rb
@@ -2324,7 +2341,6 @@ files:
 - app/views/renalware/admin/user_mailer/approval.text.erb
 - app/views/renalware/admin/user_mailer/unexpiry.text.erb
 - app/views/renalware/admin/users/_filters.html.slim
-- app/views/renalware/admin/users/_summary_part.html.slim.dead
 - app/views/renalware/admin/users/_tabs.html.slim
 - app/views/renalware/admin/users/edit.html.slim
 - app/views/renalware/admin/users/index.html.slim
@@ -2659,8 +2675,6 @@ files:
 - 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
@@ -2679,7 +2693,6 @@ files:
 - app/views/renalware/low_clearance/mdm_patients/_tabs.html.slim
 - app/views/renalware/low_clearance/profiles/_summary.html.slim
 - app/views/renalware/low_clearance/profiles/edit.html.slim
-- app/views/renalware/mdm/_biopsies.html.slim.dead
 - app/views/renalware/mdm/_clinic_visits.html.slim
 - app/views/renalware/mdm/_events.html.slim
 - app/views/renalware/mdm/_letters.html.slim
@@ -2699,6 +2712,11 @@ files:
 - app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim
 - app/views/renalware/medications/drug_types/prescriptions/_table.html.slim
 - app/views/renalware/medications/drug_types/prescriptions/index.html.slim
+- app/views/renalware/medications/home_delivery/events/_edit.html.slim
+- app/views/renalware/medications/home_delivery/events/edit.html.slim
+- app/views/renalware/medications/home_delivery/events/edit.js.erb
+- app/views/renalware/medications/home_delivery/events/new.js.erb
+- app/views/renalware/medications/home_delivery/events/update.js.erb
 - app/views/renalware/medications/home_delivery/prescriptions/index.pdf.slim
 - app/views/renalware/medications/prescriptions/_current.html.slim
 - app/views/renalware/medications/prescriptions/_extended_patient_details.html.slim
@@ -3836,6 +3854,10 @@ files:
 - db/migrate/20200129093835_create_system_dashboards.rb
 - db/migrate/20200204153231_alter_hd_prescription_administrations.rb
 - db/migrate/20200205121805_remove_created_by_on_pathology_code_groups.rb
+- db/migrate/20200301113102_create_drug_homecare_suppliers.rb
+- db/migrate/20200301124200_create_medication_delivery_events.rb
+- db/migrate/20200301124300_create_medication_delivery_event_prescriptions.rb
+- db/migrate/20200306183423_add_next_delivery_date_to_prescriptions.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -4059,6 +4081,8 @@ files:
 - spec/factories/directory/people.rb
 - spec/factories/drugs/drug.rb
 - spec/factories/drugs/drug_types.rb
+- spec/factories/drugs/homecare_forms.rb
+- spec/factories/drugs/suppliers.rb
 - spec/factories/events/events.rb
 - spec/factories/events/events_types.rb
 - spec/factories/feeds/file.rb
@@ -4097,6 +4121,7 @@ files:
 - spec/factories/low_clearance/modality_descriptions.rb
 - spec/factories/low_clearance/patients.rb
 - spec/factories/low_clearance/profiles.rb
+- spec/factories/medications/delivery/events.rb
 - spec/factories/medications/medication_route.rb
 - spec/factories/medications/prescription.rb
 - spec/factories/medications/prescription_terminations.rb
@@ -4214,6 +4239,7 @@ files:
 - spec/support/pages/letters/form.rb
 - spec/support/pages/letters/patient_letters.rb
 - spec/support/pages/low_clearance/profile_page.rb
+- spec/support/pages/medications/home_delivery_dialog.rb
 - spec/support/pages/medications/prescription_fom.rb
 - spec/support/pages/page_object.rb
 - spec/support/pathology_spec_helper.rb

data/app/controllers/renalware/medications/home_delivery/prescriptions_controller.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "renalware/medications"
-
-module Renalware
-  module Medications
-    module HomeDelivery
-      class PrescriptionsController < BaseController
-        include Renalware::Concerns::PdfRenderable
-        include PresenterHelper
-
-        def index
-          respond_to do |format|
-            format.pdf do
-              authorize prescriptions
-              render_index_pdf prescriptions
-            end
-          end
-        end
-
-        private
-
-        def prescriptions
-          @prescriptions ||= begin
-            patient
-              .prescriptions
-              .current
-              .where(provider: :home_delivery)
-              .includes(:medication_route, :drug)
-          end
-        end
-
-        def render_index_pdf(prescriptions)
-          options = default_pdf_options.merge!(
-            pdf: pdf_filename,
-            layout: "renalware/layouts/letter",
-            locals: {
-              patient: patient,
-              prescriptions: present(prescriptions, PrescriptionPresenter)
-            }
-          )
-          render options
-        end
-
-        def pdf_filename
-          "#{patient.local_patient_id} prescriptions-for-home-delivery"
-        end
-      end
-    end
-  end
-end

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

@@ -1,90 +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 for 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
-      end
-    end
-  end
-end