renalware-core 2.0.109 → 2.0.110

data/app/views/renalware/medications/prescriptions/_form.html.slim

@@ -5,6 +5,7 @@ ruby:
   end
 
 .document
+  br
   = simple_form_for prescription,
                     url: url,
                     html: { class: "prescription-form", autocomplete: "off" },

data/app/views/renalware/navigation/_super_admin.html.slim

@@ -13,3 +13,4 @@ li.has-dropdown
     li= link_to "HD Dialysates", hd_dialysates_path
     li= link_to "HD Dialysers", hd_dialysers_path
     li= link_to "HD Cannulation Types", hd_cannulation_types_path
+    li= link_to "Print batches", letters_batches_path

data/app/views/renalware/pathology/requests/requests/_pdf_header.html.slim

@@ -6,9 +6,8 @@ html lang="en"
     title= content_for?(:title) ? yield(:title) : "Renalware v#{Renalware::VERSION}"
 
     / CSS needs to be inlined to work with wicked_pdf gem
-    style[type="text/css"] = find_asset_str("application.css")
-    style[type="text/css"] = find_asset_str("print/pathology_request_forms.css")
-
+    = wicked_pdf_stylesheet_link_tag "renalware/application"
+    = wicked_pdf_stylesheet_link_tag "renalware/print/pathology_request_forms.css"
     = csrf_meta_tag
 
   body

data/app/views/renalware/pathology/requests/requests/index.html.slim

@@ -36,7 +36,7 @@
               td = link_to "View", pathology_requests_request_path(id: request.id, format: "pdf")
               td = request.patient.full_name
               td = request.clinic.name
-              td = request.consultant.full_name
+              td = request.consultant
               td = I18n.l request.printed_on
               td = request.created_by.full_name
 

data/app/views/renalware/pathology/requests/requests/new.html.slim

@@ -28,7 +28,6 @@ html lang="en"
               include_blank: false
           = f.input :consultant_id,
             collection: all_consultants,
-            label_method: :full_name,
             input_html: { class: "small-input" },
             include_blank: false
           = f.input :telephone, input_html: { class: "small-input" }

data/config/locales/renalware/letters/letter.en.yml

@@ -26,3 +26,8 @@ en:
             page_title: New Clinical Letter
           simple:
             page_title: New Simple Letter
+      lists:
+        tabs:
+          tab:
+            all: All
+            batch_printable: Batch Printable

data/config/routes/letters.rb

@@ -22,13 +22,30 @@ resources :patients, only: [] do
 end
 
 namespace :letters do
+  resources :batches, only: [:create, :index, :show] do
+    get :status, constraints: { format: :json }, defaults: { format: :json }
+    resources :completions, only: [:new, :create], controller: "completed_batches"
+  end
   resource :pdf_letter_cache, only: [:destroy], controller: "pdf_letter_cache"
   resources :descriptions, only: :search do
     collection do
       get :search
     end
   end
-  resource :list, only: :show
+
+  # Letters::ListsController displays prefined lists of letters. The default list is :all
+  # We want to support dynamic urls with letters_list_path(named_parameeter: :all)
+  # as well as named routes eg letters_list_all_path.
+  # If you use the helper list_batch_printable_path, the named route is used to build the url,
+  # but when it is accessed it is actually the first, dynamic route definition that matches first,
+  # so the named_filter paramters is populated when we hit the controller.
+  constraints(named_filter: /(all|batch_printable)/) do
+    get "list/:named_filter", to: "lists#show", as: :filtered_letters_list
+  end
+  get "list/batch_printable", to: "lists#show", as: :list_batch_printable
+  get "list/all", to: "lists#show", as: :list_all
+  get "list", to: "lists#show", as: :list, defaults: { named_filter: :all }
+
   resources :letters, only: [] do
     resources :electronic_receipts, only: [] do
       patch :mark_as_read, on: :member

data/db/migrate/20190830153416_create_letter_batches.rb

@@ -0,0 +1,14 @@
+class CreateLetterBatches < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :letter_batches do |t|
+        t.integer :status, null: false, default: 0, index: true
+        t.jsonb :query_params, default: {}, null: false
+        t.references :created_by, foreign_key: { to_table: :users }, index: true, null: false
+        t.references :updated_by, foreign_key: { to_table: :users }, index: true, null: false
+        t.integer :batch_items_count
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/migrate/20190902085216_create_letter_batch_items.rb

@@ -0,0 +1,13 @@
+# rubocop:disable Rails/CreateTableWithTimestamps
+class CreateLetterBatchItems < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :letter_batch_items do |t|
+        t.references :letter, foreign_key: { to_table: :letter_letters }, null: false, index: false
+        t.references :batch, foreign_key: { to_table: :letter_batches }, null: false, index: false
+      end
+      add_index :letter_batch_items, [:letter_id, :batch_id], unique: true
+    end
+  end
+end
+# rubocop:enable Rails/CreateTableWithTimestamps

data/db/migrate/20190919073410_add_filepath_to_letter_batches.rb

