renalware-core 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58372406094a085ea5fd1ffe9a57724951450eb6db8adf1b2513513800479f3
-  data.tar.gz: c7a49293b5baf36736b8dc90695721328b57b6402243b9970e352859d233948b
+  metadata.gz: 490bec33f80510335ad7d199d1b9e93f31cbe5f9c2131dd2d84c46a9cd1f93ec
+  data.tar.gz: 33884ab738728ba022b3c74c207dc0055eb062a149a9ca310c042067ac06bd07
 SHA512:
-  metadata.gz: 3a92d4849645611cfc0fe10f06c27e38fbf7e75cf0c445751e94be9c978b04c217377064dd69bce6a0c817dfb085cf865d011fc8ed415ee8ea3a7f0ec2b2902d
-  data.tar.gz: ad1af0c79116b59c41068e0f0dec65ab81c00da7842ef9c6acf1be37616ec3a829499683f292da0f3b25dad252e6120ccce2c91d51d988512beef7fb0ee3bb10
+  metadata.gz: 30a02abf77c960ae5dd41980e3e79ec46edb69564cb87b01973b99df83d98f0d745f532b599251b987d88e2cb380b3a3b30b6586ffaeceb6576adde825699e49
+  data.tar.gz: e345f0a78c9d67574be381c76efa75155331a025d108323df8d9966df6f7a4245dff11eaf8817078a013b2d82da71c5c1ef5df10ddeda9de932cb1ce00140ac3

data/app/assets/stylesheets/renalware/modules/_renal.scss

@@ -28,3 +28,18 @@
     }
   }
 }
+
+table.aki-alerts tr {
+  &:nth-of-type(even) {
+    background: $white;
+  }
+
+  &.aki_alert--hotlist {
+    background-color: $bookmark-urgent-colour;
+  }
+
+  td.notes {
+    text-align: right;
+    vertical-align: top;
+  }
+}

data/app/controllers/renalware/api/v1/patients/patients_controller.rb

@@ -6,10 +6,34 @@ module Renalware
     module V1
       module Patients
         class PatientsController < TokenAuthenticatedApiController
+          include Concerns::Pageable
+
           def show
             patient = Patient.find_by!(local_patient_id: params[:id])
             render locals: { patient: patient }
           end
+
+          def index
+            render locals: { patients: patients }
+          end
+
+          private
+
+          def patients
+            relation = last_patient_id.blank? ? Patient.none : Patient
+            relation
+              .where("id > ?", last_patient_id)
+              .order(id: :asc)
+              .page(page).per(per_page)
+          end
+
+          def last_patient_id
+            params[:last_patient_id]
+          end
+
+          def per_page
+            params[:per_page] || 100
+          end
         end
       end
     end

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

@@ -12,7 +12,8 @@ module Renalware
         render locals: {
           alerts: alerts,
           form: search_form,
-          search: query.search
+          search: query.search,
+          path_params: path_params
         }
       end
 
@@ -24,7 +25,7 @@ module Renalware
       def update
         authorize alert
         if alert.update(aki_alert_params.merge(by: current_user))
-          redirect_to renal_aki_alerts_path
+          redirect_to renal_filtered_aki_alerts_path(named_filter: :today)
         else
           render_edit(alert)
         end
@@ -35,6 +36,7 @@ module Renalware
       def search_form
         @search_form ||= begin
           options = params.key?(:q) ? search_params : {}
+          options[:named_filter] = named_filter
           AKIAlertSearchForm.new(options)
         end
       end
@@ -61,6 +63,14 @@ module Renalware
           .require(:q) {}
           .permit(:term, :on_hotlist, :action, :hospital_unit_id, :hospital_ward_id, :s)
       end
+
+      def path_params
+        params.permit([:controller, :action, :named_filter])
+      end
+
+      def named_filter
+        params[:named_filter]
+      end
     end
   end
 end

