renalware-core 2.0.137 → 2.0.138

data/spec/support/factory_bot.rb

@@ -40,6 +40,7 @@ RSpec.configure do |config|
     end
   end
 
+  # rubocop:disable Style/HashTransformValues
   config.after(:suite) do
     results = factory_bot_results
       .to_a
@@ -47,6 +48,7 @@ RSpec.configure do |config|
       .sort { |a, b| (b.flatten.last || 0) <=> (a.flatten.last || 0) }
     warn "FactoryBot creates: #{results}"
   end
+  # rubocop:enable Style/HashTransformValues
 end
 
 # Use this strategy to get Hash output from factories defined using class: OpenStruct.

data/spec/support/pages/hd/prescription_administration_dialog.rb

@@ -0,0 +1,132 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+require_relative "../page_object"
+require "capybara-select-2"
+
+module Pages
+  module HD
+    class PrescriptionAdministrationDialog < PageObject
+      include CapybaraSelect2
+      pattr_initialize [:prescription!]
+      MODAL_CONTAINER_ID = "#hd-prescription-administration-modal"
+
+      def container_css
+        MODAL_CONTAINER_ID
+      end
+
+      # Assumes we are the HD Summary
+      def open_by_clicking_on_drug_name
+        visit patient_hd_dashboard_path(prescription.patient)
+        within(".page-heading") do
+          click_on "Record HD Drugs" # will dropdown the menu so we can select...
+          click_on prescription.drug.name
+        end
+      end
+
+      def visible?
+        page.has_css?("#{MODAL_CONTAINER_ID} .modal")
+      end
+
+      def displaying_prescription?
+        within(MODAL_CONTAINER_ID) do
+          page.has_content?(prescription.drug.name)
+        end
+      end
+
+      def not_administered_reason=(reason)
+        select reason, from: "hd_prescription_administration_reason_id"
+      end
+
+      def notes=(value)
+        within(MODAL_CONTAINER_ID) do
+          fill_in "Notes", with: value
+        end
+      end
+
+      def recorded_on=(value)
+        fill_in "Recorded on", with: value
+      end
+
+      def administered=(value)
+        return if value.nil?
+
+        selection = value ? "Yes" : "No"
+        within(".hd_prescription_administration_administered") do
+          choose selection
+        end
+      end
+
+      def administered_by=(user)
+        within ".user-and-password--administrator" do
+          select2 user.given_name, from: "Nurse"
+        end
+      end
+
+      def administered_by_password=(password)
+        fill_password(:administrator, password)
+      end
+
+      def administered_by_id
+        within ".user-and-password--administrator" do
+          find("select option[selected='selected']")&.value&.to_i
+        end
+      end
+
+      def witnessed_by=(user)
+        return if user.blank?
+
+        within ".user-and-password--witness" do
+          select2 user.given_name, from: "Witness"
+        end
+      end
+
+      def witnessed_by_password=(password)
+        fill_password(:witness, password)
+      end
+
+      # Returns an array of captions for visible submit buttons on the form
+      def save_button_captions
+        within(MODAL_CONTAINER_ID) do
+          all("input[type='submit']").map(&:value)
+        end
+      end
+
+      def save
+        within(MODAL_CONTAINER_ID) do
+          click_on "Save"
+        end
+      end
+
+      def save_and_witness_later
+        within(MODAL_CONTAINER_ID) do
+          click_on "Save and Witness Later"
+        end
+      end
+
+      # Cancel the dialog
+      def cancel
+        within(MODAL_CONTAINER_ID) do
+          click_on "Cancel"
+        end
+      end
+
+      # def submit
+      #   within ".top" do
+      #     click_on "Create"
+      #   end
+      # end
+
+      private
+
+      # Fill in the password field and then simulate a tab which will cause a
+      # blur and the handler will authenticate the password
+      def fill_password(user_type, password)
+        within ".user-and-password--#{user_type}" do
+          find("input[type='password']").set(password)
+          # find(".user-password").send_keys :tab
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.137
+  version: 2.0.138
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -570,6 +570,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.3
 - !ruby/object:Gem::Dependency
   name: pandoc-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -1028,8 +1042,10 @@ files:
 - app/assets/images/renalware/icons/chevron-up.svg
 - app/assets/images/renalware/icons/chevrons-down.svg
 - app/assets/images/renalware/icons/chevrons-up.svg
