renalware-core 2.0.158 → 2.0.159

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

@@ -186,6 +186,19 @@ article.clinical-allergies {
           }
         }
 
+        &.active-consult {
+          background-color: $nhs-pink;
+
+          &:hover {
+            background-color: darken($nhs-pink, 7);
+          }
+
+          .title a,
+          i:before {
+            color: $white;
+          }
+        }
+
         &.research-study-participant {
           background-color: darken($nhs-green, 3);
           color: $white;

data/app/components/renalware/admissions/active_consult_alert_component.html.slim

@@ -1,4 +1,4 @@
-li.patient-alert.bg-pink-200.text-gray-700
+li.patient-alert.active-consult
   i.fas.fa-exclamation-triangle
   span.title
     = link_to "Active Consult", renalware.edit_admissions_consult_path(id: consult_id)

data/app/components/renalware/pd/pet_results_component.html.slim

@@ -4,9 +4,6 @@
     header
       h2= title
 
-
-
-      /.flex.flex-row-reverse
       .flex.justify-end
 
         .inline-flex
@@ -22,6 +19,7 @@
 
         = link_to "Show all", renalware.patient_pd_pet_results_path(patient), remote: true, class: "float-none button flex-initial secondary"
         = link_to "Add", renalware.new_patient_pd_pet_result_path(patient), class: "float-none button flex-initial"
+
     div#pet-results-table data-target="tabs.panel"
 
       = render "renalware/pd/pet_results/table",

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

@@ -4,7 +4,7 @@ require_dependency "renalware/pd"
 
 module Renalware
   module PD
-    class PETResultsController < BaseController
+    class PETResultsController < PD::BaseController
       def new
         pet = PETResult.new(
           patient: patient,

data/app/presenters/renalware/user_session_presenter.rb

@@ -21,8 +21,6 @@ module Renalware
     #       data-session-timeout="3600">
     # rubocop:disable Metrics/MethodLength
     def self.session_controller_data_attributes
-      return {} if Renalware.config.session_expiry_use_previous_mechansim
-
       urls = Renalware::Engine.routes.url_helpers
       {
         data: {
@@ -39,6 +37,6 @@ module Renalware
         }
       }
     end
+    # rubocop:enable Metrics/MethodLength
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/app/views/renalware/letters/mailshots/mailshots/_form.html.slim

@@ -38,24 +38,28 @@
     br
     .panel
       h2
-        i.fas.fa-info-circle style="color: #00a499"
-        span(style="padding-left: 5px") Tips
-      p
-        | The list of patients to include in a mailshot it determined by the SQL View chosen above.
-        |  It is intended that a systems or database administrator create this view for you in the
-        |  renalware database. The view should have one column called 'patient_id' and return the ids
-        |  of all the patients you want to send this letter to.
-        |  You should ideally create the view in the hospital's
-        |  own postgres schema eg 'renalware_kch' in the case of Kings College Hospital.
-      p Here is a (somewhat pointless) example of a compatible SQL view definition:
-      p
-        code
-          | CREATE OR REPLACE VIEW
-          br
-          |  renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
-          br
-          |  SELECT id as patient_id
-          br
-          |  FROM patients
-          br
-          |  WHERE family_name like 'R%';
+        i.fas.fa-info-circle
+        span.pl-3 Help
+
+      markdown:
+        The list of patients to include in a mailshot it determined by the SQL View chosen above.
+        It is intended that a systems or database administrator create this view for you in the
+        renalware database. The view should have one column called 'patient_id' and return the ids
+        of all the patients you want to send this letter to.
+
+        You should ideally create the view in the hospital's
+        own postgres schema (eg 'renalware_kch' in the case of Kings College Hospital) in order to
+        indicate your view is hospital-specific.
+
+        **Note that in order for your view to appear in the dropdown above, its name must start
+        with `letter_mailshot_`**
+
+        Here is a (somewhat pointless) example of a compatible SQL view definition:
+
+        ```
+          CREATE OR REPLACE VIEW
+          renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
+          SELECT id as patient_id
+          FROM patients
+          WHERE family_name like 'R%';
+        ```

data/app/views/renalware/system/view_metadata/_columns_table.html.slim

@@ -28,9 +28,9 @@ table.sortables(style="list-style-type: none;")
           td.border-0
             code= col.code
           td.text-center.border-0
-            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden)
+            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden style="margin:0")
           td.border-0
