renalware-core 2.0.147 → 2.0.148

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0a85e291938153f0f3d994195230457b6550239d0e8dde9e7d4a0b8a72f7819
-  data.tar.gz: 34d8b8b3b54731448ec32c05c136e3f371e4725a5a7efc2f7946264d041153d0
+  metadata.gz: cc532fe594f3e9543c134b831af132696f44881c88673d0aacbaaa78a3f9022e
+  data.tar.gz: d15adf0bcb79edb855647ba4e73e1a7785cd0771b438348d6a1ff66032158b5c
 SHA512:
-  metadata.gz: 2da7dbc33f709e9effcb837f78c0678bbe375d977e8c276aa70dbcb2f94366f5df7c518f554ccd9f8611a3b801a2e74c4a11ffb21a08356d6fcd77e15b0015ed
-  data.tar.gz: a1d6d42f2adf772b8201e982fd8cb850403ce6cd70c87820b96a581356f7dab2efdc826db6bc96ba628b8ae44a39790c236f725bfee3a68170cc75ca91941bd4
+  metadata.gz: 7c4cdc7709741aa5c19405fea7e84b96b6c11b11f0f569dc254ec11c9e1cd2a0e48d99a6dfb736040f8a60d0c1f494dbd40cddf1d823c0aa858ecd9ff37b50b1
+  data.tar.gz: aac97b39b0b13eb5a2d52bf80f3e22666fc325affc4f6fd5ea1b3cce0fdd43cb75604fb5521fe1162f2d867a8afe448ed92d4c8474dca13b00fc6a767ec82bd6

data/app/assets/javascripts/renalware/components/ajax_errors.js

