renalware-core 2.0.64 → 2.0.67

data/app/views/renalware/patients/bookmarks/_table.html.slim

@@ -0,0 +1,20 @@
+table.auto-layout
+  thead
+    tr
+      th.at-least.col-width-medium= sort_link(search,
+                                              :patient,
+                                              ["patient_family_name", "patient_given_name asc"],
+                                              t(".patient_name"))
+      th.col-width-nhs-no= t(".nhs_number")
+      th.col-width-reference-no= t(".hospital_number")
+      th.col-width-date= t(".born_on")
+      th.col-width-tiny= t(".age")
+      th.col-width-tiny= t(".sex")
+      th.col-width-medium= sort_link(search, :modality_desc, t(".modality"))
+      th= t(".notes")
+      th= t(".tags")
+      th.col-width-date-time= sort_link(search, :created_at, t(".bookmarked_on"))
+      th.col-width-tiny
+
+  tbody
+    = render partial: "bookmark", collection: bookmarks

data/app/views/renalware/patients/bookmarks/index.html.slim

@@ -1,2 +1,4 @@
 = within_admin_layout(title: "Bookmarked Patients") do
-  #bookmarks= render "renalware/dashboard/bookmarks/table", bookmarks: bookmarks
+  #bookmarks
+    = render "table", bookmarks: bookmarks, search: search
+  = paginate bookmarks

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

@@ -3,14 +3,7 @@ article
     h1 Prescriptions
     .supplemental
       span= "#{mdm.current_prescriptions.length} of #{mdm.patient.summary.prescriptions_count}"
-      = link_to t("links.view_all"),
-                patient_prescriptions_path(mdm.patient),
-                class: "button secondary"
-
-      = link_to "Toggle",
-                "#prescriptions",
-                class: "button secondary",
-                data: { behaviour: "css-toggler" }
+      = render "prescription_buttons", patient: mdm.patient
 
   #prescriptions.expandable
 

data/config/initializers/core_extensions.rb

@@ -3,12 +3,12 @@
 require "core_extensions/i18n/handle_blank_value"
 require "core_extensions/i18n/always_cascade"
 require "core_extensions/dumb_delegator"
-require "core_extensions/active_record/migration_helpers"
 require "core_extensions/active_record/sort"
 require "core_extensions/date"
 require "core_extensions/active_support/duration"
 require "core_extensions/scenic"
 require "core_extensions/hash"
+require "core_extensions/active_record/migration_helpers"
 
 I18n.extend CoreExtensions::I18n::HandleBlankValue
 I18n::Backend::Simple.send(:include, I18n::Backend::Cascade)

data/config/initializers/renalware.rb

@@ -36,6 +36,9 @@ Renalware.configure do |config|
         async: true
       )
     ],
+    "Renalware::Letters::ResolveDefaultElectronicCCs" => [
+      "Renalware::HD::PatientListener"
+    ],
     "Renalware::Pathology::CreateObservationRequests" => []
   }
 end

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

@@ -50,6 +50,7 @@ en:
         subs_volume: Subs Volume
       renalware/hd/session_document/complications:
         access_site_status: Access Site Status
+        line_exit_site_status: MR VICTOR (line exit site assessment)
         was_dressing_changed: Was dressing changed?
         had_intradialytic_hypotension: Had intradialytic hypotension?
         had_saline_administration: Had saline administration?
@@ -102,6 +103,12 @@ en:
         slight_erythema: Slight Erythema
         erythema: Erythema
         purulent: Purulent
+      line_exit_site_status:
+        0: 0
+        1: 1
+        2: 2
+        3: 3
+        4: 4
 
   simple_form:
     hints:

data/config/locales/renalware/patients/bookmarks.en.yml

@@ -8,3 +8,15 @@ en:
           cancel: Cancel
         delete:
           confirm: Are you sure you want to remove this bookmark?
+        none: There are no patients bookmarked.
+        table:
+          patient_name: Name
+          nhs_number: NHS Number
+          hospital_number: Hosp No
+          born_on: DOB
+          age: Age
+          sex: Sex
+          notes: Notes
+          tags: Tags
+          modality: Modality
+          bookmarked_on: Bookmarked

data/config/locales/renalware/patients/side_menu.en.yml

@@ -20,7 +20,7 @@ en:
           virology: Virology
           problems: Problems (%{count})
           modalities: Modalities (%{count})
-          esrf: ESRF/Comorbidities
+          esrf: Renal Profile
           clinical_profile: Clinical Profile
           contacts: Contacts (%{count})
           demographics: Demographics

data/db/migrate/20150119160039_create_versions.rb

@@ -1,9 +1,9 @@
 class CreateVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20150120155952_create_problem_versions.rb

@@ -1,9 +1,9 @@
 class CreateProblemVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :problem_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20150203161438_create_medication_prescription_versions.rb