+- app/assets/images/renalware/icons/home.svg
 - app/assets/images/renalware/icons/more-horizontal.svg
 - app/assets/images/renalware/icons/more-vertical.svg
+- app/assets/images/renalware/icons/settings.svg
 - app/assets/images/renalware/kidney.png
 - app/assets/images/renalware/loading-gears-animation.gif
 - app/assets/images/renalware/nhs_a4_letter_logo_black.png
@@ -1041,7 +1057,6 @@ files:
 - app/assets/javascripts/renalware/components/aki_alerts.js
 - app/assets/javascripts/renalware/components/appointments.js
 - app/assets/javascripts/renalware/components/behaviours.js
-- app/assets/javascripts/renalware/components/bla.es6
 - app/assets/javascripts/renalware/components/clipboard_setup.js
 - app/assets/javascripts/renalware/components/clockpicker.js
 - app/assets/javascripts/renalware/components/contacts.js
@@ -1081,6 +1096,7 @@ files:
 - app/assets/javascripts/renalware/components/toggler.js
 - app/assets/javascripts/renalware/components/transplants.js
 - app/assets/javascripts/renalware/core.js.erb
+- app/assets/javascripts/renalware/rollup_compiled.js
 - app/assets/pdf/blank_page.pdf
 - app/assets/stylesheets/renalware/README.md
 - app/assets/stylesheets/renalware/base/_mixins.scss
@@ -1141,6 +1157,7 @@ files:
 - app/assets/stylesheets/renalware/partials/_mdm.scss
 - app/assets/stylesheets/renalware/partials/_modal_window.scss
 - app/assets/stylesheets/renalware/partials/_navigation.scss
+- app/assets/stylesheets/renalware/partials/_pagination.scss
 - app/assets/stylesheets/renalware/partials/_patient_search.scss
 - app/assets/stylesheets/renalware/partials/_print.scss
 - app/assets/stylesheets/renalware/partials/_simple_form.scss
@@ -1160,6 +1177,10 @@ files:
 - app/components/renalware/application_component.rb
 - app/components/renalware/events/biopsies_component.html.slim
 - app/components/renalware/events/biopsies_component.rb
+- app/components/renalware/hd/administer_prescription_dropdown_component.html.slim
+- app/components/renalware/hd/administer_prescription_dropdown_component.rb
+- app/components/renalware/hd/prescription_last_administration_component.html.slim
+- app/components/renalware/hd/prescription_last_administration_component.rb
 - app/components/renalware/letters/letters_in_progress_component.html.slim
 - app/components/renalware/letters/letters_in_progress_component.rb
 - app/components/renalware/letters/unread_electronic_ccs_component.html.slim
@@ -1170,6 +1191,10 @@ files:
 - app/components/renalware/patients/bookmarks_component.rb
 - app/components/renalware/patients/side_menu_component.html.slim
 - app/components/renalware/patients/side_menu_component.rb
+- app/components/renalware/system/admin_menu_component.html.slim
+- app/components/renalware/system/admin_menu_component.rb
+- app/components/renalware/system/users_awaiting_approval_component.html.slim
+- app/components/renalware/system/users_awaiting_approval_component.rb
 - app/controllers/renalware/accesses/assessments_controller.rb
 - app/controllers/renalware/accesses/base_controller.rb
 - app/controllers/renalware/accesses/dashboards_controller.rb
@@ -1177,6 +1202,7 @@ files:
 - app/controllers/renalware/accesses/procedures_controller.rb
 - app/controllers/renalware/accesses/profiles_controller.rb
 - app/controllers/renalware/admin/cache_controller.rb
+- app/controllers/renalware/admin/dashboards_controller.rb
 - app/controllers/renalware/admin/feeds/files_controller.rb
 - app/controllers/renalware/admin/users_controller.rb
 - app/controllers/renalware/admissions/admissions_controller.rb
