renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72947b647dc6fa2a19f08fae31c82d1434758d19
-  data.tar.gz: 4fac004d893040109ba91ba25a6b4315f71f6522
+  metadata.gz: b5e7a417e754a71bbaed524baa1e92f6a0491bd1
+  data.tar.gz: 1d904d6f9bb3162292ec84e39fbed1217900c843
 SHA512:
-  metadata.gz: 21233ae1518dd2b94d412cdcf25a3d9caf3974d405c4657c75fd9cd5b143dcbcbd5719e950a8959e251d2e9bc134ba15ba640a3d685b54bf84e0a9518d1da62a
-  data.tar.gz: 7ae3733d3341ea54cf5e5c1336870a4e3a3e6153e9a589ecd7cbf4ecaa857f858348b4866717d0a76fb3a17a9e1a3bd49581a4d480abcf3ebfaea5bf80941033
+  metadata.gz: 975d591a6795b6cca71871f1ade8bd8b18d38b47568d5c7bcddb36f2e1ad07adc925124a8174b8ad3fb051fa0ad4aaa85c97716899e7fa19991f083ff809a40e
+  data.tar.gz: 03fac27edf51107c38ec0299714bf51dd1232924feb98b9afc2932cafd08697227f5c5d74886cb7c784d618be8ac745adb033a65c5a6a50a0138dab07c5dfef2

data/README.md

