renalware-core 2.0.156 → 2.0.161

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/letters"
-require "attr_extras"
 
 module Renalware
   module Letters

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/low_clearance"
-require "attr_extras"
 
 module Renalware
   module LowClearance

data/app/presenters/renalware/medications/prescription_presenter.rb

@@ -47,6 +47,13 @@ module Renalware
         ].compact.join(" - ")
       end
 
+      def provider_suffix
+        case __getobj__.provider&.to_s
+        when "gp" then "GP"
+        when "hospital", "home_delivery" then "HOSP"
+        end
+      end
+
       private
 
       def translated_dose_unit

data/app/presenters/renalware/pathology/observations_diff.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
 require_dependency "renalware/pathology"
 
 # Compares two hashes of pathology observations (OBXs).

data/app/presenters/renalware/renal/clinical_summary_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/renal"
-require "attr_extras"
 
 module Renalware
   module Renal

data/app/presenters/renalware/summary_part.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   # A base class for Summary presenters in other name-spaces. SummaryParts can be composed into
   # reporting dashboards or summary pages. The Clinical Summary for instance comprises an array

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module Transplants

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module Transplants

data/app/presenters/renalware/ukrdc/transplant_operation_presenter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_dependency "renalware/transplants"
-require "attr_extras"
 
 module Renalware
   module UKRDC

data/app/presenters/renalware/user_session_presenter.rb

@@ -21,8 +21,6 @@ module Renalware
     #       data-session-timeout="3600">
     # rubocop:disable Metrics/MethodLength
     def self.session_controller_data_attributes
-      return {} if Renalware.config.session_expiry_use_previous_mechansim
-
       urls = Renalware::Engine.routes.url_helpers
       {
         data: {
@@ -39,6 +37,6 @@ module Renalware
         }
       }
     end
+    # rubocop:enable Metrics/MethodLength
   end
-  # rubocop:enable Metrics/MethodLength
 end

data/app/values/renalware/bmi.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "attr_extras"
-
 module Renalware
   # Value object representing Body Mass Index. Accepts only meters and kg
   #

data/app/views/renalware/admin/playgrounds/show.html.slim

@@ -34,7 +34,7 @@ css:
                             url: pathology_chart_data_admin_playground_path,
                             wrapper: nil,
                             method: :get,
-                            data: { target: "charts.form", action: "ajax:success->charts#redisplay" }) do |f|
+                            data: { "charts-target" => "form", action: "ajax:success->charts#redisplay" }) do |f|
 
             = f.input :patient_id,
                       collection: [[form.patient_id, form.patient_id]],
@@ -52,7 +52,7 @@ css:
                       include_blank: false
             = f.submit "Refresh", class: :button
 
-      #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+      #chart1 style="height: 300px; width: 500px" data-charts-target="chart"
 
     / To test tailwindcss
     .max-w-sm.rounded.overflow-hidden.shadow-lg  

data/app/views/renalware/hd/prescription_administrations/_form.html.slim

@@ -16,7 +16,7 @@
 
       = fpa.input :prescription_id, as: :hidden
 
-      .hd-drug-administration(data-target="hd-prescription-administration.container")
+      .hd-drug-administration(data-hd-prescription-administration-target="container")
         .summary
           .hd-drug
             .hd-drug--name= prescription.drug_name
@@ -40,7 +40,7 @@
                       label: false,
                       input_html: { \
                         data: { \
-                          target: "hd-prescription-administration.radio",
+                          "hd-prescription-administration-target" => "radio",
                           action: "change->hd-prescription-administration#toggleAdministered",
                         } \
                       }

data/app/views/renalware/letters/contacts/_new_person.html.slim

@@ -10,7 +10,7 @@
                   class: "button secondary",
                   data: { behaviour: "toggle-section" }
       .right
-        = f.submit t(".save"), class: "button"
+        = f.submit t(".save"), class: "button", data: { disable_with: false }
         '  or
         = link_to t(".cancel"),
                "#",

data/app/views/renalware/letters/contacts/_person_from_directory.html.slim

@@ -16,7 +16,7 @@
   .row
     .large-12.columns
       br
-      = f.submit t(".save"), class: "button"
+      = f.submit t(".save"), class: "button", data: { disable_with: false }
       '  or
       = link_to t(".cancel"),
                "#",

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

@@ -4,6 +4,10 @@ scss:
     font-family: Helvetica, Arial;
   }
 
