renalware-core 2.0.124 → 2.0.125

data/app/models/renalware/ukrdc/incoming/import_surveys.rb

@@ -30,7 +30,7 @@ module Renalware
         # Import all surverys (they will be for the same patient) in the XML file.
         # Note that #with_logging yields a block that will catch and save any error to
         # ukrdc_transmission_logs
-        # rubocop:disable Lint/HandleExceptions, Metrics/AbcSize
+        # rubocop:disable Metrics/AbcSize
         def import_surveys_from_file(file)
           # Important to create the log before we do anything that might cause an error
           # eg parse the xml etc.
@@ -48,7 +48,7 @@ module Renalware
         ensure
           FileUtils.mv file, paths.archive.join(file.basename)
         end
-        # rubocop:enable Lint/HandleExceptions, Metrics/AbcSize
+        # rubocop:enable Metrics/AbcSize
 
         def import_survey(survey_hash, patient)
           ImportSurvey.new(

data/app/models/renalware/ukrdc/transmission_log.rb

@@ -15,7 +15,7 @@ module Renalware
         sent: 3,
         imported: 4
       }
-      enum direction: [:out, :in]
+      enum direction: { out: 0, in: 1 }
       scope :ordered, -> { order(sent_at: :asc) }
 
       def self.with_logging(patient, request_uuid, **options)

data/app/models/renalware/ukrdc/treatment_timeline/hd/generator.rb

@@ -2,8 +2,6 @@
 
 require_dependency "renalware/ukrdc"
 require "attr_extras"
-
-# rubocop:disable Lint/UnneededCopDisableDirective, Rails/Output
 # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 module Renalware
   module UKRDC
@@ -138,5 +136,4 @@ module Renalware
     end
   end
 end
-# rubocop:enable Lint/UnneededCopDisableDirective, Rails/Output
 # rubocop:enable Metrics/AbcSize, Metrics/MethodLength

data/app/models/renalware/ukrdc/treatment_timeline/prepare_tables.rb

@@ -20,7 +20,7 @@ module Renalware
           SQL
           if result.ntuples == 1
             connection.execute("select ukrdc_prepare_tables();")
-            return true
+            true
           end
         end
       end

data/app/presenters/renalware/hd/protocol_presenter.rb

@@ -82,7 +82,7 @@ module Renalware
         old_formats = formats
         begin
           self.formats = [format]
-          return block.call
+          block.call
         ensure
           self.formats = old_formats
         end

data/app/views/renalware/accesses/assessments/_list.html.slim

@@ -18,9 +18,8 @@ article.access-assessments
     tbody
       - assessments.each do |assessment|
         tr
-          td
+          td.actions
             = link_to "View", patient_accesses_assessment_path(patient, assessment)
-            = pipe_separator
             = link_to "Edit", edit_patient_accesses_assessment_path(patient, assessment)
           td= assessment.performed_on
           td= assessment.type

data/app/views/renalware/accesses/procedures/_list.html.slim

@@ -7,6 +7,7 @@ article.access-procedures
 
   table.auto-layout
     thead
+      th.togglers = table_toggler
       th.col-width-small
       th.col-width-date Performed
       th Procedure
@@ -17,12 +18,10 @@ article.access-procedures
     tbody
       - procedures.each do |procedure|
         tr
-          td
+          td.toggler = toggler("#procedure-quick-preview-#{procedure.id}")
+          td.actions
             = link_to "View", patient_accesses_procedure_path(patient, procedure)
-            = pipe_separator
             = link_to "Edit", edit_patient_accesses_procedure_path(patient, procedure)
-            = pipe_separator
-            = link_to("Toggle", "#procedure-quick-preview-#{procedure.id}", data: { behaviour: "toggler" })
           td= procedure.performed_on
           td= procedure.type&.long_name
           td= procedure.side

data/app/views/renalware/accesses/profiles/_list.html.slim

@@ -17,9 +17,8 @@ article.access-profiles
     tbody
       - profiles.each do |profile|
         tr
-          td
+          td.actions
             = link_to "View", patient_accesses_profile_path(patient, profile)
-            = pipe_separator
             = link_to "Edit", edit_patient_accesses_profile_path(patient, profile)
           td= profile.formed_on
           td= profile.started_on

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -5,7 +5,8 @@
   table
     thead
       tr
