RubyGems - renalware-core - Versions diffs - 2.0.146 → 2.0.152 - Mend

renalware-core 2.0.146 → 2.0.152

Files changed (449) hide show

data/app/views/renalware/hd/current_profile/show.html.slim CHANGED

@@ -4,6 +4,6 @@
 = within_patient_layout(title: "HD Profile",
                         breadcrumbs: hd_summary_breadcrumb(patient)) do
-  .grid
+  .mgrid
     .row
       = render "show", patient: patient, profile: profile

data/app/views/renalware/hd/dialysates/_form.html.slim CHANGED

@@ -8,5 +8,5 @@
     = f.input :"#{element}_content_uom", wrapper: :horizontal_small
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", hd_dialysates_path

data/app/views/renalware/hd/dialysers/_form.html.slim CHANGED

@@ -8,5 +8,5 @@
   = f.input :membrane_surface_area_coefficient_k0a, wrapper: :horizontal_small
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", hd_dialysers_path

data/app/views/renalware/hd/mdm_patients/_filters.html.slim CHANGED

@@ -26,5 +26,5 @@
     .medium-2.columns.actions
       = f.submit t("helpers.submit.filter"), class: "button", name: nil
-      span= " or "
+      '  or
       = link_to t("helpers.reset"), filter_form.url

data/app/views/renalware/hd/ongoing_sessions/_filters.html.slim CHANGED

@@ -13,5 +13,5 @@
             include_blank: true
       .small-4.medium-4.large-3.columns.actions.end
         = f.submit t("helpers.submit.filter"), class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), hd_ongoing_sessions_path

data/app/views/renalware/hd/preference_sets/_form.html.slim CHANGED

@@ -22,5 +22,5 @@ ruby:
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

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

@@ -25,6 +25,8 @@
             .hd-drug--frequency= prescription.frequency
             .hd-drug--prescribed-on= l(prescription.prescribed_on)
             .hd-drug--prescriber-name= prescription.updated_by
+            - position = prescription.updated_by&.professional_position
+            .hd-drug--prescriber-position= position && "(#{position})"
             - if prescription.terminated_on.present?
               .hd-drug--termination
@@ -44,7 +46,7 @@
                       }
         .recorded-on
-          = fpa.input :recorded_on, as: :date_picker, wrapper: :hz_tiny, input_html: { autocomplete: "off" }
+          = fpa.input :recorded_on, as: :date_picker, wrapper: :hz_xs, input_html: { autocomplete: "off" }
         .notes(style="display: block")
           = fpa.label :notes
@@ -89,7 +91,7 @@
                        id: "btn_save_and_witness_later",
                        class: "button secondary"
-          span= " or "
+          '  or
           = link_to "Cancel",
                   "#",
                   "aria-label" => "Close",

data/app/views/renalware/hd/prescription_administrations/_row.html.slim CHANGED

@@ -15,7 +15,7 @@ tbody(class=(administration.authorised? ? "authorised" : "unauthorised"))
           i.fa.fa-check-circle
         - else
           = link_to "Sign-off",
-                    edit_hd_prescription_administration_witness_path(administration),
+                    edit_hd_prescription_administration_witness_path(administration, format: :html),
                     data: { "reveal-id" => "hd-prescription-administration-modal", "reveal-ajax" => "true" }
     td.col-width-medium-with-ellipsis.show-for-large-up= administration.notes
   tr

data/app/views/renalware/hd/prescription_administrations/new.js.erb CHANGED

