renalware-core 2.0.0.pre.rc13 → 2.0.0

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

@@ -6,10 +6,14 @@ module Renalware
       include Renalware::Concerns::Pageable
 
       def index
-        alerts = AKIAlert.includes(:updated_by, :action, :hospital_ward, :patient)
-                         .ordered.page(page).per(per_page)
+        query = search_form.query
+        alerts = query.call.page(page).per(per_page)
         authorize alerts
-        render locals: { alerts: alerts }
+        render locals: {
+          alerts: alerts,
+          form: search_form,
+          search: query.search
+        }
       end
 
       def edit
@@ -28,6 +32,13 @@ module Renalware
 
       private
 
+      def search_form
+        @search_form ||= begin
+          options = params.key?(:q) ? search_params : {}
+          AKIAlertSearchForm.new(options)
+        end
+      end
+
       def render_edit(alert)
         render :edit, locals: { alert: alert }
       end
@@ -44,6 +55,12 @@ module Renalware
             :max_cre, :cre_date, :max_aki, :aki_date
           )
       end
+
+      def search_params
+        params
+          .require(:q) {}
+          .permit(:term, :on_hotlist, :action, :hospital_unit_id, :hospital_ward_id, :s)
+      end
     end
   end
 end

data/app/controllers/renalware/research/studies_controller.rb

@@ -3,8 +3,10 @@ require_dependency "renalware/research"
 module Renalware
   module Research
     class StudiesController < BaseController
+      include Renalware::Concerns::Pageable
+
       def index
-        studies = Study.ordered
+        studies = Study.ordered.page(page).per(per_page)
         authorize studies
         render locals: { studies: studies }
       end

data/app/controllers/renalware/session_timeout_controller.rb

@@ -53,7 +53,7 @@ module Renalware
     # Returns a truthy value if we came from a devise URL like users/sign_in
     def referrer_is_a_devise_url?
       referrer = request.referer
-      return if request.blank?
+      return if request.blank? || referrer.blank?
       regex_defining_devise_paths = %r{(#{new_user_session_path}|users\/password|users\/sign_up)}
       URI.parse(referrer).path =~ regex_defining_devise_paths
     end

data/app/models/renalware/letters/html_renderer.rb

@@ -5,7 +5,8 @@ module Renalware
         context = LettersController.new
         context.render_to_string(
           partial: "/renalware/letters/formatted_letters/letter",
-          locals: { letter: letter }
+          locals: { letter: letter },
+          encoding: "UTF-8"
         )
       end
     end

data/app/models/renalware/letters/pdf_letter_cache.rb

@@ -35,6 +35,8 @@ module Renalware
   module Letters
     class PdfLetterCache
       class << self
+        delegate :clear, to: :store
+
         def fetch(letter)
           store.fetch(cache_key_for(letter)) { yield }
         end
@@ -46,7 +48,8 @@ module Renalware
         # valid and a new key and cache entry will be created.
         def cache_key_for(letter)
           timestamp = letter&.updated_at&.strftime("%Y%m%d%H%M%S")
-          "letter-pdf-#{letter.id}-#{timestamp}-#{Digest::MD5.hexdigest(letter.to_html)}"
+          pat_id = letter.patient.id
+          "letter-pdf-#{letter.id}-#{pat_id}-#{timestamp}-#{Digest::MD5.hexdigest(letter.to_html)}"
         end
 
         def cache_path

data/app/models/renalware/letters/pdf_renderer.rb

@@ -11,7 +11,8 @@ module Renalware
         footer: {
           font_size: 8,
           right: "Page [page] of [topage]"
-        }
+        },
+        encoding: "UTF-8"
       }.freeze
 
       def self.call(letter)

data/app/models/renalware/pathology/create_observations_grouped_by_date_table.rb

@@ -12,9 +12,6 @@ module Renalware
       end
 
       def call
-        if observation_descriptions.blank?
-          raise(ArgumentError, "No observation_descriptions supplied")
-        end
         create_observations_table
       end
 

data/app/models/renalware/pathology/observations_grouped_by_date_query.rb

@@ -36,7 +36,8 @@ module Renalware
 
       def initialize(patient:, observation_descriptions:, page: 1, per_page: 50)
         @patient = patient
-        @observation_descriptions = observation_descriptions
+        @observation_descriptions =
+          observation_descriptions.presence || observation_descriptions_null_object
         @page = Integer(page)
         @limit = Integer(per_page)
       end
@@ -52,11 +53,16 @@ module Renalware
       end
 
       def all
+        return Pathology::Observation.none if observation_descriptions.empty?
         conn.execute(to_paginated_sql)
       end
 
       private
 
+      def observation_descriptions_null_object
+        Pathology::Observation.none
+      end
+
       def to_sql
         <<-SQL.squish
           select obs_req.patient_id, cast(observed_at as date) as observed_on,

data/app/models/renalware/pd/apd_regime.rb

