renalware-core 2.0.132 → 2.0.133

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

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

data/app/views/renalware/transplants/mdm_patients/_patient.html.slim

@@ -1,5 +1,10 @@
 - observation_set = patient.current_observation_set
 tr
+  td.actions
+    = link_to view_proc.call(patient), target: "_blank" do
+      i.fa.fa-external-link-square-alt
+      |   
+      = t(".view")
   td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
   td.nowrap= patient.nhs_number
   td.nowrap= patient.hospital_identifier
@@ -15,4 +20,3 @@ tr
   td= l(observation_set.cre_observed_at)
   td= observation_set.egfr_result
   td= l(patient.esrf_date)
-  td.actions= link_to t(".view"), view_proc.call(patient)

data/app/views/renalware/transplants/mdm_patients/_table.html.slim

@@ -2,6 +2,7 @@
 table#patients.mdm-patients.columns
   thead
     tr
+      th.col-width-tiny
       th.col-width-large= sort_link(path, :family_name, t(".name"))
       th.col-width-nhs-no= sort_link(path, :nhs_number, t(".nhs_no"))
       th.col-width-reference-no= t(".hosp_no")
@@ -14,7 +15,6 @@ table#patients.mdm-patients.columns
         th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))
       th.col-width-tiny= sort_link(path, :egfr, t(".egfr"))
       th.col-width-date= t(".esrf")
-      th.col-width-small
 
   tbody
     = render partial: "patient",

data/app/views/renalware/transplants/wait_lists/_registration.html.slim

@@ -12,6 +12,7 @@ tr
   td= registration.hd_hospital_unit_code
   td= registration.current_status
   td= registration.uk_transplant_centre_status
+  td= registration.document&.codes&.uk_transplant_patient_recipient_number
   td= l(registration.esrf_date)
   td= l(registration.entered_on)
   td= registration.dol

data/app/views/renalware/transplants/wait_lists/show.html.slim