@@ -1,4 +1,5 @@
-$(document).ajaxError(function (e, xhr, settings) {
+$(document).on("ajax:error", function(event) {
+  var xhr = event.detail[2];
   switch(xhr.status) {
     // For 401 Unathorised responses, for example trying to making a
     // js request after a session timeout, reloading the current page
@@ -7,6 +8,6 @@ $(document).ajaxError(function (e, xhr, settings) {
       location.reload();
       break;
     case 500:
-      alert("Your request has unexpectedly failed (" + xhr.statusText + ").  Please try again.");
+      alert("Your request has unexpectedly failed (" + xhr.statusText + "). Please try again.");
   }
 });

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

@@ -28,6 +28,6 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
 });
 
 // If there was an error submitting a modal form, be sure to re-enable the submit button
-$(document).on('ajaxError', function(event, xhr, status, error) {
-  Rails.enableElement($('input[data-disable-with]'))[0];
+$(document).on('ajax:error', function(event) {
+  Rails.enableElement($('input[data-disable-with]')[0]);
 });

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

@@ -7,7 +7,6 @@
 // would prevent a dyno sleeping, but its also a waste of resources.
 //
 $(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;
@@ -16,12 +15,16 @@ $(document).ready(function() {
   // bypass having to wait for the session polling interval to tick over.
   window.sessionTimeoutCheck = function(){
     if(window.location.pathname != login_path) {
-      $.getScript("<%= Renalware::Engine.routes.url_helpers.session_timed_out_path %>")
-       .fail(function(jqxhr, settings, exception) {
-         <% unless Rails.env.test? %>
-           console.log("Failed to query for session timeout");
-         <% end %>
-       });
+      Rails.ajax({
+        type: "GET",
+        url: "<%= Renalware::Engine.routes.url_helpers.session_timed_out_path %>",
+        dataType: "html",
+        error: function(responseText, status, xhr) {
+          if (xhr.status == 401) {
+            window.location.reload()
+          }
+        }
+      });
     }
   };
 

data/app/assets/javascripts/renalware/rollup_compiled.js

@@ -3768,6 +3768,18 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
 }
 
+function _isNativeReflectConstruct() {
+  if (typeof Reflect === "undefined" || !Reflect.construct) return false;
+  if (Reflect.construct.sham) return false;
+  if (typeof Proxy === "function") return true;
+  try {
+    Date.prototype.toString.call(Reflect.construct(Date, [], function() {}));
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
 function _assertThisInitialized(self) {
   if (self === void 0) {
     throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -3782,13 +3794,27 @@ function _possibleConstructorReturn(self, call) {
   return _assertThisInitialized(self);
 }
 
+function _createSuper(Derived) {
+  return function() {
+    var Super = _getPrototypeOf(Derived), result;
+    if (_isNativeReflectConstruct()) {
+      var NewTarget = _getPrototypeOf(this).constructor;
+      result = Reflect.construct(Super, arguments, NewTarget);
+    } else {
+      result = Super.apply(this, arguments);
+    }
+    return _possibleConstructorReturn(this, result);
+  };
+}
+
 var $ = window.$;
 
 var _default = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "row",
@@ -3820,9 +3846,10 @@ var $$1 = window.$;
 
 var _default$1 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "connect",
@@ -3851,9 +3878,10 @@ var Rails = window.Rails;
 
 var _default$2 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "refreshForm",
@@ -3876,9 +3904,10 @@ var $$2 = window.$;
 
 var _default$3 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "insert",
@@ -3897,9 +3926,10 @@ var $$3 = window.$;
 
 var _default$4 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "initInsertEventNotesIntoTrixEditor",
@@ -3925,9 +3955,10 @@ _defineProperty(_default$4, "targets", [ "trix" ]);
 
 var _default$5 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "connect",
@@ -3959,9 +3990,10 @@ var Chartkick = window.Chartkick;
 
 var _default$6 = function(_Controller) {
   _inherits(_default, _Controller);
+  var _super = _createSuper(_default);
   function _default() {
     _classCallCheck(this, _default);
-    return _possibleConstructorReturn(this, _getPrototypeOf(_default).apply(this, arguments));
+    return _super.apply(this, arguments);
   }
   _createClass(_default, [ {
     key: "redisplay",

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

@@ -29,22 +29,27 @@ dl.pos-s-key {
 
 .pos-s--0 {
   background-color: $survey-0;
+  border: solid 1px #CCC;
 }
 
 .pos-s--1 {
   background-color: $survey-1;
+  border: solid 1px #CCC;
 }
 
 .pos-s--2 {
   background-color: $survey-2;
+  border: solid 1px #CCC;
 }
 
 .pos-s--3 {
   background-color: $survey-3;
+  border: solid 1px #CCC;
 }
 
 .pos-s--4 {
   background-color: $survey-4;
+  border: solid 1px #CCC;
 }
 
 .summary-part--pos_s table {

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

@@ -12,12 +12,17 @@ module Renalware
         new(**args).call
       end
 
+      # Note that we want to avoid any patient validation errors (email is invalid etc)
+      # at this important stage, so we use validate: false. While we validate patient data
+      # entered thorugh the UI, its possible that some migrated data might be invalid
+      # and would cause an error to be raised during a callback in save!
       def call
         patient.send_to_rpv = false
         patient.rpv_decision_on = Time.zone.today
         patient.rpv_recorded_by = by.to_s
         patient.skip_death_validations = true
-        patient.save_by!(by)
+        patient.by = by
+        patient.save!(validate: false)
       end
     end
   end

data/app/models/renalware/surveys/pos_s_summary_part.rb

@@ -15,8 +15,8 @@ module Renalware
           survey
             .questions
             .order(:position)
-            .select(:code, :label)
-            .each_with_object({}) { |q, hash| hash[q.code] = q.label }
+            .select(:code, :label, :label_abbrv)
+            .each_with_object({}) { |q, hash| hash[q.code] = q.admin_label }
         end
       end
 

data/app/models/renalware/surveys/question.rb

@@ -17,6 +17,10 @@ module Renalware
       validates :code, presence: true, uniqueness: { scope: :survey_id }
       validates :label, presence: true
       validates :position, presence: true
+
+      def admin_label
+        label_abbrv.presence || label
+      end
     end
   end
 end

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

@@ -54,5 +54,5 @@
               wrapper: :horizontal_small
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", admin_users_path

data/app/views/renalware/admissions/admissions/_filters.html.slim

@@ -19,5 +19,5 @@
                   include_blank: "Any"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_admissions_path

data/app/views/renalware/admissions/admissions/_form.html.slim

@@ -45,5 +45,5 @@
     = f.input :discharge_summary, as: :trix_editor, class: "discharge-summary", wrapper: :zilch
 
   = f.submit class: :button
-  span= " or "
+  '  or
   = link_to "Cancel", admissions_admissions_path

data/app/views/renalware/admissions/consults/_filters.html.slim

@@ -37,5 +37,5 @@
                   label: "Modality"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_consults_path(reset: 1)

data/app/views/renalware/admissions/requests/_form.html.slim

@@ -22,7 +22,7 @@
       = f.input :hospital_unit_id, collection: hospital_units, wrapper: :horizontal_medium
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
-      span= " or "
+      '  or
       = link_to "Cancel",
                "#",
                "aria-label" => "Close",

data/app/views/renalware/clinical/allergies/_new.html.slim

@@ -7,7 +7,7 @@
     h2= t(".title")
     = f.input :description, as: :text, autofocus: true
     = f.submit t(".save"), class: :button, data: { disable_with: t(".save_disable_with") }
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

data/app/views/renalware/clinical/body_compositions/_form.html.slim

@@ -44,5 +44,5 @@
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/dry_weights/_form.html.slim

@@ -14,5 +14,5 @@
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", return_url

data/app/views/renalware/clinical/profiles/edit.html.slim

@@ -36,5 +36,5 @@
 
           .columns.large-12.form-actions
             = submit_tag "Update", class: "button"
-            span= " or "
+            '  or
             = link_to "Cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/clinics/clinic_visits/new.html.slim

@@ -15,5 +15,5 @@
       = render "form", f: f
 
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_clinic_visits_path(patient)

data/app/views/renalware/clinics/visits/_filters.html.slim

@@ -15,7 +15,7 @@
           = f.input :created_by_id_eq, as: :user_picker, collection: users, label: "Clinician"
         .medium-2.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), clinic_visits_path
 
   .filters__output

data/app/views/renalware/deaths/edit.html.slim

@@ -31,5 +31,5 @@
               wrapper: :horizontal_large
 
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/directory/people/_filters.html.slim

@@ -5,5 +5,5 @@
         = f.input :name_cont, label: "Name contains"
       .small-4.end.columns.actions
         = f.submit t("helpers.submit.filter"), class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), directory_people_path

data/app/views/renalware/directory/people/_form.html.slim

@@ -10,5 +10,5 @@
     = render "address_form", f: f
 
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", directory_people_path

data/app/views/renalware/drugs/drugs/_filters.html.slim

@@ -7,5 +7,5 @@
           = f.search_field :name_or_drug_types_name_start
         .small-3.large-4.columns.actions.end
           = f.submit t("helpers.submit.filter"), class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), drugs_drugs_path

data/app/views/renalware/drugs/drugs/_form.html.slim

@@ -11,5 +11,5 @@
       = f.collection_check_boxes :drug_type_ids, Renalware::Drugs::Type.all, :id, :name
 
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", drugs_drugs_path

data/app/views/renalware/events/events/_filters.html.slim

@@ -16,5 +16,5 @@
                   label: "Created by"
       .medium-3.large-3.columns.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), patient_events_path(events.patient)

data/app/views/renalware/events/events/_form.html.slim

@@ -33,5 +33,5 @@
   br
 
   = submit_tag "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "Cancel", return_url

data/app/views/renalware/events/lists/_filters.html.slim

@@ -25,5 +25,5 @@
                   label: "To"
       .small-12.medium-2.large-2.columns.actions.end
         = f.submit t("helpers.submit.filter"), class: "button secondary"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), renalware.events_filtered_list_path(named_filter: :all)

data/app/views/renalware/events/types/_form.html.slim

@@ -6,5 +6,5 @@
     = simple_form_for event_type, html: { autocomplete: "off" } do |f|
       = f.input :name, label: "Event Type"
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", events_types_path

data/app/views/renalware/hd/cannulation_types/_form.html.slim

@@ -5,5 +5,5 @@
     = f.input :name, autofocus: true
 
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", hd_cannulation_types_path

data/app/views/renalware/hd/current_profile/_form.html.slim

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 
 .form-content
@@ -133,5 +133,5 @@ ruby:
 .row.form-actions
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

data/app/views/renalware/hd/dialysates/_form.html.slim

@@ -8,5 +8,5 @@
     = f.input :"#{element}_content_uom", wrapper: :horizontal_small
 
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", hd_dialysates_path