@@ -1228,7 +1254,7 @@ files:
 - app/controllers/renalware/hd/ongoing_sessions_controller.rb
 - app/controllers/renalware/hd/patients_controller.rb
 - app/controllers/renalware/hd/preference_sets_controller.rb
-- app/controllers/renalware/hd/prescription_administration_authorisations_controller.rb
+- app/controllers/renalware/hd/prescription_administrations_controller.rb
 - app/controllers/renalware/hd/protocols_controller.rb
 - app/controllers/renalware/hd/scheduling/diaries_controller.rb
 - app/controllers/renalware/hd/scheduling/diary_slots_controller.rb
@@ -1237,6 +1263,7 @@ files:
 - app/controllers/renalware/hd/stations_controller.rb
 - app/controllers/renalware/hd/transmission_logs_controller.rb
 - app/controllers/renalware/hd/unmet_preferences_controller.rb
+- app/controllers/renalware/hd/witnesses_controller.rb
 - app/controllers/renalware/hospitals/units_controller.rb
 - app/controllers/renalware/hospitals/wards_controller.rb
 - app/controllers/renalware/letters/approved_letters_controller.rb
@@ -1430,7 +1457,11 @@ files:
 - app/inputs/select_container_input.rb
 - app/inputs/simple_time_input.rb
 - app/inputs/user_picker_input.rb
-- app/javascript/controllers/clipboard_controller.js.dead
+- app/javascript/renalware/controllers/another_test_controller.js
+- app/javascript/renalware/controllers/hd/prescription_administration_controller.js
+- app/javascript/renalware/controllers/test_controller.js
+- app/javascript/renalware/controllers/toggle_controller.js
+- app/javascript/renalware/index.js
 - app/jobs/application_job.rb
 - app/jobs/feed_job.rb
 - app/jobs/hl7_message_example.txt
@@ -1589,6 +1620,7 @@ files:
 - app/models/renalware/hd/preference_set.rb
 - app/models/renalware/hd/prescription_administration.rb
 - app/models/renalware/hd/prescription_administration_reason.rb
+- app/models/renalware/hd/prescription_last_administration_query.rb
 - app/models/renalware/hd/profile.rb
 - app/models/renalware/hd/profile_for_modality.rb
 - app/models/renalware/hd/profiles_in_date_range_query.rb
@@ -1631,6 +1663,7 @@ files:
 - app/models/renalware/hd/transmission_log.rb
 - app/models/renalware/hd/update_rolling_patient_statistics.rb
 - app/models/renalware/hd/version.rb
+- app/models/renalware/hd/witness_form.rb
 - app/models/renalware/hospitals.rb
 - app/models/renalware/hospitals/centre.rb
 - app/models/renalware/hospitals/unit.rb
@@ -2070,6 +2103,7 @@ files:
 - app/policies/renalware/hd/dialysate_policy.rb
 - app/policies/renalware/hd/dna_session_policy.rb
 - app/policies/renalware/hd/open_session_policy.rb
+- app/policies/renalware/hd/prescription_administration_policy.rb
 - app/policies/renalware/hd/scheduling/diary_policy.rb
 - app/policies/renalware/hd/session_forms/batch_policy.rb
 - app/policies/renalware/hd/session_policy.rb
@@ -2136,7 +2170,7 @@ files:
 - app/presenters/renalware/address_presenter/block.rb
 - app/presenters/renalware/address_presenter/short.rb
 - app/presenters/renalware/address_presenter/single_line.rb
-- app/presenters/renalware/admin/users/summary_part.rb
+- app/presenters/renalware/admin/users/summary_part.rb.dead
 - app/presenters/renalware/admissions/admission_presenter.rb
 - app/presenters/renalware/admissions/consult_presenter.rb
 - app/presenters/renalware/admissions/consult_summary_part.rb
@@ -2285,11 +2319,12 @@ files:
 - app/views/renalware/addresses/_contact_info.html.slim
 - app/views/renalware/addresses/_form.html.slim
 - app/views/renalware/admin/cache/show.html.slim