-        th.col-width-medium.noprint
+        = th_toggle_all_rows
+        th.col-width-small.noprint
         - unless compact
           th.col-width-large
             - if allow_sorting
@@ -63,6 +64,7 @@
       - consults.each do |consult|
         - uid = "consult-#{consult.id}"
         tr.keep-with-next
+          = td_toggle_row("#consult-quick-preview-#{consult.id}")
           td.actions-dropdown.going-right.noprint
             / As we have lots of possible actions, group them in a button group.
             / A wrapping div is required for now in order for the button group display correctly
@@ -91,10 +93,6 @@
                   li= render "renalware/admissions/requests/create_request_link",
                              patient: consult.patient,
                              link_text: "Request Admission"
-            |   
-            = link_to("Toggle",
-                      "#consult-quick-preview-#{consult.id}",
-                      data: { behaviour: "toggler" })
           - unless compact
             td= default_patient_link(consult.patient)
           td.noprint= consult.patient_nhs_number

data/app/views/renalware/drugs/drugs/index.html.slim

@@ -16,9 +16,8 @@
     tbody
       - @drugs.each do |drug|
         tr
-          td
+          td.actions
             = link_to "Edit", edit_drugs_drug_path(drug)
-            = pipe_separator
             = link_to "Delete", drugs_drug_path(drug),
               id: "#{drug.id}-drug",
               method: :delete,

data/app/views/renalware/events/types/_table.html.slim

@@ -6,9 +6,8 @@ table
   tbody
     - event_types.each do |t|
       tr
-        td
+        td.actions
           = link_to "Edit", edit_events_type_path(t.id)
-          = pipe_separator
           = link_to "Delete",
                     events_type_path(t.id),
                     method: :delete,

data/app/views/renalware/hd/cannulation_types/index.html.slim

@@ -13,9 +13,8 @@
     tbody
       - cannulation_types.each do |t|
         tr
-          td
+          td.actions
             = link_to "Edit", edit_hd_cannulation_type_path(t.id)
-            = pipe_separator
             = link_to "Delete",
                       hd_cannulation_type_path(t.id),
                       method: :delete,

data/app/views/renalware/hd/mdm/_top.html.slim

@@ -1,13 +1,15 @@
-.columns.small-12.medium-6.large-3
+.columns.small-12.medium-6.large-6
   = render "renalware/hd/current_profile/summary", profile: mdm.hd_profile, patient: mdm.patient
 .columns.small-12.medium-6.large-3
   - if mdm.access.present?
     = render "renalware/hd/accesses/summary", access: mdm.access, patient: mdm.patient
-.columns.medium-12.large-6
+.columns.medium-6.large-6
   = render "renalware/virology/profiles/summary",
            patient: mdm.patient,
            positive_results_only: true
+.columns.medium-6.large-6
+  = render "summary", mdm: mdm
+= render "worryboard", mdm: mdm
+
 .columns.medium-12.large-6
   = render "prescriptions", mdm: mdm, with_esa: true
-.columns.medium-12.large-6
-  = render "summary", mdm: mdm

data/app/views/renalware/hd/scheduling/diary_slots/edit.html.slim

@@ -1,6 +1,11 @@
 .modal
   .modal__header
-    h2= slot.patient
+    h2
+      = link_to(patient_clinical_summary_path(slot.patient), target: "_blank") do
+        = slot.patient.to_s(:default)
+        |  
+        i.fa.fa-external-link-square-alt
+
     = render "renalware/shared/modal_close_link"
 
   .modal__body

data/app/views/renalware/layouts/_patient.html.slim

@@ -6,12 +6,7 @@
 
 nav.patient-side-nav.full-screenable
   .layout-wrapper
-    = render "renalware/patients/side_menu", patient: current_patient
-    / Note that ActionView::Components are not really working out of the box inside an engine:
-    / "Could not find a template file for Renalware::Patients::SideMenuComponent."
-    / source_location.split(".")[0] returns the wrong segment when there is eg .rbenv and .2.6.3
-    / in the path. TODO: Check/raise issue on https://github.com/github/actionview-component
-    /= render Renalware::Patients::SideMenuComponent, patient: current_patient
+    = render Renalware::Patients::SideMenuComponent, patient: current_patient
 
 .main-content.patient-content.full-screenable
   .layout-wrapper

