renalware-core 2.0.38 → 2.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bded04d49b6bb55e363f0aea57ff4bb129dee0f9e25ffaa3a4d515aa7942f55b
-  data.tar.gz: 2d2513e0f3d161c064f7a7010f4420b0fa7fcbb913e55ecb8130cc88ae0205e3
+  metadata.gz: 68409a0a75c780847c2cdf55ab44325dd993b74fd850090e86f5925efd592eee
+  data.tar.gz: a69a86d2c84b6db5e7b7e5823fac9a37d41c8f19fda3af2810b1216b4ae631fb
 SHA512:
-  metadata.gz: ce45551e62fdb8f6e03c4845ddbd9fc2b740aeb8f9cdbc2d34197107f285b53fdff81299501822415beabd3413b60e78658837947a30affb147be11fd44188a3
-  data.tar.gz: 32ae5f07a4e9f1c1de68b0ab881712cbebab81c6e722288295fc419c0b0cf8d9467cba7c9d1b8516b060de096742c4bcede1b2c0224a6a05f1fe89df9af80881
+  metadata.gz: 2e4088f788a4da2c0a309045d83ba2d01644b6b1064108ec59b3fc8b1213f2d56a506a034250fdf9986c3024f5d49b4e21d2f05a1cc64200ac0394839ccaf079
+  data.tar.gz: 2fcfebba60f4b399ac10f134fe846946bccaaf89dc11089acd8553b396343af99b8d13bd7efcb9430c45156da7be74e50ab92e412384da1da56d446d99e6fada

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

@@ -16,6 +16,7 @@
     margin: .1rem .3rem .2rem 0;
     border-radius: .3rem;
     background-color: $mid-grey;
+    white-space: nowrap;
 
     &.devops {
 

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -192,7 +192,7 @@ table {
     }
 
     &.col-width-reference-no {
-      width: 8rem;
+      width: 8.5rem;
       min-width: 8rem;
       white-space: nowrap;
     }

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

@@ -9,7 +9,12 @@ module Renalware
 
       def show
         query = Sessions::OngoingQuery.new(q: params[:q])
-        sessions = query.call.page(page).per(per_page || 15)
+        sessions = query.call
+          .includes(
+            :hospital_unit, :signed_on_by, :signed_off_by,
+            patient: { current_modality: [:description] }
+          )
+          .page(page).per(per_page || 15)
         authorize sessions
         render locals: { query: query.search, sessions: sessions }
       end

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

@@ -5,6 +5,16 @@ module Renalware
     class BookmarksController < BaseController
       before_action :load_patient, only: :create
 
+      # Display the user's bookmarks
+      def index
+        bookmarks = Patients.cast_user(current_user)
+          .bookmarks
+          .ordered
+          .includes(patient: [current_modality: :description])
+        authorize bookmarks
+        render locals: { bookmarks: bookmarks }
+      end
+
       # idempotent
       def create
         Bookmark.find_or_create_by!(user: user, patient: patient) do |bookmark|

data/app/models/renalware/medications/dose_unit.rb

@@ -15,6 +15,7 @@ module Renalware
           microgram
           milligram
           millilitre
+          nanogram
           puff
           tab
           tablet

data/app/models/renalware/patients/clear_patient_ukrdc_data.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/patients"
+require "attr_extras"
+
+module Renalware
+  module Patients
+    class ClearPatientUKRDCData
+      pattr_initialize [:patient!, :by!]
+
+      def self.call(**args)
+        new(**args).call
+      end
+
+      def call
+        patient.send_to_rpv = false
+        patient.rpv_decision_on = Time.zone.today
+        patient.rpv_recorded_by = by.to_s
+        patient.save_by!(by)
+      end
+    end
+  end
+end

data/app/models/renalware/patients/patient_listener.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/medications"
+
+module Renalware
+  module Patients
+    class PatientListener
+      def patient_modality_changed_to_death(patient:, actor:, **)
+        ClearPatientUKRDCData.call(patient: patient, by: actor)
+      end
+    end
+  end
+end

data/app/models/renalware/transplants/registrations/wait_list_query.rb

@@ -33,19 +33,47 @@ module Renalware
           end
         end
 
-        # Mixing in some scopes here rather than using ransack as I cannot get ransack scopes
-        # to 'or' together other scopes like this. I seem to spend a lot of time debugging the
-        # vagaries of ransack and wonder if its more pain that its worth!
+        # The status_mismatch filter finds patients with a UKT status that does not match their
+        # tx wait list status. We filter out UKT statuses of null or ''.
+        # At some point we will have turn this into a mapping object or hash because there will
+        # probably not be a 1 to 1 mapping from wait list to UKT status.
         module Scopes
+          # rubocop:disable Metrics/MethodLength
           def apply_filter(filter)
             case filter
             when :status_mismatch
-              current_status_is_active.ukt_status_is_not_active
-              .or(current_status_is_not_active.ukt_status_is_active)
+              joins(statuses: :description)
+              .where(transplant_registration_statuses: { terminated_on: nil })
+              .where(
+                <<-SQL.squish
+                (
+                  transplant_registration_status_descriptions.code in ('active','suspended')
+                  and
+                  (
+                    transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' not ilike '%' || transplant_registration_status_descriptions.code || '%'
+                    or
+                    transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' = ''
+                    or
+                    transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' IS NULL
+                  )
+                )
+                or
+                (
+                  transplant_registration_status_descriptions.code not in ('active','suspended')
+                  and
+                  (
+                    transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' ilike '%active%'
+                    or
+                    transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' ilike '%suspended%'
+                  )
+                )
+                SQL
+              )
             else
               all
             end
           end
+          # rubocop:enable Metrics/MethodLength
         end
 
         private
@@ -77,13 +105,6 @@ module Renalware
               .where(transplant_registration_status_descriptions: { code: codes })
           }
 