-            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name)
+            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name style="margin:0")
           td.border-0
             select.m-0(name="view_metadata[columns][][width]")
               option(value="")

data/db/migrate/20201105153422_update_medication_current_prescriptions_view.rb

@@ -0,0 +1,7 @@
+class UpdateMedicationCurrentPrescriptionsView < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      replace_view :medication_current_prescriptions, version: 2, revert_to_version: 1
+    end
+  end
+end

data/db/migrate/20201112152752_update_pd_mdm_patients_view1.rb

@@ -0,0 +1,7 @@
+class UpdatePDMDMPatientsView1 < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      update_view :pd_mdm_patients, version: 3, revert_to_version: 2
+    end
+  end
+end

data/db/views/medication_current_prescriptions_v01.sql

@@ -1,4 +1,5 @@
- SELECT mp.id,
+ SELECT
+    mp.id,
     mp.patient_id,
     mp.drug_id,
     mp.treatable_type,

data/db/views/medication_current_prescriptions_v02.sql

@@ -0,0 +1,30 @@
+ SELECT distinct on (mp.patient_id, mp.id)
+     mp.id,
+    mp.patient_id,
+    mp.drug_id,
+    mp.treatable_type,
+    mp.treatable_id,
+    mp.dose_amount,
+    mp.dose_unit,
+    mp.medication_route_id,
+    mp.route_description,
+    mp.frequency,
+    mp.notes,
+    mp.prescribed_on,
+    mp.provider,
+    mp.created_at,
+    mp.updated_at,
+    mp.created_by_id,
+    mp.updated_by_id,
+    mp.administer_on_hd,
+    mp.last_delivery_date,
+    drugs.name as drug_name,
+    drug_types.code AS drug_type_code,
+    drug_types.name AS drug_type_name
+  FROM medication_prescriptions mp
+  left outer join medication_prescription_terminations mpt ON mpt.prescription_id = mp.id
+  inner JOIN drugs ON drugs.id = mp.drug_id
+  left outer join drug_types_drugs ON drug_types_drugs.drug_id = drugs.id
+  left outer join drug_types ON drug_types_drugs.drug_type_id = drug_types.id
+  where (mpt.terminated_on IS NULL OR mpt.terminated_on > current_date)
+  order by mp.patient_id asc, mp.id asc;

data/db/views/pd_mdm_patients_v03.sql

@@ -0,0 +1,50 @@
+select
+  distinct on (P.id)
+  P.id,
+  P.secure_id,
+  (upper(P.family_name) || ', ' || P.given_name) as "patient_name",
+  P.nhs_number,
+  P.local_patient_id as hospital_numbers,
+  P.sex,
+  P.born_on,
+  date_part('year', age(P.born_on)) as "age",
+  RPROF.esrf_on,
+  Mx.modality_name,
+  case
+    when pw.id > 0 then true
+    else false
+    end as on_worryboard,
+  TXRSD."name" tx_status,
+  case pr.type
+    when 'Renalware::PD::APDRegime' then 'APD'
+    when 'Renalware::PD::CAPDRegime' then 'CAPD'
+    end as pd_type,
+   (select
+       date(date_time)
+       from events e
+       inner join event_types et on et.id = e.event_type_id
+       where et.slug = 'pd_line_changes'
+       and e.patient_id  = P.id
+       order by date_time desc limit 1) as last_line_change_date,
+  pesi.diagnosis_date as last_esi_date,
+  ppe.diagnosis_date as last_peritonitis_date,
+  (select bmi from clinic_visits cv2 where cv2.patient_id = P.id and bmi > 0 order by date desc limit 1) as bmi,
+  PA.values -> 'HGB' ->> 'result' as hgb,
+  (PA.values -> 'HGB' ->> 'observed_at')::date as hgb_date,
+  PA.values -> 'URE' ->> 'result' as ure,
+  (PA.values -> 'URE' ->> 'observed_at')::date as ure_date,
+  PA.values -> 'CRE' ->> 'result' as cre,
+  (PA.values -> 'CRE' ->> 'observed_at')::date as cre_date,
+  PA.values -> 'EGFR' ->> 'result' as egfr
+from renalware.patients P
+left outer join patient_worries pw on pw.patient_id = p.id
+left outer join renalware.pathology_current_observation_sets PA on PA.patient_id = P.id
+left outer join renalware.renal_profiles RPROF on RPROF.patient_id = P.id
+left outer join renalware.transplant_registrations TXR on TXR.patient_id = P.id
+left outer join renalware.transplant_registration_statuses TXRS on TXRS.registration_id = TXR.id AND TXRS.terminated_on IS NULL
+left outer join renalware.transplant_registration_status_descriptions TXRSD on TXRSD.id = TXRS.description_id
+left outer join renalware.pd_regimes pr on pr.patient_id = P.id and pr.start_date <= current_date and pr.end_date is null
+left outer join renalware.pd_exit_site_infections pesi on pesi.patient_id = P.id
+left outer join pd_peritonitis_episodes ppe on ppe.patient_id = P.id
+inner join renalware.patient_current_modalities Mx on Mx.patient_id = P.id and Mx.modality_code = 'pd'
+order by P.id, pr.start_date desc, pr.created_at desc, pesi.diagnosis_date desc, ppe.diagnosis_date desc;

