renalware-core 2.0.148 → 2.0.155

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

@@ -0,0 +1,3 @@
+article
+  header
+    h1= title

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Renalware
+  module System
+    # Experimental ActionView component
+    class AdminMenuComponent < ApplicationComponent
+    end
+  end
+end

data/app/components/renalware/users/last_signin_component.html.slim

@@ -0,0 +1,3 @@
+- if effective_last_sign_in_at.present?
+  p.last-login(style="position: absolute;top: -36px; right: 2px;")
+    = "You last signed in at #{effective_last_sign_in_at.strftime("%H:%M")} on #{effective_last_sign_in_at.strftime("%d-%b-%Y")}"

data/app/components/renalware/users/last_signin_component.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Users
+    # Renders a section on the dashboard that displays the last date and time the
+    # user signed in. This is a National Cyber Security Centre recommendation.
+    class LastSigninComponent < ApplicationComponent
+      include Renalware::UsersHelper
+      pattr_initialize [:current_user!]
+      delegate :last_sign_in_at, :current_sign_in_at, to: :current_user
+
+      def effective_last_sign_in_at
+        return if last_sign_in_at.blank? || last_sign_in_at == current_sign_in_at
+
+        last_sign_in_at
+      end
+
+      def render?
+        effective_last_sign_in_at.present?
+      end
+    end
+  end
+end

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

@@ -50,7 +50,7 @@ module Renalware
         return {} if form.patient_id.blank?
 
         ActiveRecord::Base.connection.execute(
-          Arel.sql(<<-SQL)
+          Arel.sql(<<-SQL.squish)
             select
               observed_on as x,
               result as y

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

@@ -51,6 +51,7 @@ module Renalware
           :telephone,
           :consultant,
           :hidden,
+          :prescriber,
           role_ids: []
         )
     end

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -25,7 +25,7 @@ module Renalware
                 query: query.search
               }
             )
-            render options
+            render_with_wicked_pdf options
           end
           format.html do
             consults = query.call.page(page).per(per_page)

data/app/controllers/renalware/base_controller.rb

@@ -11,13 +11,13 @@ module Renalware
     after_action :verify_authorized
 
     # A note on ahoy tracking:
-    # has_user_timed_out is defined on SessionTimeoutController
+    # check_session_expired is defined on SessionTimeoutController
     # using this in the that controller
-    #   skip_before_action :track_ahoy_visit, only: has_user_timed_out
+    #   skip_before_action :track_ahoy_visit, only: check_session_expired
     # does not seem to work hence this global blacklist
 
     # rubocop:disable Rails/LexicallyScopedActionFilter
-    after_action :track_action, except: [:has_user_timed_out, :status]
+    after_action :track_action, except: :status
     # rubocop:enable Rails/LexicallyScopedActionFilter
 
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized

data/app/controllers/renalware/concerns/pdf_renderable.rb

@@ -36,7 +36,7 @@ module Renalware
           body = System::RenderLiquidTemplate.call(template_name: template_name,
                                                    variables: variables)
           options = default_pdf_options.merge!(pdf: filename, locals: { body: body })
-          render options
+          render_with_wicked_pdf options
         end
 
         private

data/app/controllers/renalware/drugs/drugs_controller.rb

@@ -8,7 +8,11 @@ module Renalware
       include Renalware::Concerns::Pageable
 
       before_action :prepare_drugs_search, only: :index
+      after_action :track_action, except: :selected_drugs
 
+      # Return a list of drugs as JSON for specific drug type (medication_switch)
+      # TODO: Make a separate resource eg drug_/esa/drugs.json. E.g.
+      # drug_type.drugs.ordered.pluck(:id, :name)
       def selected_drugs
         selected_drugs = Drug.for(params[:medication_switch])
                              .ordered

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

@@ -9,7 +9,7 @@ module Renalware
       include PresenterHelper
 
       def show
-        profile = Profile.deleted.for_patient(patient).find_by!(id: params[:id])
+        profile = Profile.deleted.for_patient(patient).find(params[:id])
         authorize profile
         render locals: {
           patient: patient,

data/app/controllers/renalware/hd/scheduling/diaries_controller.rb

@@ -36,7 +36,7 @@ module Renalware
                 pdf: pdf_filename,
                 locals: { unit: unit, diary: DiaryPresenter.new(current_user, diary) }
               )
-              render options
+              render_with_wicked_pdf options
             end
           end
         end

data/app/controllers/renalware/medications/prescriptions_controller.rb