-          scope :current_status_not_in, lambda { |codes|
-            codes ||= %w(active)
-            joins(statuses: :description)
-              .where(transplant_registration_statuses: { terminated_on: nil })
-              .where.not(transplant_registration_status_descriptions: { code: codes })
-          }
-
           ransacker :crf_highest_value do
             Arel.sql("transplant_registrations.document -> 'crf' -> 'highest' ->> 'result'")
           end
@@ -102,35 +123,10 @@ module Renalware
             Arel.sql("renal_profiles.esrf_on")
           end
 
-          scope :ukt_status_is, lambda { |status|
-            where(
-              "transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' ilike ?",
-              status
-            )
-          }
-          scope :ukt_status_is_not, lambda { |status|
-            where.not(
-              "transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' ilike ?",
-              status
-            )
-          }
-          scope :current_status_is_active, ->{ current_status_in(:active) }
-          scope :current_status_is_not_active, ->{ current_status_not_in(:active) }
-          scope :ukt_status_is_active, ->{ ukt_status_is(:active) }
-          scope :ukt_status_is_not_active, ->{ ukt_status_is_not(:active) }
-
           private_class_method :ransackable_scopes
 
           def self.ransackable_scopes(_auth_object = nil)
-            %i(current_status_in
-               current_status_not_in
-               current_status_is_active
-               current_status_is_not_active
-               ukt_status_is
-               ukt_status_is_not
-               ukt_status_is_active
-               ukt_status_is_not_active
-               status_mismatches)
+            %i(current_status_in)
           end
         end
       end

data/app/presenters/renalware/dashboard/dashboard_presenter.rb

@@ -30,6 +30,7 @@ module Renalware
               .reverse
               .where("author_id = ? or created_by_id = ?", user.id, user.id)
               .in_progress
+              .includes(:author, :patient, :letterhead)
           )
           # Renalware::Letters.cast_author(user)
         end
