renalware-core 2.0.137 → 2.0.138

data/app/views/renalware/research/study_participants/index.html.slim

@@ -7,8 +7,7 @@
 = content_for(:tabs) do
   = render "renalware/research/studies/tabs", study: study
 
-= within_admin_layout(\
-  title: study.code,
-  breadcrumbs: breadcrumb_for("Clinical Studies", research_studies_path)) do
+= within_admin_layout(title: study.code,
+                      breadcrumbs: breadcrumb_for("Clinical Studies", research_studies_path)) do
 
   = render "table", study: study, participants: participants, query: query

data/app/views/renalware/surveys/_pos_s_summary_part.html.slim

@@ -19,7 +19,7 @@
     br
     br
     .xsss
-      table.table-header-rotated.toggleable
+      table.table-header-rotated.toggleable(data-controller="toggle")
         thead
           tr
             th.togglers= rows_toggler
@@ -49,6 +49,7 @@
                     = value
             tr
               td
+                |  
               td
               td
               td(class="summary-part--pos_s-patient-question-text" colspan=(pos_s_summary_part.question_labels.count ))

data/app/views/renalware/system/email_templates/index.html.slim

@@ -1,4 +1,4 @@
- = within_admin_layout(title: "System Email Templates") do
+ = within_new_admin_layout(title: "System Email Templates") do
 
   .panel
     p Listed below are previews of the email templates sent by this application.
@@ -9,3 +9,7 @@
 
     dt= link_to "User Reactivated Email", "/rails/mailers/renalware/admin/user_mailer/unexpiry"
     dd Sent when an administrator reactivates a deactivated user.
+
+  / You can remove this
+  .xxx(data-controller="test")
+  .xxx(data-controller="another_test")

data/app/views/renalware/system/messages/edit.html.slim

