renalware-core 2.0.104 → 2.0.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4759c82f676bcb96352e1244449b55ee7e69f1b3f9921c7d2af5575ac740e20f
-  data.tar.gz: f64720e8f4c26663b2a532454112eef362783b2a64be5c0fda4dbabb6e5bcbe3
+  metadata.gz: d299c658864be00fd2bb5e32766ca4bb07f92e4d1e3cac36536bbb351dc13132
+  data.tar.gz: d405e456e7f324d56d2d9b10cd4643dd7d20721967d1126461d4f287150b83e1
 SHA512:
-  metadata.gz: ddfceb2f396292b11d4f9a74c98484fa8cbc93a3565518227e29d93d4c9ac6de8557c114c5dc26978f6e03f5c0eafd5630de1fbce46dd2635c68847873e8cb16
-  data.tar.gz: adc5f560e7975ffc33539ec17b66123635e632330137877c05b364d9f00df916b478e1b25ea471cd5b30c948bddb6360d5a0b18edd328b22c09550433fff4cb9
+  metadata.gz: 22d08baf9693562abd1048245c849a2015d1210594b1f7821f78820a626ac58b21442f742c702add9798b4dde1ea33e2b423703dee6e94622aa340c0ce4a689d
+  data.tar.gz: fcb3ddb0e16d5bc177dace948ea795659523d196086967a0743b0a98843561b325bcc9b148b2f31123324a00d9817c13ca4575d4f5bc096cab95fc0469b23544

data/README.md

