renalware-core 2.0.109 → 2.0.110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c997818b4731d4dacc650d1ee21da4bc8d0731612f4b6afb6992375ad8ab5ebe
-  data.tar.gz: ca7fb8bb184625a629f68e685a8af2ed8a931e597496d3ad4f47f4cd7dd20f83
+  metadata.gz: d299c658864be00fd2bb5e32766ca4bb07f92e4d1e3cac36536bbb351dc13132
+  data.tar.gz: d405e456e7f324d56d2d9b10cd4643dd7d20721967d1126461d4f287150b83e1
 SHA512:
-  metadata.gz: 1f78547330d9e31903a14a2c794f782589ce3624888912a84bc3204d8e939091e503b29def2e06c7d835db8c70d9cb840986480ae77fbbd57bdf8d6bc7837ff2
-  data.tar.gz: 341dd6ad0f4f7c298de70c14b47cae472524fcd502d084c89c24a9020cdc37dde51970b517cd20eb7d2e3c31e4ec77bd31b59c354b72b88e376dd6e50c5884f7
+  metadata.gz: 22d08baf9693562abd1048245c849a2015d1210594b1f7821f78820a626ac58b21442f742c702add9798b4dde1ea33e2b423703dee6e94622aa340c0ce4a689d
+  data.tar.gz: fcb3ddb0e16d5bc177dace948ea795659523d196086967a0743b0a98843561b325bcc9b148b2f31123324a00d9817c13ca4575d4f5bc096cab95fc0469b23544

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/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/_letters.scss

@@ -112,3 +112,49 @@ table.letters {
     }
   }
 }
+
+#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;
+    }
+  }
+}
+
+.batch_results_container {
+  text-align: center;
+}
+
+.generated-batch-print-pdf-container {
+  text-align: center;
+  padding: 1.5rem 0;
+  font-size: 1.3rem;
+
+  .print-batch-letter {
+    padding: .5rem 1rem;
+    text-decoration: underline;
+    color: $nhs-green;
+
+    &:hover {
+      color: $nhs-dark-green;
+    }
+
+    i {
+      padding: 1rem 1rem 1rem 0;
+      vertical-align: sub;
+      color: $nhs-green;
+      font-size: 1.8rem;
+    }
+  }
+}

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