@@ -1,3 +1,3 @@
-= within_admin_layout(title: "Edit",
+= within_new_admin_layout(title: "Edit",
   breadcrumbs: breadcrumb_for("System Messages", system_messages_path)) do
   = render "form", message: message

data/app/views/renalware/system/messages/index.html.slim

@@ -1,7 +1,7 @@
 = content_for(:actions) do
   = link_to "Add", new_system_message_path, class: :button
 
-= within_admin_layout(title: "System Messages") do
+= within_new_admin_layout(title: "System Messages") do
   .system-messages
     table
       thead

data/app/views/renalware/system/messages/new.html.slim

@@ -1,3 +1,3 @@
-= within_admin_layout(title: "New",
+= within_new_admin_layout(title: "New",
     breadcrumbs: breadcrumb_for("System Messages", system_messages_path)) do
   = render "form", message: message

data/app/views/renalware/system/user_feedback/edit.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout( \
+= within_new_admin_layout( \
   title: "Edit",
   breadcrumbs: breadcrumb_for("User Feedback", system_user_feedback_index_path) \
 ) do

data/app/views/renalware/system/user_feedback/index.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "User Feedback") do
+= within_new_admin_layout(title: "User Feedback") do
   table.feedback
     thead
       th.col-width-tiny

data/app/views/renalware/transplants/mdm/_bottom.html.slim

@@ -9,4 +9,4 @@
     = render "measurements", mdm: mdm
 
   .columns.medium-12.large-4
-    = render(Renalware::Events::BiopsiesComponent, patient: current_patient)
+    = render Renalware::Events::BiopsiesComponent.new(patient: current_patient)

data/config/initializers/pagy.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+#
+# See here for all options: https://github.com/ddnexus/pagy/blob/master/lib/config/pagy.rb
+#
+
+# Foundation extra: Add nav, nav_js and combo_nav_js helpers and templates for Foundation pagination
+# See https://ddnexus.github.io/pagy/extras/foundation
+require "pagy/extras/foundation"

data/config/locales/renalware/hd/dashboards.en.yml

@@ -7,3 +7,4 @@ en:
         page_actions:
           protocol: Print HD Session Form
           mdm: MDM
+          record_hd_drugs: Record HD Drugs

data/config/locales/renalware/hd/session.en.yml

@@ -196,7 +196,8 @@ en:
           add_dna_session: Add DNA Session
           add: Add Session
           add_dna: Add DNA Session
-          view_all: View All
+          view_all: View All Sessions
+          view_all_drugs_given: View All Drugs Given
           missing_profile_message: |
             Please enter the HD Profile before creating sessions
         row:

data/config/routes/admin.rb

@@ -2,6 +2,7 @@
 
 namespace :admin do
   resources :users
+  resource :dashboard, only: :show
   namespace :feeds do
     resources :files, only: [:index, :show, :new, :create]
   end

data/config/routes/hd.rb

@@ -16,6 +16,7 @@ resources :patients, only: [] do
               only: [:index, :show],
               path: "/profiles/historical"
     resources :sessions
+    resources :prescription_administrations, only: :index
   end
 end
 
@@ -25,6 +26,14 @@ namespace :hd do
     get "patients_dialysing_at_hospital" => "patients#dialysing_at_hospital"
   end
 
+  resources :prescriptions, only: [] do
+    resources :administrations,
+              only: %i(new create edit update),
+              controller: "prescription_administrations"
+  end
+  resources :prescription_administration, only: [] do
+    resource :witness, only: [:edit, :update]
+  end
   resources :prescription_administration_authorisations, only: :create
   resources :transmission_logs, only: [:show, :index]
   resources :cannulation_types, except: :show

data/db/migrate/20190627141751_add_tokens_to_hd_prescription_administrations.rb

@@ -1,8 +1,6 @@
 class AddTokensToHDPrescriptionAdministrations < ActiveRecord::Migration[5.2]
   def change
     within_renalware_schema do
-      # add_column :hd_prescription_administrations, :administrator_authorisation_token, :string
-      # add_column :hd_prescription_administrations, :witness_authorisation_token, :string
       add_column(
         :hd_prescription_administrations,
         :administrator_authorised,

data/db/migrate/20200204153231_alter_hd_prescription_administrations.rb

@@ -0,0 +1,18 @@
+class AlterHDPrescriptionAdministrations < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      # Allow HD session if to be null, now that we are allowing HD drugs to be
+      # administered before the HD session is created, so there may be no
+      # associated session
+      change_column_null :hd_prescription_administrations, :hd_session_id, true
+      add_reference(
+        :hd_prescription_administrations,
+        :patient,
+        foreign_key: { to_table: :patients },
+        index: true,
+        null: true # old data will not have one
+      )
+      add_column :hd_prescription_administrations, :recorded_on, :date, null: true
+    end
+  end
+end

data/db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Access Catheter Insertion Techniques" do
-
     file_path = File.join(File.dirname(__FILE__), "access_pd_catheter_insertion_techniques.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/accesses/access_plan_types.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Access Plan Types" do
-
     file_path = File.join(File.dirname(__FILE__), "access_plan_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/accesses/access_sites.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Access Sites" do
-
     file_path = File.join(File.dirname(__FILE__), "access_sites.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/clinics/clinics.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Clinics" do
-
     [
       "Access",
       "AKI",

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

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Default Event Types e.g. Biopsy, Swabs" do
-
     file_path = File.join(File.dirname(__FILE__), "event_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/hd/cannulation_types.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding HD Cannulation Types" do
-
     file_path = File.join(File.dirname(__FILE__), "cannulation_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/hd/dialysers.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding HD Dialysers" do
-
     file_path = File.join(File.dirname(__FILE__), "dialysers.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/modalities/reasons.rb

@@ -3,28 +3,28 @@
 module Renalware
   module Modalities
     log "Adding PD To Haemodialysis (Reasons for Change)" do
-        PDToHaemodialysis.find_or_create_by!(rr_code: 201, description: "Patient/partner choice")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 202, description: "Loss of supporting partner")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 203, description: "Other change of personal circumstances")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 204, description: "Inability to perform PD")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 205, description: "Other reasons")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 211, description: "Frequent/Recurrent peritonitis with or without loss of UF")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 212, description: "Unresolving peritonitis")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 213, description: "Catheter loss through exit site infection")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 214, description: "Loss of UF")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 215, description: "Inadequate clearance")
-        PDToHaemodialysis.find_or_create_by!(rr_code: 216, description: "Abdominal surgery or complications")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 201, description: "Patient/partner choice")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 202, description: "Loss of supporting partner")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 203, description: "Other change of personal circumstances")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 204, description: "Inability to perform PD")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 205, description: "Other reasons")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 211, description: "Frequent/Recurrent peritonitis with or without loss of UF")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 212, description: "Unresolving peritonitis")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 213, description: "Catheter loss through exit site infection")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 214, description: "Loss of UF")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 215, description: "Inadequate clearance")
+      PDToHaemodialysis.find_or_create_by!(rr_code: 216, description: "Abdominal surgery or complications")
     end
 
     log "Adding Haemodialysis To PD (Reasons for Change)" do
-        HaemodialysisToPD.find_or_create_by!(rr_code: 221, description: "Patient/partner choice")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 222, description: "Loss of supporting partner")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 223, description: "Other change of personal circumstances")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 224, description: "Lack of HD facilities")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 225, description: "Other reasons")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 231, description: "Loss of vascular access")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 232, description: "Haemodynamic instability")
-        HaemodialysisToPD.find_or_create_by!(rr_code: 233, description: "Elective after temporary HD")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 221, description: "Patient/partner choice")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 222, description: "Loss of supporting partner")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 223, description: "Other change of personal circumstances")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 224, description: "Lack of HD facilities")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 225, description: "Other reasons")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 231, description: "Loss of vascular access")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 232, description: "Haemodynamic instability")
+      HaemodialysisToPD.find_or_create_by!(rr_code: 233, description: "Elective after temporary HD")
     end
   end
 end