@@ -3,6 +3,7 @@
 [![Code Climate](https://codeclimate.com/repos/58beee3ed41d600266000147/badges/50451f89d7aad6c2d200/gpa.svg)](https://codeclimate.com/repos/58beee3ed41d600266000147/feed)
 [![Test Coverage](https://codeclimate.com/repos/58beee3ed41d600266000147/badges/50451f89d7aad6c2d200/coverage.svg)](https://codeclimate.com/repos/58beee3ed41d600266000147/coverage)
 [![Dependency Status](https://gemnasium.com/badges/github.com/airslie/renalware-core.svg)](https://gemnasium.com/github.com/airslie/renalware-core)
+[![Gem Version](https://badge.fury.io/rb/renalware-core.svg)](https://badge.fury.io/rb/renalware-core)
 
 Renalware uses demographic, clinical, pathology, and nephrology datasets to improve patient care,
 undertake clinical and administrative audits and share data with external systems.
@@ -158,12 +159,12 @@ to just create
 #### Engine migrations
 
 `config.active_record.schema_format = :sql` in `application.rb` is used the engine
-uses postgres views and functions which are not properly supported in a `schema.rb`
+uses Postgres views and functions which are not properly supported in a `schema.rb`
 
 #### Throttling login attempts
 
 [rack-attack](https://github.com/kickstarter/rack-attack) is configured to throttle login attempts.
-Only 10 attempts per username as permitted in any one minute in an attempt to thwaght login attacks.
+Only 10 attempts per username as permitted in any one minute in an attempt to thwart login attacks.
 
 #### Test Configuration
 

data/app/assets/javascripts/renalware/application.js.erb

@@ -47,6 +47,9 @@
 //= require_tree .
 //
 
+// Define a console.log if one does not yet exist - e.g. we in IE11
+window.console = window.console || { log: function() {} };
+
 // Disabled jQuery animations during tests to speed things up a little
 <% if Rails.env.test? %>
   $.fx.off = true;

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

@@ -15,7 +15,8 @@ $(document).foundation({
 $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
   var modal = $(this);
   modal.find('[autofocus]').focus();
-  $('form[data-validate]').enableClientSideValidations();
+  $('form[data-client-side-validations]').enableClientSideValidations();
+  $('.searchable_select', modal).select2();
   // If a modal is launched again, ensure the submit button is re-enabled.
   $.rails.enableFormElement($('input[data-disable-with]'));
 });
@@ -24,3 +25,4 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
 $(document).on('ajaxError', function(event, xhr, status, error) {
   $.rails.enableFormElement($('input[data-disable-with]'));
 });
+

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

@@ -41,25 +41,8 @@ function initClockpickersIn(container) {
   });
 }
 
-function initSearchableSelects(container) {
-  $(container + " .searchable_select").select2();
-}
-
-
 $(function() {
-  // Removed the auto scroll-to-error feature as it is not working with
-  // the new layout - it causes the top menu and patient header to scroll irretrievably off
-  // the top of the page. Adjusting the offset eg -300 helps but can lead to the bottom of
-  // the page being cut off instead. If this feature is required, we need to find a more standard
-  // way to ask the browser to scroll to an element.
-  // if ($('small.error').length > 0) {
-  //   $('html, body').animate({
-  //     scrollTop: ($('small.error').first().offset().top - 300)
-  //   },500);
-  // }
-
   initDatepickersIn("body");
   initDateTimepickersIn("body");
   initClockpickersIn("body");
-  initSearchableSelects("body");
 });

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

@@ -2,4 +2,8 @@ $(document).ready(function() {
   Mousetrap.bind('ctrl+f', function() {
     $(".patient-search-form input").focus();
   });
+
+  Mousetrap.bind('ctrl+m', function() {
+    $("#send-patient-message").trigger("click");
+  });
 });

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

@@ -0,0 +1,15 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.Messaging = (function() {
+  var focusRecipientSearchInput = function() {
+    $('#message_recipient_ids').select2('open').select2('close');
+  };
+
+  return {
+    init: function () {
+      focusRecipientSearchInput()
+    }
+  };
+})();
+
+$(document).on('opened.fndtn.reveal', '#send-message-modal', Renalware.Messaging.init);

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

@@ -4,6 +4,7 @@ $(document).ready(function(){
 
     if(selectedModal === "Death") {
       $('.hide-death').hide();
+      alert("Please note that after saving the Death modality, all current prescriptions will be terminated!")
     } else {
       $('.hide-death').show();
     }

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

@@ -5,9 +5,12 @@
 //
 $(document).ready(function() {
   $(".print-pdf").on("click", function(e) {
-    // No IE/Edge supports smil - for these we revert to the default behaviour of showing
-    // the PDF in a new tab and the user must print manually.
-    if (Modernizr.smil) {
+
+    // detect IE8 and above, and edge
+    if (document.documentMode || /Edge/.test(navigator.userAgent)) {
+      // Revert to the default behaviour of showing the PDF in a new tab and the user
+      // must print manually.
+    } else {
       var url = $(this).data("target");
       if (url) {
         e.preventDefault();

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

@@ -5,7 +5,8 @@ Renalware.Renal = (function () {
   var setAllComobidityOptionsToNo = function() {
     $(document).on( "click", "a.set_all_comorbidities_to_no", function(e) {
       e.preventDefault();
-      $(".comorbidities input[type=radio][value=no]").prop("checked", true);
+      $(".comorbidities input[type=radio]").filter("[value=no],[value=non_smoker]")
+        .prop("checked", true);
     });
   };
 

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

@@ -5,13 +5,19 @@
 // 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.
+//
 $(document).ready(function() {
   var login_path ="<%= Renalware::Engine.routes.url_helpers.new_user_session_path %>";
-  var frequency_ms = <%= Renalware.config.session_timeout_polling_frequency.to_i * 1000 %>;
+  var frequency_s = <%= Renalware.config.session_timeout_polling_frequency.to_i %>;
 
-  setInterval(function(){
+  var session_timeout_check = function(){
     if(window.location.pathname != login_path) {
-      $.getScript("<%= Renalware::Engine.routes.url_helpers.session_timed_out_path %>");
+      $.getScript("<%= Renalware::Engine.routes.url_helpers.session_timed_out_path %>")
+       .fail(function(jqxhr, settings, exception) {
+         console.log("Failed to query for session timeout");
+       });
     }
-  }, frequency_ms);
+ };
+
+  setInterval(session_timeout_check, (frequency_s * 1000));
 });

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

@@ -8,8 +8,13 @@ function initTogglers() {
   if (togglers.length > 0) {
     $(togglers).on("click", function(event) {
       event.preventDefault();
+      // Get e.g. the tr to toggle
       var toggled = $(event.target).attr("href");
       $(toggled).toggle();
+      // If we are toggling open tr B by clicking a link within tr A above it,
+      // add a class to the tr A sibling above it so it can also be styled
+      // to match the expanded TR B below it, to create a clear connection between the two.
+      $(toggled).prev().toggleClass("content-toggled");
       triggerMasonryLayoutRefresh();
     })
   }

data/app/assets/stylesheets/renalware/base/_variables.scss

@@ -85,6 +85,8 @@ $letter-preview-background-colour: #ddd;
 // tables
 $table-even-row-colour: #FCFCFC;
 $table-border-colour: #CCC;
+$table-toggled-content-colour: #FEFFF1;
+$table-urgent-colour: $nhs-yellow;
 
 $footer-colour: #C0C0C0;
 $footer-bg-colour: #FAFAFA;
@@ -93,7 +95,7 @@ $patient-menu-background-colour: #eeeeee;
 $menu-divider-colour: #E6E6E6;
 
 // Forms
-$form-hint-colour: #AAA;
+$form-hint-colour: #BBB;
 $disabled-colour: #CCC;
 
 // Menus

data/app/assets/stylesheets/renalware/lib/_foundation_and_overrides.scss

@@ -1424,7 +1424,7 @@ $table-margin-bottom: rem-calc(10);
 // $topbar-transition-speed: 300ms;
 // Using rem-calc for the below breakpoint causes issues with top bar
 // $topbar-breakpoint: #{lower-bound($medium-range)}; // Change to 9999px for always mobile layout
-$topbar-breakpoint: #{lower-bound(830px)}; // Change to 9999px for always mobile layout
+$topbar-breakpoint: unquote("#{lower-bound(830px)}"); // Change to 9999px for always mobile layout
 // $topbar-media-query: $medium-up;
 
 // Divider Styles

data/app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss

@@ -1,3 +1,24 @@
 span.select2 {
-  margin: 0 0 0.75rem 0;
+  margin: 0;
+  // margin: 0 0 0.75rem 0;
+}
+
+.grouped_select {
+  margin-bottom: 0.7rem;
+
+  label {
+    margin-bottom: 0;
+  }
+}
+
+.error {
+  span.select2 {
+    margin: 0;
+  }
+}
+
+.horizontal_medium {
+  span.select2.select2-container.select2-container--default {
+    min-width: 500px !important;
+  }
 }

data/app/assets/stylesheets/renalware/lib/_select2-foundation5.scss

@@ -12,7 +12,7 @@
     vertical-align: middle;
 }
 span.select2.select2-container.select2-container--default {
-    width: 100%!important;
+    width: 100%; //!important;
 }
 
 .select2-container .select2-selection--single {
@@ -60,8 +60,10 @@ span.select2.select2-container.select2-container--default {
     box-sizing: border-box;
     border: none;
     font-size: 100%;
-    margin-top: 5px;
+    margin-top: 0.6rem;
+    margin-bottom: 5px;
     padding: 0;
+    height: auto;
 }
 .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
     -webkit-appearance: none;
@@ -86,7 +88,8 @@ span.select2.select2-container.select2-container--default {
     padding: 0;
 }
 .select2-results__option {
-    padding: 1px 1px 1px 10px;
+    // padding: 1px 1px 1px 10px;
+    padding: 0 0 0 10px;
     user-select: none;
     -webkit-user-select: none;
 }
@@ -324,7 +327,7 @@ span.select2.select2-container.select2-container--default {
 .select2-container--default .select2-results__group {
     cursor: default;
     display: block;
-    padding: 6px;
+    padding: 2px 6px 0 6px;
 }
 .select2-container--classic .select2-selection--single {
     background-color: #f7f7f7;

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

@@ -8,5 +8,6 @@
   p.empty-section {
     padding-left: 0;
     color: $dashboard-muted-color;
+    clear: both;
   }
 }

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

@@ -0,0 +1,55 @@
+.read-messages {
+  .mark-as-read,
+  .keep-as-unread {
+    display: none;
+  }
+}
+
+.messages {
+  .urgent {
+    background-color: $table-urgent-colour !important;
+  }
+
+  .urgent .state span {
+    @include badge;
+    background-color: $letter-state-pending-review;
+  }
+
+  ul.actions {
+    list-style: none;
+    text-align: right;
+
+    .button {
+      padding: 0.4rem .6rem;
+      margin: 0.3rem 0 0.2rem 0;
+    }
+  }
+
+  .message-preview {
+    padding: 0.4rem 1rem;
+
+    .subject {
+      font-weight: bold;
+      margin: 0 0 0.5rem;
+    }
+
+    .body {
+
+    }
+  }
+
+  h2 {
+    float: left;
+  }
+
+  .messages-key {
+    float: right;
+    margin: 0.3rem 0 .5rem;
+
+    span {
+      padding: 0.2rem 0.4rem;
+      border-radius: 0.3rem;
+    }
+  }
+}
+

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

@@ -282,8 +282,78 @@ ul.provider {
   tr.urgent {
     background-color: $bookmark-urgent-colour;
   }
+
+  .button {
+
+  }
+}
+
+// Alerts
+
+.alerts {
+  table-layout: fixed;
+}
+
+.alerts--alert,
+.alerts--alert:nth-of-type(even) {
+  clear: both;
+  height: 2rem;
+  padding: 0.4em 0.2em 0.5em 0.6em;
+  background-color: $table-toggled-content-colour;
+  border-bottom: dotted 1px $light-grey;
+
+  &:hover {
+    background-color: lighten($table-toggled-content-colour, 5);
+  }
+
+  td {
+    border: 0;
+    border-top: dotted 1px $light-grey;
+  }
+
+  .icon {
+    width: 1.7rem;
+    padding-left: 0.4rem;
+  }
+
+  .notes {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .author {
+    width: 15rem;
+    text-align: right;
+  }
+
+  .actions {
+    width: 3rem;
+    padding-right: 1rem;
+
+    a {
+      color: $dark-grey;
+    }
+  }
+
+  &.urgent {
+    background-color: $nhs-yellow;
+
+    &:hover {
+      background-color: lighten($nhs-yellow, 5);
+    }
+  }
+
+  &.urgent {
+    .icon {
+      @extend .fa;
+      @extend .fa-warning;
+      display: table-cell;
+    }
+  }
 }
 
+// End Alerts
 form {
   .blood-pressure {
     &.with-errors {

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

@@ -1,6 +1,12 @@
+
+.fa-link-annotation {
+  width: 1.4rem;
+}
+
 .page-actions {
   .button {
     margin-right: 0.8rem;
+    margin-bottom: 0.4rem;
   }
 }
 
@@ -9,6 +15,10 @@
   font-size: 1rem;
   padding: 0.6rem 1.2rem;
 
+  &:hover {
+    background-color: $nhs-blue;
+  }
+
   i.fa {
     margin-right: .5rem;
   }

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

@@ -1,3 +1,7 @@
+input::placeholder {
+  color: $form-hint-colour
+}
+
 .panel.compact {
   padding: 0.5rem 1rem;
 }
@@ -71,6 +75,10 @@ form {
     }
   }
 
+  .error.medium-input {
+    max-width: 500px;
+  }
+
   @media screen and (min-width: 40.063em) {
     .small-input {
       max-width: 250px !important;
@@ -192,7 +200,7 @@ article {
     }
 
     .button:hover {
-      background-color: $link-colour;
+      background-color: $nhs-blue;
       text-decoration: underline;
     }
   }

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

@@ -43,12 +43,17 @@
   }
 
   &.xlarge {
-
     dt {
       width: $dl-horizontal-dt-width + 5.5rem;
     }
   }
 
+  &.xxlarge {
+    dt {
+      width: $dl-horizontal-dt-width + 9.5rem;
+    }
+  }
+
   // Default
   &.large {
   }

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

@@ -64,7 +64,7 @@ dd.patient-name {
 
 .patient-side-nav {
   background-color: $patient-menu-background-colour;
-  padding: 0.5rem 0;
+  padding: 0.6rem 0;
   padding-bottom: 8rem;
   position: absolute;
   width: $patient-side-nav-width;
@@ -73,6 +73,10 @@ dd.patient-name {
   bottom: 0;
   left: 0;
 
+  hr {
+    margin: 0.3rem 0 0.5rem;
+  }
+
   ul.side-nav {
     margin: 0;
     padding: 0;
@@ -91,6 +95,35 @@ dd.patient-name {
       span {
         padding: 0.2rem 0.5rem;
       }
+
+      &.action {
+        padding-right: 0.5rem;
+        padding-right: .5rem;
+
+        a {
+          text-decoration: none;
+          text-align: left;
+          margin-right:1rem;
+          margin-bottom: 0.2rem;
+          margin-top: 0.1rem;
+          padding: 0.2rem 0.5rem;
+          background-color: $light-grey;
+          color: $dark-grey;
+          border-radius: 3px;
+          transition: all 0.3s ease 0s;
+          border-radius: 2px;
+
+          &:hover {
+            background-color: $nhs-blue;
+            color: $off-white;
+            box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.13), 0 1px 3px 0 rgba(0, 0, 0, 0.08);
+          }
+        }
+      }
+
+      &.actions-heading {
+        margin-bottom: 0.3rem;
+      }
     }
   }
 }
@@ -126,6 +159,8 @@ dd.patient-name {
 
 .patient-side-nav li.heading {
   color: $dark-grey;
+  font-weight: normal;
+  font-size: .9rem;
 }
 
 .mdm-top-bar {

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

@@ -25,7 +25,7 @@
 
       input {
         float: left;
-        margin: 0.15rem 0 0 -1rem;
+        margin: 0.5rem 0 1rem -1rem;
       }
     }
   }

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

@@ -1,3 +1,4 @@
+
 table {
   // This will have to be removed at some point to comply with NHS table guidelines
   width: 100%;
@@ -22,6 +23,36 @@ table {
     width: auto;
   }
 
+  // On tables where every other row is can be toggled open, we need the following:
+  // 0 Visible white bg
+  // 1 Hidden white bg
+  // 2 -- Visible grey bg --
+  // 3 Hidden white bg
+  // 4 Visible white
+  // 5 Hidden white bg
+  // 6 -- Visible grey bg --
+  // 7 Hidden white bg
+  // So this == tr:nth-child(4n+3) (offset of 3 then every 4 rows)
+  &.has-togglable-rows {
+    tbody tr {
+      &:nth-child(4n+3) {
+        background: $table-even-row-colour;
+      }
+
+      // The (initially hidden) toggle content row
+      &:nth-child(even) {
+        background-color: $table-toggled-content-colour;
+      }
+
+      &.content-toggled {
+        background-color: $table-toggled-content-colour;
+        td {
+          border-bottom: none;
+        }
+      }
+    }
+  }
+
   .quick-preview {
     p {
       padding: 0;
@@ -46,6 +77,13 @@ table {
     }
   }
 
+  &.align-centre {
+    td,
+    th {
+      vertical-align: middle;
+    }
+  }
+
   tr th,
   tr td {
     border-bottom: 1px dotted $disabled-colour;
@@ -76,7 +114,8 @@ table {
     }
   }
 
-  tr th {
+  tr th,
+  tr td {
     &.col-width-date {
       min-width: 7.1em;
       width: 7.8em;

data/app/controllers/renalware/accesses/assessments_controller.rb

@@ -23,7 +23,7 @@ module Renalware
           redirect_to patient_accesses_dashboard_path(patient),
             notice: t(".success", model_name: "Access assessment")
         else
-          flash[:error] = t(".failed", model_name: "Access assessment")
+          flash.now[:error] = t(".failed", model_name: "Access assessment")
           render_new(assessment)
         end
       end
@@ -40,7 +40,7 @@ module Renalware
           redirect_to patient_accesses_dashboard_path(patient),
             notice: t(".success", model_name: "Access assessment")
         else
-          flash[:error] = t(".failed", model_name: "Access assessment")
+          flash.now[:error] = t(".failed", model_name: "Access assessment")
           render_edit(assessment)
         end
       end

data/app/controllers/renalware/accesses/procedures_controller.rb

@@ -21,7 +21,7 @@ module Renalware
           redirect_to patient_accesses_dashboard_path(patient),
             notice: t(".success", model_name: "Access procedure")
         else
-          flash[:error] = t(".failed", model_name: "Access procedure")
+          flash.now[:error] = t(".failed", model_name: "Access procedure")
           render :new, locals: { patient: patient, procedure: procedure }
         end
       end
@@ -38,7 +38,7 @@ module Renalware
           redirect_to patient_accesses_dashboard_path(patient),
                       notice: success_msg_for("access procedure")
         else
-          flash[:error] = failed_msg_for("access procedure")
+          flash.now[:error] = failed_msg_for("access procedure")
           render :edit, locals: { patient: patient, procedure: procedure }
         end
       end