renalware-core 2.0.137 → 2.0.138

data/app/javascript/renalware/controllers/another_test_controller.js

@@ -0,0 +1,8 @@
+import { Controller } from "stimulus"
+
+// A test controller to establish that rollup + stimulus + babel are working
+export default class extends Controller {
+  connect() {
+    this.element.textContent = "AnotherTestController connected"
+  }
+}

data/app/javascript/renalware/controllers/hd/prescription_administration_controller.js

@@ -0,0 +1,22 @@
+import { Controller } from "stimulus"
+const $ = window.$
+
+export default class extends Controller {
+  static targets = ["container","radio"]
+
+  connect() {
+    window.initDatepickersIn(".hd-drug-administration")
+  }
+
+  toggleAdministered() {
+    var checked = event.target.value == "true"
+    this.containerTarget.classList.toggle("administered", checked)
+    this.containerTarget.classList.toggle("not-administered", !checked)
+    this.containerTarget.classList.remove("undecided")
+    // The rest of this actions are using jQuery for now.
+    $(".authentication", this.containerTarget).toggle(checked)
+    $(".authentication", this.containerTarget).toggleClass("disabled-with-faded-overlay", !checked)
+    $(".reason-why-not-administered", this.containerTarget).toggle(!checked)
+    $("#btn_save_and_witness_later").toggle(checked)
+  }
+}

data/app/javascript/renalware/controllers/test_controller.js

@@ -0,0 +1,8 @@
+import { Controller } from "stimulus"
+
+// A test controller to establish that rollup + stimulus + babel are working
+export default class extends Controller {
+  connect() {
+    this.element.textContent = "TestController connected."
+  }
+}

data/app/javascript/renalware/controllers/toggle_controller.js

@@ -0,0 +1,36 @@
+const $ = window.$
+import { Controller } from "stimulus"
+
+// Used when a table has toggleable rows (initially hidden rows that can be toggled open
+// to see e.g. notes or extended details) and each master row and its toggleable sibling are
+// nested in a tbody (this is valid HTML) - ie there are probably two trs per tbody, and the last
+// one is toggleable. If you need anyting more complex you'll need to clone or adapt this
+// controller
+export default class extends Controller {
+  // This handler toggles the last tr in the current tbody. We use multiple tbodys in each table
+  // to make toggling like this simpler, and to group the related (visible and toggleable) rows
+  // together.
+  row(event) {
+    event.preventDefault
+    const tbody = event.target.closest("tbody")
+    tbody.classList.toggle("toggleable--open")
+    // Update masonry - TODO: move to a module
+    $(".grid > .row").masonry("layout")
+  }
+
+  // Toggle the last tr in each tbody in the current table.
+  // The link that triggers this event will most likelt be a double chevron icon
+  // sitting in a thead.
+  table(event) {
+    event.preventDefault
+    const table = event.target.closest("table")
+    const thead = event.target.closest("thead")
+    // Use an Array rather a NodeList here as IE does not support NodeList.forEach
+    const tbodies = Array.prototype.slice.call(table.querySelectorAll("tbody"))
+    const hide = thead.classList.contains("toggleable--open")
+    thead.classList.toggle("toggleable--open")
+    tbodies.forEach(function(tbody) { tbody.classList.toggle("toggleable--open", !hide) })
+    // Update masonry - TODO: move to a module
+    $(".grid > .row").masonry("layout")
+  }
+}

data/app/javascript/renalware/index.js