@@ -20,6 +20,7 @@ module Renalware
         additional_manual_exchange_volumes: 500..5_000,
         cycles_per_apd: 2..20,
         overnight_volumes: 3_000..25_000,
+        dwell_times: 10..120,
         tidal_percentages: (60..100).step(5).to_a
       ).freeze
 
@@ -63,6 +64,11 @@ module Renalware
                 numericality: { only_integer: true },
                 numeric_inclusion: { in: VALID_RANGES.therapy_times }
 
+      validates :dwell_time,
+                allow_nil: true,
+                numericality: { only_integer: true },
+                numeric_inclusion: { in: VALID_RANGES.dwell_times }
+
       validate :all_active_days_have_the_same_available_volume
 
       before_save -> { APD::CalculateVolumes.new(self).call }

data/app/models/renalware/renal/aki_alert.rb

@@ -4,6 +4,7 @@ module Renalware
   module Renal
     class AKIAlert < ApplicationRecord
       include Accountable
+      include PatientsRansackHelper
       scope :ordered, ->{ order(created_at: :desc) }
       belongs_to :patient, class_name: "Renal::Patient", touch: true
       belongs_to :action, class_name: "Renal::AKIAlertAction"

data/app/models/renalware/renal/aki_alert_query.rb

@@ -0,0 +1,32 @@
+require_dependency "renalware/clinics"
+
+module Renalware
+  module Renal
+    class AKIAlertQuery
+      DEFAULT_SORT = "aki_date :desc".freeze
+      attr_reader :query
+
+      def initialize(query = nil)
+        @query = query || {}
+        @query[:s] = DEFAULT_SORT if @query[:s].blank?
+      end
+
+      def self.call(query)
+        new(query).call
+      end
+
+      def call
+        search.result
+      end
+
+      def search
+        @search ||= begin
+          AKIAlert
+            .joins(:patient) # required for PatientsRansackHelper - see Admission
+            .includes(:patient, :updated_by, :action, hospital_ward: :hospital_unit)
+            .ransack(query)
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/renal/aki_alert_search_form.rb

@@ -0,0 +1,31 @@
+require_dependency "renalware/renal"
+
+module Renalware
+  module Renal
+    class AKIAlertSearchForm
+      include ActiveModel::Model
+      include Virtus::Model
+
+      attribute :hospital_unit_id, Integer
+      attribute :hospital_ward_id, Integer
+      attribute :action, String
+      attribute :term, String
+      attribute :on_hotlist, String
+      attribute :s, String
+
+      def query
+        @query ||= begin
+          options = {
+            identity_match: term,
+            hospital_ward_id_eq: hospital_ward_id,
+            hospital_ward_hospital_unit_id_eq: hospital_unit_id,
+            action_id_eq: action,
+            hotlist_eq: on_hotlist,
+            s: s
+          }
+          AKIAlertQuery.new(options)
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/system/event.rb

@@ -0,0 +1,12 @@
+require_dependency "renalware/system"
+
+module Renalware
+  module System
+    class Event < ApplicationRecord
+      include Ahoy::QueryMethods # See https://github.com/ankane/ahoy
+
+      belongs_to :visit, class_name: "System::Visit"
+      belongs_to :user, optional: true
+    end
+  end
+end

data/app/models/renalware/system/user_feedback.rb

@@ -10,7 +10,9 @@ module Renalware
 
       belongs_to :author, class_name: "User"
 
-      enumerize :category, in: %i(general bug missing_feature), default: :general
+      enumerize :category,
+                in: %i(urgent_bug non_urgent_bug missing_feature general_comment),
+                default: :general_comment
     end
   end
 end

data/app/models/renalware/system/visit.rb

@@ -0,0 +1,11 @@
+require_dependency "renalware/system"
+
+module Renalware
+  module System
+    class Visit < ApplicationRecord
+      # See https://github.com/ankane/ahoy
+      has_many :events, class_name: "System::Event"
+      belongs_to :user, optional: true
+    end
+  end
+end

data/app/presenters/renalware/events/summary_part.rb

@@ -28,8 +28,10 @@ module Renalware
       # We purposefully don't use the recent_events relation here as it has includes and a limit
       # and apart from being slower, using LIMIT in cache_key sql has been known to produce
       # inconsistent results.
+      # We need to include the patient.cache_key otherwise if there are no events, the key will
+      # be the same for other patients with no events.
       def cache_key
-        Events::Event.for_patient(patient).cache_key
+        [patient.cache_key, Events::Event.for_patient(patient).cache_key].join("~")
       end
 
       def to_partial_path

data/app/presenters/renalware/letters/summary_part.rb

@@ -22,7 +22,7 @@ module Renalware
       end
 
       def cache_key
-        letters_patient.letters.cache_key
+        [letters_patient.cache_key, letters_patient.letters.cache_key].join("~")
       end
 
       private

data/app/presenters/renalware/mdm_presenter.rb

