renalware-core 2.0.109 → 2.0.110

data/app/policies/renalware/letters/batch_policy.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/letters/letter_policy"
+
+module Renalware
+  module Letters
+    class BatchPolicy < BasePolicy
+      def status?
+        show?
+      end
+    end
+  end
+end

data/app/presenters/renalware/letters/recipient_presenter.rb

@@ -20,7 +20,7 @@ module Renalware
       private
 
       def address_for_addressee
-        __getobj__.address
+        __getobj__&.address
       end
 
       # The address for a recipient such as a primary care physician or a patient are

data/app/presenters/renalware/pathology/requests/request_presenter.rb

@@ -23,7 +23,7 @@ module Renalware
         end
 
         def consultant
-          request_form.consultant.full_name
+          request_form.consultant&.name
         end
 
         def clinical_detail

data/app/presenters/renalware/transplants/mdm_presenter.rb

@@ -10,7 +10,7 @@ module Renalware
       end
 
       def cmvdna_pathology
-        @cmvdna_pathology ||= pathology_for_codes("CMVDNA")
+        @cmvdna_pathology ||= pathology_for_codes("CMVD")
       end
     end
   end

data/app/presenters/renalware/virology/dashboard_presenter.rb

@@ -11,9 +11,10 @@ module Renalware
 
       def latest_hep_b_antibody_statuses
         @latest_hep_b_antibody_statuses ||= begin
+          observation_descriptions = Renalware::Pathology::ObservationDescription.for(Array("BHBS"))
           Renalware::Pathology::CreateObservationsGroupedByDateTable.new(
             patient: patient,
-            observation_descriptions: Renalware::Pathology::ObservationDescription.for(Array("BHBS")),
+            observation_descriptions: observation_descriptions,
             page: 1,
             per_page: 5
           ).call

data/app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder

@@ -3,8 +3,8 @@
 xml = builder
 
 observation_times = {
-  pre: session.performed_on + session.start_time.seconds_since_midnight.seconds,
-  post: session.performed_on + session.end_time.seconds_since_midnight.seconds
+  pre: session.performed_on.to_datetime + session.start_time.seconds_since_midnight.seconds,
+  post: session.performed_on.to_datetime + session.end_time.seconds_since_midnight.seconds
 }
 
 {

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -10,7 +10,9 @@
         .medium-3.large-3.columns
           = f.input :clinic_id_eq, collection: clinics, label: "Clinic"
         .medium-3.large-3.columns
-          = f.input :user_id_eq, as: :user_picker, collection: users, label: "User"
+          = f.input(:consultant_id_eq,
+                    collection: Renalware::Renal::Consultant.pluck(:name, :id),
+                    label: "Consultant")
         .medium-3.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
 
@@ -29,7 +31,6 @@
       | Generate request forms
 
 = within_admin_layout(title: "Upcoming Clinic Visit Appointments") do
-
     table#appointments
       thead
         tr
@@ -68,7 +69,7 @@
               = " | "
               - if appointment.becomes_visit_id.present?
                 = link_to edit_patient_clinic_visit_path(appointment.patient,
-                                                          id: appointment.becomes_visit_id) do
+                                                         id: appointment.becomes_visit_id) do
                   | View Clinic Visit
               - else
                 = link_to new_patient_clinic_visit_path(appointment.patient,
@@ -83,7 +84,7 @@
             td= appointment.patient.age
             td= appointment.patient.current_modality
             td= appointment.clinic.name
-            td= appointment.user.full_name
+            td= appointment.consultant&.name
             td.show-for-large-up.col-width-medium-with-ellipsis= appointment.outcome_notes
             td.show-for-large-up.col-width-medium-with-ellipsis= appointment.dna_notes
           = content_tag(:tr, id: "appointment-quick-preview-#{appointment.id}", style: "display: none")

data/app/views/renalware/clinics/appointments/new.html.slim

@@ -26,6 +26,9 @@
     = f.input :clinic_id,
               collection: Renalware::Clinics::Clinic.all,
               wrapper: :horizontal_medium
+    = f.input :consultant_id,
+              collection: Renalware::Renal::Consultant.pluck(:name, :id),
+              wrapper: :horizontal_medium
     = f.input :starts_at, as: :datetime_picker, wrapper: :horizontal_datepicker
     = f.input :outcome_notes, as: :text, wrapper: :horizontal_large
     = f.input :dna_notes, as: :text, wrapper: :horizontal_large

data/app/views/renalware/letters/batches/_create.html.slim

@@ -0,0 +1,27 @@
+.modal
+  .modal__header
+    h1= "Compiling #{batch.batch_items_count} letters"
+    .percent_complete
+  .modal__body
+    .content
+      .batch_results_container(data={"poll-url" => renalware.letters_batch_status_path(batch)})
+        .preparing
+          = image_tag("renalware/loading-gears-animation.gif", height: "116")
+
+
+        .generated-batch-print-pdf-container(style="display:none")
+          = link_to letters_batch_path(batch, format: :pdf),
+                    target: "_blank",
+                    class: "print-batch-letter",
+                    data: { "modal-url" => new_letters_batch_completion_path(batch) } do
+            i.far.fa-check-circle
+            | Open PDF in a new tab
+
+  .modal__footer
+    .left
+      = "##{batch.id}"
+    .right
+      = link_to "Cancel",
+        "#",
+        "aria-label" => "Close",
+        class: "reveal-modal-close cancel-link"

data/app/views/renalware/letters/batches/create.js.erb

@@ -0,0 +1,3 @@
+<%= refresh("#batch-print-modal", partial: "create", locals: local_assigns) %>
+$("#batch-print-modal").foundation('reveal', 'open');
+Renalware.Letters.pollBatchStatus('<%= letters_batch_status_path(batch) %>');

data/app/views/renalware/letters/batches/index.html.slim

@@ -0,0 +1,20 @@
+= within_admin_layout(title: "Print Batches") do
+
+  table
+    thead
+      tr
+        th.col-width-tiny Id
+        th.col-width-medium Status
+        th.col-width-date-time Created
+        th.col-width-tiny Letters
+        th Created by
+    tbody
+      - batches.each do |batch|
+        tr
+          td= batch.id
+          td= batch.status.humanize
+          td= l(batch.created_at)
+          td= batch.batch_items_count
+          td= batch.created_by
+
+  = paginate batches

data/app/views/renalware/letters/batches/show.html.slim

@@ -0,0 +1,7 @@
+.generated-batch-print-pdf-container
+  = link_to letters_batch_path(batch, format: :pdf),
+            target: "_blank",
+            class: "print-batch-letter",
+            data: { "modal-url" => new_letters_batch_completion_path(batch) } do
+    i.far.fa-file-pdf
+    | Open PDF in a new tab

data/app/views/renalware/letters/completed_batches/create.js.erb

@@ -0,0 +1,9 @@
+// We have just 'created' a Letter Completion resource on the server
+// (in other words we have updated the letter state to Completed!) and now we
+// need to refresh the view the user was on. This could be any page
+// were the letter is listed or displayed. So look for a URL stored
+// somewhere on the page in a data attribute and if found make an AJAX call
+// which will probably reload e.g. a letters table or something like that.
+<%# url = $(".reveal-modal").data("refresh-url");
+if(url) { $.getScript(url); } %>
+location.reload(true);

data/app/views/renalware/letters/completed_batches/new.html.slim

@@ -0,0 +1,26 @@
+.modal
+  .modal__header
+    h2= "Was printing successful?"
+  .modal__body
+    / dl.dl-horizontal
+    /   dt Patient
+    /   dd= letter.patient.to_s
+    /   dt Letter
+    /   dd= letter.description
+    /   dt Date
+    /   dd= l(letter.issued_on)
+    /   dt Author
+    /   dd= letter.author
+    br
+  .modal__footer
+    = link_to "No - leave in the Print Queue",
+              "#",
+              class: "button secondary reveal-modal-close",
+              "aria-label" => "Close"
+    |    
+    = link_to "Yes - remove from the Print Queue",
+              letters_batch_completions_path(batch),
+              method: :post,
+              remote: true,
+              data: { disable_with: "Updating..." },
+              class: "button primary right"

data/app/views/renalware/letters/lists/_table.html.slim

@@ -2,7 +2,7 @@
   table.report.letters
     thead
       tr
-        th.noprint.col-width-17
+        th.noprint.col-width-large
         th Type
         th= sort_link([:renalware, q], :type, "State")
         th.col-width-medium= sort_link([:renalware, q], :patient_family_name, "Patient")

data/app/views/renalware/letters/lists/_tabs.html.slim

@@ -0,0 +1,9 @@
+- named_filter_param = params[:named_filter]
+dl.sub-nav
+  - filter = :all
+  dd(class=("active" if named_filter_param.to_s == filter.to_s))
+    = link_to t(".tab.#{filter}"), renalware.letters_filtered_letters_list_path(named_filter: filter)
+  - if Renalware.config.batch_printing_enabled
+    - filter = :batch_printable
+    dd(class=("active" if named_filter_param.to_s == filter.to_s))
+      = link_to t(".tab.#{filter}"), renalware.letters_filtered_letters_list_path(named_filter: filter)

data/app/views/renalware/letters/lists/index.html.slim.dead

@@ -0,0 +1,101 @@
+/ OK
+/ elements
+/ tabs - ok done
+/ filters
+/ for each named_dfilter
+/   - what is displayed
+/    - what is enabled
+/    - what values it has
+/ { filter: { enclosures_present: { disabled: true, options: [], visible: false } } }
+
+= content_for(:tabs) do
+  = render "tabs"
+
+= content_for(:filters) do
+  .search-form.filters
+    = simple_form_for q,
+                      as: :q,
+                      url: renalware.letters_filtered_letters_list_path(named_filter:  params[:named_filter]),
+                      html: { autocomplete: "off" },
+                      method: :get do |f|
+      .row
+        - unless filter_options.dig(:enclosures_present, :hidden)
+          .small-6.medium-1.large-1.columns
+            = f.input :enclosures_present,
+                      as: :select,
+                      label: "Enclosure",
+                      input_html: { disabled: filter_options.dig(:enclosures_present, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :state_eq,
+                    collection: filter_options.dig(:state_eq, :options)&.call,
+                    label: "State",
+                    input_html: { disabled: filter_options.dig(:state_eq, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :author_id_eq,
+                    as: :user_picker,
+                    collection: authors,
+                    label: "Author",
+                    input_html: { disabled: filter_options.dig(:author_id_eq, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :created_by_id_eq,
+                    as: :user_picker,
+                    collection: typists,
+                    label: "Typist"
+        .small-6.medium-2.large-2.columns
+          = f.input :letterhead_id_eq, collection: letterheads, label: "Letterhead"
+        .small-6.medium-1.large-1.columns
+          = f.input :page_count_in_array,
+                    collection: [["1 or 2", "[1,2]"],["3 or 4", "[3,4]"]],
+                    label: "Pages"
+        .small-12.medium-2.large-2.columns.actions.end
+          = f.submit t("helpers.submit.filter"), class: "button secondary"
+          span= " or "
+          = link_to t("helpers.reset"), letters_list_path
+
+  = link_to("#", data: { "reveal-id" => "batch-print-modal" }, class: "button") do
+    i.fas.fa-print
+    | Batch print these letters
+
+  #batch-print-modal.reveal-modal.medium(data-reveal)
+    .modal
+      .modal__header
+        h1= "Batch print #{letters.total_count} letters"
+        /= render "renalware/shared/modal_close_link"
+      .modal__body
+        p Excludes 2 letters with enclosures
+        .content
+          / This for uses the same attributes as the filter form but when submitted will
+          / queue a print job for the current search criteria.
+          = simple_form_for q,
+                            as: :batch,
+                            url: letters_batches_path,
+                            method: :post,
+                            remote: true do |f|
+            = f.input :enclosures_present, as: :hidden
+            = f.input :state_eq, as: :hidden
+            = f.input :author_id_eq, as: :hidden
+            = f.input :created_by_id_eq, as: :hidden
+            = f.input :letterhead_id_eq, as: :hidden
+            = f.input :page_count_in_array, as: :hidden
+            = f.submit "Print", class: "button", data: { disable_with: "Printing" }
+            n= " or "
+            = link_to "Cancel",
+                "#",
+                "aria-label" => "Close",
+                  class: "reveal-modal-close"
+      .modal__footer
+
+= within_admin_layout(title: "Letters") do
+  = render "table", letters: letters, q: q
+
+/ The modal dialog container for the dialog which will ask the user
+/ if they want to mark the letter as printed. We load this dialog via ajax.
+/ See letters/completed_letters/new.html.slim for th dialog content.
+/ See also
+/ - letters/completed_letters/create.js.erb
+/ - ./show.js.erb
+/ - letters.js
+/ for the complete works. Using ujs for these sort of dialog -> -> post -> page refresh
+/ cycles is a bit complex and we could move to using something like stimulus
+/ to keep thing a bit simpler
+#letter-print-modal.reveal-modal.medium(data-reveal data-refresh-url=request.original_fullpath)

data/app/views/renalware/letters/lists/index.html.slim.dead1

@@ -0,0 +1,90 @@
+= content_for(:tabs) do
+  = render "tabs"
+
+= content_for(:filters) do
+  .search-form.filters
+    = simple_form_for q,
+                      as: :q,
+                      url: renalware.letters_filtered_letters_list_path(named_filter:  params[:named_filter]),
+                      html: { autocomplete: "off" },
+                      method: :get do |f|
+      .row
+        - unless filter_options.dig(:enclosures_present, :hidden)
+          .small-6.medium-1.large-1.columns
+            = f.input :enclosures_present,
+                      as: :select,
+                      label: "Enclosure",
+                      input_html: { disabled: filter_options.dig(:enclosures_present, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :state_eq,
+                    collection: filter_options.dig(:state_eq, :options)&.call,
+                    label: "State",
+                    input_html: { disabled: filter_options.dig(:state_eq, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :author_id_eq,
+                    as: :user_picker,
+                    collection: authors,
+                    label: "Author",
+                    input_html: { disabled: filter_options.dig(:author_id_eq, :disabled) }
+        .small-6.medium-2.large-2.columns
+          = f.input :created_by_id_eq,
+                    as: :user_picker,
+                    collection: typists,
+                    label: "Typist"
+        .small-6.medium-2.large-2.columns
+          = f.input :letterhead_id_eq, collection: letterheads, label: "Letterhead"
+        .small-6.medium-1.large-1.columns
+          = f.input :page_count_in_array,
+                    collection: [["1 or 2", "[1,2]"],["3 or 4", "[3,4]"]],
+                    label: "Pages"
+        .small-12.medium-2.large-2.columns.actions.end
+          = f.submit t("helpers.submit.filter"), class: "button secondary"
+          span= " or "
+          = link_to t("helpers.reset"), letters_list_path
+
+  = link_to("#", data: { "reveal-id" => "batch-print-modal" }, class: "button") do
+    i.fas.fa-print
+    | Batch print these letters
+
+  #batch-print-modal.reveal-modal.medium(data-reveal)
+    .modal
+      .modal__header
+        h1= "Batch print #{letters.total_count} letters"
+        /= render "renalware/shared/modal_close_link"
+      .modal__body
+        .content
+          / This for uses the same attributes as the filter form but when submitted will
+          / queue a print job for the current search criteria.
+          = simple_form_for q,
+                            as: :batch,
+                            url: letters_batches_path,
+                            method: :post,
+                            remote: true do |f|
+            = f.input :enclosures_present, as: :hidden
+            = f.input :state_eq, as: :hidden
+            = f.input :author_id_eq, as: :hidden
+            = f.input :created_by_id_eq, as: :hidden
+            = f.input :letterhead_id_eq, as: :hidden
+            = f.input :page_count_in_array, as: :hidden
+            = f.submit "Print", class: "button", data: { disable_with: "Printing" }
+            n= " or "
+            = link_to "Cancel",
+                "#",
+                "aria-label" => "Close",
+                  class: "reveal-modal-close"
+      .modal__footer
+
+= within_admin_layout(title: "Letters") do
+  = render "table", letters: letters, q: q
+
+/ The modal dialog container for the dialog which will ask the user
+/ if they want to mark the letter as printed. We load this dialog via ajax.
+/ See letters/completed_letters/new.html.slim for th dialog content.
+/ See also
+/ - letters/completed_letters/create.js.erb
+/ - ./show.js.erb
+/ - letters.js
+/ for the complete works. Using ujs for these sort of dialog -> -> post -> page refresh
+/ cycles is a bit complex and we could move to using something like stimulus
+/ to keep thing a bit simpler
+#letter-print-modal.reveal-modal.medium(data-reveal data-refresh-url=request.original_fullpath)

data/app/views/renalware/letters/lists/show.html.slim

@@ -1,29 +1,75 @@
+- named_filter = params[:named_filter]&.to_sym || :all
+
+= content_for(:tabs) do
+  = render "tabs"
+
 = content_for(:filters) do
   .search-form.filters
-    = simple_form_for q,
+    = simple_form_for form,
                       as: :q,
-                      url: letters_list_path,
+                      url: renalware.letters_filtered_letters_list_path(named_filter: named_filter),
                       html: { autocomplete: "off" },
                       method: :get do |f|
       .row
         .small-6.medium-1.large-1.columns
-          = f.input :enclosures_present, as: :select, label: "Enclosure"
+            = f.input :enclosures_present,
+                      as: :select,
+                      label: "Enclosure",
+                      input_html: { disabled: form.disabled_inputs.include?(:enclosures_present) }
         .small-6.medium-2.large-2.columns
-          = f.input :state_eq, collection: state_options_for_receptionists, label: "State"
+          = f.input :state_eq,
+                    collection: form.letter_state_options,
+                    label: "State",
+                    include_blank: form.allow_blank_inputs.include?(:state_eq),
+                    input_html: { disabled: form.disabled_inputs.include?(:state_eq) }
         .small-6.medium-2.large-2.columns
-          = f.input :author_id_eq, as: :user_picker, collection: authors, label: "Author"
+          = f.input :author_id_eq,
+                    as: :user_picker,
+                    collection: form.author_options,
+                    label: "Author",
+                    input_html: { disabled: form.disabled_inputs.include?(:author_id_eq) }
         .small-6.medium-2.large-2.columns
-          = f.input :created_by_id_eq, as: :user_picker, collection: typists, label: "Typist"
+          = f.input :created_by_id_eq,
+                    as: :user_picker,
+                    collection: form.typist_options,
+                    label: "Typist"
         .small-6.medium-2.large-2.columns
-          = f.input :letterhead_id_eq, collection: letterheads, label: "Letterhead"
+          = f.input :letterhead_id_eq,
+                    collection: form.letterhead_options,
+                    label: "Letterhead"
         .small-6.medium-1.large-1.columns
           = f.input :page_count_in_array,
-                    collection: [["1 or 2", "[1,2]"],["3 or 4", "[3,4]"]],
-                    label: "Pages"
+                    collection: form.page_count_options,
+                    label: "Pages",
+                    include_blank: form.allow_blank_inputs.include?(:page_count_in_array)
         .small-12.medium-2.large-2.columns.actions.end
-          = f.submit t("helpers.submit.filter"), class: "button"
+          = f.submit t("helpers.submit.filter"), class: "button secondary"
           span= " or "
-          = link_to t("helpers.reset"), letters_list_path
+          = link_to t("helpers.reset"), renalware.letters_filtered_letters_list_path(named_filter: named_filter)
+
+  - if named_filter == :batch_printable
+    / Thus form wil all hidden fields and one button is otherwise a mirror of the above filter form.
+    / It POSTs the form to create a batch and its items (which really just help us to keep track)
+    / or what was printed and the user does not need to know about it) and once created
+    / it pops up a dialog with a spinner and an asycn_render partial that, once the PDFs are compiled
+    / will return with a partial containing a link to the PDF. The user clicks on this to open it in a
+    / new window. At the same time on the original page we close the modal and display another one
+    / which asks the user if the print batch was successful - if so we send a patch to update
+    / the batch status and set letter status to Completed.
+    = simple_form_for form,
+                      as: :batch,
+                      url: letters_batches_path,
+                      method: :post,
+                      remote: true do |f|
+      = f.input :enclosures_present, as: :hidden
+      = f.input :state_eq, as: :hidden
+      = f.input :author_id_eq, as: :hidden
+      = f.input :created_by_id_eq, as: :hidden
+      = f.input :letterhead_id_eq, as: :hidden
+      = f.input :page_count_in_array, as: :hidden
+      = f.submit "Batch Print #{letters.total_count} letters", class: "button", disabled: letters.none?
+
+    #batch-print-modal.reveal-modal.small(data-reveal)
 
 = within_admin_layout(title: "Letters") do
   = render "table", letters: letters, q: q