@@ -218,8 +218,8 @@ table {
     }
 
     &.col-width-date-time {
-      min-width: 9.5rem;
-      width: 9.5rem;
+      min-width: 9.6rem;
+      width: 9.6rem;
     }
 
     &.col-width-reference-without-prefix {

data/app/controllers/renalware/base_controller.rb

@@ -9,9 +9,16 @@ module Renalware
 
     before_action :set_paper_trail_whodunnit
     after_action :verify_authorized
+
+    # A note on ahoy tracking:
     # has_user_timed_out is defined on SessionTimeoutController
-    # Perhaps we should define #has_user_timed_out here and override in SessionTimeoutController?
-    after_action :track_action, except: [:has_user_timed_out]
+    # using this in the that controller
+    #   skip_before_action :track_ahoy_visit, only: has_user_timed_out
+    # does not seem to work hence this global blacklist
+
+    # rubocop:disable Rails/LexicallyScopedActionFilter
+    after_action :track_action, except: [:has_user_timed_out, :status]
+    # rubocop:enable Rails/LexicallyScopedActionFilter
 
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 

data/app/controllers/renalware/clinics/appointments_controller.rb

@@ -27,9 +27,8 @@ module Renalware
 
       def create
         appointment = Appointment.new(appointment_params)
-        appointment.user = current_user
         authorize appointment
-        if appointment.save
+        if appointment.save_by(current_user)
           redirect_to appointments_path, notice: t(".success", model_name: "Appointment")
         else
           render_new(appointment)
@@ -56,7 +55,13 @@ module Renalware
       def appointment_params
         params
           .require(:clinics_appointment)
-          .permit(:patient_id, :clinic_id, :starts_at, :outcome_notes, :dna_notes, :clinician_id)
+          .permit(
+            :patient_id,
+            :clinic_id,
+            :starts_at,
+            :outcome_notes,
+            :dna_notes,
+            :consultant_id)
       end
     end
   end

data/app/controllers/renalware/letters/batches_controller.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/letters"
+
+module Renalware
+  module Letters
+    class BatchesController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def create
+        batch = create_unprocessed_batch_and_batch_items(ids_of_letters_to_batch_print)
+        authorize batch
+        Printing::BatchPrintJob.perform_later(batch, current_user)
+        respond_to do |format|
+          format.js {
+            render locals: { batch: batch }
+          }
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def status
+        batch = find_and_authorize_batch(params[:batch_id])
+        respond_to do |format|
+          format.json {
+            render(
+              status: :ok,
+              json: {
+                id: batch.id,
+                status: batch.status,
+                percent_complete: batch.percent_complete
+              }
+            )
+          }
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # rubocop:disable Metrics/MethodLength
+      def show
+        batch = find_and_authorize_batch
+        respond_to do |format|
+          format.pdf do
+            # Returns the PDF itself using path saved in the Batch - provided status is correct
+            send_file(
+              batch.filepath,
+              type: "application/pdf",
+              disposition: "inline",
+              filename: "letter_batch_#{batch.id}.pdf"
+            )
+          end
+          format.html do
+            # Returns a partial with a link to the compiled batch pdf
+            render layout: false, locals: { batch: find_and_authorize_batch }
+          end
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def index
+        batches = Batch.order(created_at: :desc)
+        authorize batches
+        render locals: { batches: batches.page(page).per(per_page) }
+      end
+
+      private
+
+      def find_and_authorize_batch(id = nil)
+        id ||= params[:id]
+        Letters::Batch.find(id).tap do |batch|
+          authorize batch
+        end
+      end
+
+      def ids_of_letters_to_batch_print
+        LetterQuery
+          .new(q: batch_params)
+          .call
+          .select(:id, :event_type, :event_id)
+          .map(&:id)
+      end
+
+      def create_unprocessed_batch_and_batch_items(letter_ids)
+        batch = Batch.new
+        Batch.transaction do
+          letter_ids.each { |letter_id| batch.items.build(letter_id: letter_id) }
+          batch.save_by!(current_user)
+        end
+        batch
+      end
+
+      def batch_params
+        params
+          .require(:batch)
+          .permit(
+            :enclosures_present,
+            :state_eq,
+            :author_id_eq,
+            :created_by_id_eq,
+            :letterhead_id_eq,
+            :page_count_in_array
+          )
+      end
+    end
+  end
+end

data/app/controllers/renalware/letters/completed_batches_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/letters"
+
+module Renalware
+  module Letters
+    class CompletedBatchesController < BaseController
+      include Renalware::Concerns::Pageable
+
+      # Renders a modal asking the user if they want to complete (ie mark as printed)
+      # the batch.
+      def new
+        batch = find_and_authorize_batch
+        render layout: false, locals: { batch: batch }
+      end
+
+      def create
+        batch = find_and_authorize_batch
+        Printing::CompleteBatch.new(user: current_user, batch: batch).call
+        render layout: false, locals: { batch: batch }
+      end
+
+      private
+
+      def find_and_authorize_batch
+        Letters::Batch.find(params[:batch_id]).tap do |batch|
+          authorize batch
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/letters/lists_controller.rb

@@ -10,16 +10,24 @@ module Renalware
       # rubocop:disable Metrics/MethodLength
       # TODO: Use a presenter here
       def show
-        query = LetterQuery.new(q: params[:q])
+        named_filter = params.fetch(:named_filter, "all").to_sym
+        form = form_for(named_filter)
+        query = LetterQuery.new(q: form.attributes)
         letters = find_and_authorize_letters(query)
 
+        q = query.search
+
         locals = {
           letters: letters,
-          authors: User.author.ordered,
-          typists: User.ordered,
-          letterheads: Letters::Letterhead.ordered,
-          q: query.search
+          q: q,
+          form: form_for(named_filter)
         }
+
+        # Could pass back a batchprint summary
+        # {
+        #   count: 123,
+        #   excluded_enc: 3
+        # }
         respond_to do |format|
           format.html { render(locals: locals) }
           format.js   { render(locals: locals, layout: false) }
@@ -29,6 +37,10 @@ module Renalware
 
       private
 
+      def form_for(named_filter)
+        Lists::Form.new(named_filter: named_filter, params: filter_parameters)
+      end
+
       def find_and_authorize_letters(query)
         collection = call_query(query).page(page).per(per_page)
         present_letters(collection).tap { |letters| authorize letters }
@@ -47,6 +59,23 @@ module Renalware
           .with_author
           .with_created_by
       end
+
+      # These are used also when creating a batch.
+      def filter_parameters
+        return {} unless params.key?(:q)
+
+        params
+          .require(:q)
+          .permit(
+            :enclosures_present,
+            :state_eq,
+            :author_id_eq,
+            :created_by_id_eq,
+            :letterhead_id_eq,
+            :page_count_in_array,
+            :s
+          )
+      end
     end
   end
 end