data/app/models/renalware/hd/sessions/close_stale_open_sessions.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd"
+require "attr_extras"
+
+module Renalware
+  module HD
+    module Sessions
+      class CloseStaleOpenSessions
+        attr_reader :closed_session_ids, :unclosed_session_ids, :performed_before
+
+        class CloseableSessionQuery
+          pattr_initialize [:performed_before!]
+
+          def each
+            Session::Open
+              .where("performed_on <= ?", performed_before)
+              .where.not(signed_off_by: nil)
+              .find_each do |session|
+              # Note the bang in becomes! is crucial in copying the session attributes
+              # and setting the sti column appropriately
+              yield CloseableSession.new(session.becomes!(Session::Closed))
+            end
+          end
+        end
+
+        class CloseableSession < SimpleDelegator
+          include Renalware::Engine.routes.url_helpers
+          def close
+            self.profile = patient.hd_profile
+            self.signed_off_at = Time.zone.now
+            self.dry_weight = Renalware::Clinical::DryWeight.for_patient(patient).first
+            valid? && document.valid? && save_by(Renalware::SystemUser.find)
+          end
+
+          # rubocop:disable Metrics/AbcSize
+          def all_errors
+            [
+              errors.full_messages,
+              document.dialysis.errors.full_messages,
+              document.observations_before.errors.full_messages,
+              document.observations_after.errors.full_messages,
+              document.hdf.errors.full_messages,
+              document.info.errors.full_messages
+            ].flatten.uniq.compact
+          end
+          # rubocop:enable Metrics/AbcSize
+
+          def url
+            edit_patient_hd_session_path(patient, self)
+          end
+        end
+
+        def self.call(performed_before: 3.days.ago)
+          new(performed_before: performed_before).call
+        end
+
+        def initialize(performed_before:)
+          @performed_before = performed_before
+          @closed_session_ids = []
+          @unclosed_session_ids = []
+        end
+
+        # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+        def call
+          log_start
+          results = OpenStruct.new(closed_ids: [], unclosed_ids: [])
+
+          CloseableSessionQuery.new(performed_before: performed_before).each do |session|
+            if session.close
+              results.closed_ids << session.id
+              log("[Session #{session.id}] - closed")
+            else
+              results.unclosed_ids << session.id
+              log("[Session #{session.id}] - unclosed: #{session.all_errors.join(', ')}")
+              log("[Session #{session.id}] - #{session.url}")
+            end
+          end
+          log_results(results)
+          results
+        end
+        # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
+
+        private
+
+        def log_start
+          log("Trying to close stale open sessions performed before #{performed_before}")
+        end
+
+        def log_results(results)
+          log("#{results.closed_ids.count} sessions closed")
+          log("#{results.unclosed_ids.count} sessions could not be closed")
+        end
+
+        def log(msg = "")
+          Rails.logger.info(msg)
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/renal.rb

@@ -4,6 +4,8 @@ require_dependency "renalware"
 
 module Renalware
   module Renal
+    AKI_ALERT_FILTERS = %w(today all).freeze
+
     def self.table_name_prefix
       "renal_"
     end

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

@@ -14,6 +14,8 @@ module Renalware
       validates :patient, presence: true
       validates :max_aki, inclusion: 1..3, allow_nil: true
       alias_attribute :decided_by, :updated_by
+
+      scope :today, ->{ where(aki_date: Time.zone.today) }
     end
   end
 end

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

@@ -5,7 +5,7 @@ require_dependency "renalware/clinics"
 module Renalware
   module Renal
     class AKIAlertQuery
-      DEFAULT_SORT = "aki_date :desc"
+      DEFAULT_SORT = "aki_date desc"
       attr_reader :query
 
       def initialize(query = nil)
@@ -26,6 +26,7 @@ module Renalware
           AKIAlert
             .joins(:patient) # required for PatientsRansackHelper - see Admission
             .includes(:patient, :updated_by, :action, hospital_ward: :hospital_unit)
+            .public_send(query[:named_filter].to_s)
             .ransack(query)
         end
       end

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

@@ -14,6 +14,7 @@ module Renalware
       attribute :term, String
       attribute :on_hotlist, String
       attribute :s, String
+      attribute :named_filter, String
 
       def query
         @query ||= begin
@@ -23,7 +24,8 @@ module Renalware
             hospital_ward_hospital_unit_id_eq: hospital_unit_id,
             action_id_eq: action,
             hotlist_eq: on_hotlist,