@@ -37,14 +38,21 @@ module Renalware
 
       def unread_messages_receipts
         @unread_messages_receipts ||= begin
-          receipts = Messaging::Internal.cast_recipient(user).receipts.unread
+          receipts = Messaging::Internal.cast_recipient(user)
+            .receipts
+            .includes(message: [:author, :patient])
+            .unread
           CollectionPresenter.new(receipts, Messaging::Internal::ReceiptPresenter)
         end
       end
 
       def unread_electronic_ccs
         @unread_electronic_ccs ||= begin
-          receipts = Letters::ElectronicReceipt.unread.for_recipient(user.id).ordered
+          receipts = Letters::ElectronicReceipt
+            .includes(letter: [:patient, :author, :letterhead])
+            .unread
+            .for_recipient(user.id)
+            .ordered
           CollectionPresenter.new(receipts, Letters::ElectronicReceiptPresenter)
         end
       end

data/app/presenters/renalware/mdm_presenter.rb

@@ -120,12 +120,10 @@ module Renalware
       result
     end
 
-    def transplant_status
-      Renalware::Transplants::Registration.for_patient(patient)
-        .first
-        &.current_status
-        &.description
-        &.name
+    def current_transplant_status
+      @current_transplant_status ||= begin
+        Renalware::Transplants::Registration.for_patient(patient).first&.current_status
+      end
     end
 
     private

data/app/views/renalware/admin/users/_summary_part.html.slim

@@ -1,3 +1,4 @@
-section.admin--users
-  h2 Admin
-  = link_to summary_part.users_needing_approval_title, admin_users_path(q: { unapproved: true })
+article.admin--users
+  header
+    h2 Admin
+  =link_to summary_part.users_needing_approval_title, admin_users_path(q: { unapproved: true })

data/app/views/renalware/dashboard/dashboards/_content.html.slim

@@ -1,32 +1,40 @@
 .dashboard-content
-  section.letters
-    h2 Letters in Progress
+  article.letters
+    header
+      h2 Letters in Progress
     - if dashboard.letters_in_progress.any?
       #letters-in-progress
         = render "renalware/dashboard/letters/table", letters: dashboard.letters_in_progress
     - else
       p.empty-section= t(".letters.in_progress.none").html_safe
 
-  section.bookmarks
-    h2 Bookmarked Patients
+  article.bookmarks
+    header
+      h2.title= "Bookmarked Patients"
+      ul
+        li= link_to "View All", bookmarks_path, class: "button"
+
     - if dashboard.bookmarks.any?
       #bookmarks
         = render "renalware/dashboard/bookmarks/table", bookmarks: dashboard.bookmarks
     - else
       p.empty-section= t(".bookmarks.none")
 
-  section.messages
-    h2 Messages
+  article.messages
+    header
+      h2 Messages
+      ul
+        li= render "renalware/messaging/shared/key"
     - if dashboard.unread_messages_receipts.any?
-      = render "renalware/messaging/shared/key"
       .unread-messages
         = render "renalware/messaging/internal/receipts/table",
                  receipts: dashboard.unread_messages_receipts
     - else
       p.empty-section= t(".messages.none")
 
-  section.electonic_ccs
-    h2 Electronic CCs
+  article.electonic_ccs
+    header
+      h2 Electronic CCs
     - if dashboard.unread_electronic_ccs.any?
       = render "renalware/letters/electronic_receipts/table",
                receipts: dashboard.unread_electronic_ccs

data/app/views/renalware/hd/mdm/_summary.html.slim

@@ -18,4 +18,6 @@ article
       = "(#{l(obs.date)})" if obs.date.present?
 
     dt Transplant status
-    dd= mdm.transplant_status
+    dd
+      b= "#{mdm.current_transplant_status} "
+      = "since #{l(mdm.current_transplant_status&.started_on)}"

data/app/views/renalware/hd/ongoing_sessions/_table.html.slim