@@ -0,0 +1,25 @@
+import "@stimulus/polyfills" // required for IE11 support
+import { Application } from "stimulus"
+
+// Manually import stimulusjs controllers for now as we had problems with the stimulus-controllers
+// package on CI ('file.isDirectory is not a function')
+// and cannot use the webpacker-helper/require method as per usual in a rails app as we
+// do not use webpacker in this engine because it is a poor fit. We just want to compile all
+// es6 assets into a file in app/assets/javascripts so that they can be used in the asset pipeline
+// by a host app initially. We could publish our package to e.g. GH packages at some point in the
+// future so that a host app can include us using webpacker and skip the asset pipeline, but we
+// are a little way off that.
+// So the approach right now is quite simple - to allow is to use stimulus.js and IE11
+// (via the polyfill) for new js development, and the remaining js can be ported or moved at some
+// point in the future.
+// The rollupjs setup from adapted from the approach used by ActiveStorage
+import TestController from "./controllers/test_controller"
+import AnotherTestController from "./controllers/another_test_controller"
+import ToggleController from "./controllers/toggle_controller"
+import HDPrescriptionController from "./controllers/hd/prescription_administration_controller"
+
+const application = Application.start()
+application.register("test", TestController)
+application.register("another_test", AnotherTestController)
+application.register("toggle", ToggleController)
+application.register("hd-prescription-administration", HDPrescriptionController)

data/app/models/renalware/hd/patient.rb

@@ -8,6 +8,7 @@ module Renalware
       has_one :hd_profile, class_name: "Profile"
       has_one :hd_preference_set, class_name: "PreferenceSet"
       has_many :hd_sessions, class_name: "Session"