@@ -1,9 +1,9 @@
 class CreateMedicationPrescriptionVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :medication_prescription_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20150515155052_users_have_and_belong_to_many_roles.rb

@@ -1,10 +1,12 @@
 class UsersHaveAndBelongToManyRoles < ActiveRecord::Migration[4.2]
+  # rubocop:disable Rails/CreateTableWithTimestamps
   def change
-    create_table :roles_users, :id => false do |t|
+    create_table :roles_users, id: false do |t|
       t.references :role, :user
     end
 
     add_foreign_key :roles_users, :users, column: :user_id
     add_foreign_key :roles_users, :roles, column: :role_id
   end
+  # rubocop:enable Rails/CreateTableWithTimestamps
 end

data/db/migrate/20160120203747_create_access_versions.rb

@@ -1,9 +1,9 @@
 class CreateAccessVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :access_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20160121175711_create_hd_versions.rb

@@ -1,9 +1,9 @@
 class CreateHDVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :hd_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20170217141529_create_clinic_versions.rb

@@ -1,9 +1,9 @@
 class CreateClinicVersions < ActiveRecord::Migration[5.0]
   def change
     create_table :clinic_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20170217161409_create_patient_versions.rb

@@ -1,9 +1,9 @@
 class CreatePatientVersions < ActiveRecord::Migration[5.0]
   def change
     create_table :patient_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20170605102519_create_clinical_versions.rb

@@ -1,9 +1,9 @@
 class CreateClinicalVersions < ActiveRecord::Migration[4.2]
   def change
     create_table :clinical_versions do |t|
-      t.string   :item_type, :null => false
-      t.integer  :item_id,   :null => false
-      t.string   :event,     :null => false
+      t.string   :item_type, null: false
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
       t.string   :whodunnit
       t.jsonb    :object
       t.jsonb    :object_changes

data/db/migrate/20171002175804_add_rr_columns_to_transplant_registration_status_descriptions.rb

@@ -1,12 +1,14 @@
 class AddRrColumnsToTransplantRegistrationStatusDescriptions < ActiveRecord::Migration[5.1]
   def change
-    add_column :transplant_registration_status_descriptions,
-               :rr_code,
-               :integer,
-               index: true
+    within_renalware_schema do
+      add_column :transplant_registration_status_descriptions,
+                :rr_code,
+                :integer,
+                index: true
 
-    add_column :transplant_registration_status_descriptions,
-               :rr_comment,
-               :text
+      add_column :transplant_registration_status_descriptions,
+                :rr_comment,
+                :text
+    end
   end
 end

data/db/migrate/20171003093347_create_hospital_wards.rb

@@ -1,17 +1,19 @@
 class CreateHospitalWards < ActiveRecord::Migration[5.1]
   def change
-    create_table :hospital_wards do |t|
-      t.string :name, null: false
-      t.references :hospital_unit, index: true, foreign_key: true, null: false
-      t.datetime :deleted_at
-      t.timestamps null: false
-    end
+    within_renalware_schema do
+      create_table :hospital_wards do |t|
+        t.string :name, null: false
+        t.references :hospital_unit, index: true, foreign_key: true, null: false
+        t.datetime :deleted_at
+        t.timestamps null: false
+      end
 
-    # This create a postgres partial index
-    # Name must be unique in for any unit, but only amongst un-deleted wards.
-    add_index :hospital_wards,
-              [:name, :hospital_unit_id],
-              unique: true,
-              where: "deleted_at IS NOT NULL"
+      # This create a postgres partial index
+      # Name must be unique in for any unit, but only amongst un-deleted wards.
+      add_index :hospital_wards,
+                [:name, :hospital_unit_id],
+                unique: true,
+                where: "deleted_at IS NOT NULL"
+    end
   end
 end

data/db/migrate/20171003111228_create_aki_alert_actions.rb

@@ -1,10 +1,12 @@
 class CreateAKIAlertActions < ActiveRecord::Migration[5.1]
   def change
-    create_table :renal_aki_alert_actions do |t|
-      t.string :name, null: false, index: :unique
-      t.integer :position, null: false, default: 0
+    within_renalware_schema do
+      create_table :renal_aki_alert_actions do |t|
+        t.string :name, null: false, index: :unique
+        t.integer :position, null: false, default: 0
 
-      t.timestamps null: false
+        t.timestamps null: false
+      end
     end
   end
 end

data/db/migrate/20171003122425_create_renal_aki_alerts.rb

@@ -1,22 +1,24 @@
 class CreateRenalAKIAlerts < ActiveRecord::Migration[5.1]
   def change