data/app/views/renalware/letters/formatted_letters/_enclosures.html.slim

@@ -0,0 +1,2 @@
+- if letter.enclosures.present?
+  p.enclosures = "Enc: #{letter.enclosures}"

data/app/views/renalware/letters/formatted_letters/_letter.html.slim

@@ -336,6 +336,8 @@ scss:
           br
           = letter.author.professional_position
 
+    = render "renalware/letters/formatted_letters/enclosures", letter: letter
+
   .footer
     .ccs
       h3 cc:

data/app/views/renalware/letters/letters/_letter.html.slim

@@ -1,8 +1,8 @@
 - columns = local_assigns[:columns] || []
 - cache([letter, columns.join("-")]) do
   tr(class=letter.state.dasherize)
-    td= toggler("#letter-quick-preview-#{letter.id}")
-    td.actions
+    td.noprint= toggler("#letter-quick-preview-#{letter.id}")
+    td.noprint.actions
       = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
       - if policy(letter).update?
         = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)

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

@@ -4,14 +4,14 @@ table.auto-layout.letters.has-togglable-rows
   thead
     tr
       th.noprint.togglers= table_toggler
-      th.col-width-11
+      th.noprint.col-width-11
       th.col-width-tiny State
       th.col-width-date-time Date
       - if columns.include?(:author)
         th.col-width-medium Author
       - if columns.include?(:patient)
         th.col-width-medium Patient
-      th.col-width-medium Recipient
+      th.at-least.col-width-medium Recipient
       th.col-width-medium Description
 
   tbody

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

@@ -1,5 +1,5 @@
 tr(class=letter.state.dasherize)
-  td= toggler("#letter-quick-preview-#{letter.id}")
+  td.noprint= toggler("#letter-quick-preview-#{letter.id}")
   td.noprint
     = link_to "View", patient_letters_letter_path(letter.patient, letter)
     - if letter.approved?

data/app/views/renalware/low_clearance/mdm/_top.html.slim

@@ -13,3 +13,4 @@
   = render "prescriptions", mdm: mdm, with_esa: true
 .columns.small-12.medium-6.large-6.xlarge-4
   = render "problems", mdm: mdm
+= render "worryboard", mdm: mdm

data/app/views/renalware/mdm/_worryboard.html.slim

@@ -0,0 +1,10 @@
+- worry = mdm.patient.worry
+- return if worry.blank?
+
+.columns.medium-6
+  article
+    header
+      h2 Worryboard
+      ul
+        li(style="float:right")= "Added #{l(worry.created_at&.to_date)} by #{worry.created_by}"
+    = worry.notes

data/app/views/renalware/mdm/show.html.slim

@@ -8,7 +8,9 @@
   / TODO: a.trigger-full-screen Full screen
   .full-screen-container.mdm-page.no-side-gutters
     .grid
-      .row= render_if_exists "top", mdm: mdm
+      .row
+        = render_if_exists "top", mdm: mdm
+
       .row= render "pathology", mdm: mdm
       .row= render_if_exists "middle", mdm: mdm
       = render_if_exists "bottom", mdm: mdm

data/app/views/renalware/modalities/descriptions/index.html.slim

@@ -13,11 +13,10 @@
     tbody
       - modality_descriptions.each do |description|
         tr
-          td
+          td.actions
             - if policy(description).edit?
               = link_to "Edit", edit_modalities_description_path(description.id)
             - if policy(description).destroy?
-              = pipe_separator
               = link_to "Delete",
                         modalities_description_path(description.id),
                         method: :delete,

data/app/views/renalware/pathology/required_observations/index.html.slim

@@ -39,7 +39,7 @@
             tr
               td = request_description.code
               td = request_description.lab.name
-              td = request_description.bottle_type.capitalize
+              td = request_description.bottle_type&.capitalize
               td = request_description.name
 
   .row

data/app/views/renalware/patients/primary_care_physicians/_primary_care_physician.html.slim

@@ -1,8 +1,7 @@
 tr
-  td
+  td.actions
     = link_to "Edit",
               edit_patients_primary_care_physician_path(primary_care_physician)