data/db/views/reporting_anaemia_audit_v01.sql

@@ -1,5 +1,3 @@
-
---explain analyze
 select
   modality_desc       modality,
   count(e1.patient_id)  patient_count,

data/lib/renalware/configuration.rb

@@ -14,7 +14,6 @@
 # To access configuration settings use e.g.
 #   Renalware.config.x
 #
-# rubocop:disable Metrics/ClassLength
 module Renalware
   class Configuration
     include ActiveSupport::Configurable
@@ -37,9 +36,6 @@ module Renalware
     config_accessor(:patient_hospital_identifiers) { {} }
     config_accessor(:session_timeout_polling_frequency) { 1.minute }
     config_accessor(:session_register_user_user_activity_after) { 2.minutes }
-    config_accessor(:session_expiry_use_previous_mechansim) {
-      ENV["SESSION_EXPIRY_USE_PREVIOUS_MECHANSIM"] == "true"
-    }
     config_accessor(:duration_of_last_url_memory_after_session_expiry) { 30.minutes }
     config_accessor(:broadcast_subscription_map) { {} }
     config_accessor(:include_sunday_on_hd_diaries) { false }
@@ -161,4 +157,3 @@ module Renalware
     yield config
   end
 end
-# rubocop:enable Metrics/ClassLength

data/lib/renalware/version_number.rb

@@ -5,6 +5,6 @@ module Renalware
   # to creat that class even though its not used. If we don't do this zeitwerk
   # complains that version.rb does export a constant called Version.
   class VersionNumber
-    VERSION = "2.0.158"
+    VERSION = "2.0.159"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.158
+  version: 2.0.159
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
@@ -854,14 +854,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
@@ -896,14 +896,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -1105,11 +1105,12 @@ files:
 - app/assets/javascripts/renalware/components/behaviours.js
 - app/assets/javascripts/renalware/components/clipboard_setup.js
 - app/assets/javascripts/renalware/components/clockpicker.js
+- app/assets/javascripts/renalware/components/configuration.js
 - app/assets/javascripts/renalware/components/contacts.js
-- app/assets/javascripts/renalware/components/dialogs.js.erb
+- app/assets/javascripts/renalware/components/dialogs.js
 - app/assets/javascripts/renalware/components/drugs.js
 - app/assets/javascripts/renalware/components/events.js
-- app/assets/javascripts/renalware/components/feed_only_inputs.js.erb
+- app/assets/javascripts/renalware/components/feed_only_inputs.js
 - app/assets/javascripts/renalware/components/feeds.js
 - app/assets/javascripts/renalware/components/forms.js
 - app/assets/javascripts/renalware/components/full_screen.js