@@ -0,0 +1,7 @@
+class AddFilepathToLetterBatches < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :letter_batches, :filepath, :string
+    end
+  end
+end

data/db/migrate/20190920063447_add_status_to_letter_batch_items.rb

@@ -0,0 +1,15 @@
+class AddStatusToLetterBatchItems < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column(
+        :letter_batch_items,
+        :status,
+        :integer,
+        default: 0,
+        null: false,
+        limit: 2 # smallint
+      )
+      add_index :letter_batch_items, [:batch_id, :status]
+    end
+  end
+end

data/db/migrate/20190925104902_remove_user_from_appointments.rb

@@ -0,0 +1,19 @@
+class RemoveUserFromAppointments < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      remove_column :clinic_appointments, :user_id, :integer
+
+      add_reference :clinic_appointments,
+                    :updated_by,
+                    foreign_key: { to_table: :users },
+                    index: true,
+                    null: true
+
+      add_reference :clinic_appointments,
+                    :created_by,
+                    foreign_key: { to_table: :users },
+                    index: true,
+                    null: true
+    end
+  end
+end

data/db/migrate/20190925130052_add_telephone_to_renal_consultants.rb

@@ -0,0 +1,7 @@
+class AddTelephoneToRenalConsultants < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :renal_consultants, :telephone, :string
+    end
+  end
+end

data/db/migrate/20190925161724_change_path_request_consultant_id.rb

@@ -0,0 +1,19 @@
+class ChangePathRequestConsultantId < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      remove_reference(
+        :pathology_requests_requests,
+        :consultant,
+        foreign_key: { to_table: :users },
+        index: true
+      )
+      add_reference(
+        :pathology_requests_requests,
+        :consultant,
+        foreign_key: { to_table: :renal_consultants },
+        index: true,
+        null: true
+      )
+    end
+  end
+end

data/db/migrate/20190925173849_renal_consultants_changes.rb

@@ -0,0 +1,9 @@
+class RenalConsultantsChanges < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      remove_index :renal_consultants, :code
+      change_column_null :renal_consultants, :code, true
+      add_index :renal_consultants, :name, unique: true
+    end
+  end
+end

data/db/migrate/20190928131032_add_some_more_missing_indexes.rb

@@ -0,0 +1,18 @@
+class AddSomeMoreMissingIndexes < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_index :modality_descriptions, :type
+      add_index :addresses, :addressable_id
+      add_index :letter_recipients, :role
+      # add_index :clinic_clinics, :name # this is added in heroic branch so don't add here
+      add_index :pathology_requests_global_rules, :rule_set_type
+      add_index :event_types, :hidden
+      add_index :letter_letters, :type
+      add_index :transplant_versions, :item_id
+      add_index :access_profiles, :started_on
+      add_index :access_profiles, :terminated_on
+      add_index :hospital_units, :is_hd_site
+      add_index :transplant_registration_status_descriptions, :position
+    end
+  end
+end

data/db/views/pathology_observation_digests_v01.sql

@@ -6,7 +6,7 @@ Example output:
 patient_id  observation_date  observations
 ------------------------------------------
 1           2018-02-02        {"CYA": "14"}