@@ -1,5 +1,5 @@
 // Render this to re-display the form with errors after an unsuccessful save
 var modal = $("#hd-prescription-administration-modal")
 $(modal).html("<%=
-  j(render 'form', prescription_administration: prescription_administration, url: hd_prescription_administrations_path)
+  j(render 'form', prescription_administration: prescription_administration, url: hd_prescription_administrations_path, format: :html)
 %>");

data/app/views/renalware/hd/protocols/_protocol.pdf.slim CHANGED

@@ -3,42 +3,43 @@
 - content_for(:head) do
   = wicked_pdf_stylesheet_link_tag "renalware/protocol_pdf"
-- protocol.with_format("html") do
-  .protocol
-    = render "renalware/patients/header", patient: protocol.patient
-    table.protocol-patient-summary
-      thead
-        tr
-          th.protocol-hd-profile HD Profile
-          th.protocol-allergies
-            | Allergies
-            - if clinical_patient.allergy_status_updated_at
-              span.allergy_status_updated_at
-                = " #{l(clinical_patient.allergy_status_updated_at&.to_date)}"
-          th.protocol-prescriptions Prescriptions on HD
-          th.protocol-recent-pathology Recent Pathology
-      tbody
-        tr
-          td
-            = render "profile", profile: protocol.profile
-          td
-            = render "allergies", patient: protocol.patient
-            = render "virology", protocol: protocol
-          td
-            = render "prescriptions", prescriptions: protocol.prescriptions
-          td
-            = render "recent_pathology", recent_pathology: protocol.recent_pathology
-            = render "latest_dry_weight", latest_dry_weight: protocol.latest_dry_weight
+  /- protocol.with_format("html") do
+.protocol
+  = render "renalware/patients/header", patient: protocol.patient, formats: :html
+  table.protocol-patient-summary
+    thead
+      tr
+        th.protocol-hd-profile HD Profile
+        th.protocol-allergies
+          | Allergies
+          - if clinical_patient.allergy_status_updated_at
+            span.allergy_status_updated_at
+              = " #{l(clinical_patient.allergy_status_updated_at&.to_date)}"
+        th.protocol-prescriptions Prescriptions on HD
+        th.protocol-recent-pathology Recent Pathology
+    tbody
+      tr
+        td
+          = render "profile", profile: protocol.profile, formats: :html
+        td
+          = render "allergies", patient: protocol.patient, formats: :html
+          = render "virology", protocol: protocol, formats: :html
+        td
+          = render "prescriptions", prescriptions: protocol.prescriptions, formats: :html
+        td
+          = render "recent_pathology", recent_pathology: protocol.recent_pathology, formats: :html
+          = render "latest_dry_weight", latest_dry_weight: protocol.latest_dry_weight, formats: :html
-    .row.collapse
-      .small-12.columns
-        table.auto-layout.protocol-sessions
-          = render "renalware/hd/sessions/thead"
-          tbody
-            - 1..3.times do
-              = render "renalware/hd/sessions/empty_row"
-            - protocol.sessions.each_with_index do |session, index|
-              - stripe_class = index % 2 == 0 ? "even" : "odd"
-              = render "renalware/hd/sessions/row",
-                       session: session,
-                       stripe_class: stripe_class
+  .row.collapse
+    .small-12.columns
+      table.auto-layout.protocol-sessions
+        = render "renalware/hd/sessions/thead", formats: :html
+        tbody
+          - 1..3.times do
+            = render "renalware/hd/sessions/empty_row", formats: :html
+          - protocol.sessions.each_with_index do |session, index|
+            - stripe_class = index % 2 == 0 ? "even" : "odd"
+            = render "renalware/hd/sessions/row",
+                      session: session,
+                      stripe_class: stripe_class,
+                      formats: :html

data/app/views/renalware/hd/scheduling/diary_slots/_slot.html.slim CHANGED

@@ -17,5 +17,6 @@ td*{ "data-slot-id" => slot.id.present? && slot.id,
               new_hd_scheduling_diary_slot_path(diary_id: slot.diary_id,
                                      station_id: slot.station_id,
                                      diurnal_period_code_id: slot.diurnal_period_code_id,
-                                     day_of_week: slot.day_of_week),
+                                     day_of_week: slot.day_of_week,
+                                     format: :html),
               data: { "reveal-id" => "add-patient-to-diary-modal", "reveal-ajax" => "true" }

data/app/views/renalware/hd/sessions/_form_actions.html.slim CHANGED

@@ -16,5 +16,5 @@
               method: :delete,
               class: "button alert")
   | &nbsp;
-  span= " or "
+  '  or
   = link_to "cancel", back_path

data/app/views/renalware/hd/sessions/_show.html.slim CHANGED

@@ -1,5 +1,5 @@
 .document-view
-  .grid
+  .mgrid
     .row
       = render "renalware/shared/attributes_group",
           legend: "Sign-In", destination: "signin",

data/app/views/renalware/hd/stations/_form.html.slim CHANGED

@@ -9,5 +9,5 @@
             wrapper: :horizontal_medium
   = f.submit "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "cancel", hd_unit_stations_path(station.hospital_unit_id)

data/app/views/renalware/hd/transmission_logs/index.html.slim CHANGED

@@ -36,8 +36,7 @@
                 - filename = log.filepath && Pathname(log.filepath).basename
                 - if filename.present?
                   i.fas.fa-file