@@ -9,9 +9,8 @@ module Renalware
       include PrescriptionsHelper
       include PresenterHelper
 
-      before_action :load_patient
-
       def index
+        authorize Prescription, :index?
         @treatable = treatable_class.find(treatable_id)
         respond_to do |format|
           format.html { render_index }
@@ -23,6 +22,7 @@ module Renalware
       def new
         @treatable = treatable_class.find(treatable_id)
         prescription = build_new_prescription_for(@treatable)
+        authorize prescription
         render_form(prescription, url: patient_prescriptions_path(patient, @treatable))
       end
 
@@ -32,6 +32,7 @@ module Renalware
         prescription = patient.prescriptions.new(
           prescription_params.merge(treatable: @treatable)
         )
+        authorize prescription
 
         if prescription.save
           render_index
@@ -42,6 +43,7 @@ module Renalware
 
       def edit
         prescription = patient.prescriptions.find(params[:id])
+        authorize prescription
         @treatable = prescription.treatable
 
         render_form(prescription, url: patient_prescription_path(patient, prescription))
@@ -49,6 +51,7 @@ module Renalware
 
       def update
         prescription = patient.prescriptions.find(params[:id])
+        authorize prescription
         @treatable = prescription.treatable
 
         updated = RevisePrescription.new(prescription).call(prescription_params)
@@ -76,7 +79,7 @@ module Renalware
 
       # rubocop:disable Layout/LineLength, Metrics/MethodLength
       def render_prescriptions_list_to_hand_to_patient