@@ -1,12 +1,12 @@
 table.report
   thead
     tr
-      th.noprint.col-width-11
+      th.noprint.col-width-13
       th.col-width-medium= sort_link([:renalware, query], :patient_family_name, "Patient")
-      th.col-width-tiny Hosp No
+      th.col-width-reference-no Hosp No
       th= sort_link([:renalware, query], :patient_born_on, "Age")
       th= sort_link([:renalware, query], :patient_sex, "Sex")
-      th Current Modality
+      th.col-width-tiny Current Modality
       th= sort_link([:renalware, query], :hospital_unit_name, "Unit")
       th.col-width-date= sort_link([:renalware, query], :performed_on, "Date")
       th.col-width-time= sort_link([:renalware, query], :start_time, "Start Time")

data/app/views/renalware/mdm/_events.html.slim

@@ -1,10 +1,12 @@
-article.events
-  header
-    h2 Events
-    .supplemental
-      span= "#{events.length} of #{patient.summary.events_count}"
-      = link_to "View All",
-                  patient_events_path(patient),
-                  class: "button secondary"
+- events = mdm.events
+.columns.medium-12.large-12
+  article.events
+    header
+      h2 Events
+      .supplemental
+        span= "#{events.length} of #{mdm.patient.summary.events_count}"
+        = link_to "View All",
+                    patient_events_path(mdm.patient),
+                    class: "button secondary"
 
-  = render "renalware/events/events/table", events: events
+    = render "renalware/events/events/table", events: events

data/app/views/renalware/mdm/show.html.slim

@@ -13,3 +13,4 @@
       .row= render_if_exists "middle", mdm: mdm
       = render_if_exists "bottom", mdm: mdm
       .row= render "letters", mdm: mdm
+      .row= render "events", mdm: mdm

data/app/views/renalware/modalities/modalities/new.html.slim

@@ -13,10 +13,11 @@
         .large-9.columns
           = field_set_tag "", class: "borderless" do
 
-              = m.association :description,
-                  input_html: { id: "modality-description-select" },
-                  label_method: :name, value_method: :id,
-                  wrapper: :horizontal_medium
+              = m.input :description_id,
+                        collection: Renalware::Modalities::Description.where(hidden: false),
+                        input_html: { id: "modality-description-select" },
+                        label_method: :name, value_method: :id,
+                        wrapper: :horizontal_medium
 
               .hide-death
                 = m.input :modal_change_type,

data/app/views/renalware/patients/bookmarks/index.html.slim

@@ -0,0 +1,2 @@
+= within_admin_layout(title: "Bookmarked Patients") do
+  #bookmarks= render "renalware/dashboard/bookmarks/table", bookmarks: bookmarks

data/app/views/renalware/pd/mdm/_summary.html.slim

@@ -0,0 +1,9 @@
+article
+  header
+    h2 Additional Information
+
+  dl.dl-horizontal.xlarge
+    dt Transplant status
+    dd
+      b= "#{mdm.current_transplant_status} "
+      = "since #{l(mdm.current_transplant_status&.started_on)}"

data/app/views/renalware/pd/mdm/_top.html.slim

@@ -1,6 +1,8 @@
 .columns.medium-12.large-6
   - if mdm.current_regime
     = render "renalware/pd/regimes/current_regime", current_regime: mdm.current_regime
+.columns.medium-12.large-6
+  = render "summary", mdm: mdm
 .columns.medium-12.large-6
   = render "prescriptions", mdm: mdm, with_esa: true
 .columns.medium-12.large-6

data/app/views/renalware/transplants/mdm/_bottom.html.slim

@@ -13,6 +13,3 @@
 
   .columns.medium-12.large-4
     = render "biopsies", mdm: mdm
-.row
-  .columns.medium-12.large-12
-    = render "events", events: mdm.events, patient: mdm.patient

data/config/initializers/renalware.rb

