renalware-core 2.0.137 → 2.0.138

data/app/components/renalware/system/admin_menu_component.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Renalware
+  module System
+    # Experimental ActionView component
+    class AdminMenuComponent < ApplicationComponent
+      include Renalware::UsersHelper
+      attr_reader :current_user
+
+      def initialize(current_user:)
+        @current_user = current_user
+      end
+
+      def admin_menu_item(*args)
+        return unless
+          current_user_is_admin? ||
+          current_user_is_super_admin? ||
+          current_user_is_developer?
+
+        menu_item(*args)
+      end
+
+      def super_admin_menu_item(*args)
+        return unless current_user_is_super_admin? || current_user_is_developer?
+
+        menu_item(*args)
+      end
+
+      def developer_menu_item(*args)
+        return unless current_user_is_developer?
+
+        menu_item(*args)
+      end
+
+      def menu_item(title, path, active_when_controller_matches, enabled = true)
+        klasses = %w(link)
+        klasses << "active" if current_controller_matches(active_when_controller_matches)
+        content_tag :li, class: klasses.join(" ") do
+          if enabled
+            link_to(title, path)
+          else
+            content_tag :span, title
+          end
+        end
+      end
+
+      def current_controller_matches(regex)
+        regex.match(params[:controller]).present?
+      end
+
+      def formatted_nhs_number(patient)
+        ::Renalware::PatientPresenter.new(patient).nhs_number
+      end
+    end
+  end
+end

data/app/components/renalware/system/users_awaiting_approval_component.html.slim

@@ -0,0 +1,6 @@
+.row
+  .columns.small-12.medium-6.large-4
+    article.admin--users
+      header
+        h2 User Admin
+      = link_to users_needing_approval_title, renalware.admin_users_path(q: { unapproved: true })

data/app/components/renalware/system/users_awaiting_approval_component.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Renalware
+  module System
+    class UsersAwaitingApprovalComponent < ApplicationComponent
+      attr_reader :current_user
+
+      def initialize(current_user:)
+        @current_user = current_user
+      end
+
+      def users_needing_approval_count
+        @users_needing_approval_count ||= User.unapproved.count
+      end
+
+      def users_needing_approval_title
+        [
+          users_needing_approval_count,
+          "user".pluralize(users_needing_approval_count),
+          "awaiting approval"
+        ].join(" ")
+      end
+    end
+  end
+end

data/app/controllers/renalware/admin/dashboards_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Renalware
+  class Admin::DashboardsController < BaseController
+    def show
+      authorize User, :index?
+    end
+  end
+end

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

@@ -11,6 +11,10 @@ module Renalware
         super
         @patient = Renalware::HD.cast_patient(patient)
       end
+
+      def hd_patient
+        @hd_patient ||= Renalware::HD.cast_patient(patient)
+      end
     end
   end
 end

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+require "collection_presenter"
+
+module Renalware
+  module HD
+    class PrescriptionAdministrationsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def index
+        hd_patient = HD.cast_patient(patient)
+        administrations = hd_patient
+          .prescription_administrations
+          .includes(:administered_by, :witnessed_by, :reason, :prescription)
+          .ordered
+          .page(page)
+          .per(per_page)
+        authorize administrations
+        render locals: { prescription_administrations: administrations }
+      end
+
+      # GET HTML
+      def new
+        administration = hd_patient.prescription_administrations.build(
+          prescription: prescription,
+          administered_by: current_user,
+          recorded_on: Date.current
+        )
+        render_new(administration)
+      end
+
+      # POST JS
+      # issues - user validation not working
+      def create
+        administration = hd_patient.prescription_administrations.build(
+          prescription_administration_parameters
+        )
+        clear_irrelevant_attributes_if_drug_was_not_administered(administration)
+        authorize administration
+        if administration.save_by(current_user)
+          # will render create.js
+        else
+          render_new(administration) # re-display dialog with errors
+        end
+      end
+
+      private
+
+      def clear_irrelevant_attributes_if_drug_was_not_administered(administration)
+        unless administration.administered
+          administration.administered_by = nil
+          administration.witnessed_by = nil
+        end
+      end
+
+      def prescription
+        @prescription ||= Medications::Prescription.find_by(
+          id: params[:prescription_id],
+          administer_on_hd: true
+        )
+      end
+
+      def hd_patient
+        HD.cast_patient(prescription.patient)
+      end
+
+      def render_new(administration)
+        authorize administration
+        render :new, locals: { prescription_administration: administration }, layout: false
+      end
+
+      def prescription_administration_parameters
+        params
+          .require(:hd_prescription_administration)
+          .permit(
+            [
+              :administered, :prescription_id, :notes, :reason_id,
+              :administered_by_id,
+              :witnessed_by_id, :administered_by_password, :witnessed_by_password,
+              :skip_witness_validation, :recorded_on
+            ]
+          )
+      end
+    end
+  end
+end

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

