renalware-core 2.0.148 → 2.0.155

data/app/controllers/renalware/renal/aki_alerts_controller.rb

@@ -45,7 +45,7 @@ module Renalware
             path_params: path_params
           }
         )
-        render options
+        render_with_wicked_pdf options
       end
 
       def render_index_html(query, alerts)

data/app/controllers/renalware/renal/registry_preflight_checks_controller.rb

@@ -8,52 +8,88 @@ module Renalware
     class RegistryPreflightChecksController < BaseController
       include Renalware::Concerns::Pageable
 
-      class PatientPresenter < SimpleDelegator
-        def missing_data
-          Registry::PreflightChecks::PatientsQuery.missing_data_for(__getobj__)
-        end
-
+      module WithHDUnit
         def hd_unit
           if current_modality.description.name == "HD"
             Renalware::HD.cast_patient(__getobj__)&.hd_profile&.hospital_unit&.unit_code
           end
         end
+      end
+
+      class BasePresenter < SimpleDelegator
+        def hd_unit; end
 
         def renal_profile
           Renalware::Renal.cast_patient(__getobj__).profile
         end
       end
 
-      class DeceasedPatientPresenter < SimpleDelegator
+      class PatientsPresenter < BasePresenter
+        include WithHDUnit
+
+        def missing_data
+          Registry::PreflightChecks::PatientsQuery.missing_data_for(__getobj__)
+        end
+      end
+
+      class DeathsPresenter < BasePresenter
         def missing_data
           Registry::PreflightChecks::DeathsQuery.missing_data_for(__getobj__)
         end
+      end
 
-        def hd_unit; end
+      class MissingESRFPresenter < BasePresenter
+        include WithHDUnit
 
-        def renal_profile
-          Renalware::Renal.cast_patient(__getobj__).profile
+        def missing_data
+          Registry::PreflightChecks::MissingESRFQuery.missing_data_for(__getobj__)
         end
       end
 
       def patients
-        authorize [:renalware, :renal, :registry_preflight_check], :patients?
-        query = Registry::PreflightChecks::PatientsQuery.new(query_params: query_params)
-        patients = query.call.page(page).per(per_page)
-        patients = CollectionPresenter.new(patients, PatientPresenter)
-        render locals: { patients: patients, query: query.search }
+        authorize_action
+        query = build_query(query_params)
+        render locals: {
+          patients: patients_for(query),
+          query: query.search
+        }
       end
 
       def deaths
-        authorize [:renalware, :renal, :registry_preflight_check], :deaths?
-        query = Registry::PreflightChecks::DeathsQuery.new(query_params: query_params)
-        patients = query.call.page(page).per(per_page)
-        patients = CollectionPresenter.new(patients, DeceasedPatientPresenter)
-        render locals: { patients: patients, query: query.search }
+        authorize_action
+        query = build_query(query_params)
+        render locals: {
+          patients: patients_for(query),
+          query: query.search
+        }
+      end
+
+      def missing_esrf
+        authorize_action
+        query = build_query(params.fetch(:q, {}))
+        render locals: {
+          patients: patients_for(query),
+          query: query.search
+        }
       end
 
       private
 
+      def build_query(query_params)
+        query_class = Registry::PreflightChecks.const_get("#{action_name.to_s.camelize}Query")
+        query_class.new(query_params: query_params)
+      end
+
+      def patients_for(query)
+        presenter_class = self.class.const_get("#{action_name.to_s.camelize}Presenter")
+        patients = query.call.page(page).per(per_page)
+        CollectionPresenter.new(patients, presenter_class)
+      end
+
+      def authorize_action
+        authorize [:renalware, :renal, :registry_preflight_check], :"#{action_name}?"
+      end
+
       def query_params
         qparams = params.fetch(:q, {})
         qparams[:profile_esrf_on_gteq] ||= 3.years.ago

data/app/controllers/renalware/session_timeout_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# This controller exposes a has_user_timed_out action which is invoked via Ajax on a JavaScript
+# This controller exposes a check_session_expired action which is invoked via Ajax on a JavaScript
 # timer and will cause the user to be redirected to the login page if their session has expired
 # due to a period of activity. The redirect happens because of a generic Ajax error handling
 # JavaScript - see ajax_errors.js - which causes the page to reload after any Ajax 401 error
@@ -11,35 +11,38 @@
 #
 module Renalware
   class SessionTimeoutController < BaseController
-    prepend_before_action :skip_timeout, only: :has_user_timed_out
-    skip_before_action :authenticate_user!, only: :has_user_timed_out
-    skip_before_action :track_ahoy_visit, only: :has_user_timed_out
-    protect_from_forgery except: [:has_user_timed_out, :reset_user_clock]
+    prepend_before_action :skip_timeout, only: :check_session_expired
+    skip_before_action :authenticate_user!, only: :check_session_expired
+    skip_before_action :track_ahoy_visit
+    protect_from_forgery only: []
+    after_action :track_action, only: []
 
     # Note this action will NOT update the session activity (thus keeping the session alive)
     # because we invoke #skip_timeout at the beginning of the filter chain.
     # We could return the amount of time remaining before the session expires like so
     #   time_left = Devise.timeout_in - (Time.now - user_session["last_request_at"]).round
     # and display this to the user if required.