@@ -9,7 +9,8 @@ Renalware.configure do |config|
     "Renalware::Modalities::ChangePatientModality" => [
       "Renalware::Medications::PatientListener",
       "Renalware::Letters::PatientListener",
-      "Renalware::HD::PatientListener"
+      "Renalware::HD::PatientListener",
+      "Renalware::Patients::PatientListener"
     ],
     "Renalware::Letters::ApproveLetter" => [],
     "Renalware::Pathology::CreateObservationRequests" => []

data/config/locales/renalware/medications/prescription.yml

@@ -34,6 +34,7 @@ en:
             microgram: microgram
             milligram: mg
             millilitre: ml
+            nanogram: ng
             puff: puff
             tab: tab
             tablet: tablet

data/config/routes.rb

@@ -110,7 +110,7 @@ Renalware::Engine.routes.draw do
               as: :invocations
   end
 
-  resources :bookmarks, controller: "patients/bookmarks", only: :destroy
+  resources :bookmarks, controller: "patients/bookmarks", only: [:destroy, :index]
   resource :dashboard, only: :show, controller: "dashboard/dashboards"
   resource :worryboard, only: :show, controller: "patients/worryboard"
 

data/db/migrate/20180712143314_add_hidden_to_modality_descriptions.rb

@@ -0,0 +1,5 @@
+class AddHiddenToModalityDescriptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :modality_descriptions, :hidden, :boolean, default: false, null: false
+  end
+end

data/db/migrate/20180718172750_update_audit_letters_authors_to_version_3.rb

@@ -0,0 +1,17 @@
+class UpdateAuditLettersAuthorsToVersion3 < ActiveRecord::Migration[5.1]
+  def change
+    update_view :reporting_main_authors_audit,
+                materialized: true,
+                version: 3,
+                revert_to_version: 2
+
+    reversible do |direction|
+      direction.up {
+        connection.execute("refresh materialized view reporting_main_authors_audit;")
+      }
+      direction.down {
+        connection.execute("refresh materialized view reporting_main_authors_audit;")
+      }
+    end
+  end
+end

data/db/views/reporting_main_authors_audit_v03.sql

@@ -0,0 +1,36 @@
+WITH archived_clinic_letters AS (
+    SELECT
+      date_part('year' :: text, archive.created_at)                                                 AS year,
+      to_char(archive.created_at, 'Month' :: text)                                                  AS month,
+      letters.author_id,
+      date_part('day' :: text, (archive.created_at - (visits.date) :: timestamp without time zone)) AS days_to_archive
+    FROM ((letter_letters letters
+      JOIN letter_archives archive ON ((letters.id = archive.letter_id)))
+      JOIN clinic_visits visits ON ((visits.id = letters.event_id)))
+    WHERE (archive.created_at > (CURRENT_DATE - '3 mons' :: interval))
+), archived_clinic_letters_stats AS (
+    SELECT
+      --archived_clinic_letters.year,
+      --archived_clinic_letters.month,
+      archived_clinic_letters.author_id,
+      count(*)                                                                   AS total_letters,
+      round(avg(archived_clinic_letters.days_to_archive))                        AS avg_days_to_archive,
+      ((SELECT count(*) AS count
+        FROM archived_clinic_letters acl
+        WHERE ((acl.days_to_archive <= (7) :: double precision) AND
+               (acl.author_id = archived_clinic_letters.author_id)))) :: numeric AS archived_within_7_days
+    FROM archived_clinic_letters
+    GROUP BY archived_clinic_letters.author_id
+)
+
+SELECT
+  (((users.family_name) :: text || ', ' :: text) || (users.given_name) :: text)                 AS name,
+  stats.total_letters,
+  round(((stats.archived_within_7_days / (stats.total_letters) :: numeric) *
+         (100) :: numeric))                                                                     AS percent_archived_within_7_days,
+  stats.avg_days_to_archive,
+  users.id as user_id
+FROM (archived_clinic_letters_stats stats
+  JOIN users ON ((stats.author_id = users.id)))
+--GROUP BY (((users.family_name)::text || ', '::text) || (users.given_name)::text), users.id, stats.total_letters, stats.avg_days_to_archive, stats.archived_within_7_days
+ORDER BY stats.total_letters desc

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.38"
+  VERSION = "2.0.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.38
+  version: 2.0.39
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -1618,6 +1618,7 @@ files:
 - app/models/renalware/patients.rb
 - app/models/renalware/patients/alert.rb
 - app/models/renalware/patients/bookmark.rb
