renalware-core 2.0.111 → 2.0.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb6fe2a9d36fece24e482f2cf318d89af11914dab2beb7b346bf3a6cba9c8b8
-  data.tar.gz: ecde69203a3b74dacc87163bb1b19bf103eb79b2a7e34742fe824d6a53e62f7d
+  metadata.gz: 90a6805bb8cf3b390ced2cb486b99fcc5ffe4d422a191f93cd0db17d7ecd48d5
+  data.tar.gz: 8f1f5c571e429f2733916bc467bb4795c644bab6499c8d33827265847a3c06c9
 SHA512:
-  metadata.gz: 878519c049773af3fe86eb79f5a20274b470d6cbc4c132c3db7c25c67f324bc32a77bb8d6e0d9a9c1270c5090adc6187031b366be4443d4d7df66e60f2d44742
-  data.tar.gz: 0f3cf22ee16a7737816afd2a0245aa0676d3cb3d1ab7c10b85c5873250c90da20e91e7ca96e7b2a1d32ce51231a71b85cdb43e9f0c2ee944da1d8d9da67a3836
+  metadata.gz: 01a912fcb03003db4ab86ce2561dc66370548a0f37e00e90f97e2db932a66723f69d7db0d62c11ff1e2ef5cdd768dbd9d262894a7dcd7e504b13c271ea86e0e3
+  data.tar.gz: b3b0b0b66293404ff97e20c05bbc79598e999cdc5aa35ebc44eda9c902ba2adf465f76b20ea03932b4c392711b2aa4b82bf8bd69814c96884429f66184a169c6

data/Rakefile

@@ -35,6 +35,7 @@ namespace :assets do
 
   desc "Precompile assets within dummy app"
   task :precompile do
+    Rake::Task["app:yarn:install"].invoke
     Rake::Task["app:assets:precompile"].invoke
   end
 
@@ -44,6 +45,12 @@ namespace :assets do
   end
 end
 
+namespace :yarn do
+  task :install do
+    Rake::Task["app:yarn:install"].invoke
+  end
+end
+
 # Default rake task to run all tests:
 #   bundle exec rake
 task :engine_default_task do

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

@@ -15,9 +15,7 @@
 //= require jquery-readyselector
 //= require jquery_ujs
 //= require jquery-ui/core
-//= require jquery-ui/widgets/autocomplete
 //= require jquery-ui/widgets/sortable
-//= require jquery-ui/widgets/tabs
 //= require jquery-ui/effects/effect-highlight
 //= require dataTables/jquery.dataTables
 //= require dataTables/jquery.dataTables.foundation
@@ -31,22 +29,22 @@
 //= require foundation/foundation.tab
 //= require foundation/foundation.tooltip
 //= require foundation/foundation.topbar
-//= require underscore
-//= require select2
+//= require underscore/underscore
+//= require select2/dist/js/select2
 //= require jquery_nested_form
 //= require foundation-datepicker
 //= require renalware/clockpicker
 //= require renalware/double_scroll
 //= require cocoon
-//= require mousetrap
+//= require mousetrap/mousetrap
 //= require renalware/iframeResizer
 //= require clipboard
-//= require renalware/masonry.min
+//= require masonry-layout/dist/masonry.pkgd
 //= require rails.validations
 //= require rails.validations.simple_form
-//= require renalware/print.min
-//= require moment
-//= require_tree .
+//= require print-js/dist/print
+//= require moment/moment
+//= require_directory .
 //
 
 // Define a console.log if one does not yet exist - e.g. we in IE11

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

@@ -0,0 +1,4 @@
+//= require chartkick
+//= require Chart.bundle
+//= require_tree .
+//

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

@@ -24,18 +24,7 @@ $(document).on('opened.fndtn.reveal', '[data-reveal]', function () {
 
   var resizeSelect2DropDownsToFitModal = function(){
     $('.select2', modal).css('width', "100%");
-    $('#tabs').on('tabsactivate', function(event, ui) {
-      $('.select2').css('width', "100%");
-    });
   };
-
-  var layoutTabs = function() {
-    // Layout any JQueryUI tabs
-    $("#tabs").tabs();
-    resizeSelect2DropDownsToFitModal();
-  };
-
-  layoutTabs();
 });
 
 // If there was an error submitting a modal form, be sure to re-enable the submit button

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

