renalware-core 2.0.146 → 2.0.152

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

@@ -23,4 +23,5 @@ ul.side-nav.side-nav--admin
   = super_admin_menu_item "HD Cannulation Types", renalware.hd_cannulation_types_path, %r{hd/cannulation_types}
   = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
   = admin_menu_item "Mailshots", renalware.letters_mailshots_path, %r{letters/mailshots}
+  = super_admin_menu_item "Playground", renalware.admin_playground_path, %r{admin/playground}
   = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path

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

@@ -35,11 +35,11 @@ module Renalware
       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
+        tag.li class: klasses.join(" ") do
           if enabled
             link_to(title, path)
           else
-            content_tag :span, title
+            tag.span title
           end
         end
       end

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/controllers/renalware/admin/playgrounds_controller.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Renalware
+  class Admin::PlaygroundsController < BaseController
+    def show
+      authorize User, :index?
+      render locals: { form: ChartForm.new(obx_code: "CRE", period: "all") }
+    end
+
+    # Returns test json to display a chart of one obx code over time for a patient
+    def pathology_chart_data
+      authorize User, :index?
+      form = ChartForm.new(chart_params)
+      chart = Chart.new(form)
+      render json: chart.json
+    end
+
+    class ChartForm
+      include ActiveModel::Model
+      include Virtus::Model
+
+      attribute :patient_id, Integer
+      attribute :obx_code, String
+      attribute :period, String
+
+      # Map a period string to a date, eg 6m = 6 months ago
+      def start_date
+        time = case period
+               when "yr" then 1.year.ago
+               when "6m" then 6.months.ago
+               when "3m" then 3.months.ago
+               when "1m" then 1.month.ago
+               when "1wk" then 1.week.ago
+               else 100.years.ago
+               end
+        time.to_date.to_s
+      end
+    end
+
+    def chart_params
+      return {} unless params.key?(:chart)
+
+      params.require(:chart).permit!
+    end
+
+    class Chart
+      pattr_initialize :form
+
+      def json
+        return {} if form.patient_id.blank?
+
+        ActiveRecord::Base.connection.execute(
+          Arel.sql(<<-SQL)
+            select
+              observed_on as x,
+              result as y
+              from renalware.pathology_chart_data(#{form.patient_id},
+                '#{form.obx_code}',
+                '#{form.start_date}')
+          SQL
+        ).to_a.each_with_object({}) { |h, hash| hash[Date.parse(h["x"])] = h["y"] }
+      end
+    end
+  end
+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/deaths_controller.rb

@@ -3,15 +3,16 @@
 module Renalware
   class DeathsController < BaseController
     include PresenterHelper
-    include Renalware::Concerns::Pageable
+    include Pagy::Backend
 
     def index
-      patients = Patient.dead.page(page).per(per_page)
-      search = patients.ransack(params[:q])
+      query = Patients::DeceasedPatientsQuery.new(params[:q])
+      pagy, patients = pagy(query.call.includes(previous_modality: :description))
       authorize patients
       render locals: {
-        patients: present(search.result, PatientPresenter),
-        q: search
+        patients: present(patients, PatientPresenter),
+        q: query.search,
+        pagy: pagy
       }
     end
 

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/home_delivery/events_controller.rb

@@ -31,9 +31,7 @@ module Renalware
           authorize event
 
           event.prescriptions = prescriptions_for(event)
-
           event.valid?
-          # byebug
           render(:edit, layout: false, locals: { event: event })
         end
 
@@ -64,7 +62,6 @@ module Renalware
                   last_delivery_date: last_delivery_date,
                   next_delivery_date: next_delivery_date
                 )
-
               end
               render :update, locals: { event: event }
             else

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/medications"
+
+module Renalware
+  module Medications
+    module HomeDelivery
+      class PrescriptionsController < BaseController
+        include Pagy::Backend
+
+        def index
+          form = SearchForm.new(search_params)
+          query = Medications::Delivery::PrescriptionsDueForDeliveryQuery.new(
+            drug_type_code: params[:named_filter],
+            modality_description_id: form.modality_description_id,
+            query: params[:q]
+          )
+          pagy, prescriptions = pagy(query.call)
+          authorize prescriptions
+          render :index, locals: {
+            prescriptions: prescriptions,
+            pagy: pagy,
+            query: query.search,
+            form: form
+          }
+        end
+
+        class SearchForm
+          include ActiveModel::Model
+          include Virtus::Model
+
+          attribute :modality_description_id, Integer
+        end
+
+        def search_params
+          return {} unless params.key?(:search)
+
+          params.require(:search).permit(:modality_description_id)
+        end
+      end
+    end
+  end
+end

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

@@ -76,7 +76,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/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_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

data/app/controllers/renalware/patients/primary_care_physician_controller.rb

@@ -26,6 +26,12 @@ module Renalware
         end
       end
 
+      def destroy
+        authorize patient
+        patient.update_by(current_user, primary_care_physician_id: nil, practice_id: nil)
+        render locals: { patient: patient }
+      end
+
       private
 
       # There maybe times (for instance after migration from a previous system) where the

data/app/controllers/renalware/pd/adequacy_completions_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/pd"
+
+module Renalware
+  module PD
+    class AdequacyCompletionsController < BaseController
+      include Pagy::Backend
+
+      def index
+        query = AdequacyResult.joins(:patient).order(performed_on: :desc).ransack(params[:q])
+        pagy, results = pagy(query.result)
+        authorize results
+        render locals: { pagination: pagy, results: results, query: query }
+      end
+    end
+  end
+end