-1           2016-06-15        {"CMVDNA": "0.10"}
+1           2016-06-15        {"CMVD": "0.10"}
 1           2016-03-15        {"NA": "137", "TP": "74", "ALB": "48", "ALP": "71", ...
 1           2016-02-29        {"NA": "136", "TP": "78", "ALB": "47", "ALP": "71", ...
 */

data/lib/renalware/configuration.rb

@@ -85,6 +85,8 @@ module Renalware
 
     config_accessor(:hd_session_prescriptions_require_signoff) { true }
 
+    config_accessor(:batch_printing_enabled) { true }
+
     # 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.
     config_accessor(:page_layouts) {

data/lib/renalware/engine.rb

@@ -148,6 +148,7 @@ module Renalware
         renalware/print-button-example.png
         renalware/hd/mr_victor.jpg
         renalware/hd/avf_avg_assessment.jpg
+        renalware/loading-gears-animation.gif
       )
       app.config.assets.paths <<
         Rails.root.join(config.root, "vendor", "assets", "javascripts", "renalware")

data/lib/renalware/version.rb

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

data/lib/tasks/demo_data.rake

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# require_dependency "renalware/letters"
+
+require_relative '../../app/models/concerns/renalware/broadcasting.rb'
+
+namespace :demo_data do
+  task generate_test_letters: :environment do
+    return if Rails.env.production?
+
+    Renalware::GenerateTestLetters.new(ENV["pages"]).call
+  end
+end
+
+module Renalware
+  class GenerateTestLetters
+    include Renalware::Broadcasting
+    attr_reader :pages
+
+    def initialize(pages = 1)
+      @pages = pages.to_i
+    end
+
+    def call
+      patient = Letters.cast_patient(Patient.find_by(local_patient_id: "Z100001"))
+      clinics_patient = Renalware::Clinics.cast_patient(patient)
+
+      users = User.limit(3).to_a
+
+      letter_body = ""
+
+      pages.times do
+        letter_body += <<-TEXT
+          Cras justo odio, dapibus ac facilisis in, egestas eget quam. Curabitur blandit tempus porttitor. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit. Nulla vitae elit libero, a pharetra augue. Nulla vitae elit libero, a pharetra augue.
+          Cras justo odio, dapibus ac facilisis in, egestas eget quam. Curabitur blandit tempus porttitor. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit. Nulla vitae elit libero, a pharetra augue. Nulla vitae elit libero, a pharetra augue.
+        TEXT
+      end
+      letter_body += <<-TEXT
+        Yours sincerely
+      TEXT
+
+      10.times do
+        letter = Letters::Letter::PendingReview.create!(
+          patient: patient,
+          issued_on: 1.day.ago,
+          pathology_timestamp: 1.day.ago,
+          event: clinics_patient.clinic_visits.first,
+          clinical: true,
+          description: Renalware::Letters::Description.last.text,
+          main_recipient_attributes: {
+            person_role: "patient"
+          },
+          salutation: "Dear Mr Rabbit",
+          body: letter_body,
+          letterhead: Renalware::Letters::Letterhead.last,
+          author: users.sample,
+          by: users.sample
+        )
+        Renalware::Letters::ApproveLetter
+          .build(letter)
+          .broadcasting_to_configured_subscribers
+          .call(by: users.sample)
+      end
+    end
+  end
+end

data/lib/tasks/pd.rake

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "benchmark"
+
+namespace :pd do
+  desc "Applies the PD Calculations that are normally done when a user saves a regime. "\
+       "Useful post-migration to populate calculated fields. "\
+       "We avoid changing the updated_at timestamp in this instance, so it is recommended "\
+       "to clear the cache after running, otherwise the PD Summary etc in the UI may not update "\
+       "becuase some cache keys are based on the regime.updated_at column."
+  # Note if this task fails because the underlying PD regime data is not valid (we call save! so
+  # validations run) an alternative is to do this, which you even do in the rails console:
+  #   regimes.each { |r| Renalware::PD::APD::CalculateVolumes.new(r).call }
+  #   regimes = Renalware::PD::APDRegime.where(daily_volume: nil);
+  #   regimes.each { |r| r.update_columns(overnight_volume: r.overnight_volume,
+  #     daily_volume: r.daily_volume,
+  #     glucose_volume_low_strength: r.glucose_volume_low_strength,
+  #     glucose_volume_medium_strength: r.glucose_volume_medium_strength,
+  #     glucose_volume_high_strength: r.glucose_volume_high_strength) }
+  task apply_calculations: :environment do
+    Rails.logger = Logger.new(STDOUT)
+    # Apply to regimes where the calcs have not been run - ie one of the calculated columns is null.
+    regimes = Renalware::PD::APDRegime.where(daily_volume: nil).order(created_at: :asc)
+    Rails.logger.info "Applying calcs to #{regimes.count} regimes"
+    regimes.find_in_batches(batch_size: 50).each do |batch|
+      batch.each do |regime|
+        Rails.logger.info "Updating regime##{regime.id}"
+        regime.save!(touch: false) # don't change updated_at column
+      end
+    end
+  end
+end

data/spec/factories/clinics/appointments.rb

@@ -5,6 +5,6 @@ FactoryBot.define do
     patient
     clinic
     starts_at { Time.zone.now }
-    association :user
+    association :consultant, factory: :renal_consultant
   end
 end

data/spec/factories/medications/medication_route.rb

@@ -8,6 +8,11 @@ FactoryBot.define do
     code { "PO" }
     name { "Per Oral" }
 
+    trait :po do
+      code { "PO" }
+      name { "Per Oral" }
+    end
+
     trait :other do
       code { "Other" }
       name { "Other" }

data/spec/factories/renal/consultants.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :renal_consultant, class: "Renalware::Renal::Consultant" do
+    initialize_with { Renalware::Renal::Consultant.find_or_create_by(name: name) }
+    name { "name" }
+    code { "code" }
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative "../page_object"
+
+module Pages
+  module Medications
+    # Wraps the Add Prescription form
+    class PrescriptionForm < PageObject
+      def drug_type=(value)
+        select value, from: "Medication Type"
+      end
+
+      def drug=(value)
+        select value, from: "Drug"
+      end
+
+      def drug_dose=(value)
+        fill_in "Dose amount", with: value
+      end
+
+      def dose_unit=(value)
+        select value, from: "Dose unit"
+      end
+
+      def route=(value)
+        select value, from: "Route"
+      end
+
+      def route_description=(value)
+        fill_in "Route description", with: value
+      end
+
+      def frequency=(value)
+        fill_in "Frequency & Duration", with: value
+      end
+
+      def prescribed_on=(value)
+        fill_in "Prescribed on", with: value
+      end
+
+      def provider=(value)
+        within(".medications_prescription_provider") do
+          choose value
+        end
+      end
+
+      def save
+        within ".actions" do
+          click_on "Save"
+        end
+      end
+    end
+  end
+end