RubyGems - renalware-core - Versions diffs - 2.0.145 → 2.0.151 - Mend

renalware-core 2.0.145 → 2.0.151

Files changed (468) hide show

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 ADDED

@@ -0,0 +1,61 @@
+.row
+  = simple_form_for(mailshot,
+                    as: :mailshot,
+                    url: letters_mailshots_path,
+                    html: { id: "mailshot-form" }) do |form|
+    .columns.small-12
+      = 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),
+        input_html: { data: { remote:"true", url: renalware.letters_mailshots_patient_previews_path }})
+    .columns.medium-6
+      = form.association :letterhead
+    .columns.medium-6
+      = form.association :author,
+            as: :user_picker,
+            collection: Renalware::System::UsersPresenter.new.list_for_dropdown( \
+              user_to_promote_to_top: current_user \
+            )
+    .columns.small-12
+      = form.input :body, as: :trix_editor
+      br
+      = form.submit "Create letters",
+                    class: :button,
+                    data: { confirm: "Are you sure you want to this mailshot?",
+                    disable_with: "Creating letters..." }
+  .columns.small-12
+    / When the SQL view name dropdown changes we will populate this div with a
+    / table containing name of the patients to whom the mailshot will be sent.
+    / See data-url on the sql_view_name dropdown for the rails route that will be
+    / called. It will render a ujs template eg index.js.erb to insert the list of
+    / patients into this view.
+    #mailshot-patients-preview
+  .columns.small-12
+    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.
+        | &nbsp;It is intended that a systems or database administrator create this view for you in the
+        | &nbsp;renalware database. The view should have one column called 'patient_id' and return the ids
+        | &nbsp;of all the patients you want to send this letter to.
+        | &nbsp;You should ideally create the view in the hospital's
+        | &nbsp;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%';

data/app/views/renalware/letters/mailshots/mailshots/index.html.slim ADDED

@@ -0,0 +1,31 @@
+- content_for(:actions) do
+  - if policy(Renalware::Letters::Mailshots::Mailshot).new?
+    = link_to "Add", new_letters_mailshot_path, class: :button
+= within_new_admin_layout(title: "Mailshots") do
+  table.toggleable.mailshots data-controller="toggle"
+    thead
+      th.togglers.noprint= rows_toggler
+      th.col-width-date-time Created
+      th.col-width-medium Description
+      th.col-width-medium Author
+      th.col-width-tiny Letter Count
+      th Status
+      th Last Error
+    - mailshots.each do |mailshot|
+      tbody
+        tr
+          td= row_toggler
+          td= l(mailshot.created_at)
+          td= mailshot.description
+          td= mailshot.author
+          td= mailshot.letters_count
+          td class="mailshot-status mailshot-status--#{mailshot.status}"
+            = mailshot.status
+          td
+            - if mailshot.last_error
+              = mailshot.last_error&.gsub("\n", "<br>").truncate(1000).html_safe
+        tr
+          td(colspan=7)
+            | Body:
+            = mailshot.body.html_safe

data/app/views/renalware/letters/mailshots/mailshots/new.html.slim ADDED

	@@ -0,0 +1,2 @@
1	+ = within_new_admin_layout(title: "New mailshot") do
2	+ = render "form", mailshot: mailshot

data/app/views/renalware/letters/mailshots/patient_previews/_index.html.slim ADDED

@@ -0,0 +1,26 @@
+- if patients.none?
+  .panel
+    b No patients
+- else
+  .panel
+    p
+      b #{pagy.count} patients will be included in the mailshot
+    p
+      | The SQL for
+      i= " #{datasource&.viewname}:"
+    p
+      code= datasource&.definition
+  table.mailshot-patient-previews
+    thead
+      th.col-width-large Patient name
+      th.col-width-nhs-no NHS number
+      th.col-width-reference-no Hospital nos
+      th
+    tbody
+      - patients.each do |patient|
+        tr
+          td= patient
+          td= patient.nhs_number
+          td= patient.hospital_identifiers
+          td
+  == pagy_foundation_nav pagy

data/app/views/renalware/letters/mailshots/patient_previews/index.js.erb ADDED

	@@ -0,0 +1 @@
1	+ $("#mailshot-patients-preview").html("<%= j(render 'index', patients: patients, datasource: datasource, pagy: pagy) %>");

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

data/app/views/renalware/medications/prescriptions/_filter_form.html.slim CHANGED

@@ -12,5 +12,5 @@
                  include_blank: "All drug types")
     = f.button t("helpers.submit.filter"), class: "button secondary"
-    = " or "
+    '  or
     = link_to "reset", patient_prescriptions_path(@patient)

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

@@ -4,7 +4,7 @@ ruby:
     h["Renalware::PD::ExitSiteInfection"] = "exit_site_infection"
   end
-.document
+.document(data-controller="prescriptions")
   br
   = simple_form_for prescription,
                     url: url,
@@ -38,22 +38,30 @@ ruby:
                      required: false,
                      wrapper: :horizontal_datepicker
-      = f.input :provider,
-                collection: provider_codes,
-                as: :inline_radio_buttons,
-                label_method: :to_label,
-                wrapper: :horizontal_medium
+      span(data-target= "prescriptions.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"} }
-      = f.input :last_delivery_date,
-                as: :date_picker,
-                wrapper: :horizontal_datepicker
+      / Only show this if home_delivery provider is active/selected. See prescriptions stimulus controller.
+      .home_delivery_dates(style="display:none" data-target="prescriptions.homeDeliveryDates")
+        .row
+          .small-12.medium-4.large-3.columns
+          .small-12.medium-8.large-9.columns
+            label.right.inline Last home prescription date:
+            b= l(f.object.last_delivery_date)
-      = f.input :next_delivery_date,
-                as: :date_picker,
-                wrapper: :horizontal_datepicker
+        .row
+          .small-12.medium-4.large-3.columns
+          .small-12.medium-8.large-9.columns
+            label.right.inline Next home prescription date:
+            b= l(f.object.next_delivery_date)
     .row.actions
       .small-9.columns
         = f.button :submit, "Save"
-        span= " or "
+        '  or
         = link_to "cancel", patient_prescriptions_path(patient, treatable), remote: true

data/app/views/renalware/medications/prescriptions/index.html.slim CHANGED

@@ -14,7 +14,7 @@
   |&nbsp;
   / link to open the modal
-  = link_to new_patient_medications_home_delivery_event_path(patient),
+  = link_to new_patient_medications_home_delivery_event_path(patient, format: :html),
             class: "button secondary with-icon",
             data: { "reveal-id" => "print-home-delivery-drugs-modal", "reveal-ajax" => "true" } do
     i.fa.fa-print

data/app/views/renalware/medications/terminations/_form.html.slim CHANGED

@@ -12,5 +12,5 @@ p
   .row
     .large-offset-3.large-7.columns
       = f.button :submit, "Save", class: :tiny
-      span= " or "
+      '  or
       = link_to "cancel", patient_prescriptions_path(patient, treatable), remote: true

data/app/views/renalware/messaging/internal/messages/_form.html.slim CHANGED

@@ -25,7 +25,7 @@
     = f.input :urgent, as: :boolean, boolean_style: :inline
     = f.input :body, as: :text, input_html: { rows: 7 }
     = f.submit "Send", class: :button
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",