@@ -1132,16 +1133,14 @@ files:
 - app/assets/javascripts/renalware/components/primary_care_physicians.js
 - app/assets/javascripts/renalware/components/problems.js
 - app/assets/javascripts/renalware/components/renal.js
-- app/assets/javascripts/renalware/components/reporting.js.erb
 - app/assets/javascripts/renalware/components/searchables.js
 - app/assets/javascripts/renalware/components/select2-ajax-search.js
-- app/assets/javascripts/renalware/components/session_timeout_redirect.js.erb
 - app/assets/javascripts/renalware/components/sortable.js
 - app/assets/javascripts/renalware/components/table.js
 - app/assets/javascripts/renalware/components/tabs.js
 - app/assets/javascripts/renalware/components/toggler.js
 - app/assets/javascripts/renalware/components/transplants.js
-- app/assets/javascripts/renalware/core.js.erb
+- app/assets/javascripts/renalware/core.js
 - app/assets/javascripts/renalware/rollup_compiled.css
 - app/assets/javascripts/renalware/rollup_compiled.js
 - app/assets/pdf/blank_page.pdf
@@ -4071,6 +4070,8 @@ files:
 - db/migrate/20201021153832_update_supportive_care_mdm_patients_view.rb
 - db/migrate/20201021154809_update_transplant_mdm_patients_view.rb
 - db/migrate/20201023092859_remove_unused_indexes.rb
+- db/migrate/20201105153422_update_medication_current_prescriptions_view.rb
+- db/migrate/20201112152752_update_pd_mdm_patients_view1.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -4176,6 +4177,7 @@ files:
 - db/views/low_clearance_mdm_patients_v01.sql
 - db/views/low_clearance_mdm_patients_v02.sql
 - db/views/medication_current_prescriptions_v01.sql
+- db/views/medication_current_prescriptions_v02.sql
 - db/views/pathology_current_key_observation_sets_v01.sql
 - db/views/pathology_current_key_observation_sets_v02.sql
 - db/views/pathology_current_observations_v01.sql
@@ -4190,6 +4192,7 @@ files:
 - db/views/patient_summaries_v06.sql
 - db/views/pd_mdm_patients_v01.sql
 - db/views/pd_mdm_patients_v02.sql
+- db/views/pd_mdm_patients_v03.sql
 - db/views/pd_regime_for_modalities_v01.sql
 - db/views/reporting_anaemia_audit_v01.sql
 - db/views/reporting_bone_audit_v01.sql

data/app/assets/javascripts/renalware/components/session_timeout_redirect.js.erb

@@ -1,37 +0,0 @@
-// Create a timer that will poll to see if the user's session is still valid.
-// If it isn't, the server returns a 401 unauthorised causing a redirect the login page.
-// Note that we could in the future display a message letting them know their session
-// will expired in X seconds. The controller action we hit here could be expanded to
-// to render some js that would insert than into the page.
-// Note we don't want to poll if we are sat on the login page anyway. For one thing on Heroku it
-// would prevent a dyno sleeping, but its also a waste of resources.
-//
-// Note this mechanism has been superceded by the session_timeout.js stimulus controller.
-//
-
-<% if Renalware.config.session_expiry_use_previous_mechansim %>
-  $(document).ready(function() {
-    var login_path ="<%= Renalware::Engine.routes.url_helpers.new_user_session_path %>";
-    var defaultPollFreq = <%= Renalware.config.session_timeout_polling_frequency.to_i %>;
-    var frequency_s = defaultPollFreq;
-
-    // This is a global window function so that we can call it directly from capybara tests to
-    // bypass having to wait for the session polling interval to tick over.
-    window.sessionTimeoutCheck = function(){
-      if(window.location.pathname != login_path) {
-        Rails.ajax({
-          type: "GET",
-          url: "<%= Renalware::Engine.routes.url_helpers.check_session_expired_path %>",
-          dataType: "html",
-          error: function(responseText, status, xhr) {
-            if (xhr.status == 401) {
-              window.location.reload()
-            }
-          }
-        });
-      }
-    };
-
-    setInterval(window.sessionTimeoutCheck, (frequency_s * 1000));
-  });
-<% end %>