@@ -1,6 +1,28 @@
+= content_for(:filters) do
+  - options = path_params.to_h.symbolize_keys
+  = simple_form_for form,
+            as: :form,
+            url: Renalware::Engine.routes.url_for(options.merge!(only_path: true)),
+            method: :get do |f|
+
+    .row.collapse
+      .columns.small-6
+        .row.collapse
+          .small-10.columns
+            = f.input :ukt_recipient_number,
+                      class: "radius",
+                      wrapper: :hz_large,
+                      label: "UKT recipient number"
+          .small-2.columns
+            = button_tag(type: "submit",
+                        class: "search-registrations button tiny postfix radius radius-right secondary",
+                        style: "width: 3rem") do
+              i.fas.fa-search
+
 = content_for(:tabs) do
   ruby:
     filters = {
+      all: "All",
       active: "Active",
       suspended: "Suspended",
       active_and_suspended: "Active & Suspended",
@@ -17,7 +39,7 @@
       = sub_nav_item(label, path)
 
 = within_admin_layout(title: "Transplant Wait List Registrations") do
-  table.report
+  table.report.wait-list-registrations-table
     thead
       tr
         th.noprint
@@ -29,6 +51,7 @@
         th= sort_link([:renalware, q], :hd_site, "HD Site")
         th= sort_link([:renalware, q], :patient_current_status_description_name, "Status")
         th= sort_link([:renalware, q], :ukt_status, "UKT Status")
+        th.col-width-tiny UKT No
         th.col-width-date= sort_link([:renalware, q], :esrf_on, "ESRF Date")
         th.col-width-date= sort_link([:renalware, q], :entered_on, "Entry Date")
         th DOL

data/config/locales/renalware/clinical/body_composition.yml

@@ -16,6 +16,8 @@ en:
         body_cell_mass: Body Cell Mass (BCM)
         quality_of_reading: Quality of Reading (Q)
         notes: Notes
+        weight: Weight
+        pre_post_hd: Pre or Post HD
   renalware:
     clinical:
       body_compositions:
@@ -46,3 +48,5 @@ en:
           body_cell_mass: BCM
           quality_of_reading: Q
           assessor: Assessor
+          weight: Weight
+          pre_post_hd: PrePost

data/config/routes/pathology.rb

@@ -21,6 +21,7 @@ resources :patients, only: [] do
 end
 
 namespace :pathology do
+  resources :code_groups
   namespace :requests do
     # NOTE: This needs to be POST since the params may exceed url char limit in GET
     post "requests/new", to: "requests#new", as: "new_request"

data/db/migrate/20200114151225_add_clinical_body_composition_cols.rb

@@ -0,0 +1,11 @@
+class AddClinicalBodyCompositionCols < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_enum :clinical_body_composition_pre_post_hd, %w(pre post)
+      change_table :clinical_body_compositions do |t|
+        t.enum :pre_post_hd, enum_name: :clinical_body_composition_pre_post_hd
+        t.float :weight
+      end
+    end
+  end
+end

data/db/migrate/20200127165951_create_pathology_versions.rb

@@ -0,0 +1,16 @@
+class CreatePathologyVersions < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :pathology_versions do |t|
+        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
+        t.datetime :created_at
+      end
+      add_index :pathology_versions, [:item_type, :item_id]
+    end
+  end
+end

data/db/migrate/20200127170711_add_created_by_to_pathology_code_groups.rb

@@ -0,0 +1,15 @@
+class AddCreatedByToPathologyCodeGroups < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do 
+      change_table :pathology_code_groups do |t|
+        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
+      end
+
+      change_table :pathology_code_group_memberships do |t|
+        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
+      end
+    end
+  end
+end

data/db/migrate/20200129093835_create_system_dashboards.rb

@@ -0,0 +1,73 @@
+class CreateSystemDashboards < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :system_dashboards do |t|
+        t.string(
+          :name,
+          index: { unique: true },
+          comment: "A named dashboard e.g. default, hd_nurse"
+        )
+        t.text :description
+        t.references(
+          :user,
+          index: false,
+          null: true,
+          comment: "If present, this dashboard belongs to a user e.g. they have customised a "\
+                   "named dashboard to make it their own"
+        )
+        t.references(
+          :cloned_from_dashboard,
+          null: true,
+          foreign_key: { to_table: :system_dashboards },
+          comment: "Is the user customised their dashboard we store the original here"
+        )
+        t.timestamps null: false
+      end
+      add_index :system_dashboards, :user_id, unique: true
+
+      create_table(
+        :system_components,
+        comment: "Available ruby display widgets for use e.g. in dashboards") do |t|
+        t.string :class_name, null: false, index: true, comment: "Component class eg Renalware::.."
+        t.string(
+          :name,
+          null: false,
+          index: { unique: true },
+          comment: "Friendly component name e.g. 'Letters in Progress'"
+        )
+        t.boolean :dashboard, default: true, null: false, comment: "If true, can use on dashboards"
+        t.string :roles, index: true, comment: "Who can use or be assigned this component"
+        t.timestamps null: true
+      end
+
+      create_table :system_dashboard_components, comment: "Defines dashboard content" do |t|
+        t.references(
+          :dashboard,
+          foreign_key: { to_table: :system_dashboards }
+        )
+        t.references(
+          :component,
+          foreign_key: { to_table: :system_components }
+        )
+        t.integer :position, null: false, default: 1
+        t.timestamps null: false
+      end
+
+      add_index(
+        :system_dashboard_components,
+        [:dashboard_id, :component_id],
+        unique: true,
+        name: "idx_dashboard_component_useage_unique",
+        comment: "Allow only one instance of a component on any dashboard"
+      )
+
+      add_index(
+        :system_dashboard_components,
+        [:dashboard_id, :position],
+        unique: true,
+        name: "idx_dashboard_component_position",
+        comment: "Position must be unique within a dashboard"
+      )
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Renalware
+  log "Adding Pathology Code Groups" do
+    user = User.first
+    Pathology::CodeGroup.find_or_create_by!(name: "hd_session_form_recent") do |group|
+      group.description = "Recent pathology shown on the HD Sessions printable form"
+      group.created_by = user
+      group.updated_by = user
+
+      # We could add observation_descriptions to the group here but none are seeded in the
+      # default seeds.
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-require_relative "measurement_units"
+require_relative "./measurement_units"
+require_relative "./code_groups"

data/lib/core_extensions/active_record/migration_helpers.rb

@@ -3,6 +3,7 @@
 module CoreExtensions
   module ActiveRecord
     module MigrationHelpers
+      require "activerecord/postgres_enum"
       # Used in migrations to ensure the objects created/updated/found are in the correct schema.
       # We ensure that the original schema_search_path defined in the database.yml in the host app
       # is restored - this particularyl important for migations in an engine.
@@ -89,14 +90,14 @@ module CoreExtensions
         class << self
           def triggers
             [
-              Rails.root.join("db", "triggers"),
+              Rails.root.join("db/triggers"),
               Renalware::Engine.root.join("db", "triggers")
             ]
           end
 
           def functions
             [
-              Rails.root.join("db", "functions"),
+              Rails.root.join("db/functions"),
               Renalware::Engine.root.join("db", "functions")
             ]
           end

data/lib/renalware/engine.rb

@@ -57,7 +57,6 @@ require "virtus"
 require "wicked_pdf"
 require "wisper"
 require "wisper/activejob"
-require "rails-assets-foundation-datepicker"
 require "byebug" if ENV["RAILS_ENV"] == "development"
 
 module Renalware
@@ -79,6 +78,7 @@ module Renalware
       end
     end
 
+    config.action_view_component.test_controller = "Renalware::BaseController"
     config.autoload_paths += Dir["#{config.root}/lib/**/"]
     config.autoload_paths += %W(#{config.root}/app/validators/concerns)
 

data/lib/renalware/version.rb

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

data/lib/tasks/spec.rake

@@ -5,29 +5,31 @@
 #
 namespace :spec do
   namespace :acceptance do
-    ENV["RACK_ENV"] = ENV["RAILS_ENV"] = "test"
-    require "rspec/core/rake_task"
-    pattern = "./spec/acceptance/renalware/features/**/*.feature"
+    if defined?(RSpec)
+      ENV["RACK_ENV"] = ENV["RAILS_ENV"] = "test"
+      require "rspec/core/rake_task"
+      pattern = "./spec/acceptance/renalware/features/**/*.feature"
 
-    # domain features are those that do not exercise the UI
-    # Usage:
-    #   bundle exec rake spec:acceptance:domain
-    RSpec::Core::RakeTask.new(:domain) do |t|
-      t.pattern = pattern
-    end
+      # domain features are those that do not exercise the UI
+      # Usage:
+      #   bundle exec rake spec:acceptance:domain
+      RSpec::Core::RakeTask.new(:domain) do |t|
+        t.pattern = pattern
+      end
 
-    # web features exerciswe the UI and may use a webdriver is tagged with @javascript
-    # Usage:
-    #   bundle exec rake spec:acceptance:web
-    RSpec::Core::RakeTask.new(:web) do |t|
-      t.pattern = "./spec/acceptance/renalware/features/**/*.feature"
-      t.rspec_opts = "--tag web --require spec_helper" # targets features with the @web tag only
-      ENV["TURNIP_WEB"] = "1" # triggers inclusion of web_steps
-    end
+      # web features exerciswe the UI and may use a webdriver is tagged with @javascript
+      # Usage:
+      #   bundle exec rake spec:acceptance:web
+      RSpec::Core::RakeTask.new(:web) do |t|
+        t.pattern = "./spec/acceptance/renalware/features/**/*.feature"
+        t.rspec_opts = "--tag web --require spec_helper" # targets features with the @web tag only
+        ENV["TURNIP_WEB"] = "1" # triggers inclusion of web_steps
+      end
 
-    # Run both domain and web acceptance specs.
-    # Usage:
-    #   bundle exec rake spec:acceptance:all
-    task all: [:domain, :web]
+      # Run both domain and web acceptance specs.
+      # Usage:
+      #   bundle exec rake spec:acceptance:all
+      task all: [:domain, :web]
+    end
   end
 end

data/spec/factories/clinical/body_compositions.rb

@@ -16,7 +16,9 @@ FactoryBot.define do
     fat_tissue_mass { "42.1" }
     adipose_tissue_mass { "15.1" }
     body_cell_mass { "53.1" }
-    quality_of_reading { "65.123" }
+    quality_of_reading { 65.123 }
+    weight { 23.1 }
+    pre_post_hd { "post" }
     assessor { accountable_actor }
   end
 end

data/spec/factories/pathology/code_group_memberships.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pathology_code_group_membership, class: "Renalware::Pathology::CodeGroupMembership" do
+    accountable
+  end
+end

data/spec/factories/pathology/code_groups.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :pathology_code_group, class: "Renalware::Pathology::CodeGroup" do
+    accountable
+    name { "Group1" }
+    description { "Group1Description" }
+
+    trait :hd_session_form_recent do 
+      name { "hd_session_form_recent" }
+    end
+  end
+end

data/spec/factories/transplants/registration_status_descriptions.rb

@@ -5,5 +5,10 @@ FactoryBot.define do
           class: "Renalware::Transplants::RegistrationStatusDescription" do
     code { "active" }
     name { "Active" }
+
+    trait :active do
+      code { "active" }
+      name { "Active" }
+    end
   end
 end

data/spec/support/devise_spec_helper.rb

@@ -5,16 +5,19 @@ require_relative "./login_macros"
 
 RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :controller
-  config.include LoginMacros, type: :controller
-
-  config.include Warden::Test::Helpers, type: :feature
-  config.include Warden::Test::Helpers, type: :system
+  config.include Devise::Test::ControllerHelpers, type: :component
+    
+  %i(feature system request component).each do |type|
+    config.include Warden::Test::Helpers, type: type
+  end
+  
+  config.include Warden::Test::Helpers, type: :component
+  config.include Devise::Test::IntegrationHelpers, type: :component
   config.include Devise::Test::IntegrationHelpers, type: :system
-  config.include LoginMacros, type: :system
-  config.include LoginMacros, type: :feature
 
-  config.include Warden::Test::Helpers, type: :request
-  config.include LoginMacros, type: :request
+  %i(controller system feature request component).each do |type|
+    config.include LoginMacros, type: type
+  end
 
   config.before(:each, type: :controller) do
     login_as_super_admin
@@ -32,3 +35,16 @@ RSpec.configure do |config|
     Warden.test_reset!
   end
 end
+
+# This monkey patch is to allow Devise::ControllerHelpers to work with 
+# ActionView::Component::TestHelpers which does not expose @request or @controller.
+module DeviseHelperAdditionsForActionViewComponent
+  def setup_controller_for_warden
+    if respond_to?(:request)
+      @request ||= request
+      @controller ||= controller
+    end
+    super
+  end
+end
+Devise::Test::ControllerHelpers.prepend(DeviseHelperAdditionsForActionViewComponent)