@@ -0,0 +1,26 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.FeedOnlyInputs = (function() {
+  // Disable any input/textarea/selects having a data attribute suggesting it is controlled by an
+  // external feed. The data in these inouts can be overwritten by the feed at any time so it
+  // makes sense not to allow user input.
+  // Note that this js file is only re-parsed when it changes, so if you change the value of
+  // e.g. disable_inputs_controlled_by_tissue_typing_feed in an initializer, it will not
+  // take affect until you clear the assets, or make a change to this file etc.
+  var disableFeedOnlyInputs = function() {
+    <% if Renalware.config.disable_inputs_controlled_by_tissue_typing_feed %>
+      $("input,textarea,select").filter("[data-controlled-by-tissue-typing-feed]").prop("disabled", true);
+    <% end %>
+    <% if Renalware.config.disable_inputs_controlled_by_demographics_feed %>
+      $("input,textarea,select").filter("[data-controlled-by-demographics-feed]").prop("disabled", true);
+    <% end %>
+  };
+
+  return {
+    init: function () {
+      disableFeedOnlyInputs();
+    }
+  };
+}());
+
+$(document).ready(Renalware.FeedOnlyInputs.init);

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

@@ -0,0 +1,50 @@
+$(document).ready(function(){
+  $(".hl7-file-browser a").on("click", function(e) {
+    console.log($(this).data("body"));
+    $("#feeds_hl7_test_form_body").val($(this).data("body"))
+  });
+
+//   $(".file-viewer form").on("submit", function(event) {
+//     console.log("asassas");
+//     event.preventDefault();
+//     console.log(this)
+
+//     var valuesToSubmit = this.el.serialize();
+//     var self = this;
+// //#url: self.el.attr("action"), //submits it to the given url of the form
+
+//     $.ajax({
+//       type: "POST",
+//       data: valuesToSubmit,
+//       dataType: "JSON",
+//       statusCode: {
+//         201: function(contact) {
+//           // self._onSuccess(contact);
+//           console.log("asass")
+//         },
+//         400: function(jqXHR) {
+//           var errors = jqXHR.responseJSON;
+//           // self._onErrors(errors);
+//           console.log("error")
+//         }
+//       }
+//     });
+//   });
+
+  // this.el.on("submit", function(event) { self._onSubmit(event) });
+  // $.ajax({
+  //   type: "POST",
+  //   url: self.el.attr("action"), //submits it to the given url of the form
+  //   data: valuesToSubmit,
+  //   dataType: "JSON",
+  //   statusCode: {
+  //     201: function(contact) {
+  //       self._onSuccess(contact);
+  //     },
+  //     400: function(jqXHR) {
+  //       var errors = jqXHR.responseJSON;
+  //       self._onErrors(errors);
+  //     }
+  //   }
+  // });
+});

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