-    create_table :renal_aki_alerts do |t|
-      t.references :patient, null: false, foreign_key: true, index: true
-      t.references :action,
-                   foreign_key: { to_table: :renal_aki_alert_actions },
-                   index: true,
-                   null: true
-      t.references :hospital_ward,
-                   foreign_key: { to_table: :hospital_wards },
-                   index: true,
-                   null: true
-      t.boolean :hotlist, null: false, default: false, index: true
-      t.string :renal_aki_alerts, :action, :string, index: true
-      t.text :notes
-      t.references :updated_by, foreign_key: { to_table: :users }, index: true
-      t.references :created_by, foreign_key: { to_table: :users }, index: true
+    within_renalware_schema do
+      create_table :renal_aki_alerts do |t|
+        t.references :patient, null: false, foreign_key: true, index: true
+        t.references :action,
+                    foreign_key: { to_table: :renal_aki_alert_actions },
+                    index: true,
+                    null: true
+        t.references :hospital_ward,
+                    foreign_key: { to_table: :hospital_wards },
+                    index: true,
+                    null: true
+        t.boolean :hotlist, null: false, default: false, index: true
+        t.string :renal_aki_alerts, :action, :string, index: true
+        t.text :notes
+        t.references :updated_by, foreign_key: { to_table: :users }, index: true
+        t.references :created_by, foreign_key: { to_table: :users }, index: true
 
-      t.timestamps null: false
+        t.timestamps null: false
+      end
     end
   end
 end

data/db/migrate/20171004092235_create_hd_dialysates.rb

@@ -1,13 +1,15 @@
 class CreateHDDialysates < ActiveRecord::Migration[5.1]
   def change
-    create_table :hd_dialysates do |t|
-      t.string :name, null: false
-      t.text :description
-      t.integer :sodium_content, null: false
-      t.string :sodium_content_uom, null: false
+    within_renalware_schema do
+      create_table :hd_dialysates do |t|
+        t.string :name, null: false
+        t.text :description
+        t.integer :sodium_content, null: false
+        t.string :sodium_content_uom, null: false
 
-      t.datetime :deleted_at, index: true
-      t.timestamps null: false
+        t.datetime :deleted_at, index: true
+        t.timestamps null: false
+      end
     end
   end
 end

data/db/migrate/20171004110909_add_dialysate_id_to_profile_and_session.rb

@@ -1,9 +1,11 @@
 class AddDialysateIdToProfileAndSession < ActiveRecord::Migration[5.1]
   def change
-    add_reference :hd_profiles, :dialysate, references: :hd_dialysates, index: true
-    add_foreign_key :hd_profiles, :hd_dialysates, column: :dialysate_id
+    within_renalware_schema do
+      add_reference :hd_profiles, :dialysate, references: :hd_dialysates, index: true
+      add_foreign_key :hd_profiles, :hd_dialysates, column: :dialysate_id
 
-    add_reference :hd_sessions, :dialysate, references: :hd_dialysates, index: true
-    add_foreign_key :hd_sessions, :hd_dialysates, column: :dialysate_id
+      add_reference :hd_sessions, :dialysate, references: :hd_dialysates, index: true
+      add_foreign_key :hd_sessions, :hd_dialysates, column: :dialysate_id
+    end
   end
 end

data/db/migrate/20171005081224_create_reporting_bone_audit.rb

@@ -1,5 +1,7 @@
 class CreateReportingBoneAudit < ActiveRecord::Migration[5.0]
   def change
-    create_view :reporting_bone_audit
+    within_renalware_schema do
+      create_view :reporting_bone_audit
+    end
   end
 end

data/db/migrate/20171005091202_reporting_audit_changes.rb

@@ -1,7 +1,9 @@
 class ReportingAuditChanges < ActiveRecord::Migration[5.1]
   def change
-    rename_column :reporting_audits, :materialized_view_name, :view_name
-    add_column :reporting_audits, :materialized, :boolean, null: false, default: true
-    change_column_null :reporting_audits, :refresh_schedule, true
+    within_renalware_schema do
+      rename_column :reporting_audits, :materialized_view_name, :view_name
+      add_column :reporting_audits, :materialized, :boolean, null: false, default: true
+      change_column_null :reporting_audits, :refresh_schedule, true
+    end
   end
 end

data/db/migrate/20171005130109_create_medication_current_prescriptions.rb

@@ -1,5 +1,7 @@
 class CreateMedicationCurrentPrescriptions < ActiveRecord::Migration[5.0]
   def change
-    create_view :medication_current_prescriptions
+    within_renalware_schema do
+      create_view :medication_current_prescriptions
+    end
   end
 end

data/db/migrate/20171005144505_create_reporting_anaemia_audit.rb

@@ -1,5 +1,7 @@
 class CreateReportingAnaemiaAudit < ActiveRecord::Migration[5.0]
   def change
-    create_view :reporting_anaemia_audit
+    within_renalware_schema do
+      create_view :reporting_anaemia_audit
+    end
   end
 end