+- app/views/renalware/admin/dashboards/show.html.slim
 - app/views/renalware/admin/feeds/files/index.html.slim
 - app/views/renalware/admin/user_mailer/approval.text.erb
 - app/views/renalware/admin/user_mailer/unexpiry.text.erb
 - app/views/renalware/admin/users/_filters.html.slim
-- app/views/renalware/admin/users/_summary_part.html.slim
+- app/views/renalware/admin/users/_summary_part.html.slim.dead
 - app/views/renalware/admin/users/_tabs.html.slim
 - app/views/renalware/admin/users/edit.html.slim
 - app/views/renalware/admin/users/index.html.slim
@@ -2476,6 +2511,16 @@ files:
 - app/views/renalware/hd/preference_sets/_form.html.slim
 - app/views/renalware/hd/preference_sets/_summary.html.slim
 - app/views/renalware/hd/preference_sets/edit.html.slim
+- app/views/renalware/hd/prescription_administrations/_form.html.slim
+- app/views/renalware/hd/prescription_administrations/_row.html.slim
+- app/views/renalware/hd/prescription_administrations/_table.html.slim
+- app/views/renalware/hd/prescription_administrations/_thead.html.slim
+- app/views/renalware/hd/prescription_administrations/create.js.erb
+- app/views/renalware/hd/prescription_administrations/edit.html.slim
+- app/views/renalware/hd/prescription_administrations/edit.js.erb
+- app/views/renalware/hd/prescription_administrations/index.html.slim
+- app/views/renalware/hd/prescription_administrations/new.html.slim
+- app/views/renalware/hd/prescription_administrations/new.js.erb
 - app/views/renalware/hd/protocols/_allergies.html.slim
 - app/views/renalware/hd/protocols/_latest_dry_weight.html.slim
 - app/views/renalware/hd/protocols/_prescriptions.html.slim
@@ -2502,19 +2547,16 @@ files:
 - app/views/renalware/hd/scheduling/diary_slots/update.js.erb
 - app/views/renalware/hd/session_forms/batches/_create.html.slim
 - app/views/renalware/hd/session_forms/batches/create.js.erb
-- app/views/renalware/hd/sessions/_administered_drugs_row.html.slim
-- app/views/renalware/hd/sessions/_administered_drugs_thead.html.slim
 - app/views/renalware/hd/sessions/_empty_row.html.slim
 - app/views/renalware/hd/sessions/_form.html.slim
 - app/views/renalware/hd/sessions/_form_actions.html.slim
+- app/views/renalware/hd/sessions/_index_tabs.html.slim
 - app/views/renalware/hd/sessions/_list.html.slim
-- app/views/renalware/hd/sessions/_prescription_administrations.html.slim
 - app/views/renalware/hd/sessions/_row.html.slim
 - app/views/renalware/hd/sessions/_session_nav.html.slim
 - app/views/renalware/hd/sessions/_show.html.slim
 - app/views/renalware/hd/sessions/_table.html.slim
 - app/views/renalware/hd/sessions/_thead.html.slim
-- app/views/renalware/hd/sessions/closed/_administered_drugs_row.html.slim
 - app/views/renalware/hd/sessions/closed/_form.html.slim
 - app/views/renalware/hd/sessions/closed/_row.html.slim
 - app/views/renalware/hd/sessions/closed/_show.html.slim
@@ -2523,7 +2565,6 @@ files:
 - app/views/renalware/hd/sessions/dna/_row.html.slim
 - app/views/renalware/hd/sessions/dna/_show.html.slim
 - app/views/renalware/hd/sessions/edit.html.slim
-- app/views/renalware/hd/sessions/form/_drugs_to_be_administered.html.slim
 - app/views/renalware/hd/sessions/index.html.slim
 - app/views/renalware/hd/sessions/new.html.slim
 - app/views/renalware/hd/sessions/open/_administered_drugs_row.html.slim
@@ -2542,6 +2583,10 @@ files:
 - app/views/renalware/hd/unmet_preferences/_filters.html.slim
 - app/views/renalware/hd/unmet_preferences/_table.html.slim
 - app/views/renalware/hd/unmet_preferences/index.html.slim