@@ -5,7 +5,6 @@ require "collection_presenter"
 
 module Renalware
   module HD
-    # rubocop:disable Metrics/ClassLength
     class SessionsController < BaseController
       include PresenterHelper
       include Renalware::Concerns::Pageable
@@ -16,24 +15,13 @@ module Renalware
         query = sessions_query
         sessions = query
           .call
-          .eager_load(
-            :hospital_unit,
-            :patient,
-            :signed_on_by,
-            :signed_off_by,
-            prescription_administrations: [
-              {
-                prescription: [:medication_route, :drug]
-              },
-              :administered_by,
-              :reason
-            ])
+          .eager_load(:hospital_unit, :patient, :signed_on_by, :signed_off_by)
           .page(page)
           .per(per_page || 15)
         authorize sessions
         presenter = CollectionPresenter.new(sessions, SessionPresenter, view_context)
         @q = query.search
-        render :index, locals: { sessions: presenter }
+        render :index, locals: { patient: patient, sessions: presenter }
       end
 
       def show
@@ -57,14 +45,6 @@ module Renalware
 
       def edit
         session = Session.for_patient(patient).find(params[:id])
-        session.prescription_administrations.each do |a|
-          if a.administrator_authorised?
-            a.administrator_authorisation_token = a.administered_by&.auth_token
-          end
-          if a.witness_authorised?
-            a.witness_authorisation_token = a.witnessed_by&.auth_token
-          end
-        end
         authorize session
         render :edit, locals: locals(session)
       rescue Pundit::NotAuthorizedError
@@ -110,18 +90,10 @@ module Renalware
       def locals(session)
         {
           session: session,
-          patient: patient,
-          prescriptions_to_be_administered_on_hd: prescriptions_on_hd
+          patient: patient
         }
       end
 
-      def prescriptions_on_hd
-        @prescriptions_on_hd ||= begin
-          prescriptions = patient.prescriptions.includes([:drug]).to_be_administered_on_hd
-          present(prescriptions, Medications::PrescriptionPresenter)
-        end
-      end
-
       def sessions_query
         Sessions::PatientQuery.new(patient: patient, q: params[:q])
       end
@@ -129,13 +101,9 @@ module Renalware
       def session_params
         @session_params ||= begin
           params.require(:hd_session).require(:type)
-          sesh_params = params.require(:hd_session)
-                              .permit(attributes)
-                              .merge(document: document_attributes, by: current_user)
-          (sesh_params[:prescription_administrations_attributes] || {}).each do |_key, hash|
-            hash[:by] = current_user
-          end
-          sesh_params
+          params.require(:hd_session)
+                        .permit(attributes)
+                        .merge(document: document_attributes, by: current_user)
         end
       end
 
@@ -143,11 +111,6 @@ module Renalware
         [:performed_on, :start_time, :end_time,
          :hospital_unit_id, :notes, :dialysate_id,
          :signed_on_by_id, :signed_off_by_id, :type,
-         prescription_administrations_attributes: [
-           :id, :hd_session_id, :prescription_id, :administered, :notes,
-           :administered_by_id, :administrator_authorisation_token,
-           :witnessed_by_id, :witness_authorisation_token, :reason_id
-         ],
          document: []]
       end
 
@@ -162,6 +125,5 @@ module Renalware
         Delayed::Job.enqueue UpdateRollingPatientStatisticsDjJob.new(patient.id)
       end
     end
-    # rubocop:enable Metrics/ClassLength
   end
 end

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

@@ -7,17 +7,18 @@ module Renalware
   module HD
     class TransmissionLogsController < BaseController
       include PresenterHelper
-      include Renalware::Concerns::Pageable
+      include Pagy::Backend
 
       # NB be sure not to select the payload as this will slow things down.
       # The payload is loaded by clicking on a link in the table
       def index
-        logs = TransmissionLog
-          .order(created_at: :desc)
-          .select(TransmissionLog.attribute_names - [:payload])
-          .page(page).per(per_page)
+        pagy, logs = pagy(
+          TransmissionLog
+            .order(created_at: :desc)
+            .select(TransmissionLog.attribute_names - [:payload])
+        )
         authorize logs
