renalware-core 2.0.111 → 2.0.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb6fe2a9d36fece24e482f2cf318d89af11914dab2beb7b346bf3a6cba9c8b8
-  data.tar.gz: ecde69203a3b74dacc87163bb1b19bf103eb79b2a7e34742fe824d6a53e62f7d
+  metadata.gz: d5ca791105ad77524bc53a491d593ca9871363fdd5b3c3b874755f1a3898ca8c
+  data.tar.gz: 770c7beab9d9369f637cf067ff7fe9a068a579805690aeb76ef77a080be3bf6d
 SHA512:
-  metadata.gz: 878519c049773af3fe86eb79f5a20274b470d6cbc4c132c3db7c25c67f324bc32a77bb8d6e0d9a9c1270c5090adc6187031b366be4443d4d7df66e60f2d44742
-  data.tar.gz: 0f3cf22ee16a7737816afd2a0245aa0676d3cb3d1ab7c10b85c5873250c90da20e91e7ca96e7b2a1d32ce51231a71b85cdb43e9f0c2ee944da1d8d9da67a3836
+  metadata.gz: a10238b66a41f3a73e924acf31ac1691194fefd2738764a52bc3bcef8a75872288f0dbb55835ceed2579a50f2357b214641c55cc5d37a89ffab289af065a8514
+  data.tar.gz: 1f17f033bd3a78c003e385500b4505bb3eb1ec452adcc6c8850a210f79d0a2a5616065581a5eb2f891553dcbc9cbc409abfcf2f2f95be707ce59ff8843ac1fb0

data/Rakefile

@@ -35,6 +35,9 @@ namespace :assets do
 
   desc "Precompile assets within dummy app"
   task :precompile do
+    p "Here"
+    Rake::Task["app:yarn:install"].invoke
+    p "There"
     Rake::Task["app:assets:precompile"].invoke
   end
 
@@ -44,6 +47,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

@@ -17,7 +17,6 @@
 //= 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 +30,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/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/stylesheets/renalware/application.scss

@@ -11,7 +11,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 +19,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/_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/_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 {

data/app/assets/stylesheets/renalware/print/pathology_request_forms.scss

@@ -31,3 +31,29 @@ hr.page_break {
 }
 
 div.alwaysbreak { page-break-before: always; }
+
+.path-request-form {
+  table {
+    width: 100%;
+    td, th {
+      padding: .3rem;
+    }
+  }
+
+  h4, h3 {
+    font-size: 1.2rem;
+  }
+
+  .border_box_half {
+    width: 47%;
+    margin-top: .5rem;
+    padding: 0.5rem;
+
+    &.global_requests {
+      float: left;
+    }
+    &.patient_requests {
+      float: right;
+    }
+  }
+}

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

@@ -138,11 +138,11 @@ h1 {
           &.col-width-date {
             min-width: 6rem;
             width: 6rem;
+            text-align: centre;
           }
 
           &.col-width-time {
-            min-width: 5.6rem;
-            width: 5.6rem;
+            width: 3rem;
           }
 
           &.col-width-minute {
@@ -155,6 +155,11 @@ h1 {
             width: 5rem;
           }
 
+          &.col-width-bp {
+            min-width: 3.7rem;
+            width: 3.7rem;
+          }
+
           &.col-width-drugs {
             min-width: 10rem;
             width: 10rem;
@@ -179,7 +184,7 @@ h1 {
         td {
           border-top: solid 1px #000;
           height: 2rem;
-          padding: 3px;
+          padding: 1px;
           text-align: center;
 
           &.text-left {
@@ -188,7 +193,7 @@ h1 {
         }
 
         &.empty-session-row {
-          height: 4rem;
+          height: 3.5rem;
           &.first {
             td {
               border-top: solid 2px #000;

data/app/controllers/renalware/hd/mdm_patients_controller.rb

@@ -6,11 +6,13 @@ module Renalware
   module HD
     class MDMPatientsController < Renalware::MDMPatientsController
       def index
-        render_index(filter_form: filter_form,
-                     query: query,
-                     page_title: t(".page_title"),
-                     view_proc: ->(patient) { patient_hd_mdm_path(patient) },
-                     patient_presenter_class: HD::PatientPresenter)
+        render_index(
+          filter_form: filter_form,
+          query: query,
+          page_title: t(".page_title"),
+          view_proc: ->(patient) { patient_hd_mdm_path(patient) },
+          patient_presenter_class: HD::PatientPresenter
+        )
       end
 
       private
@@ -48,12 +50,21 @@ module Renalware
         params[:named_filter]
       end
 
+      def batch_print_form
+        patient_ids = query.call.pluck("patients.id").join(",")
+        SessionForms::Form.new(patient_ids: patient_ids)
+      end
+
       def render_index(filter_form:, **args)
         presenter = build_presenter(params: params, **args)
         authorize presenter.patients
         render(
           :index,
-          locals: { presenter: presenter, filter_form: filter_form }
+          locals: {
+            presenter: presenter,
+            filter_form: filter_form,
+            batch_print_form: batch_print_form
+          }
         )
       end
     end

data/app/controllers/renalware/hd/protocols_controller.rb

@@ -4,51 +4,42 @@ require_dependency "renalware/hd/base_controller"
 
 module Renalware
   module HD
+    # Responsible for rendering an HD Session Form PDF (aka Protocol) which has the patients
+    # past 3 sessions on it, and empty rows for their next three sessions.
     class ProtocolsController < BaseController
-      before_action :load_patient
-
+      # Note that although rendering an individual PDF for a patient here, we use PdfRender
+      # which can handles multiple patients, and hence it uses the index.pdf.slim view.
+      # The show view is not used.
       def show
+        authorize Session, :show?
         respond_to do |format|
-          format.pdf {
-            disposition = params.fetch("disposition", "inline")
-            render_pdf(disposition)
-          }
+          format.html { render html: pdf_renderer.call }
+          format.pdf { send_pdf_data_as_inline_file }
         end
       end
 
       private
 
-      def render_pdf(disposition)
-        render(
-          pdf_options.merge(
-            pdf: pdf_filename,
-            disposition: disposition,
-            print_media_type: true,
-            locals: {
-              protocol: ProtocolPresenter.new(patient, view_context)
-            }
-          )
+      def send_pdf_data_as_inline_file
+        send_data(
+          pdf_renderer.call,
+          filename: pdf_filename,
+          type: "application/pdf",
+          disposition: "inline"
         )
       end
 
-      # Other options to consider:
-      #  viewport_size: '1280x1024'
-      #  disable_smart_shrinking: true
-      def pdf_options
-        {
-          page_size: "A4",
-          orientation: "Landscape",
-          layout: "renalware/layouts/pdf",
-          margin: { top: 10, bottom: 10, left: 10, right: 10 },
-          footer: {
-            font_size: 8
-          },
-          show_as_html: (Rails.env.development? || Rails.env.test?) && params.key?("debug")
-        }
+      def pdf_renderer
+        @pdf_renderer ||= begin
+          SessionForms::PdfRenderer.new(
+            patients: patient,
+            output_html_for_debugging: params.key?(:debug)
+          )
+        end
       end
 
       def pdf_filename
-        "#{patient.family_name}-#{patient.hospital_identifier.id}-protocol".upcase
+        "#{patient.family_name}-#{patient.hospital_identifier.id}-protocol".upcase + ".pdf"
       end
     end
   end