-                  | &nbsp;
-                  = filename
+                  => filename
             td= log.patient && link_to(log.patient, patient_hd_sessions_path(log.patient))
             td
               - if log.parent_id.present?

data/app/views/renalware/hd/unmet_preferences/_filters.html.slim CHANGED

@@ -27,5 +27,5 @@
         .medium-3.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), hd_unmet_preferences_path

data/app/views/renalware/hd/witnesses/_form.html.slim CHANGED

@@ -21,6 +21,8 @@
             .hd-drug--frequency= prescription.frequency
             .hd-drug--prescribed-on= l(prescription.prescribed_on)
             .hd-drug--prescriber-name= prescription.updated_by
+            - position = prescription.updated_by&.professional_position
+            .hd-drug--prescriber-position= position && "(#{position})"
             - if prescription.terminated_on.present?
               .hd-drug--termination
@@ -32,17 +34,17 @@
       = f.input :user_id,
                 as: :user_picker,
                 collection: Renalware::User.ordered,
-                wrapper: :hz_small
+                wrapper: :hz_sm
       = f.input :password,
                 as: :password,
-                wrapper: :hz_small
+                wrapper: :hz_sm
     .modal__footer
       .right
         = f.submit "Witness", class: "button"
         | &nbsp;&nbsp;
         = f.submit "Update User Only", name: "form[update_user_only]", class: "button secondary"
-        span= " or "
+        '  or
         = link_to "Cancel",
                 "#",
                 "aria-label" => "Close",

data/app/views/renalware/hospitals/units/_form.html.slim CHANGED

@@ -13,5 +13,5 @@
   = f.input :is_hd_site, wrapper: :horizontal_small
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", hospitals_units_path

data/app/views/renalware/letters/contacts/_contact.html.slim CHANGED

@@ -6,5 +6,5 @@
   td= contact.notes
   td
     = link_to("Edit",
-                edit_patient_letters_contact_path(patient, contact),
+                edit_patient_letters_contact_path(patient, contact, format: :html),
                 data: { "reveal-id" => "edit-patient-contact-modal", "reveal-ajax" => "true" })

data/app/views/renalware/letters/contacts/_edit.html.slim CHANGED

@@ -21,7 +21,7 @@
       = f.input :notes, as: :text
       = f.submit class: :button
-      span= " or "
+      '  or
       = link_to "Cancel",
                "#",
                "aria-label" => "Close",

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

@@ -11,7 +11,7 @@
                   data: { behaviour: "toggle-section" }
       .right
         = f.submit t(".save"), class: "button"
-        span= " or "
+        '  or
         = link_to t(".cancel"),
                "#",
                "aria-label" => "Close",

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

@@ -17,7 +17,7 @@
     .large-12.columns
       br
       = f.submit t(".save"), class: "button"
-      span= " or "
+      '  or
       = link_to t(".cancel"),
                "#",
                "aria-label" => "Close",

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

@@ -38,7 +38,7 @@ table.letters.electronic-ccs.has-togglable-rows
             = simple_format letter.body
         td.nowrap
-          - if policy(receipt).mark_as_read?
+          - if Pundit.policy!(current_user, receipt).mark_as_read?
             ul.actions
               li= link_to "Keep as unread",
                           "##{receipt.html_preview_identifier}",

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

@@ -5,7 +5,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content data-controller="letters-form"
@@ -67,5 +67,5 @@ ruby:
 .row.bottom
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

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

@@ -4,3 +4,7 @@
 = within_patient_layout(title: "Letters") do
   = render "table", letters: letters, patient: patient
+  / If the host app has a views/renalware/letters/_legacy_letters.html.slim partial
+  / then render it - provides a way for the host app a change to augment this page.
+  = render_if_exists "legacy_letters", patient: patient

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

@@ -44,7 +44,7 @@
                     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 secondary"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), renalware.letters_filtered_letters_list_path(named_filter: named_filter)
   - if named_filter == :batch_printable

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

@@ -4,7 +4,8 @@
                     url: letters_mailshots_path,
                     html: { id: "mailshot-form" }) do |form|
     .columns.small-12