@@ -223,3 +223,9 @@ docker build -t renalware .
 docker-compose run web rake db:create
 docker-compose run web rake app:db:create
 ```
+
+#### Browser testing
+
+<a href="https://www.browserstack.com">
+<img alt="Browserstack logo" src="doc/Browserstack-logo.svg" width="188" height="43">
+</a>

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

@@ -39,7 +39,7 @@ $(document).ready(function(){
       data: { medication_switch: selectedMedicationType },
       success: function(json) {
         var $drugSelectBox = $medForm.find('.drug-select');
-        var option_template = "<option class='drug-select-link' value=<%=id%>><%=name%></option>"
+        var option_template = "<option value=<%=id%>><%=name%></option>"
 
         $drugSelectBox.html('');
         $drugSelectBox.append(_.template(option_template)({ id: null, name: 'Please select' }));
@@ -79,7 +79,7 @@ $(document).ready(function(){
       if (query.length > 2) {
         $.ajax({
           url: '/drugs/drugs.json',
-          data: { q : { name_or_drug_types_name_start : query } },
+          data: { q : { name_or_drug_types_name_cont : query } },
           success: function(json) {
             $drugResults.html('').show();
             for (var i = 0; i < json.length; i++) {
@@ -115,7 +115,7 @@ $(document).ready(function(){
       $medForm.find('.selected-drug-id').val(selectedDrug);
     }, delay);
 
-    $('.drug-select').change(function(e) {
+    $('.drug-select').unbind().change(function(e) {
       var $bullet = $(e.currentTarget);
       var $medForm = $bullet.closest('.med-form');
       var selectedDrug = $medForm.find('.drug-select').val();
@@ -125,4 +125,3 @@ $(document).ready(function(){
   });
 
 });
-

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

@@ -0,0 +1,108 @@
+/*
+  These are functions relating to the authorisation by nurse + witness of prescriptions
+  within the HD Session form.
+  TODO: This needs refactoring.
+*/
+$(document).ready(function() {
+  /*
+  If enter is pressed in a password field (out of habit as enter is oftern used when logging in,
+  after entering their password) throw it away. We could map it to a tab but frankly that gets
+  a bit complicated - see here:
+  https://stackoverflow.com/questions/2335553/jquery-how-to-catch-enter-key-and-change-event-to-tab
+  */
+  $("input.user-password").on("keypress", function(e) {
+    if (e.keyCode == 13) { return false; }
+  });
+
+  $(".hd-drug-administered input[type='radio']").on("change", function(e) {
+    var checked = ($(this).val() == "true");
+    var container = $(this).closest(".hd-drug-administration");
+    $(container).toggleClass("administered", checked)
+    $(container).toggleClass("not-administered", !checked)
+    $(container).removeClass("undecided");
+    $(".authentication", container).toggle(checked)
+    $(".authentication", container).toggleClass("disabled-with-faded-overlay", !checked)
+    $(".reason-why-not-administered", container).toggle(!checked)
+  });
+
+  $(".hd-drug-administration .authentication-user-id").on("select2:select", function(e) {
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    $(container).find(".authentication-token").val("")
+    $("input.user-password", container).val("");
+    $(container).removeClass("authorised");
+    var tokenCount = $(topContainer).find(".authorised").length;
+    $(topContainer).attr("data-token-count", tokenCount);
+  });
+
+
+  // When a user clicks the link to clear the authorisation (they might have used the wrong user
+  // for instance) the clear the relevant token and password fields and classes.
+  $(".hd-drug-administration .user-and-password .user-and-password--clear").on("click", function(e) {
+    e.preventDefault();
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    $(container).find(".authentication-token").val("")
+    $("input.user-password", container).val("");
+    $(container).removeClass("authorised");
+    var tokenCount = $(topContainer).find(".authorised").length;
+    $(topContainer).attr("data-token-count", tokenCount);
+  });
+
+  // When the user has entered a password and leaves the password field, make an ajax POST to
+  // authenticate the user and on success return an authorisation token which is added to the html
+  // form - it will be validated when the form is submitted.
+  // TODO: also do this if enter pressed while in the password field.
+  $(".user-and-password input.user-password").on("blur", function(e) {
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    var authUrl = $(container).closest(".authentication").data("authentication-url");
+    var userSelect = $(container).find(".authentication-user-id");
+    var userId = $(userSelect).find("option:selected").val();
+    var authorisationTokenHiddenField = $(container).find(".authentication-token");
+    var password = $(this).val();
+
+    // Prevent the a 401 xhr code from redirecting us to the login page - see ajax_errors.js
+    $(document).off('ajaxError');
+
+    if (userId && password) {
+      $.ajax({
+        async: false, /* needed as if pwd field has focus and user clicks submit, it would not wait for ajax */
+        url: authUrl,
+        type: "POST",
+        data: "[user][id]=" + userId + "&[user][password]=" + password,
+        beforeSend: function() {
+          // Add a 'working' class during ajax operations so we can show a spinner for example
+          $(container).addClass("working");
+          $(container).removeClass("error");
+          // $(".hd-session-form button[type='submit]").prop("disabled", "disabled")
+        },
+        complete: function() {
+          $(container).removeClass("working");
+          // $(".hd-session-form input[type='submit']").removeProp("disabled")
+        },
+        statusCode: {
+          200: function (token) {
+            // The user id/password combination is valid and a token has been returned.
+            // We save the token to a hidden field so it wikll be submitted in the session form.
+            $(authorisationTokenHiddenField).val(token);
+            $(container).removeClass("unauthorised").addClass("authorised").removeClass("error");
+            // $(userSelect).prop("disabled", true);
+            var tokenCount = $(topContainer).find(".authorised").length;
+            $(topContainer).attr("data-token-count", tokenCount);
+
+          },
+          401: function (data) {
+            // The user id/password combination was not valid
+            console.log('401: Unauthenticated');
+            $(authorisationTokenHiddenField).prop("value", "");
+            $(container).removeClass("authorised").addClass("error");
+
+            var tokenCount = $(topContainer).find(".authorised").length;
+            $(topContainer).attr("data-token-count", tokenCount);
+          }
+        }
+      });
+    }
+  });
+});

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

@@ -24,6 +24,15 @@ Renalware.Letters = (function() {
     });
   }
 
+  var bindOnLetterAboutToBatchPrint = function() {
+    $(document).on("click", ".print-batch-letter", function(e) {
+      var modal = $("#letter-print-modal");
+      url = $(this).data("modal-url");
+      modal.load(url).foundation('reveal', 'open');
+      true;
+    });
+  }
+
   var bindOnSalutationChange = function() {
 
     $("#letter-form").on("click", ".has_salutation", function(e) {
@@ -91,7 +100,41 @@ Renalware.Letters = (function() {
         alert("There are no notes to insert");
       }
     });
-  }
+  };
+
+  var pollBatchStatus = function(url) {
+    var POLL_INTERVAL = 2000; // ms
+    var batch = {};
+
+    // Check the current status of the TaskStatus object.
+    var updateStatus = function() {
+      $.ajax({
+        method: 'GET',
+        url: url,
+        contentType: 'json'
+      }).fail(function(e, x, a) {
+        // Possible network glitch or perhaps a re-deploy causing the site to be down momentarily.
+        // Anyway, not enough for us to give up polling.
+        // TODO: examine the response code to see if we should in fact give up and show an
+        // appropriate message.
+        setTimeout(updateStatus, POLL_INTERVAL);
+      }).done(function(batch) {
+        // Done!
+        $(".modal .percent_complete").html(batch.percent_complete + "%");
+        if(batch.status == 'awaiting_printing') {
+          $(".batch_results_container .preparing").hide();
+          $(".batch_results_container .generated-batch-print-pdf-container").show();
+        }
+        // Not done!
+        else {
+          // Could update a progress/100% tracker here
+          // Ask again in POLL_INTERVAL ms.
+          setTimeout(updateStatus, POLL_INTERVAL);
+        }
+      });
+    };
+    setTimeout(updateStatus, POLL_INTERVAL);
+  };
 
   return {
     init: function () {
@@ -101,8 +144,10 @@ Renalware.Letters = (function() {
       initNewContactAsMainRecipient();
       initNewContactAsCC();
       initInsertEventNotesIntoTextEditor();
+      bindOnLetterAboutToBatchPrint();
       bindOnLetterAboutToPrint();
-    }
+    },
+    pollBatchStatus: pollBatchStatus
   };
 }());
 

data/app/assets/pdf/blank_page.pdf

@@ -0,0 +1,56 @@
+%PDF-1.3
+%����
+1 0 obj
+<< /Creator <feff0050007200610077006e>
+/Producer <feff0050007200610077006e>
+>>
+endobj
+2 0 obj
+<< /Type /Catalog
+/Pages 3 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages
+/Count 1
+/Kids [5 0 R]
+>>
+endobj
+4 0 obj
+<< /Length 4
+>>
+stream
+q
+Q
+
+endstream
+endobj
+5 0 obj
+<< /Type /Page
+/Parent 3 0 R
+/MediaBox [0 0 595.28 841.89]
+/CropBox [0 0 595.28 841.89]
+/BleedBox [0 0 595.28 841.89]
+/TrimBox [0 0 595.28 841.89]
+/ArtBox [0 0 595.28 841.89]
+/Contents 4 0 R
+/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+>>
+>>
+endobj
+xref
+0 6
+0000000000 65535 f 
+0000000015 00000 n 
+0000000109 00000 n 
+0000000158 00000 n 
+0000000215 00000 n 
+0000000268 00000 n 
+trailer
+<< /Size 6
+/Root 2 0 R
+/Info 1 0 R
+>>
+startxref
+540
+%%EOF

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

@@ -375,3 +375,207 @@ table.hd-sessions {
     margin-bottom: 0.2rem;
   }
 }
+
+/*
+For the prescription administration section in the HD Session form
+use flexbox to layout items inside each prescription.
+*/
+.hd-drug-administration {
+  display: flex;
+  border: solid 1px $light-grey;
+  margin: .7rem 0;
+  padding: .3rem .6rem;
+  border-right-width: 15px;
+  flex-wrap: wrap;
+
+  .summary {
+    flex-basis: 100%;
+    display: flex; /* also a flex for items within it */
+
+    .hd-drug {
+      flex: 1;
+      padding-bottom: .5rem;
+      color: $mid-grey;
+
+      .hd-drug--name {
+        font-weight: bold;
+      }
+      .hd-drug--name,
+      .hd-drug--dose,
+      .hd-drug--route,
+      .hd-drug--prescribed-on,
+      .hd-drug--frequency {
+        display: inline-block;
+        padding-right: .5rem;
+        color: $dark-grey;
+      }
+
+      .hd-drug--prescriber-name {
+        display: inline-block;
+        color: $mid-grey;
+      }
+
+      .hd-drug--termination {
+        .hd-drug--termination-date {
+          color: $dark-grey;
+          display: inline-block;
+          color: $dark-grey;
+          padding: 0 .3rem;
+        }
+      }
+    }
+
+    /*
+    This is the checkox to indicate the drug was administered.
+    We fix its width as we never want it to shrink.
+    */
+    .hd-drug-administered {
+      flex-basis: 220px;
+      text-align: right;
+
+      .radio {
+        display: inline-block !important;
+      }
+    }
+  }
+
+  .reason-why-not-administered {
+    display: none;
+  }
+
+  &.undecided {
+    .authentication {
+      display: block;
+    }
+  }
+
+  &.administered {
+    border-right-color: $nhs-red;
+
+    /* The 'status' values for the prescription-administration */
+    &[data-token-count='2'] {
+      border-right-color: $nhs-green;
+    }
+  }
+
+  &.not-administered {
+    .authentication {
+      display: none;
+    }
+
+    .reason-why-not-administered {
+      display: block;
+    }
+  }
+
+  .small-input {
+    max-width: inherit !important;
+  }
+
+  .notes {
+    flex: 1;
+    margin-right: 1rem;
+
+    textarea {
+      height: 5.2rem;
+    }
+
+    @media screen and (max-width: 768px) {
+      // As the screen shrinks, put the user/password boxes under the notes
+      flex-basis: 100%;
+    }
+  }
+
+  /* this section contains select2 inputs and pwd fields for the 2 users */
+  .authentication {
+    flex-basis: 330px;
+    flex-grow: 0;
+
+    // Addinng the disabled-with-faded-overlay class to authentication adds a semi transparent overlay
+    // that indicates the section is no receiving input ie because the drug has been marked
+    // as not administered.
+    &.disabled-with-faded-overlay {
+      position: relative;
+    }
+
+    &.disabled-with-faded-overlay:after {
+      content: " ";
+      z-index: 10;
+      display: block;
+      position: absolute;
+      height: 100%;
+      top: 0;
+      left: 0;
+      right: 0;
+      background: rgba(255, 255, 255, 0.5);
+    }
+
+    .user-and-password {
+      display: inline-block;
+      width: 50%;
+      padding-right: 1rem;
+      vertical-align: top;
+
+      .select2-container--default.select2-container--disabled .select2-selection--single {
+        background-color: $white;
+      }
+
+      .spinner {
+        display: none;
+      }
+
+      &.working {
+        .spinner {
+          display: inline-block;
+        }
+
+        .user-password  {
+          background: $mid-grey;
+        }
+
+      }
+
+      .error.invalid-password {
+        display: none;
+      }
+
+      &.error {
+        small.error {
+          display: block;
+        }
+      }
+
+      .select2 {
+        // margin-bottom: 0.75rem;
+      }
+
+      .user-password {
+        margin-bottom: 0;
+      }
+
+      .confirmed {
+        display: none;
+        text-align: center;
+
+        i {
+          font-size: 1.6rem;
+          color: $nhs-green;
+        }
+
+        a {
+          margin-left: .4rem;
+        }
+      }
+
+      &.authorised {
+        .user-password {
+          display: none
+        }
+
+        .confirmed {
+          display: block;
+        }
+      }
+    }
+  }
+}