+      has_many :prescription_administrations
       scope :with_profile, lambda {
         includes(hd_profile: :hospital_unit)
         .joins(<<-SQL)

data/app/models/renalware/hd/prescription_administration.rb

@@ -7,63 +7,87 @@ module Renalware
     class PrescriptionAdministration < ApplicationRecord
       include Accountable
       acts_as_paranoid
-      attr_accessor :administrator_authorisation_token
-      attr_accessor :witness_authorisation_token
 
       # Set to true by the parent hd_session if we are not signing off at this stage
-      attr_accessor :skip_validation
+      attr_accessor :skip_witness_validation
+      attr_accessor :skip_administrator_validation
+      attr_accessor :administered_by_password
+      attr_accessor :witnessed_by_password
 
       belongs_to :hd_session, class_name: "HD::Session", touch: true
       belongs_to :prescription, class_name: "Medications::Prescription"
       belongs_to :administered_by, class_name: "User"
       belongs_to :witnessed_by, class_name: "User"
       belongs_to :reason, class_name: "PrescriptionAdministrationReason"
-      validates :administered, inclusion: { in: [true, false] }, unless: :skip_validation
+      validates :recorded_on, presence: true
+      validates :administered, inclusion: { in: [true, false] }
       validates :prescription, presence: true
-      validates :administered_by, presence: true, if: :validate_administrator_and_witness?
-      validates :witnessed_by, presence: true, if: :validate_administrator_and_witness?
-      validate :check_administrator_authorisation_token
-      validate :check_witness_authorisation_token
-      scope :ordered, -> { order(created_at: :desc) }
+      validates :administered_by, presence: true, if: :validate_administrator?
+      validates :witnessed_by, presence: true, if: :validate_witness?
+      validate :check_administered_by_password, if: :validate_administrator?
+      validate :check_witnessed_by_password, if: :validate_witness?
+      validate :witness_cannot_be_administrator
+
+      scope :ordered, -> { order(recorded_on: :desc, created_at: :desc) }
+
+      def authorised?
+        return true unless administered?
+
+        administrator_authorised? && witness_authorised?
+      end
+
+      def witnessed?
+        administered? && witness_authorised?
+      end
 
       private
 
-      def validate_administrator_and_witness?
-        return false if skip_validation || not_administered?
-        return false unless Renalware.config.hd_session_prescriptions_require_signoff
+      def witness_cannot_be_administrator
+        return unless authorised?
+
+        if administered_by_id.present? && administered_by_id == witnessed_by_id
+          errors.add(:witnessed_by_id, "Must be a different user")
+        end
+      end
+
+      def validate_witness?
+        return false if not_administered?
+        return false if skip_witness_validation
 
         true
       end
 
-      def check_administrator_authorisation_token
-        verify_submitted_user_token(
-          administered_by,
-          administrator_authorisation_token,
-          :administrator_authorisation_token
-        )
+      def validate_administrator?
+        return false if not_administered?
+        return false if skip_administrator_validation
+
+        true
       end
 
-      def check_witness_authorisation_token
-        verify_submitted_user_token(
-          witnessed_by,
-          witness_authorisation_token,
-          :witness_authorisation_token
-        )
+      def not_administered?
+        administered.nil? || administered == false
       end
 
-      def verify_submitted_user_token(user, token, error_key)
-        return if skip_validation
-        return if user.blank? || not_administered?
+      def check_administered_by_password
+        return if administered_by.blank?
 
-        if token.blank?
-          errors[error_key] << "can't be blank"
-        elsif user.auth_token != token
-          errors[error_key] << "invalid token"
+        self.administrator_authorised = false
+        if administered_by.valid_password?(administered_by_password)
+          self.administrator_authorised = true
+        else
+          errors.add(:administered_by_password, "Invalid password")
         end
       end
 
-      def not_administered?
-        administered.nil? || administered == false
+      def check_witnessed_by_password
+        return if witnessed_by.blank?
+
+        self.witness_authorised = false
+        if witnessed_by.valid_password?(witnessed_by_password)
+          self.witness_authorised = true
+        else
+          errors.add(:witnessed_by_password, "Invalid password")
+        end
       end
     end
   end

data/app/models/renalware/hd/prescription_last_administration_query.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    # Find the lastest PrescriptionAdministration for a particular prescription - ie the last time
+    # it was given.
+    class PrescriptionLastAdministrationQuery
+      pattr_initialize [:prescription!]
+      delegate :patient, to: :prescription
+
+      def call
+        raise ArgumentError if prescription.blank?
+        raise ArgumentError if patient.blank?
+
+        hd_patient
+          .prescription_administrations
+          .where(prescription: prescription, administered: true)
+          .order(recorded_on: :desc, created_at: :desc)
+          .first
+      end
+
+      private
+
+      def hd_patient
+        HD.cast_patient(patient)
+      end
+    end
+  end
+end

data/app/models/renalware/hd/sessions/save_session.rb

@@ -19,20 +19,12 @@ module Renalware
         # Closed (sign-off) but next time they want to save as Open (not signed off)
         # - so we need make sure the hidden :type form value is not rendered as :closed
         # This is getting a bit confusing and might need some refactoring, for example by
-        # driving the :type to save as using the button on the form (which we already do using
-        # the sign-off name of the SignOff button - see signed_off?
+        # driving the :type to save using the button name on the form
         def call(params:, id: nil, signing_off: false)
           @params = parse_params(params)
           session = find_or_build_session(id)
           session = update_session_attributes(session, signing_off)
 
-          session.prescription_administrations.each do |pa|
-            pa.administrator_authorised =
-              (pa.administrator_authorisation_token == pa.administered_by&.auth_token)
-            pa.witness_authorised =
-              (pa.witness_authorisation_token == pa.witnessed_by&.auth_token)
-          end
-
           if session.save
             # Might be cleaner if something listened for this event and created this job there?
             # UpdateRollingPatientStatisticsJob.perform_later(patient) unless session.open?
@@ -59,21 +51,11 @@ module Renalware
         def update_session_attributes(session, signing_off)
           session = signed_off(session) if signing_off
           session.attributes = params
-          force_validation_of_nested_prescription_administrations(session)
-          skip_validation_on_prescription_administrations(session) unless signing_off
           session.by = current_user
           lookup_access_type_abbreviation(session)
           session
         end
 
-        def force_validation_of_nested_prescription_administrations(session)
-          # These valid? calls required because while accepts_nested_attributes yields validation
-          # errors on create, no errors are raise when updating existing records.
-          # It might be something I don't understand about how accepts_nested_attributes works in
-          # this scenario. Anyway calling valid? causes the errors collection to be updated.
-          session.prescription_administrations.each(&:valid?)
-        end
-
         def find_or_build_session(id)
           if id.present?
             Session.for_patient(patient).find(id)
@@ -110,12 +92,6 @@ module Renalware
 
           session.document.info.access_type_abbreviation = access_type.abbreviation
         end
-
-        def skip_validation_on_prescription_administrations(session)
-          session.prescription_administrations.each do |pa|
-            pa.skip_validation = true
-          end
-        end
       end
     end
   end

data/app/models/renalware/hd/witness_form.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    # Form object to help us update the PrescriptionAdministration#witnesses_by
+    # See WitnessesController#edit/update and the corresponding html and js views.
+    class WitnessForm
+      include ActiveModel::Model
+      include Virtus::Model
+
+      attribute :user_id, Integer
+      attribute :password, String
+      attribute :prescription_administration_id, Integer
+      attribute :update_user_only, Boolean
+
+      validates :user_id, presence: true
+      validates :prescription_administration_id, presence: true
+      validates :password, presence: { unless: :update_user_only }
+      validate :password_is_correct, unless: :update_user_only
+
+      private
+
+      def password_is_correct
+        witness = User.find(user_id)
+        unless witness.valid_password?(password)
+          errors.add(:password, "Invalid password")
+        end
+      end
+    end
+  end
+end

data/app/policies/renalware/hd/prescription_administration_policy.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    class PrescriptionAdministrationPolicy < BasePolicy
+    end
+  end
+end

data/app/presenters/renalware/hd/dashboard_presenter.rb

@@ -45,7 +45,6 @@ module Renalware
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
       def sessions
         @sessions ||= begin
           hd_sessions = Session
@@ -53,17 +52,27 @@ module Renalware
               :hospital_unit,
               :patient,
               :signed_on_by,
-              :signed_off_by,
-              prescription_administrations: [
-                { prescription: [:medication_route, :drug] }, :administered_by, :reason
-              ]
+              :signed_off_by
             )
             .for_patient(patient)