-        render(
+        render_with_wicked_pdf(
           pdf_options.merge(
             pdf: pdf_filename,
             disposition: "inline",

data/app/controllers/renalware/messaging/internal/messages_controller.rb

@@ -8,6 +8,7 @@ module Renalware
       class MessagesController < BaseController
         include Renalware::Concerns::Pageable
         include PresenterHelper
+        include Pagy::Backend
 
         def new
           authorize Message, :new?
@@ -28,8 +29,20 @@ module Renalware
           end
         end
 
+        # Display all public message for a patient
+        def index
+          authorize Message, :index?
+          scope = patient.messages.where(public: true).order(created_at: :desc)
+          pagination, messages = pagy(scope, items: 20)
+          render locals: { patient: patient, messages: messages, pagination: pagination }
+        end
+
         private
 
+        def patient
+          Messaging.cast_patient(Patient.find(params[:patient_id]))
+        end
+
         def message_we_are_replying_to(message)
           return if message.replying_to_message_id.blank?
 
@@ -57,14 +70,10 @@ module Renalware
           Messaging::Internal.cast_author(current_user)
         end
 
-        def patient
-          Messaging.cast_patient(Patient.find(params[:patient_id]))
-        end
-
         def message_params
           params
             .require(:internal_message)
-            .permit(:subject, :body, :urgent, :replying_to_message_id, recipient_ids: [])
+            .permit(:subject, :body, :urgent, :replying_to_message_id, :public, recipient_ids: [])
         end
       end
     end

data/app/controllers/renalware/pathology/charts_controller.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class ChartsController < Pathology::BaseController
+      # Returns HTML rendered by a view component for pulling into say a modal dialog
+      def show
+        authorize Patient, :show?
+        render(
+          locals: {
+            patient: patient,
+            observation_description: ObservationDescription.find(params[:id])
+          },
+          layout: false
+        )
+      end
+    end
+  end
+end

data/app/controllers/renalware/pathology/current_observation_results_controller.rb

@@ -10,7 +10,7 @@ module Renalware
         observation_set = ObservationSetPresenter.new(
           patient.fetch_current_observation_set
         )
-        render :index, locals: { observation_set: observation_set }
+        render :index, locals: { observation_set: observation_set, patient: patient }
       end
     end
   end

data/app/controllers/renalware/pathology/historical_observation_results_controller.rb

@@ -15,7 +15,7 @@ module Renalware
           page: page || 1,
           per_page: 25
         ).call
-        render :index, locals: { table: observations_table }
+        render :index, locals: { table: observations_table, patient: patient }
       end
     end
   end

data/app/controllers/renalware/pathology/nearest_observation_results_controller.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class NearestObservationResultsController < Pathology::BaseController
+      def index
+        near_date
+        authorize Patient, :index?
+        render json: nearest_results
+      end
+
+      private
+
+      def code_group
+        @code_group ||= CodeGroup.find(params[:code_group_id])
+      end
+
+      def observation_description_ids
+        @observation_description_ids ||= code_group.memberships.pluck(:observation_description_id)
+      end
+
+      def near_date
+        Date.parse(params[:date])
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def nearest_results
+        Pathology
+          .cast_patient(Patient.find(params[:patient_id]))
+          .observations
+          .joins(:description)
+          .where(description_id: observation_description_ids)
+          .select(
+            :observed_at,
+            :result,
+            :description_id,
+            "pathology_observation_descriptions.code as code"
+          )
+          .map do |row|
+            {
+              code: row.code,
+              observed_on: row.observed_at.to_date,
+              result: row.result
+            }
+          end
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+  end
+end

data/app/controllers/renalware/pathology/observation_descriptions_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pathology"
+
+module Renalware
+  module Pathology
+    class ObservationDescriptionsController < BaseController
+      include Pagy::Backend
+
+      def index
+        query = ObservationDescription
+          .includes(:measurement_unit)
+          .order(:code)
+          .ransack(params[:q] || {})
+        pagy, descriptions = pagy(query.result)
+        authorize descriptions
+        render locals: { descriptions: descriptions, pagy: pagy, query: query }
+      end
+
+      def edit
+        render_edit find_authorise_description
+      end
+
+      def update
+        description = find_authorise_description
+        if description.update(description_params)
+          redirect_to(
+            pathology_observation_descriptions_path,
+            notice: t(".success", model_name: "observation descrition")
+          )
+        else
+          render_edit(description)
+        end
+      end
+
+      private
+
+      def render_edit(description)
+        render :edit, locals: { description: description }
+      end
+
+      def find_authorise_description
+        ObservationDescription.find(params[:id]).tap { |desc| authorize desc }
+      end
+
+      def description_params
+        params
+          .require(:pathology_observation_description)
+          .permit(
+            :name,
+            :measurement_unit_id,
+            :lower_threshold,
+            :upper_threshold
+          )
+      end
+    end
+  end
+end

data/app/controllers/renalware/pathology/observation_requests_controller.rb

@@ -11,7 +11,7 @@ module Renalware
       def index
         observation_requests = find_observation_requests
         render locals: {
-          observation_requests: observation_requests.result .page(page).per(per_page),
+          observation_requests: observation_requests.result.page(page).per(per_page),
           search: observation_requests,
           obr_filter_options: obr_filter_options,
           patient: @patient

data/app/controllers/renalware/pathology/observations_controller.rb

@@ -8,12 +8,35 @@ module Renalware
       include Renalware::Concerns::Pageable
       before_action :load_patient
 
+      # Observation history for a particular OBX.
+      # - HTML version is rendered from patient pathology under Investigations when you
+      # select a Request and see its Observations and click on the Code.
+      # - JSON version used in graphs
+      # rubocop:disable Metrics/MethodLength
       def index
         description = find_description
         observations = find_observations_for_description(description)
 
-        render locals: { patient: @patient, observations: observations, description: description }
+        respond_to do |format|
+          format.html do
+            render locals: {
+              patient: @patient,
+              observations: observations,
+              description: description
+            }
+          end
+          format.json do
+            render json: {
+              code: description.code,
+              name: description.name,
+              results: observations.pluck(:observed_at, :result).map { |arr|
+                [arr.first.to_date, arr.last&.to_f]
+              }
+            }
+          end
+        end
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 
@@ -22,7 +45,8 @@ module Renalware
       end
 
       def find_observations_for_description(description)
-        @patient.observations
+        @patient
+          .observations
           .page(page)
           .includes(:request)
           .for_description(description)

data/app/controllers/renalware/pathology/requests/requests_controller.rb

@@ -24,7 +24,7 @@ module Renalware
             Request.find(params[:id])
           )
           authorize request
-          render(
+          render_with_wicked_pdf(
             pdf: "show",
             page_size: "A4",
             layout: "renalware/layouts/pdf",
@@ -52,7 +52,7 @@ module Renalware
         def create
           requests.each(&:print_form)
 
-          render(
+          render_with_wicked_pdf(
             pdf: "create",
             page_size: "A4",
             layout: "renalware/layouts/pdf",
@@ -81,9 +81,11 @@ module Renalware
         end
 
         def requests
-          RequestPresenter.present(
-            Requests::RequestsFactory.new(@patients, request_params).build
-          )
+          @requests ||= begin
+            RequestPresenter.present(
+              Requests::RequestsFactory.new(@patients, request_params).build
+            )
+          end
         end
 
         def request_params