-            s: s
+            s: s,
+            named_filter: named_filter
           }
           AKIAlertQuery.new(options)
         end

data/app/views/renalware/api/v1/patients/patients/index.json.jbuilder

@@ -0,0 +1,33 @@
+def modify_query(url, options={})
+  uri = URI(url)
+  query_hash = Rack::Utils.parse_query(uri.query)
+  query_hash.merge!(options)
+  uri.query = Rack::Utils.build_query(query_hash)
+  uri.to_s
+end
+
+json.links do
+  json.prev patients.prev_page && modify_query(request.url, "page" => patients.prev_page)
+  json.next patients.next_page && modify_query(request.url, "page" => patients.next_page)
+  json.total_pages patients.total_pages
+  json.next_page patients.next_page
+  json.current_page patients.current_page
+  json.prev_page patients.prev_page
+end
+
+json.data patients do |patient|
+  json.id patient.id
+  json.secure_id patient.secure_id
+  json.local_patient_id patient.local_patient_id
+  json.local_patient_id_2 patient.local_patient_id_2
+  json.local_patient_id_3 patient.local_patient_id_3
+  json.local_patient_id_4 patient.local_patient_id_4
+  json.nhs_number patient.nhs_number
+  json.family_name patient.family_name
+  json.given_name patient.given_name
+  json.title patient.title
+  json.born_on patient.born_on
+  json.sex patient.sex&.code
+  json.send_to_renalreg patient.send_to_renalreg
+  json.send_to_rpv patient.send_to_rpv
+end

data/app/views/renalware/navigation/_renal.html.slim

@@ -10,6 +10,6 @@ li.has-dropdown
     li= link_to t(".letters"), letters_list_path
     li= link_to t(".esa_prescriptions"), medications_esa_prescriptions_path
     li= link_to t(".audits"), reporting_audits_path
-    li= link_to t(".aki_alerts"), renal_aki_alerts_path
+    li= link_to t(".aki_alerts"), renal_filtered_aki_alerts_path(named_filter: :today)
     li= link_to t(".studies"), research_studies_path
     li= link_to t(".renal_registry_checks"), patients_renal_registry_preflight_checks_path

data/app/views/renalware/renal/aki_alerts/_aki_alert.html.slim

@@ -0,0 +1,25 @@
+- toggleable_id = "aki-alert-quick-preview-#{aki_alert.id}"
+tr(class="#{'aki_alert--hotlist' if aki_alert.hotlist?}")
+  td
+    = link_to("Edit", edit_renal_aki_alert_path(aki_alert))
+    |  | 
+    = link_to("Toggle",
+              "##{toggleable_id}",
+              data: { behaviour: "toggler" })
+  td= default_patient_link(aki_alert.patient)
+  td= aki_alert.patient.hospital_identifiers
+  td= aki_alert.patient.sex
+  td= aki_alert.patient.age
+  td= aki_alert.action
+  td= [aki_alert.hospital_ward, aki_alert.hospital_ward&.hospital_unit&.unit_code]\
+      .compact.join(" - ")
+  td= yes_no aki_alert.hotlist?
+  td= aki_alert.max_aki
+  td= l(aki_alert.aki_date)
+  td= aki_alert.decided_by
+= content_tag(:tr, id: "#{toggleable_id}", style: "display: none")
+  td.notes Notes
+  td(colspan=10)
+    .quick-preview
+      =aki_alert.notes
+

data/app/views/renalware/renal/aki_alerts/_filters.html.slim

@@ -1,12 +1,26 @@
+ruby:
+  filters = {
+    active: "Today",
+    suspended: "All"
+  }
+
+h2.print-only= filters[path_params[:named_filter].to_sym]
+
+dl.sub-nav
+  - Renalware::Renal::AKI_ALERT_FILTERS.each do |key|
+    - options = path_params.merge(named_filter: key).to_h.symbolize_keys
+    - path = Renalware::Engine.routes.url_for(options.merge!(only_path: true))
+    = sub_nav_item(key.to_s.humanize, path)
+
 .search-form.filters
   = simple_form_for form,
       as: :q,
-      url: renal_aki_alerts_path,
+      url: renal_filtered_aki_alerts_path,
       method: :get do |f|
 
     .row
       .columns.medium-2.large-3