data/db/seeds/default/pathology/measurement_units.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Pathology Measurement Units" do
-
     file_path = File.join(File.dirname(__FILE__), "measurement_units.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/patients/patients_ethnicities.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Renal Registry Ethnicities" do
-
     file_path = File.join(File.dirname(__FILE__), "rr18_ethnicity_codes.csv")
     CSV.foreach(file_path, headers: true) do |row|
       Patients::Ethnicity.find_or_create_by!(rr18_code: row["code"]) do |code|

data/db/seeds/default/patients/patients_languages.rb

@@ -3,6 +3,7 @@
 module Renalware
   log "Adding Languages" do
     return if Patients::Language.count > 0
+
     file_path = File.join(File.dirname(__FILE__), "patients_languages.csv")
     languages = []
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/patients/patients_religions.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Religions" do
-
     file_path = File.join(File.dirname(__FILE__), "patients_religions.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/pd/bag_types.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding PD Bag Types" do
-
     file_path = File.join(File.dirname(__FILE__), "bag_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/pd/organisms.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding Renal Reg Organisms" do
-
     file_path = File.join(File.dirname(__FILE__), "rr_organisms.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/pd/systems.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding PD Systems" do
-
     file_path = File.join(File.dirname(__FILE__), "systems.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/pd/training_sites.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding PD Training Sites" do
-
     file_path = File.join(File.dirname(__FILE__), "training_sites.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/pd/training_types.rb

@@ -2,7 +2,6 @@
 
 module Renalware
   log "Adding PD Training Types" do
-
     file_path = File.join(File.dirname(__FILE__), "training_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/practices/practices.rb

@@ -4,11 +4,11 @@ module Renalware
   log "Adding NHS Practices\n" do
     sample_status = "SAMPLE ONLY"
     Patients::Practice.transaction do
-      #NOTE: use '_sample' file for demo/devel
+      # NOTE: use '_sample' file for demo/devel
       CSV.foreach(File.join(File.dirname(__FILE__), "nhs_practices_sample.csv"), headers: true) do |row|
         practice = Patients::Practice.find_or_initialize_by(code: row["code"])
         practice.name = row["name"]
-        unless practice.address.present?
+        if practice.address.blank?
           practice.build_address(
             organisation_name: row["name"],
             postcode: row["postcode"],

data/db/seeds/default/practices/primary_care_physicians.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 module Renalware
-
   log "Adding Primary Care Physicians\n" do
     sample_status = "SAMPLE ONLY"
     file_path = File.join(File.dirname(__FILE__), "primary_care_physicians_sample.csv")
-    #"id","practice_code","gp_code","name","practice_id"
+    # "id","practice_code","gp_code","name","practice_id"
 
     CSV.foreach(file_path, headers: true) do |row|
       practice_id = row["practice_id"].to_i

data/db/seeds/default/renal/prd_descriptions.rb

@@ -3,6 +3,7 @@
 module Renalware
   log "Adding Primary Renal Diagnosis (PRD) Codes" do
     return if Renal::PRDDescription.count > 0
+
     file_path = File.join(File.dirname(__FILE__), "prd_descriptions.csv")
     descriptions = []
     CSV.foreach(file_path, headers: true) do |row|

data/db/seeds/default/system/roles.rb

@@ -3,7 +3,7 @@
 module Renalware
   log "Adding Roles" do
     Role::ROLES.each do |role|
-      hidden = ([:super_admin, :devops].include?(role))
+      hidden = [:super_admin, :devops].include?(role)
       Role.find_or_create_by!(name: role, hidden: hidden)
     end
   end

data/lib/renalware/engine.rb

@@ -36,6 +36,7 @@ require "naught"
 require "nested_form"
 require "nokogiri"
 require "ox"
+require "pagy"
 require "paper_trail"
 require "paranoia"
 require "pg"

data/lib/renalware/version.rb

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

data/spec/factories/hd/prescription_administrations.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :hd_prescription_administration, class: "Renalware::HD::PrescriptionAdministration" do
+    accountable
+    patient
+    prescription
+    association :administered_by, factory: :user
+    administrator_authorised { true }
+    association :witnessed_by, factory: :user
+    witness_authorised { true }
+    administered { true }
+    notes { "some notes" }
+    deleted_at { nil }
+    recorded_on { Time.zone.today }
+  end
+end