-    = pipe_separator
     = link_to "Delete",
               patients_primary_care_physician_path(primary_care_physician),
               method: :delete

data/app/views/renalware/pd/_pet_adequacies.html.slim

@@ -15,9 +15,8 @@ table
   tbody
     - pet_adequacies.each do |pet_adequacy|
       tr data-assessment-id="#{pet_adequacy.id}" valign="top"
-        td
+        td.actions
           = link_to "View", patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
-          |  | 
           = link_to "Edit", edit_patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
         td= l(pet_adequacy.pet_date)
         td= pet_adequacy.pet_type&.text

data/app/views/renalware/pd/_regimes.html.slim

@@ -13,13 +13,12 @@ table(class=table_class)
   tbody
     - regimes.each do |r|
       tr(data-regime-id=r.id)
-        td
+        td.actions
           / TODO: Use a policy
           - if r.current? && !current_user.has_role?(:read_only)
             = link_to "Update",
                       edit_patient_pd_regime_path(patient, r.id),
                       class: "update-pd-regime"
-            = pipe_separator
           = link_to "View",
                     patient_pd_regime_path(patient, r.id),
                     class: "view-pd-regime"

data/app/views/renalware/pd/assessments/_list.html.slim

@@ -16,10 +16,9 @@ article.pd_assessments
       - assessments.each do |assessment|
         - document = assessment.document
         tr
-          td
+          td.actions
             - if policy(assessment).edit?
               = link_to("Edit", edit_patient_pd_assessment_path(patient, assessment))
-              = pipe_separator
             - if policy(assessment).show?
               = link_to("View", [patient, assessment])
           td= l(assessment.created_at)

data/app/views/renalware/pd/bag_types/index.html.slim

@@ -23,9 +23,8 @@
     tbody
       - bag_types.each do |bt|
         tr
-          td
+          td.actions
             = link_to "Edit", edit_pd_bag_type_path(bt.id), id: "edit-bag-type-#{bt.id}"
-            = pipe_separator
             = link_to "Delete",
                       pd_bag_type_path(bt.id),
                       method: :delete,

data/app/views/renalware/pd/mdm/_top.html.slim

@@ -1,8 +1,9 @@
 .columns.medium-12.large-6
   - if mdm.current_regime
     = render "renalware/pd/regimes/current_regime", current_regime: mdm.current_regime
-.columns.medium-12.large-6
+.columns.medium-6
   = render "summary", mdm: mdm
+= render "worryboard", mdm: mdm
 .columns.medium-12.large-6
   = render "prescriptions", mdm: mdm, with_esa: true
 .columns.medium-12.large-6

data/app/views/renalware/pd/training_sessions/_list.html.slim

@@ -17,10 +17,9 @@ article.pd_training_sessions
       - training_sessions.each do |training_session|
         - document = training_session.document
         tr
-          td
+          td.actions
             - if policy(training_session).edit?
               = link_to("Edit", edit_patient_pd_training_session_path(patient, training_session))
-              = pipe_separator
             - if policy(training_session).show?
               = link_to("View", [patient, training_session])
           td= l(training_session.created_at)

data/app/views/renalware/renal/aki_alerts/_aki_alert.html.slim

@@ -1,11 +1,7 @@
 - toggleable_id = "aki-alert-quick-preview-#{aki_alert.id}"
 tr(class="#{'aki_alert--hotlist' if aki_alert.hotlist?}")
-  td
-    = link_to("Edit", edit_renal_aki_alert_path(aki_alert))
-    |  | 
-    = link_to("Toggle",
-              "##{toggleable_id}",
-              data: { behaviour: "toggler" })
+  td= toggler("##{toggleable_id}")
+  td= link_to("Edit", edit_renal_aki_alert_path(aki_alert))
   td= default_patient_link(aki_alert.patient)
   td= aki_alert.patient.hospital_identifiers
   td.show-for-large-up.col-width-medium-with-ellipsis= aki_alert.patient.current_modality
@@ -18,6 +14,7 @@ tr(class="#{'aki_alert--hotlist' if aki_alert.hotlist?}")
   td= l(aki_alert.aki_date)
   td= aki_alert.decided_by
 = content_tag(:tr, id: "#{toggleable_id}", style: "display: none")
+  td
   td.notes Notes
   td(colspan=10)
     .quick-preview