-        = f.input :term
+        = f.input :term, label: "Hosp/NHS no or name"
       .columns.medium-1.large-1
         = f.input :on_hotlist,
                   collection: [["Yes",true],["No",false]]
@@ -22,4 +36,4 @@
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "
-        = link_to t("helpers.reset"), renal_aki_alerts_path
+        = link_to t("helpers.reset"), renal_filtered_aki_alerts_path

data/app/views/renalware/renal/aki_alerts/_table.html.slim

@@ -0,0 +1,15 @@
+table.aki-alerts
+  thead
+    th.col-width-small
+    th.col-width-large Patient
+    th.col-width-reference-no Hosp. No.
+    th.col-width-tiny Sex
+    th.col-width-tiny Age
+    th= sort_link(search, :action_name, "Action")
+    th.col-width-medium Ward
+    th= sort_link(search, :hotlist, "Hotlist")
+    th= sort_link(search, :max_aki, "Max AKI")
+    th.col-width-date= sort_link(search, :aki_date, "AKI Date")
+    th Decided by
+  tbody
+    = render alerts

data/app/views/renalware/renal/aki_alerts/edit.html.slim

@@ -1,5 +1,5 @@
 = within_admin_layout(title: "Edit",
-                      breadcrumbs: breadcrumb_for("AKI Alerts", renal_aki_alerts_path)) do
+                      breadcrumbs: breadcrumb_for("AKI Alerts", renal_filtered_aki_alerts_path(named_filter: :today))) do
 
   = simple_form_for(alert, wrapper: :horizontal_form) do |f|
     = f.association :action, wrapper: :horizontal_small
@@ -17,4 +17,4 @@
     = f.input :notes, wrapper: :horizontal_large, input_html: { rows: 5 }
     = f.submit class: "button"
     span= " or "
-    = link_to "cancel", renal_aki_alerts_path
+    = link_to "cancel", renal_filtered_aki_alerts_path(named_filter: :today)

data/app/views/renalware/renal/aki_alerts/index.html.slim

@@ -1,40 +1,5 @@
 = within_admin_layout(title: "AKI Alerts") do
-  = render "filters", form: form
-  table.aki-alerts
-    thead
-      th
-      th.col-width-large Patient
-      /th.col-width-nhs-no NHS No.
-      th.col-width-reference-no Hosp. No.
-      th.col-width-tiny Sex
-      th.col-width-tiny Age
-      /th.col-width-date= sort_link(search, :patient_born_on, "Born on")
-      th= sort_link(search, :action_name, "Action")
-      th.col-width-medium Ward
-      th= sort_link(search, :hotlist, "Hotlist")
-      th= sort_link(search, :max_cre, "Max CRE")
-      th.col-width-date.col-width-date= sort_link(search, :cre_date, "CRE Date")
-      th= sort_link(search, :max_aki, "Max AKI")
-      th.col-width-date= sort_link(search, :aki_date, "AKI Date")
-      th Decided by
-    tbody
-      - alerts.each do |alert|
-        tr
-          td= link_to("Edit", edit_renal_aki_alert_path(alert))
-          td= default_patient_link(alert.patient)
-          /td= alert.patient.nhs_number
-          td= alert.patient.hospital_identifiers
-          td= alert.patient.sex
-          td= alert.patient.age
-          /td= alert.patient.born_on
-          td= alert.action
-          td= [alert.hospital_ward, alert.hospital_ward&.hospital_unit&.unit_code]\
-              .compact.join(" - ")
-          td= yes_no alert.hotlist?
-          td= alert.max_cre
-          td= l(alert.cre_date)
-          td= alert.max_aki
-          td= l(alert.aki_date)
-          td= alert.decided_by
+  = render "filters", form: form, path_params: path_params
+  = render "table", alerts: alerts, search: search
 
   = paginate alerts

data/config/routes.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Style/FormatStringToken
 Renalware::Engine.routes.draw do
   match "/404", to: "system/errors#not_found", via: :all
   match "/500", to: "system/errors#internal_server_error", via: :all