-      = form.input :description, placeholder: "A description of the mailshot purpose."
+      = form.input(:description,
+        placeholder: "The patient will see this at the top of letter. A description of the letter's purpose.")
     .columns.small-12
       = form.input(:sql_view_name,
         collection: Renalware::Letters::Mailshots::DataSource.all.map(&:viewname),

data/app/views/renalware/low_clearance/dashboards/show.html.slim CHANGED

@@ -5,3 +5,13 @@
   - if dashboard.profile&.persisted?
     .row
       = render "renalware/low_clearance/profiles/summary", profile: dashboard.profile
+  .row
+    .columns
+      .small-12.medium-9.large-6
+        = render Renalware::Events::EventListComponent.new(\
+          patient: patient,
+          event_class: Renalware::Events::ClinicalFrailtyScore)
+        = render Renalware::Events::EventListComponent.new(\
+          patient: patient,
+          event_class: Renalware::Events::AdvancedCarePlan)

data/app/views/renalware/low_clearance/profiles/edit.html.slim CHANGED

@@ -42,5 +42,5 @@
     .form-actions
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_low_clearance_dashboard_path(patient)

data/app/views/renalware/mdm/_pathology.html.slim CHANGED

@@ -9,4 +9,3 @@
     = render "renalware/pathology/historical_observation_results/table",
               table: mdm.pathology
-    /= mdm.pathology.table.render(mdm.pathology.rows)

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

@@ -7,7 +7,7 @@
   br
   / TODO: a.trigger-full-screen Full screen
   .full-screen-container.mdm-page.no-side-gutters
-    .grid
+    .mgrid
       .row
         = render_if_exists "top", mdm: mdm

data/app/views/renalware/mdm_patients/_patient.html.slim CHANGED

@@ -4,8 +4,7 @@ tr
   td.actions
     = link_to view_proc.call(patient), target: "_blank" do
       i.fa.fa-external-link-square-alt
-      | &nbsp;&nbsp;
-      = t(".view")
+      =< t(".view")
   td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
   td.nowrap= patient.nhs_number
   td.nowrap= patient.hospital_identifier

data/app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim CHANGED

@@ -18,8 +18,6 @@
                 label: "Provider"
     .small-3.columns.actions.end
       = f.submit "Search", class: "button"
-      | &nbsp;
-      span or
-      | &nbsp;
+      '  or
       = link_to "Reset", medications_esa_prescriptions_path
       /class: "cancel-link #{'disabled' unless searching}"

data/app/views/renalware/medications/home_delivery/prescriptions/index.html.slim ADDED

@@ -0,0 +1,51 @@
+- content_for(:filters) do
+  .panel
+    | Prescriptions with a next home prescription date within the last 4 weeks or the next 2 weeks.
+  .row
+    .columns.small-12.medium-6
+      = simple_form_for(form,
+                        as: :search,
+                        url: renalware.medications_home_delivery_prescriptions_path(named_filter: params[:named_filter]),
+                        method: :get) do |f|
+        = f.input :modality_description_id,
+                  collection: Renalware::Modalities::Description.order(:name),
+                  input_html: { onchange: "this.form.submit();" }
+  br
+- content_for(:tabs) do
+ dl.sub-nav
+    dd
+      = link_to "ESA",
+                renalware.medications_home_delivery_prescriptions_path(named_filter: "esa")
+    dd
+      = link_to "Immunosuppressant",
+                renalware.medications_home_delivery_prescriptions_path(named_filter: "immunosuppressant")
+= within_admin_layout(title: "Home Delivery Prescriptions") do
+  table
+    thead
+      tr
+        th.col-width-large= sort_link(query, :patient_family_name, "Patient")
+        th.col-width-nhs-no NHS number
+        th.col-width-medium Drug Type
+        th.col-width-large= sort_link(query, :drug_name, "Drug")
+        th.col-width-date= sort_link(query, :prescribed_on, "Prescribed on")
+        th.col-width-date-time= sort_link(query, :last_delivery_date, "Last home prescription date")
+        th.col-width-date-time= sort_link(query, :next_delivery_date, "Next home prescription date")
+        th.col-width-medium Modality
+        th
+    tbody
+      - prescriptions.each do |prescription|
+        tr
+          td= default_patient_link(prescription.patient)
+          td= prescription.patient.nhs_number
+          td= prescription.drug.drug_types.first&.name
+          td= prescription.drug.name
+          td= l(prescription.prescribed_on)
+          td= l(prescription.last_delivery_date)
+          td= l(prescription.next_delivery_date)
+          td= prescription.patient.current_modality
+          td
+  == pagy_foundation_nav pagy