renalware-core 2.0.164 → 2.1.1

data/app/controllers/renalware/transplants/donor_workups_controller.rb

@@ -26,9 +26,9 @@ module Renalware
 
         if workup.update(workup_params)
           redirect_to patient_transplants_donor_workup_path(patient),
-                      notice: t(".success", model_name: "donor work up")
+                      notice: success_msg_for("donor work up")
         else
-          flash.now[:error] = t(".failed", model_name: "donor work up")
+          flash.now[:error] = failed_msg_for("donor work up")
           render :edit, locals: { patient: patient, workup: workup }
         end
       end

data/app/controllers/renalware/transplants/recipient_operations_controller.rb

@@ -27,9 +27,9 @@ module Renalware
 
         if recipient_operation.save
           redirect_to patient_transplants_recipient_dashboard_path(patient),
-                      notice: t(".success", model_name: "recipient operation")
+                      notice: success_msg_for("recipient operation")
         else
-          flash.now[:error] = t(".failed", model_name: "recipient operation")
+          flash.now[:error] = failed_msg_for("recipient operation")
           render :new,
                  locals: {
                    patient: patient,
@@ -50,9 +50,9 @@ module Renalware
 
         if operation.save
           redirect_to patient_transplants_recipient_dashboard_path(patient),
-                      notice: t(".success", model_name: "recipient operation")
+                      notice: success_msg_for("recipient operation")
         else
-          flash.now[:error] = t(".failed", model_name: "recipient operation")
+          flash.now[:error] = failed_msg_for("recipient operation")
           render :edit, locals: { patient: patient, recipient_operation: operation }
         end
       end

data/app/controllers/renalware/transplants/recipient_workups_controller.rb

@@ -31,9 +31,9 @@ module Renalware
 
         if workup.update workup_params
           redirect_to patient_transplants_recipient_workup_path(patient),
-                      notice: t(".success", model_name: "recipient work up")
+                      notice: success_msg_for("recipient work up")
         else
-          flash.now[:error] = t(".failed", model_name: "recipient work up")
+          flash.now[:error] = failed_msg_for("recipient work up")
           render :edit, locals: { patient: patient, workup: workup }
         end
       end

data/app/controllers/renalware/transplants/registration_statuses_controller.rb

@@ -19,9 +19,9 @@ module Renalware
 
         if status.valid?
           redirect_to patient_transplants_recipient_dashboard_path(patient),
-                      notice: t(".success", model_name: "registration status")
+                      notice: success_msg_for("registration status")
         else
-          flash.now[:error] = t(".failed", model_name: "registration status")
+          flash.now[:error] = failed_msg_for("registration status")
           render :new, locals: { patient: patient, status: status }
         end
       end
@@ -38,9 +38,9 @@ module Renalware
         status = update_status
         if status.valid?
           redirect_to patient_transplants_recipient_dashboard_path(patient),
-                      notice: t(".success", model_name: "registration status")
+                      notice: success_msg_for("registration status")
         else
-          flash.now[:error] = t(".failed", model_name: "registration status")
+          flash.now[:error] = failed_msg_for("registration status")
           render :edit, locals: { patient: patient, status: status }
         end
       end
@@ -50,7 +50,7 @@ module Renalware
         registration.delete_status!(status)
 
         redirect_to patient_transplants_recipient_dashboard_path(patient),
-                    notice: t(".success", model_name: "registration status")
+                    notice: success_msg_for("registration status")
       end
 
       protected

data/app/controllers/renalware/transplants/registrations_controller.rb

@@ -22,9 +22,9 @@ module Renalware
       def update
         if update_registration
           redirect_to patient_transplants_recipient_dashboard_path(patient),
-                      notice: t(".success", model_name: "registration")
+                      notice: success_msg_for("registration")
         else
-          flash.now[:error] = t(".failed", model_name: "registration")
+          flash.now[:error] = failed_msg_for("registration")
           render :edit, locals: { patient: patient, registration: registration }
         end
       end

data/app/controllers/renalware/virology/vaccination_types_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/virology"
+
+module Renalware
+  module Virology
+    class VaccinationTypesController < BaseController
+      def index
+        types = VaccinationType.with_deleted.ordered
+        authorize types
+        render locals: { types: types }
+      end
+
+      def edit
+        type = find_and_authorise_type
+        render locals: { type: type }
+      end
+
+      def update
+        type = find_and_authorise_type
+        if type.update(type_params)
+          redirect_to virology_vaccination_types_path
+        else
+          render :edit, locals: { type: type }
+        end
+      end
+
+      def new
+        type = VaccinationType.new
+        authorize type
+        render locals: { type: type }
+      end
+
+      def create
+        type = VaccinationType.new(type_params)
+        authorize type
+        if type.save
+          redirect_to virology_vaccination_types_path
+        else
+          render :new, locals: { type: type }
+        end
+      end
+
+      def destroy
+        find_and_authorise_type.destroy!
+        redirect_to virology_vaccination_types_path
+      end
+
+      def sort
+        authorize VaccinationType, :sort?
+        ids = params[:virology_vaccination_type]
+        VaccinationType.sort(ids)
+        render json: ids
+      end
+
+      private
+
+      def find_and_authorise_type
+        VaccinationType.find(params[:id]).tap { |type| authorize type }
+      end
+
+      def type_params
+        params
+          .require("virology_vaccination_type")
+          .permit(:name, :code, :position)
+      end
+    end
+  end
+end

data/app/helpers/renalware/form_helper.rb

@@ -35,10 +35,15 @@ module Renalware
       end
     end
 
-    def save_or_cancel(form:, back_path:, submit_title: "Save", cancel_title: "cancel")
+    def save_or_cancel(
+      form:,
+      back_path:,
+      submit_title: I18n.t("btn.save"),
+      cancel_title: I18n.t("btn.cancel")&.downcase
+    )
       capture do
         concat(form.submit(submit_title, class: "button"))
-        concat(tag.span { " or " })
+        concat(tag.span { " #{I18n.t('btn.or')} " })
         concat(link_to(cancel_title, back_path))
       end
     end

data/app/javascript/renalware/controllers/collapsible_controller.js

@@ -0,0 +1,36 @@
+import { Controller } from "stimulus"
+
+// Controller to enable collapsing elements of a nav/menu to for example
+// allow a more dense menu that can simplifies by hiding/collapsing sections.
+//
+// Example slim markup:
+//
+// div(data-controller="collapsible" data-collapsible-open-class="open")
+//   a(data-action="collapsible#open" data-collapsible-target="link" href="#") X
+//   div.collapsible(data-collapsible-target="section")
+//     p XXX
+//   a(data-action="collapsible#open" data-collapsible-target="link" href="#") Y
+//   div.collapsible(data-collapsible-target="section")
+//     p YYY
+export default class extends Controller {
+  static targets = [ "section", "link" ]
+  static classes = [ "open" ]
+
+  connect() {
+    // TODO: We could support an initial open section here for example.
+  }
+
+  // When a user clicks on a link with the target of "link", we determine its index,
+  // hide all "section" targets initially, then just show the section with the
+  // current index. This is a similar approach to the one we take with the tabs controller.
+  open(event) {
+    let index = this.linkTargets.indexOf(event.currentTarget)
+
+    this.sectionTargets.forEach((elem, idx) => {
+      elem.classList.remove(this.openClass)
+      if (idx == index) {
+        elem.classList.add(this.openClass)
+      }
+    })
+  }
+}

data/app/javascript/renalware/index.js

@@ -27,6 +27,7 @@ import SimpleToggleController from "./controllers/simple_toggle_controller"
 import TabsController from "./controllers/tabs_controller"
 import PDPetChartsController from "./controllers/pd/pet_charts_controller"
 import PathologySparklinesController from "./controllers/pathology/sparklines_controller"
+import CollapsibleController from "./controllers/collapsible_controller"
 
 const application = Application.start()
 application.register("toggle", ToggleController)
@@ -41,5 +42,6 @@ application.register("simple-toggle", SimpleToggleController)
 application.register("tabs", TabsController)
 application.register("pd-pet-chart", PDPetChartsController)
 application.register("pathology-sparklines", PathologySparklinesController)
+application.register("collapsible", CollapsibleController)
 
 window.Chartkick.use(window.Highcharts)

data/app/models/renalware/events/category.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class Category < ApplicationRecord
+      self.table_name = "event_categories"
+      acts_as_paranoid
+      has_many :types,
+               dependent: :nullify,
+               inverse_of: :category,
+               class_name: "Renalware::Events::Type"
+      validates :name, presence: true, uniqueness: true
+
+      def to_s
+        name
+      end
+    end
+  end
+end

data/app/models/renalware/events/type.rb

@@ -12,12 +12,14 @@ module Renalware
         foreign_key: :event_type_id,
         dependent: :destroy
       )