-    # rubocop :disable Naming/PredicateName
-    def has_user_timed_out
-      skip_authorization
+    def check_session_expired
+      skip_authorization # pundit
       if referrer_is_a_devise_url? || !current_users_session_has_timed_out?
-        head(:ok)
+        head :ok
       else
-        flash[:notice] = "Your session timed due to inactivity. Please log in again."
         head :unauthorized
       end
     end
-    # rubocop :enable Naming/PredicateName
 
-    # A user could invoke this action to keep their session alive, by for example
-    # clicking on a "Keep my session active" button which makes an ajax call to this action.
-    # Note this will keep the session alive because we have not invoked skip_timeout before
-    # action, so, like all actions on all controllers, the user's last_request_at time stamp is
+    # session_controller.js invoked this action to when there is user activity on the page
+    # to update the session window.
+    # Note this will keep the session alive because we have NOT invoked skip_timeout before the
+    # action, so, like all controller actions, the user's last_request_at time stamp is
     # updated in their session cookie.
-    def reset_user_clock
-      head :ok
+    def keep_session_alive
+      skip_authorization # pundit
+      if referrer_is_a_devise_url? || !current_users_session_has_timed_out?
+        head :ok
+      else
+        head :unauthorized
+      end
     end
 
     private

data/app/controllers/renalware/system/view_metadata_controller.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Renalware
+  module System
+    class ViewMetadataController < BaseController
+      def edit
+        klass = klass_for_view(view_name)
+        render locals: { view: view, klass: klass }, layout: false
+      end
+
+      def update
+        view = find_and_authorize_view
+        authorize view
+        if view.update(view_metadata_params)
+          redirect_back fallback_location: dashboard_path
+        end
+      end
+
+      # Restore the view to previous version at a specific datetime
+      def restore
+        view = find_and_authorize_view
+        datetime_version_to_restore = params[:version_at]
+        view.paper_trail.version_at(datetime_version_to_restore).save!
+        redirect_back(fallback_location: root_url)
+      end
+
+      private
+
+      def view
+        @view ||= find_and_authorize_view
+      end
+
+      def view_name
+        "#{view.schema_name}.#{view.view_name}"
+      end
+
+      # Dynamically create an anonymous AR class to wrap the view so we can get
+      # pagination etc without having to work with PG::Result.
+      def klass_for_view(view_name)
+        Class.new(ApplicationRecord) do
+          self.table_name = view_name
+          define_method(:to_s, ->(_x) { patient_name })
+          define_method(:to_param, -> { secure_id })
+        end.tap do |klass|
+          Object.const_set("AnonymousView", klass) # required for ransack search_form_for
+          klass.connection
+        end
+      end
+
+      def find_and_authorize_view
+        ViewMetadata.find(params[:id]).tap { |view| authorize view }
+      end
+
+      def view_metadata_params
+        params
+          .require(:view_metadata)
+          .permit(filters: {}, columns: [[:code, :name, :width, :truncate, :hidden]])
+      end
+    end
+  end
+end

data/app/controllers/renalware/users_controller.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+# Note we rely on template inheritance with this MDM Base class i.e. subclasses (e.g.
+# HD::MDMPatientsController) can override templates and partials (e.g. add a _filters partial
+# or override the _patient partial to replace what is displayed in the table).
+# Otherwise the default template location is of course app/views/renalware/mdm_patients.
+module Renalware
+  class UsersController < BaseController
+    include Pagy::Backend
+
+    def index
+      query = params.fetch(:q, {})
+      query[:s] ||= "family_name"
+      search = User
+        .includes(:roles)
+        .where.not(username: [:rwdev, :systemuser])
+        .ransack(query)
+      pagy, users = pagy(search.result(distinct: true))
+      authorize users
+      render locals: { users: users, pagy: pagy, user_search: search }
+    end
+  end
+end

data/app/documents/renalware/age.rb

@@ -17,6 +17,8 @@ module Renalware
     end
 
     def self.new_from(years:, months:, **)
+      years = years&.to_i
+      months = months&.to_i
       new.tap do |age|
         if years && months
           if years < age_in_months_threshold
@@ -39,7 +41,7 @@ module Renalware
     def validate_unit
       return if amount.blank?
 
-      if amount < Age.age_in_months_threshold && unit.to_sym != :months
+      if amount.to_i < Age.age_in_months_threshold && unit.to_sym != :months
         errors.add(:unit, :invalid_unit)
       end
     end

data/app/helpers/renalware/application_helper.rb

@@ -3,6 +3,7 @@
 require "inline_image"
 require "git_commit_sha"
 require "breadcrumb"
+require "renalware/version_number"
 
 module Renalware
   module ApplicationHelper
@@ -61,15 +62,15 @@ module Renalware
       " field_with_errors" if model.errors.key?(attr)
     end
 
-    def yes_no(bool)
-      bool ? "Yes" : "No"
-    end
+    # def yes_no(bool)
+    #   bool ? "Yes" : "No"
+    # end
 
