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/deaths/index.html.slim CHANGED

@@ -9,28 +9,36 @@
   table#patients-deceased
     thead
       tr
-        th Name
+        th
+        th.col-width-mediumish= sort_link([:renalware, q], :family_name, "Name")
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp No.
         th.col-width-tiny Sex
-        th.col-width-date= sort_link([:renalware, q], :born_on, "Date of Birth")
-        th.col-width-date-time= sort_link([:renalware, q], :died_on, "Date of Death")
         th.col-width-tiny Age
-        th.col-width-medium
+        th.col-width-date= sort_link([:renalware, q], :born_on, "Date of Birth")
+        th.col-width-date= sort_link([:renalware, q], :died_on, "Date of Death")
+        th First cause
+        th Current Modality
+        th Previous Modality
     tbody
       - patients.each do |patient|
         tr
+          td.actions
+            = link_to edit_patient_death_path(patient),
+                      title: "Edit death details" do
+              i.fas.fa-edit
+              span.show-for-large-up
+                | &nbsp;Death details
           td= default_patient_link(patient)
           td= patient.nhs_number
           td= patient.hospital_identifier
           td= patient.sex
+          td= patient.age
           td= l patient.born_on
           td= l patient.died_on
-          td= patient.age
-          td.actions
-            = link_to "Edit death details",
-                      edit_patient_death_path(patient),
-                      title: "Edit death details"
+          td= patient.first_cause&.description
+          td= patient.current_modality
+          td= patient.previous_modality
-  = paginate patients
+  == pagy_foundation_nav pagy

data/app/views/renalware/directory/people/_filters.html.slim CHANGED

@@ -5,5 +5,5 @@
         = f.input :name_cont, label: "Name contains"
       .small-4.end.columns.actions
         = f.submit t("helpers.submit.filter"), class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), directory_people_path

data/app/views/renalware/directory/people/_form.html.slim CHANGED

@@ -10,5 +10,5 @@
     = render "address_form", f: f
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "cancel", directory_people_path

data/app/views/renalware/directory/people/show.html.slim CHANGED

@@ -6,7 +6,7 @@
 = within_admin_layout(title: "Person",
                       breadcrumbs: breadcrumb_for("Directory", directory_people_path))
-  .grid
+  .mgrid
     = article_tag "Person" do
       = definition_list_for(person, size: :large) do |list|
         = list.definition(:title)

data/app/views/renalware/drugs/drugs/_filters.html.slim CHANGED

@@ -7,5 +7,5 @@
           = f.search_field :name_or_drug_types_name_start
         .small-3.large-4.columns.actions.end
           = f.submit t("helpers.submit.filter"), class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), drugs_drugs_path

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

@@ -11,5 +11,5 @@
       = f.collection_check_boxes :drug_type_ids, Renalware::Drugs::Type.all, :id, :name
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", drugs_drugs_path

data/app/views/renalware/events/advanced_care_plans/_cell.html.slim ADDED

	@@ -0,0 +1,2 @@
1	+ / See Events::AdvancedCarePlan.to_partial_path etc
2	+ = event.document.state.text

data/app/views/renalware/events/advanced_care_plans/_inputs.html.slim ADDED

@@ -0,0 +1,4 @@
+/ See Events::AdvancedCarePlan.to_partial_path etc
+/ Pulled into the New Event form via a js get to EventsController#new
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :state, wrapper: :horizontal_medium

data/app/views/renalware/events/advanced_care_plans/_toggled_cell.html.slim ADDED

@@ -0,0 +1,8 @@
+/ See Events::AdvancedCarePlan.to_partial_path etc
+- document = event.document
+dl.dl-horizontal
+  dt= attr_name(document, :state, suffix: ":")
+  dd= document.state&.text || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/clinical_frailty_score/_cell.html.slim ADDED

	@@ -0,0 +1,2 @@
1	+ / See ClinicalFrailtyScore.to_partial_path etc
2	+ = event.document.score.text

data/app/views/renalware/events/clinical_frailty_score/_inputs.html.slim ADDED

@@ -0,0 +1,4 @@
+/ See ClinicalFrailtyScore.to_partial_path etc
+/ Pulled into the New Event form via a js get to EventsController#new
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :score, wrapper: :horizontal_tiny

data/app/views/renalware/events/clinical_frailty_score/_toggled_cell.html.slim ADDED

@@ -0,0 +1,8 @@
+/ See ClinicalFrailtyScore.to_partial_path etc
+- document = event.document
+dl.dl-horizontal
+  dt= attr_name(document, :score, suffix: ":")
+  dd= document.score&.text || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/events/_filters.html.slim CHANGED

@@ -16,5 +16,5 @@
                   label: "Created by"
       .medium-3.large-3.columns.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), patient_events_path(events.patient)

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

@@ -33,5 +33,5 @@
   br
   = submit_tag "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "Cancel", return_url

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

@@ -11,7 +11,7 @@ table.has-togglable-rows.events-table
         th.col-width-large= t(".type")
       - if local_assigns.fetch(:include_patient_column, false)
         th.col-width-large= t(".patient")
-      th= t(".description")
+      th= local_assigns.fetch(:description_column_title, t(".description"))
       th.created_at.col-width-date-time= t(".date_time")
       th.created_by.col-width-medium= t(".created_by")
   tbody

data/app/views/renalware/events/events/toggled_cell/_biopsy.html.slim CHANGED

@@ -6,4 +6,4 @@ dl.dl-horizontal
   dt= attr_name(document, :result2, suffix: ":")
   dd= document.result2&.text || t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes&.html_safe
+  dd== event.notes

data/app/views/renalware/events/events/toggled_cell/_simple.html.slim CHANGED

@@ -2,4 +2,4 @@ dl.dl-horizontal
   dt= attr_name(event, :description, suffix: ":")
   dd= event.description
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes&.html_safe
+  dd== event.notes

data/app/views/renalware/events/events/toggled_cell/_swab.html.slim CHANGED

@@ -3,4 +3,4 @@ dl.dl-horizontal
   dt= attr_name(document, :location, suffix: ":")
   dd= document.location.present? ? document.location : t("unspecified")
   dt= attr_name(event, :notes, suffix: ":")
-  dd= event.notes&.html_safe
+  dd== event.notes

data/app/views/renalware/events/lists/_filters.html.slim CHANGED

@@ -25,5 +25,5 @@
                   label: "To"
       .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.events_filtered_list_path(named_filter: :all)

data/app/views/renalware/events/types/_form.html.slim CHANGED

@@ -6,5 +6,5 @@
     = simple_form_for event_type, html: { autocomplete: "off" } do |f|
       = f.input :name, label: "Event Type"
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", events_types_path

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

@@ -5,5 +5,5 @@
     = f.input :name, autofocus: true
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", hd_cannulation_types_path

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

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -133,5 +133,5 @@ ruby:
 .row.form-actions
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

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

@@ -1,4 +1,4 @@
-.grid
+.mgrid
     .row
       .columns.small-6
         article

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