@@ -17,18 +17,18 @@ $(document).ready(function() {
   $(".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).toggleClass("administered", checked);
+    $(container).toggleClass("not-administered", !checked);
     $(container).removeClass("undecided");
-    $(".authentication", container).toggle(checked)
-    $(".authentication", container).toggleClass("disabled-with-faded-overlay", !checked)
+    $(".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("")
+    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;
@@ -41,8 +41,8 @@ $(document).ready(function() {
   $(".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("")
+    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;
@@ -55,7 +55,7 @@ $(document).ready(function() {
   // 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 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();
@@ -106,3 +106,53 @@ $(document).ready(function() {
     }
   });
 });
+
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.HD = (function() {
+  // This is pretty much a duplicate of Letters.pollBatchStatus and we will merge them soon
+  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) {
+        $(".modal .percent_complete").html(batch.percent_complete + "%");
+
+        switch(batch.status) {
+          case 'awaiting_printing':
+            $(".batch_results_container .preparing").hide();
+            $(".batch_results_container .generated-batch-print-pdf-container").show();
+            break;
+          case 'failure':
+            $(".batch_results_container .preparing").html("Failed");
+            break;
+          default:
+            // Ask again in POLL_INTERVAL ms.
+            setTimeout(updateStatus, POLL_INTERVAL);
+        };
+      });
+    };
+    setTimeout(updateStatus, POLL_INTERVAL);
+  };
+
+  return {
+    init: function () {
+      // nothing here yet
+    },
+    pollBatchStatus: pollBatchStatus
+  };
+}());
+
+$(document).ready(Renalware.HD.init);

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

@@ -0,0 +1,43 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.PersonSearch = (function() {
+
+  var initPersonSearch = function(){
+    var dropDown = $(".person-ajax-search");
+
+    $(dropDown).select2({
+      language: {
+        inputTooShort: function(args) {
+          return $(dropDown).data("hint");
+        }
+      },
+      ajax: {
+        dataType: 'json',
+        delay: 250,
+        data: function (params) {
+          return {
+            term: params.term
+          };
+        },
+        processResults: function (data, params) {
+          return {
+            results: data
+          };
+        },
+        cache: true
+      },
+      minimumInputLength: 2
+    });
+  };
+
+  return {
+    init: function () {
+      initPersonSearch()
+    }
+  };
+}());
+
+$(document).ready(Renalware.PersonSearch.init);
+$(document).on('opened.fndtn.reveal', '[data-reveal]', function() {
+  Renalware.PersonSearch.init();
+});

data/app/assets/stylesheets/renalware/application.scss

@@ -1,6 +1,5 @@
 /*
     *= require jquery-ui/core
-    *= require jquery-ui/autocomplete
     *= require jquery-ui/sortable
     *= require jquery-ui/tabs
     *= require_self
@@ -11,7 +10,7 @@
 @import "foundation-datepicker";
 @import "dataTables/jquery.dataTables.foundation";
 @import "trix";
-@import "renalware/balloon";
+@import "balloon-css/src/balloon";
 @import "./lib/foundation_and_overrides";
 @import "./lib/clockpicker";
 @import "./base/variables";
@@ -19,6 +18,5 @@
 @import "renalware/select2-foundation5";
 @import "./lib/select2-foundation5-overrides";
 @import "./modules/**/*";
-@import "renalware/print.min";
-@import "./print/**/*";
+@import "print-js/dist/print";
 @import "./partials/**/*";

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

@@ -0,0 +1,7 @@
+.hl7-file-browser {
+  .file-viewer {
+    textarea {
+      height: 30rem;
+    }
+  }
+}

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

@@ -1,3 +1,22 @@
+#hd-session-form-batch-print-modal {
+  .cancel-link {
+    margin-bottom: 0.5em;
+    display: inline-block;
+    font-size: 1rem;
+  }
+
+  .percent_complete {
+    font-size: 1.3rem;
+    float: right;
+  }
+
+  .modal__footer {
+    .left {
+      color: $dashboard-muted-color;
+    }
+  }
+}
+
 .hd_transmission_logs {
   tr {
     &.session_import_success {

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

@@ -138,5 +138,5 @@ table#observations {
 }
 
 #observation-requests {
-  height: 30em;
+  height: auto;
 }

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

@@ -369,6 +369,7 @@ form {
 
   .summary-part--events,
   .summary-part--admissions,
+  .summary-part--eq5d,
   .summary-part--consults {
     @include grid-column(12);
 
@@ -418,6 +419,12 @@ form {
       }
     }
   }
+
+  .summary-part--eq5d table {
+    td, th {
+      text-align: center;
+    }
+  }
 }
 
 #select2-practice-search-results {
@@ -429,3 +436,9 @@ form {
     }
   }
 }
+
+.add-patient-from-master-index {
+  table td a {
+    margin: 0;
+  }
+}

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

@@ -167,8 +167,8 @@
   }
 }
 
-.insert-snippet-button,
-.editor-toolbar-button {
+a.insert-snippet-button,
+a.editor-toolbar-button {
   margin-bottom: 5px !important;
   margin-left: 1rem;
   padding: 5px 8px;

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

@@ -174,7 +174,7 @@ article {
       span {
         color: $mid-grey;
         font-size: 1.1rem;
-        line-height: 1.78rem;
+        // line-height: 1.78rem;
         margin: 0 .5rem 0 0;
       }
 
@@ -475,3 +475,7 @@ legend .legend-note {
   font-size: .9rem;
   color: $steel;
 }
+
+.page-action-inline-form form {
+  display: inline-block;
+}