+      belongs_to :category, class_name: "Renalware::Events::Category"
 
       DEFAULT_EVENT_CLASS_NAME = "Renalware::Events::Simple"
 
       acts_as_paranoid
 
       validates :name, presence: true, uniqueness: true
+      validates :category_id, presence: true
       validates :slug,
                 format: {
                   with: /\A[0-9a-z\-\_]+\z/i,

data/app/models/renalware/hd/mdm_patients_form.rb

@@ -21,7 +21,7 @@ module Renalware
         {
           hd_profile_hospital_unit_id_eq: hospital_unit_id,
           hd_profile_schedule_definition_id_in: schedule_definition_ids_array,
-          hd_profile_named_nurse_id_eq: named_nurse_id
+          named_nurse_id_eq: named_nurse_id
         }
       end
 

data/app/models/renalware/hd/patient_listener.rb

@@ -10,7 +10,7 @@ module Renalware
       def request_default_electronic_cc_recipients_for_use_in_letters(patient:, array_of_user_ids:)
         patient = HD.cast_patient(patient)
         if patient.current_modality_hd?
-          named_nurse_id = patient.hd_profile&.named_nurse&.id
+          named_nurse_id = patient.named_nurse&.id
           array_of_user_ids.push(named_nurse_id) if named_nurse_id.present?
         end
       end

data/app/models/renalware/hd/profile.rb

@@ -15,11 +15,14 @@ module Renalware
       belongs_to :hospital_unit, class_name: "Hospitals::Unit"
       belongs_to :dialysate
       belongs_to :prescriber, class_name: "User"
-      belongs_to :named_nurse, class_name: "User"
       belongs_to :transport_decider, class_name: "User"
       belongs_to :schedule_definition
       has_document class_name: "Renalware::HD::ProfileDocument"
 
+      # Virtual attr to allow us to accept this field in the profile form, but save it to
+      # the patient record rather than to hd_profile
+      attr_accessor :named_nurse_id
+
       has_paper_trail(
         versions: { class_name: "Renalware::HD::Version" },
         on: [:create, :update, :destroy]

data/app/models/renalware/letters/batch.rb

@@ -11,6 +11,7 @@ module Renalware
       attr_accessor(
         :url,
         :enclosures_present,
+        :notes_present,
         :state_eq,
         :author_id_eq,
         :created_by_id_eq,

data/app/models/renalware/letters/letter.rb

@@ -44,7 +44,6 @@ module Renalware
       validates :letterhead, presence: true
       validates :author, presence: true
       validates :patient, presence: true
-      validates :issued_on, presence: true
       validates :description, presence: true
       validates :main_recipient, presence: true
 
@@ -133,6 +132,16 @@ module Renalware
       def effective_date
         completed_at || approved_at || submitted_for_approval_at || created_at
       end
+
+      # The date to display on the letter.
+      # Once the letter is approved it can be emailed out, hence this is the real date of issue.
+      def date
+        datetime.to_date
+      end
+
+      def datetime
+        approved_at || submitted_for_approval_at || created_at
+      end
     end
   end
 end

data/app/models/renalware/letters/lists/form.rb

@@ -29,6 +29,7 @@ module Renalware
 
           attribute :s, String # sort order, not really part of the form
           attribute :enclosures_present, Boolean
+          attribute :notes_present, Boolean
           attribute :state_eq, Integer
           attribute :author_id_eq, Integer
           attribute :created_by_id_eq, Integer
@@ -80,7 +81,7 @@ module Renalware
           end
 
           def disabled_inputs
-            [:enclosures_present, :state_eq]
+            [:enclosures_present, :notes_present, :state_eq]
           end
 
           def allow_blank_inputs
@@ -91,6 +92,10 @@ module Renalware
             false
           end
 
+          def notes_present
+            false
+          end
+
           def state_eq
             @state_eq || :approved
           end

data/app/models/renalware/letters/mailshots/mailshot.rb

@@ -64,7 +64,6 @@ module Renalware
               description: description,
               body: body,
               author_id: author_id,
-              issued_on: Time.zone.now,
               main_recipient_attributes: {
                 person_role: :patient,
                 id: nil,

data/app/models/renalware/letters/printing/batch_compile_pdfs.rb

@@ -5,10 +5,17 @@ require_dependency "renalware/letters"
 module Renalware
   module Letters
     module Printing
-      # - takes a batch of letters
-      # - compiles each letter along with its recipient cover sheets
-      # - adds blank pages to make sure the letter always starts on an odd page
-      # - appends all PDF letters
+      # Given a Batch object that has many associated letters, it
+      # - compiles each letter with a cover sheet for each recipient, adding blank padding pages
+      #   if needed to ensure the envelop stuffer will work correctly (ie each letter starts on an
+      #   odd page)
+      # - combines all these letter PDFs into one batch PDF. The output filepath is stored on the
+      # batch model.
+      #
+      # Note that this class creates files and combines them using ghost script.
+      # These operations take place in the current working directory, so to use this class
+      # you might need to create a OS tmp folder first and cdhir into it. See the spec for an
+      # example.
       class BatchCompilePdfs
         include PdfCombining
         PAGE_COUNTS = %w(2 3 4 5 6 7 8 9 10).freeze
@@ -24,6 +31,7 @@ module Renalware
           Rails.logger.info "Compiling letter PDFs for batch #{batch.id} in folder #{dir}"
         end
 
+        # rubocop:disable Metrics/AbcSize
         def call
           batch.status = :processing
           batch.save_by!(user)
@@ -36,6 +44,7 @@ module Renalware
           batch.status = :awaiting_printing
           batch.save_by!(user)
         end
+        # rubocop:enable Metrics/AbcSize
 
         private
 
@@ -75,6 +84,8 @@ module Renalware
           Dir.chdir(working_folder) do
             letter_filename = write_letter_to_pdf_file(letter)
             letter.recipients.each do |recipient|
+              next if recipient.emailed_at.present?
+
               Rails.logger.info " Recipient #{recipient.id}"
               filenames << write_recipient_cover_sheet_pdf(letter, recipient)
               filenames << letter_filename

data/app/models/renalware/letters/remembered_letter_preferences.rb

@@ -6,7 +6,7 @@ module Renalware
   module Letters
     class RememberedLetterPreferences < RememberedPreferences
       SESSION_KEY = :letter_preferences
-      ATTRIBUTES_TO_REMEMBER = %i(letterhead_id description author_id issued_on).freeze
+      ATTRIBUTES_TO_REMEMBER = %i(letterhead_id description author_id).freeze
     end
   end
 end

data/app/models/renalware/patient.rb

@@ -50,6 +50,7 @@ module Renalware
     belongs_to :religion, class_name: "Patients::Religion"
     belongs_to :language, class_name: "Patients::Language"
     belongs_to :named_consultant, class_name: "User"
+    belongs_to :named_nurse, class_name: "User"
     has_many :bookmarks, class_name: "Patients::Bookmark"
     has_many :alerts, class_name: "Patients::Alert"
     has_one :worry, class_name: "Patients::Worry"