@@ -21,7 +20,7 @@ Renalware::Engine.routes.draw do
 
   super_admin_constraint = lambda do |request|
     current_user = request.env["warden"].user
-    current_user && current_user.respond_to?(:has_role?) && current_user.has_role?(:super_admin)
+    current_user&.respond_to?(:has_role?) && current_user&.has_role?(:super_admin)
   end
 
   constraints super_admin_constraint do
@@ -81,7 +80,7 @@ Renalware::Engine.routes.draw do
     end
     # The JSON API
     namespace :v1, constraints: { format: :json }, defaults: { format: :json } do
-      resources :patients, only: :show, controller: "patients/patients" do
+      resources :patients, only: [:show, :index], controller: "patients/patients" do
         resources :prescriptions, controller: "medications/prescriptions", only: [:index]
         namespace :hd do
           resource :current_profile,
@@ -244,7 +243,10 @@ Renalware::Engine.routes.draw do
         get :search
       end
     end
-    resources :aki_alerts, except: [:new, :create, :destroy]
+    resources :aki_alerts, only: [:edit, :update]
+    constraints(named_filter: /#{Renalware::Renal::AKI_ALERT_FILTERS.join("|")}/) do
+      get "aki_alerts/:named_filter", to: "aki_alerts#index", as: :filtered_aki_alerts
+    end
     resources :registry_preflight_checks, only: [] do
       collection do
         get :patients

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.13".freeze
+  VERSION = "2.0.14".freeze
 end

data/lib/tasks/hd.rake

@@ -0,0 +1,13 @@
+require "benchmark"
+
+namespace :hd do
+  desc "Signs-off Open sessions that have a signed_off_by and are more than a few days old. "\
+       "A usability update may render this task redundant in the future but currently there are " \
+       "Save and Save and Sign-Off buttons, and user is not alwasy using the latter."
+  task close_stale_open_sessions: :environment do
+    Rails.logger = Logger.new(STDOUT)
+    Renalware::HD::Sessions::CloseStaleOpenSessions.call(
+      performed_before: 3.days.ago
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1430,6 +1430,7 @@ files:
 - app/models/renalware/hd/sessions/auditable_patients_in_period_query.rb
 - app/models/renalware/hd/sessions/auditable_session.rb
 - app/models/renalware/hd/sessions/auditable_session_collection.rb
+- app/models/renalware/hd/sessions/close_stale_open_sessions.rb
 - app/models/renalware/hd/sessions/latest_patient_sessions_query.rb
 - app/models/renalware/hd/sessions/ongoing_query.rb
 - app/models/renalware/hd/sessions/patient_query.rb
@@ -2010,6 +2011,7 @@ files:
 - app/views/renalware/api/ukrdc/patients/observations/_weight.xml.builder
 - app/views/renalware/api/ukrdc/patients/show.xml.builder
 - app/views/renalware/api/v1/medications/prescriptions/index.json.jbuilder
+- app/views/renalware/api/v1/patients/patients/index.json.jbuilder
 - app/views/renalware/api/v1/patients/patients/show.json.jbuilder
 - app/views/renalware/base/_black_hole.html.slim
 - app/views/renalware/base/_modality_missing_warning.html.slim
@@ -2532,7 +2534,9 @@ files:
 - app/views/renalware/problems/problems/index.html.slim
 - app/views/renalware/problems/problems/new.html.slim
 - app/views/renalware/problems/problems/show.html.slim
+- app/views/renalware/renal/aki_alerts/_aki_alert.html.slim
 - app/views/renalware/renal/aki_alerts/_filters.html.slim
+- app/views/renalware/renal/aki_alerts/_table.html.slim
 - app/views/renalware/renal/aki_alerts/edit.html.slim
 - app/views/renalware/renal/aki_alerts/index.html.slim
 - app/views/renalware/renal/prd_descriptions/search.json.jbuilder
@@ -3356,6 +3360,7 @@ files:
 - lib/tasks/cucumber_web.rake
 - lib/tasks/db.rake
 - lib/tasks/feeds/files.rake
+- lib/tasks/hd.rake
 - lib/tasks/ukrdc.rake
 - lib/templates/slim/scaffold/_form.html.slim
 - lib/test_support/ajax_helpers.rb