renalware-core 2.0.145 → 2.0.151

data/db/migrate/20200421082715_add_body_surface_area_to_clinic_visits.rb

@@ -0,0 +1,8 @@
+class AddBodySurfaceAreaToClinicVisits < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :clinic_visits, :body_surface_area, :decimal, precision: 8, scale: 2
+      add_column :clinic_visits, :total_body_water, :decimal, precision: 8, scale: 2
+    end
+  end
+end

data/db/migrate/20200421132911_create_pd_pet_dextrose_concentrations.rb

@@ -0,0 +1,13 @@
+class CreatePDPETDextroseConcentrations < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :pd_pet_dextrose_concentrations do |t|
+        t.string :name, null: false, index: { unique: true }
+        t.float :value, null: false, index: { unique: true }
+        t.boolean :hidden, null: false, default: false
+        t.integer :position, null: false, default: 0
+        t.timestamps null: false
+      end
+    end
+  end
+end

data/db/migrate/20200421143546_create_pet_results.rb

@@ -0,0 +1,66 @@
+class CreatePETResults < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_enum :pd_pet_type, %w(full fast)
+
+      create_table :pd_pet_results do |t|
+        t.references :patient, null: false, foreign_key: true
+
+        # The first set are inputs when seeing the patient
+        t.date :performed_on, null: false
+        t.enum :test_type, enum_name: :pd_pet_type, null: false
+        t.integer :volume_in
+        t.integer :volume_out
+        t.references(
+          :dextrose_concentration,
+          foreign_key: { to_table: :pd_pet_dextrose_concentrations },
+          index: true,
+          null: true
+        )
+        t.integer :infusion_time
+        t.integer :drain_time
+        t.integer :overnight_volume_in
+        t.integer :overnight_volume_out
+        t.references(
+          :overnight_dextrose_concentration,
+          foreign_key: { to_table: :pd_pet_dextrose_concentrations },
+          index: true,
+          null: true
+        )
+        t.integer :overnight_dwell_time
+
+        # This set is manually or automatically added pathology after the fact
+        # Refers to dialysate samples
+        [0, 2, 4, 6].each do |hr|
+          t.float :"sample_#{hr}hr_time"
+          t.float :"sample_#{hr}hr_urea"
+          t.float :"sample_#{hr}hr_creatinine"
+          t.float :"sample_#{hr}hr_glc"
+          t.float :"sample_#{hr}hr_sodium"
+          t.float :"sample_#{hr}hr_protein"
+        end
+
+        # Blood results back from the lab
+        t.float :serum_time
+        t.float :serum_urea
+        t.float :serum_creatinine
+        t.float :plasma_glc
+        t.float :serum_ab
+        t.float :serum_na
+
+        # This set is for calculated fields
+        t.integer :net_uf
+        t.float :d_pcr
+        t.boolean :complete, default: false, null: false, indeex: true
+
+        t.datetime :deleted_at, index: true
+        t.references :created_by, index: true, null: false
+        t.references :updated_by, index: true, null: false
+        t.timestamps null: false
+      end
+
+      add_foreign_key :pd_pet_results, :users, column: :created_by_id
+      add_foreign_key :pd_pet_results, :users, column: :updated_by_id
+    end
+  end
+end

data/db/migrate/20200427123229_create_adequacy_results.rb

@@ -0,0 +1,54 @@
+class CreateAdequacyResults < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :pd_adequacy_results do |t|
+        t.references :patient, null: false, foreign_key: true
+
+        # The first set are inputs after seeing the patient
+        t.date :performed_on, null: false
+        t.integer :dial_24_vol_in
+        t.integer :dial_24_vol_out
+        t.boolean :dial_24_missing, null: false, default: false
+        t.integer :urine_24_vol
+        t.boolean :urine_24_missing, null: false, default: false
+
+        # Blood results back from the lab
+        t.float :serum_urea
+        t.float :serum_creatinine
+        t.float :plasma_glc
+        t.float :serum_ab
+
+        # Dialysate results back from the lab
+        t.float :dialysate_urea
+        t.float :dialysate_creatinine
+        t.float :dialysate_glu
+        t.float :dialysate_na
+        t.float :dialysate_protein
+
+        # Urine results back from the lab
+        t.float :urine_urea
+        t.float :urine_creatinine
+        t.float :urine_na
+        t.float :urine_k
+
+        # Calculations
+        t.float :total_creatinine_clearance
+        t.float :pertitoneal_creatinine_clearance
+        t.float :renal_creatinine_clearance
+        t.float :total_ktv
+        t.float :pertitoneal_ktv
+        t.float :renal_ktv
+        t.float :dietry_protein_intake
+        t.boolean :complete, default: false, null: false, indeex: true
+
+        t.datetime :deleted_at, index: true
+        t.references :created_by, index: true, null: false
+        t.references :updated_by, index: true, null: false
+        t.timestamps null: false
+      end
+
+      add_foreign_key :pd_adequacy_results, :users, column: :created_by_id
+      add_foreign_key :pd_adequacy_results, :users, column: :updated_by_id
+    end
+  end
+end