-        render locals: { logs: logs }
+        render locals: { logs: logs, pagy: pagy }
       end
 
       def show

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+require "collection_presenter"
+
+module Renalware
+  module HD
+    # PrescriptionAdministration witnesses
+    class WitnessesController < BaseController
+      # GET HTML
+      def edit
+        form = WitnessForm.new(
+          prescription_administration_id: administration.id,
+          user_id: administration.witnessed_by_id
+        )
+        render_edit(form)
+      end
+
+      # PATCH JS
+      def update
+        form = WitnessForm.new(
+          form_params.merge(prescription_administration_id: administration.id)
+        )
+
+        administration.skip_administrator_validation = true
+        administration.skip_witness_validation = true if form.update_user_only
+        if update_administration_from(form)
+          # will render update.js
+        else
+          render_edit(form) # re-display dialog with errors
+        end
+      end
+
+      private
+
+      def update_administration_from(form)
+        return unless form.valid?
+
+        administration.witnessed_by_id = form.user_id
+        administration.witnessed_by_password = form.password
+        unless form.update_user_only
+          administration.witness_authorised = true
+        end
+        administration.save_by(current_user)
+      end
+
+      def administration
+        @administration ||= PrescriptionAdministration
+          .find(params[:prescription_administration_id])
+          .tap { |administration| authorize administration }
+      end
+
+      def render_edit(form)
+        render :edit, locals: { form: form, administration: administration }, layout: false
+      end
+
+      def form_params
+        params.require(:form).permit(:user_id, :password, :update_user_only)
+      end
+    end
+  end
+end

data/app/helpers/renalware/application_helper.rb

@@ -7,6 +7,7 @@ require "breadcrumb"
 module Renalware
   module ApplicationHelper
     include Renalware::Engine.routes.url_helpers
+    include Pagy::Frontend
 
     def default_patient_link(patient)
       link_to(patient.to_s(:default), patient_clinical_summary_path(patient))

data/app/helpers/renalware/layout_helper.rb

@@ -16,6 +16,18 @@ module Renalware
                     **opts) { yield }
     end
 
+    def within_non_patient_layout
+      within_layout(layout: "renalware/layouts/non_patient",
+                    title: opts.fetch(:page_title, title),
+                    **opts) { yield }
+    end
+
+    def within_new_admin_layout(title: nil, **opts)
+      within_layout(layout: "renalware/layouts/admin",
+                    title: opts.fetch(:page_title, title),
+                    **opts) { yield }
+    end
+
     def within_layout(layout:, title: nil, **opts)
       title ||= t?(".page_title") ? t(".page_title") : t(".title", cascade: false)
       opts[:title] = title

data/app/helpers/renalware/toggle_helper.rb

@@ -9,6 +9,7 @@ module Renalware
               data: { behaviour: "css-toggler" }
     end
 
+    # Non-stimulus implemention for adding a link to toggle open all an adjacent row
     def toggler(row_selector, link_title: "Toggle")
       link_to(
         row_selector,
@@ -20,6 +21,7 @@ module Renalware
       end
     end
 
+    # Non-stimulus implemention for adding a link to toggle open all togglebale rows in the table
     def table_toggler(link_title: "Toggle all rows")
       link_to(
         "#",
@@ -43,11 +45,15 @@ module Renalware
       end
     end
 
-    # Create a link in a thead > tr > th that will toggle the last row in all tbodies in the table.
+    # Create a link in a thead > tr > th that will toggle the last row in all tbodies in the table,
+    # where the table contains multiple tbodies and the last row in each is the one that
+    # a user can toggle open/closed (to see extended detail for instance).
+    # Works in conjunction with the stimulus ToggleController.
+    # The enclosing html table must have data-controller="toggle" attribute.
     def rows_toggler(link_title: "Toggle all rows")
       link_to(
         "#",
-        data: { action: "row-toggler#toggleTable" },
+        data: { action: "toggle#table" },
         class: "toggler",
         title: link_title
       ) do
@@ -56,11 +62,14 @@ module Renalware
     end
 
     # Create a link to be used in a tbody > tr > td that will toggle the last row in the current
-    # tbody.
+    # tbody, where the table contains multiple tbodies and the last row in each is the one that
+    # a user can toggle open/closed (to see extended detail for instance).
+    # Works in conjunction with the stimulus ToggleController.
+    # The enclosing html table must have data-controller="toggle" attribute.
     def row_toggler(link_title: "Toggle")
       link_to(
         "#",
-        data: { action: "row-toggler#toggleRow" },
+        data: { action: "click->toggle#row" },
         class: "toggler",
         title: link_title
       ) do