-            .limit(10).ordered.merge(PrescriptionAdministration.ordered)
+            .limit(10).ordered
           CollectionPresenter.new(hd_sessions, SessionPresenter, view_context)
         end
       end
-      # rubocop:enable Metrics/MethodLength
+
+      def prescription_administrations
+        patient
+          .prescription_administrations
+          .includes(
+            [
+              :administered_by,
+              :witnessed_by,
+              :reason,
+              prescription: [:medication_route, :drug]
+            ]
+          )
+          .limit(10).ordered
+      end
 
       def can_add_hd_profile?
         profile.new_record? && policy_for(profile).edit? && has_ever_been_on_hd?

data/app/views/renalware/accesses/plans/_details.html.slim

@@ -1,5 +1,5 @@
 = definition_list_for(plan, size: :large) do |list|
-  = list.definition(:created_at){ |value| l(value) }
+  = list.definition(:created_at) { |value| l(value) }
   = list.definition(:decided_by)
   = list.definition(:plan_type)
   = list.definition(:notes)

data/app/views/renalware/admin/cache/show.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Clearing the Cache") do
+= within_new_admin_layout(title: "Clearing the Cache") do
   .panel
     h2 Application Cache
     p

data/app/views/renalware/admin/dashboards/show.html.slim

@@ -0,0 +1,4 @@
+= within_new_admin_layout(title: "Admin Dashboard") do
+  .row
+    .columns
+      = render Renalware::System::UsersAwaitingApprovalComponent.new(current_user: current_user)

data/app/views/renalware/admin/users/{_summary_part.html.slim → _summary_part.html.slim.dead}

@@ -1,4 +1,4 @@
 article.admin--users
   header
-    h2 Admin
+    h2 User admin
   =link_to summary_part.users_needing_approval_title, admin_users_path(q: { unapproved: true })

data/app/views/renalware/admin/users/edit.html.slim

@@ -1,4 +1,4 @@
-= within_admin_layout(title: "Edit",
+= within_new_admin_layout(title: "Edit",
                       breadcrumbs: breadcrumb_for("Users", admin_users_path)) do
 
   h2= user

data/app/views/renalware/admin/users/index.html.slim

@@ -4,7 +4,7 @@
 = content_for(:tabs) do
   = render "tabs", user_search: user_search
 
-= within_admin_layout(title: "Users") do
+= within_new_admin_layout(title: "Users") do
   table.admin-users
     thead
       th.col-width-tiny