+  .subtitle {
+    font-size: .9rem;
+  }
+
   .addressee {
     width: 50%;
     float: left;
@@ -153,12 +157,11 @@ scss:
     }
 
     .allergies {
-      margin-bottom: 1rem;
       float: left;
       clear: left;
       width: 50%;
 
-      h3 {
+      h3, b {
         padding-right: 1rem;
       }
 
@@ -221,10 +224,9 @@ scss:
     }
 
     .message {
-      margin-top: 30px;
-      margin-bottom: 20px;
+      margin-top: 20px;
+      margin-bottom: 0px;
       clear: both;
-
       p {
         margin-bottom: 15px;
       }
@@ -235,9 +237,6 @@ scss:
     }
 
     .author-signature {
-      .author-name {
-        font-weight: bold;
-      }
       margin-bottom: 20px;
     }
   }
@@ -320,10 +319,10 @@ scss:
       p= render "patient_summary", patient: letter.patient
 
     = render letter.parts, patient: letter.patient, letter: letter
-
-    .message
-      = letter.body&.html_safe
-
+    / empty small here is for RTF spacing
+    small  
+    .message= letter.body&.html_safe
+    br
     p Yours sincerely
 
     .signature.nobreak
@@ -332,7 +331,7 @@ scss:
 
       .author-signature
         p
-          span.author-name= letter.author.signature
+          b= letter.author.signature
           br
           = letter.author.professional_position
 
@@ -340,7 +339,7 @@ scss:
 
   .footer
     .ccs
-      h3 cc:
+      b cc:
 
       ul.electronic
         - letter.electronic_cc_recipients.each do |user|

data/app/views/renalware/letters/mailshots/mailshots/_form.html.slim

@@ -38,24 +38,28 @@
     br
     .panel
       h2
-        i.fas.fa-info-circle style="color: #00a499"
-        span(style="padding-left: 5px") Tips
-      p
-        | The list of patients to include in a mailshot it determined by the SQL View chosen above.
-        |  It is intended that a systems or database administrator create this view for you in the
-        |  renalware database. The view should have one column called 'patient_id' and return the ids
-        |  of all the patients you want to send this letter to.
-        |  You should ideally create the view in the hospital's
-        |  own postgres schema eg 'renalware_kch' in the case of Kings College Hospital.
-      p Here is a (somewhat pointless) example of a compatible SQL view definition:
-      p
-        code
-          | CREATE OR REPLACE VIEW
-          br
-          |  renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
-          br
-          |  SELECT id as patient_id
-          br
-          |  FROM patients
-          br
-          |  WHERE family_name like 'R%';
+        i.fas.fa-info-circle
+        span.pl-3 Help
+
+      markdown:
+        The list of patients to include in a mailshot it determined by the SQL View chosen above.
+        It is intended that a systems or database administrator create this view for you in the
+        renalware database. The view should have one column called 'patient_id' and return the ids
+        of all the patients you want to send this letter to.
+
+        You should ideally create the view in the hospital's
+        own postgres schema (eg 'renalware_kch' in the case of Kings College Hospital) in order to
+        indicate your view is hospital-specific.
+
+        **Note that in order for your view to appear in the dropdown above, its name must start
+        with `letter_mailshot_`**
+
+        Here is a (somewhat pointless) example of a compatible SQL view definition:
+
+        ```
+          CREATE OR REPLACE VIEW
+          renalware_kch.letter_mailshot_patients_where_surname_starts_with_r AS
+          SELECT id as patient_id
+          FROM patients
+          WHERE family_name like 'R%';
+        ```

data/app/views/renalware/letters/parts/_allergies.html.slim

@@ -1,5 +1,5 @@
 .list.allergies
-  h3 Allergies:
+  b.subtitle Allergies:
   - if allergies.any?
     ul
       - allergies.each do |allergy|

data/app/views/renalware/letters/parts/_problems.html.slim

@@ -1,5 +1,5 @@
 .list.problems
-  h3 Problems
+  b.subtitle Problems
 
   - if problems.any?
     ul.indented

data/app/views/renalware/letters/parts/_recent_pathology_results.html.slim

@@ -1,3 +1,3 @@
 .list.investigations
-  h3 Recent Investigations
+  b.subtitle Recent Investigations
   p= recent_pathology_results.results || " None"

data/app/views/renalware/medications/home_delivery/events/_edit.html.slim

@@ -7,7 +7,7 @@
       remote: true,
       authenticity_token: true,
       method: :patch,
-      data: { target: "home-delivery-modal.form" },
+      data: { "home-delivery-modal-target" => "form" },
       as: :event) do |f|
 
     .modal__header
@@ -24,7 +24,7 @@
       / - the first is initially displayed and has the print options and a print button
       / - the second is displayed once Print has been clicked, and asked asks for feedback as to
       /   whether printing was successful or not. It it was successful we set