data/db/migrate/20200616115709_add_height_weight_to_pd_adequacy_results.rb

@@ -0,0 +1,8 @@
+class AddHeightWeightToPDAdequacyResults < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :pd_adequacy_results, :height, :float
+      add_column :pd_adequacy_results, :weight, :float
+    end
+  end
+end

data/db/migrate/20200618144228_add_feature_flags_to_users.rb

@@ -0,0 +1,14 @@
+class AddFeatureFlagsToUsers < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column(
+        :users,
+        :feature_flags,
+        :integer,
+        default: 0,
+        null: false,
+        comment: "OR'ed feature flag bits to enable experimental features for certain users"
+      )
+    end
+  end
+end

data/db/seeds/default/events/event_types.csv

@@ -6,3 +6,5 @@
 "PD Line Change",,"pd_line_changes"
 "Investigation","Renalware::Events::Investigation","investigations"
 "Vaccination","Renalware::Virology::Vaccination","vaccinations"
+"Advanced Care Plan","Renalware::Events::AdvancedCarePlan","advanced_care_plans"
+"Clinical Frailty Score","Renalware::Events::ClinicalFrailtyScore","clinical_frailty_score"

data/db/seeds/seeds_helper.rb

@@ -2,8 +2,14 @@
 
 module SeedsHelper
   def without_papertrail_versioning_for(klasses)
-    Array(klasses).each { |klass| klass.paper_trail.disable }
+    Array(klasses).each do |klass|
+      klass.paper_trail.disable if klass.paper_trail.respond_to?(:disable)
+    end
+
     yield
-    Array(klasses).each { |klass| klass.paper_trail.enable }
+
+    Array(klasses).each do |klass|
+      klass.paper_trail.enable if klass.paper_trail.respond_to?(:enable)
+    end
   end
 end

data/lib/renalware/configuration.rb

@@ -14,6 +14,7 @@
 # To access configuration settings use e.g.
 #   Renalware.config.x
 #
+# rubocop:disable Metrics/ClassLength
 module Renalware
   class Configuration
     include ActiveSupport::Configurable
@@ -35,6 +36,10 @@ module Renalware
     config_accessor(:page_title_spearator) { " : " }
     config_accessor(:patient_hospital_identifiers) { {} }
     config_accessor(:session_timeout_polling_frequency) { 1.minute }
+    config_accessor(:session_register_user_user_activity_after) { 2.minutes }
+    config_accessor(:session_expiry_use_previous_mechansim) {
+      ENV["SESSION_EXPIRY_USE_PREVIOUS_MECHANSIM"] == "true"
+    }
     config_accessor(:duration_of_last_url_memory_after_session_expiry) { 30.minutes }
     config_accessor(:broadcast_subscription_map) { {} }
     config_accessor(:include_sunday_on_hd_diaries) { false }
@@ -154,3 +159,4 @@ module Renalware
     yield config
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/renalware/engine.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "rubygems"
-require "action_view/component/railtie"
+require "view_component/engine"
 require "active_type"
 require "activerecord-import"
 require "ahoy"
@@ -12,6 +12,7 @@ require "client_side_validations"
 require "client_side_validations/simple_form"
 require "clipboard/rails"
 require "cocoon"
+require "concurrent-ruby"
 require "devise"
 require "devise-security"
 require "delayed_job_active_record"
@@ -74,12 +75,14 @@ module Renalware
     # Errors in the UI are bubbled up and handled in the host app in the usual way.
     class << self
       attr_writer :exception_notifier
+
       def exception_notifier
         @exception_notifier ||= NullExceptionNotifier.new
       end
     end
 