-    def yes_no_if_set(bool)
-      return if bool.nil?
+    # def yes_no_if_set(bool)
+    #   return if bool.nil?
 
-      yes_no(bool)
-    end
+    #   yes_no(bool)
+    # end
 
     def default_for_associated(assoc, method, msg)
       assoc.present? ? assoc.public_send(method) : msg
@@ -113,7 +114,7 @@ module Renalware
     end
 
     def semantic_app_version
-      "#{Renalware::VERSION}+sha.#{GitCommitSha.current}"
+      "#{Renalware::VersionNumber::VERSION}+sha.#{GitCommitSha.current}"
     end
   end
 end

data/app/helpers/renalware/article_helper.rb

@@ -13,8 +13,8 @@ module Renalware
       output = tag(:article, options, true)
       if title.present?
         output.safe_concat(
-          content_tag("header") do
-            content_tag("h1", title)
+          tag.header do
+            tag.h1(title)
           end
         )
       end
@@ -37,7 +37,7 @@ module Renalware
         end
       end
       parts.append(")")
-      content_tag("span", parts.join(""))
+      tag.span(parts.join(""))
     end
   end
 end

data/app/helpers/renalware/boolean_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Renalware
+  module BooleanHelper
+    def yes_no(bool)
+      bool ? "Yes" : "No"
+    end
+
+    def yes_no_if_set(bool)
+      return if bool.nil?
+
+      yes_no(bool)
+    end
+  end
+end

data/app/helpers/renalware/clipboard_helper.rb

@@ -4,9 +4,8 @@ module Renalware
   module ClipboardHelper
     # A helper to create a clipboard.js button https://clipboardjs.com/
     def clipboard_button_for(target, width: "13rem")
-      content_tag :button,
-                  data: { "clipboard-action" => "copy", "clipboard-target" => target },
-                  class: "button compact low-key clipboard-btn" do
+      tag.button data: { "clipboard-action" => "copy", "clipboard-target" => target },
+                 class: "button compact low-key clipboard-btn" do
         image_tag "renalware/clippy.svg", width: width
       end
     end

data/app/helpers/renalware/dashboards_helper.rb

@@ -4,8 +4,8 @@ module Renalware
   module DashboardsHelper
     def composed_dashboard_title(user_name)
       capture do
-        concat content_tag(:span, I18n.t("renalware.dashboard.dashboards.title"))
-        concat content_tag(:span, user_name, class: "dashboard-owner")
+        concat tag.span(I18n.t("renalware.dashboard.dashboards.title"))
+        concat tag.span(user_name, class: "dashboard-owner")
       end
     end
   end

data/app/helpers/renalware/definition_list_helper.rb

@@ -17,14 +17,14 @@ module Renalware
         value = __getobj__.public_send(attribute)
         value = yield(value) if value.present? && block_given?
         capture do
-          concat content_tag(:dt, text)
-          concat content_tag(:dd, value)
+          concat tag.dt(text)
+          concat tag.dd(value)
         end
       end
     end
 
     def definition_list_for(model, size: :large)
-      content_tag(:dl, class: "dl-horizontal #{size}") do
+      tag.dl(class: "dl-horizontal #{size}") do
         yield DefinitionList.new(model)
       end
     end

data/app/helpers/renalware/devise_helper.rb

@@ -5,7 +5,7 @@ module Renalware
     def custom_devise_error_messages!
       return "" if resource.errors.empty?
 
-      messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
+      messages = resource.errors.full_messages.map { |msg| tag.li(msg) }.join
 
       html = <<-HTML
       <ul class="error-messages">#{messages}</ul>

data/app/helpers/renalware/drugs_helper.rb

@@ -11,6 +11,12 @@ module Renalware
       )
     end
 
+    # Now that we have a drug_types.colour column e.g. '#aaa' we can use here.
+    # Where the drug belongs to 2 drug types, we need to be sure to choose the colour of the most
+    # clinically significant drug type - eg 'ESA' wins over 'My other drug type'.
+    # This should be done by ordering a drugs types and taking the one with the highest value
+    # in the #weighting column - i.e. ESA will have a a large value in this column to ensure it
+    # trumps other types and its colour is used.
     def drug_types_colour_tag(drug_types)
       drug_names = drug_types.map(&:name)
       return "esa" if drug_names.include?("ESA")

data/app/helpers/renalware/form_helper.rb

@@ -30,7 +30,7 @@ module Renalware
     end
 
     def monospace(value, width = 5)
-      content_tag(:span, class: "monospaced") do
+      tag.span(class: "monospaced") do
         concat("%#{width}s" % value).gsub(/ /, " ").html_safe
       end
     end
@@ -38,7 +38,7 @@ module Renalware
     def save_or_cancel(form:, back_path:, submit_title: "Save", cancel_title: "cancel")
       capture do
         concat(form.submit(submit_title, class: "button"))
-        concat(content_tag(:span) { " or " })
+        concat(tag.span { " or " })
         concat(link_to(cancel_title, back_path))
       end
     end