@@ -120,7 +120,10 @@ module Renalware
       if codes.nil?
         Pathology::RelevantObservationDescription.all
       else
-        Pathology::ObservationDescription.for(Array(codes))
+        codes = Array(codes)
+        descriptions = Pathology::ObservationDescription.for(Array(codes))
+        warn("No OBX(es) found for codes #{codes}") if descriptions.empty?
+        descriptions
       end
     end
 

data/app/presenters/renalware/medications/summary_part.rb

@@ -39,12 +39,14 @@ module Renalware
       def cache_key
         # Based on AR::Relation.cache_key, this key incorporates the following, scoped to the
         # current patient:
+        # - patient cachekey eg renalware/patients/166-20180306184938146827
         # - max(prescriptions.updated)
         # - count(prescriptions)
         # - max(drug.updated_at) in drugs across all prescriptions
         # - count(drugs) across all prescriptions (same as prescriptions.count so not really
         #   required, but comes for free with AR::Relation.cache_key)
         [
+          patient.cache_key,
           prescriptions.cache_key,
           Drugs::Drug.where(id: prescriptions.pluck(:drug_id)).cache_key
         ].join("$")

data/app/presenters/renalware/problems/summary_part.rb

@@ -5,12 +5,14 @@ require_dependency "renalware/problems"
 module Renalware
   module Problems
     class SummaryPart < Renalware::SummaryPart
-      delegate :cache_key, to: :problems
-
       def problems
         @problems ||= patient.problems.ordered
       end
 
+      def cache_key
+        [patient.cache_key, patient.problems.cache_key].join("~")
+      end
+
       def to_partial_path
         "renalware/problems/problems/summary_part"
       end

data/app/presenters/renalware/summary_part.rb

@@ -20,6 +20,10 @@ module Renalware
       true
     end
 
+    def cache?
+      cache_key.present?
+    end
+
     protected
 
     def date_formatted_for_cache(date)

data/app/views/renalware/accesses/procedures/_list.html.slim

@@ -7,12 +7,13 @@ article.access-procedures
 
   table.auto-layout
     thead
-      th
-      th Performed
+      th.col-width-small
+      th.col-width-date Performed
       th Procedure
-      th Side
+      th.col-width-tiny Side
       th Performed By
-      th First Use
+      th.col-width-date First Use
+      th Notes
       th Outcome
 
     tbody
@@ -27,4 +28,5 @@ article.access-procedures
           td= procedure.side
           td= procedure.performed_by
           td= procedure.first_used_on
-          td= procedure.outcome
+          td.col-width-mediumish-with-ellipsis(title=procedure.notes)=procedure.notes
+          td.col-width-mediumish-with-ellipsis(title=procedure.outcome)=procedure.outcome

data/app/views/renalware/accesses/profiles/_list.html.slim

@@ -7,12 +7,12 @@ article.access-profiles
 
   table.auto-layout
     thead
-      th
-      th Formed On
-      th Start Date
-      th Term. Date
+      th.col-width-small
+      th.col-width-date Formed On
+      th.col-width-date Start Date
+      th.col-width-date Term. Date
       th Type
-      th Side
+      th.col-width-small Side
 
     tbody
       - @profiles.each do |profile|

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

@@ -1,5 +1,6 @@
-= within_admin_layout(title: "Cache") do
+= within_admin_layout(title: "Clearing the Cache") do
   .panel
+    h2 Application Cache
     p
       | The cache (backed by Redis) stores some queries and html fragments in order to make
       |  the rendering of pages faster and less resource intensive. Cached elements are invalidated
@@ -7,7 +8,9 @@
       |  count of records, in order to catch edits, inserts and deletions) or the html template
       |  changes (changes are only reflected after am app restart in this latter case).
     p
-      | There are certain cases where you might need to clear the cache:
+      | You can check the size and number of keys in the Redis cache by running 
+      code redis-cli --stat
+    p There are certain cases where you might need to clear the cache:
     ol
       li
         | You have changed the underlying database data directly in SQL without also updating the
@@ -18,3 +21,24 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the application cache?\n" },
             class: "button alert"
+
+  .panel
+    h2 PDF Letter Cache
+    p
+      | The PDF letter cache stores generated PDFs so they do not need to be regenerated if
+      |  unless their content has changed. It is a FileStore cache and the files are stored
+      |  in 
+      code shared/tmp/pdf_letter_cache
+      |  - though in a folder layout that a little tricky to navigate
+      |  and search if you are looking for something; however it is NOT meant to be the canonical
+      |  source for PDF letters, rather a volatile cache to aid performance. EPR should be the place
+      |  to look for letter content - or just view the PDF through the UI.
+    p
+      | You may wish to clear the PDF Letter Cache if you notice any anomalies in the PDFs. Please
+      | raise a GitHub issue after clearing the cache so we can look into it.
+
+  = link_to "Clear the PDF Letter Cache",
+            letters_pdf_letter_cache_path,
+            method: :delete,
+            data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
+            class: "button alert"