+- app/models/renalware/patients/clear_patient_ukrdc_data.rb
 - app/models/renalware/patients/ethnicity.rb
 - app/models/renalware/patients/idempotent_create_patient.rb
 - app/models/renalware/patients/language.rb
@@ -1625,6 +1626,7 @@ files:
 - app/models/renalware/patients/mdm_patients_query.rb
 - app/models/renalware/patients/message_param_parser.rb
 - app/models/renalware/patients/patient_hospital_identifiers.rb
+- app/models/renalware/patients/patient_listener.rb
 - app/models/renalware/patients/patient_search.rb
 - app/models/renalware/patients/practice.rb
 - app/models/renalware/patients/practice_membership.rb
@@ -2300,7 +2302,6 @@ files:
 - app/views/renalware/letters/shared/_electronic_cc_type_tabs.html.slim
 - app/views/renalware/low_clearance/dashboards/_page_actions.html.slim
 - app/views/renalware/low_clearance/dashboards/show.html.slim
-- app/views/renalware/low_clearance/mdm/_bottom.html.slim
 - app/views/renalware/low_clearance/mdm/_low_clearance_profile.html.slim
 - app/views/renalware/low_clearance/mdm/_top.html.slim
 - app/views/renalware/low_clearance/mdm_patients/_filters.html.slim
@@ -2433,6 +2434,7 @@ files:
 - app/views/renalware/patients/alerts/new.js.erb
 - app/views/renalware/patients/bookmarks/_delete.html.slim
 - app/views/renalware/patients/bookmarks/_new.html.slim
+- app/views/renalware/patients/bookmarks/index.html.slim
 - app/views/renalware/patients/clinical_summaries/show.html.slim
 - app/views/renalware/patients/patients/_form.html.slim
 - app/views/renalware/patients/patients/_patient.html.slim
@@ -2517,6 +2519,7 @@ files:
 - app/views/renalware/pd/infection_organisms/index.js.erb
 - app/views/renalware/pd/infection_organisms/new.js.erb
 - app/views/renalware/pd/infection_organisms/update.js.erb
+- app/views/renalware/pd/mdm/_summary.html.slim
 - app/views/renalware/pd/mdm/_top.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_details.html.slim
 - app/views/renalware/pd/peritonitis_episodes/_fields.html.slim
@@ -3278,6 +3281,8 @@ files:
 - db/migrate/20180605141806_add_external_id_to_research_study_participants.rb
 - db/migrate/20180605175211_add_application_url_to_research_studies.rb
 - db/migrate/20180628132323_add_letter_date_indexes.rb
+- db/migrate/20180712143314_add_hidden_to_modality_descriptions.rb
+- db/migrate/20180718172750_update_audit_letters_authors_to_version_3.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3385,6 +3390,7 @@ files:
 - db/views/reporting_hd_overall_audit_v07.sql
 - db/views/reporting_main_authors_audit_v01.sql
 - db/views/reporting_main_authors_audit_v02.sql
+- db/views/reporting_main_authors_audit_v03.sql
 - db/views/reporting_pd_audit_v01.sql
 - lib/age_calculator.rb
 - lib/array_stringifier.rb

data/app/views/renalware/low_clearance/mdm/_bottom.html.slim

@@ -1,3 +0,0 @@
-.row
-  .columns.small-12
-    = render "events", events: mdm.events, patient: mdm.patient