-      .form-fields data-target="home-delivery-modal.printOptions"
+      .form-fields data-home-delivery-modal-target="printOptions"
         - homecare_forms = Renalware::Drugs::HomecareForm.all
         = f.association :drug_type,
                   collection: Renalware::Drugs::Type.where(id: homecare_forms.map(&:drug_type_id)),
@@ -32,7 +32,7 @@
                   input_html: { \
                     data: { \
                       action: "change->home-delivery-modal#refreshForm", \
-                      target: "home-delivery-modal.drugtype" \
+                      "home-delivery-modal-target" => "drugtype" \
                     } \
                   },
                   wrapper: :horizontal_medium
@@ -59,7 +59,7 @@
                   data: { action: "click->home-delivery-modal#askForPrintFeedback" },
                   **disabled_args
 
-      .show-after-printing.visuallyhidden data-target="home-delivery-modal.printFeedback"
+      .show-after-printing.visuallyhidden data-home-delivery-modal-target="printFeedback"
 
         h2 Was printing successful?
         .right

data/app/views/renalware/medications/prescriptions/_current.html.slim

@@ -1,4 +1,4 @@
-h3 Current Medications
+b.subtitle Current Medications
 
 - if prescriptions.blank?
   p.prescription No medications listed

data/app/views/renalware/medications/prescriptions/_current_hd.html.slim

@@ -1,5 +1,5 @@
 - if prescriptions.any?
-  h3 Drugs to give on Haemodialysis
+  b.subtitle Drugs to give on Haemodialysis
 
   ul
       - prescriptions.each do |prescription|

data/app/views/renalware/medications/prescriptions/_form.html.slim

@@ -38,16 +38,16 @@ ruby:
                      required: false,
                      wrapper: :horizontal_datepicker
 
-      span(data-target= "prescriptions.providers")
+      span(data-prescriptions-target= "providers")
         = f.input :provider,
                   collection: provider_codes,
                   as: :inline_radio_buttons,
                   label_method: :to_label,
                   wrapper: :horizontal_medium,
-                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", target: "prescriptions.providers"} }
+                  input_html: { data: { action: "change->prescriptions#toggleDeliveryDates", "prescriptions.target" => "providers"} }
 
       / Only show this if home_delivery provider is active/selected. See prescriptions stimulus controller.
-      .home_delivery_dates(style="display:none" data-target="prescriptions.homeDeliveryDates")
+      .home_delivery_dates(style="display:none" data-prescriptions-target="homeDeliveryDates")
         .row
           .small-12.medium-4.large-3.columns
           .small-12.medium-8.large-9.columns

data/app/views/renalware/medications/prescriptions/_prescription.html.slim

@@ -1,5 +1,4 @@
 - recently_changed = defined?(recently_changed) && recently_changed
-
 li.prescription class=("recently_changed" if recently_changed)
   = prescription.drug.name
   = blank_separator
@@ -8,6 +7,9 @@ li.prescription class=("recently_changed" if recently_changed)
   = prescription.medication_route.code
   = blank_separator
   = prescription.frequency
+  = blank_separator
+  i
+    b= prescription.provider_suffix
 
   / We pass in date_changed if the prescription is recently_changed or recently_stopped
   / It could be the prescribed_on or terminated_on date

data/app/views/renalware/medications/prescriptions/_recently_stopped.html.slim

@@ -1,4 +1,4 @@
-h3 Recently Stopped Medications
+b.subtitle Recently Stopped Medications
 
 - if prescriptions.blank?
   p.prescription None

data/app/views/renalware/system/view_metadata/_columns_table.html.slim

@@ -28,9 +28,9 @@ table.sortables(style="list-style-type: none;")
           td.border-0
             code= col.code
           td.text-center.border-0
-            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden)
+            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden style="margin:0")
           td.border-0
-            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name)
+            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name style="margin:0")
           td.border-0
             select.m-0(name="view_metadata[columns][][width]")
               option(value="")

data/app/views/renalware/system/view_metadata/edit.html.slim

@@ -38,18 +38,18 @@ ruby:
       / Tabs - see also js stimulus tabs-controller
       div(data-controller="tabs" data-tabs-active-tab="-mb-px border-l border-t border-r rounded-t")
         ul.list-reset.flex.border-b.ml-0
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Columns
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Filters
-          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+          li.-mb-px.mr-1(data-tabs-target="tab" data-action="click->tabs#change")
             a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Previous versions
 
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "columns_table", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "filters_form", view: view
-        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-tabs-target="panel")
           = render "versions", view: view
 
     .modal__footer