-    config.action_view_component.test_controller = "Renalware::BaseController"
+    # config.view_component.test_controller = "Renalware::BaseController"
+
     config.autoload_paths += Dir["#{config.root}/lib/**/"]
     config.autoload_paths += %W(#{config.root}/app/validators/concerns)
 
@@ -109,7 +112,8 @@ module Renalware
         # need to see them. 100 users with an active session polling every minute will add
         # up to fair number of log entries.
         app.config.lograge.ignore_actions = [
-          "Renalware::SessionTimeoutController#has_user_timed_out"
+          "Renalware::SessionTimeoutController#check_session_expired",
+          "Renalware::SessionTimeoutController#keep_session_alive"
         ]
       end
     end

data/lib/renalware/version_number.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Renalware
+  VERSION = "2.0.151"
+
+  # To satisfy zeitwerk we have renamed this file version_number and make sure
+  # to creat that class even though its not used. If we don't do this zeitwerk
+  # complains that version.rb does export a constant called Version.
+  class VersionNumber
+  end
+end

data/lib/tasks/renalware.rake

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Rails/RakeEnvironment
 namespace :renalware do
   desc "Install package.json dependencies with yarn for the renalware-core engine - "\
        "without this <path to installed gem>/renalware-core/node_modules is not populated "\
@@ -7,7 +8,11 @@ namespace :renalware do
   task :yarn_install do
     puts "Installing renalware-core/package.json dependencies with yarn"
     Dir.chdir(File.join(__dir__, "../..")) do
-      system "yarn install --no-progress --production"
+      if ENV["RAILS_ENV"] == "production"
+        system "yarn install --no-progress --production"
+      else
+        system "yarn install"
+      end
     end
   end
 end
@@ -17,3 +22,4 @@ if Rake::Task.task_defined?("yarn:install")
 else
   Rake::Task.define_task("yarn:install" => "renalware:yarn_install")
 end
+# rubocop:enable Rails/RakeEnvironment

data/spec/factories/accesses/profiles.rb

@@ -7,6 +7,7 @@ FactoryBot.define do
     type { create(:access_type) }
     side { :right }
     formed_on { Time.zone.today }
+    started_on { Time.zone.today }
 
     trait :current do
       started_on { 1.day.ago }

data/spec/factories/events/events_types.rb

@@ -36,5 +36,17 @@ FactoryBot.define do
       slug { "vaccinations" }
       event_class_name { "Renalware::Virology::Vaccination" }
     end
+
+    factory :advanced_care_plan do
+      name { "AdvancedCarePlan" }
+      slug { "advanced_care_plans" }
+      event_class_name { "Renalware::Events::AdvancedCarePlan" }
+    end
+
+    factory :clinical_frailty_score do
+      name { "Clinical Frailty Score" }
+      slug { "clinical_frailty_scores" }
+      event_class_name { "Renalware::Events::ClinicalFrailtyScore" }
+    end
   end
 end

data/spec/factories/patients/patients.rb

@@ -2,7 +2,28 @@
 
 FactoryBot.define do
   sequence :nhs_number do |n|
-    n.to_s.rjust(10, "0000000000")
+    %w(
+      6393739592
+      4414733227
+      5552737601
+      4696133478
+      4904230000
+      5477425407
+      7465613493
+      9827026836
+      2132173117
+      2717073604
+      3477113764
+      7114008236
+      9660350961
+      2637392835
+      1833834704
+      9707196408
+      0676304567
+      0558366333
+      1573555126
+      5543098111
+    )[n]
   end
 
   sequence :local_patient_id do |n|

data/spec/factories/pd/adequacy_results.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pd_adequacy_result, class: "Renalware::PD::AdequacyResult" do
+    accountable
+    performed_on { I18n.l(Time.zone.today) }
+    urine_urea { 10 }
+    urine_creatinine { 10 }
+    urine_24_vol { 1000 }
+    dialysate_urea { 10 }
+    dialysate_creatinine { 10 }
+    dial_24_vol_out { 1500 }
+    serum_urea { 10 }
+    serum_creatinine { 10 }
+  end
+end

data/spec/factories/pd/pet_results.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pd_pet_result, class: "Renalware::PD::PETResult" do
+    accountable
+    performed_on { I18n.l(Time.zone.today) }
+    test_type { :full }
+  end
+end

data/spec/support/pages/letters/mailshots/form.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require_relative "../../page_object"
+require "capybara-select-2"
+
+module Pages
+  module Letters
+    module Mailshots
+      class Form < PageObject
+        include CapybaraSelect2
+        include TextEditorHelpers
+
+        def navigate_here_from_admin_dashboard
+          visit admin_dashboard_path
+
+          within ".side-nav--admin" do
+            click_on "Mailshots"
+          end
+
+          within ".page-actions" do
+            click_on "Add"
+          end
+        end
+
+        def letterhead=(letterhead)
+          select letterhead, from: "Letterhead"
+        end
+
+        def author=(user)
+          select user.to_s, from: "Author"
+        end
+
+        def description=(value)
+          fill_in "Description", with: value
+        end
+
+        def sql_view_name=(value)
+          select value, from: "Sql view name"
+        end
+
+        def body=(value)
+          fill_trix_editor with: value
+        end
+
+        def patient_preview_table
+          "#mailshot-patients-preview"
+        end
+
+        def submit
+          accept_alert do
+            click_on "Create letters"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -39,11 +39,11 @@ module Pages
       end
 
       def last_delivery_date=(date)
-        fill_in "Last delivery date", with: date
+        fill_in "Last home prescription date", with: date
       end
 
       def next_delivery_date=(date)
-        fill_in "Next delivery date", with: date
+        fill_in "Next home prescription date", with: date
       end
 
       def provider=(value)