+- app/views/renalware/hd/witnesses/_form.html.slim
+- app/views/renalware/hd/witnesses/edit.html.slim
+- app/views/renalware/hd/witnesses/edit.js.erb
+- app/views/renalware/hd/witnesses/update.js.erb
 - app/views/renalware/hospitals/units/_form.html.slim
 - app/views/renalware/hospitals/units/edit.html.slim
 - app/views/renalware/hospitals/units/index.html.slim
@@ -2550,6 +2595,7 @@ files:
 - app/views/renalware/hospitals/wards/edit.html.slim
 - app/views/renalware/hospitals/wards/index.html.slim
 - app/views/renalware/hospitals/wards/new.html.slim
+- app/views/renalware/layouts/_admin.html.slim
 - app/views/renalware/layouts/_non_patient.html.slim
 - app/views/renalware/layouts/_patient.html.slim
 - app/views/renalware/layouts/error.html.slim
@@ -3120,6 +3166,7 @@ files:
 - config/initializers/mailer_previews.rb
 - config/initializers/mime_types.rb
 - config/initializers/null_object.rb
+- config/initializers/pagy.rb
 - config/initializers/paper_trail.rb
 - config/initializers/postgresql_database_tasks.rb
 - config/initializers/ransack.rb
@@ -3786,6 +3833,7 @@ files:
 - db/migrate/20200127165951_create_pathology_versions.rb
 - db/migrate/20200127170711_add_created_by_to_pathology_code_groups.rb
 - db/migrate/20200129093835_create_system_dashboards.rb
+- db/migrate/20200204153231_alter_hd_prescription_administrations.rb
 - db/migrate/20200205121805_remove_created_by_on_pathology_code_groups.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
@@ -4023,6 +4071,7 @@ files:
 - spec/factories/hd/patient_statistics.rb
 - spec/factories/hd/patients.rb
 - spec/factories/hd/preference_sets.rb
+- spec/factories/hd/prescription_administrations.rb
 - spec/factories/hd/profiles.rb
 - spec/factories/hd/schedule_definitions.rb
 - spec/factories/hd/scheduling/diaries.rb
@@ -4160,6 +4209,7 @@ files:
 - spec/support/pages/admissions/consults_page.rb
 - spec/support/pages/clinical/allergy_page.rb
 - spec/support/pages/clinical/profile_page.rb
+- spec/support/pages/hd/prescription_administration_dialog.rb
 - spec/support/pages/letters/form.rb
 - spec/support/pages/letters/patient_letters.rb
 - spec/support/pages/low_clearance/profile_page.rb

data/app/assets/javascripts/renalware/components/bla.es6

@@ -1 +0,0 @@
-// console.log("es6")

data/app/controllers/renalware/hd/prescription_administration_authorisations_controller.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "renalware/hd/base_controller"
-
-module Renalware
-  module HD
-    class PrescriptionAdministrationAuthorisationsController < BaseController
-      skip_after_action :verify_authorized
-
-      def create
-        user = User.find(auth_params[:id])
-        if user.valid_password?(auth_params[:password])
-          render status: :ok, plain: user.auth_token
-        else
-          # head :bad_request
-          head :unauthorized
-        end
-      end
-
-      private
-
-      def auth_params
-        params.require(:user).permit(:id, :password)
-      end
-    end
-  end
-end

data/app/javascript/controllers/clipboard_controller.js.dead

@@ -1,16 +0,0 @@
-import { Controller } from "stimulus"
-
-// Experimental Stimulus clipboard controller. No IE11 support.
-// Can be enhanced but initially this exists just so we can test stimulus/webpack integration
-// when the engine is pulled into a host app
-export default class extends Controller {
-  static targets = ["source", "result"]
-
-  copy(event) {
-    event.preventDefault()
-    this.sourceTarget.select()
-    document.execCommand("copy")
-    console.log("Copied")
-    this.resultTarget.innerHTML = "Copied"
-  }
-}