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

@@ -6,9 +6,9 @@
 = within_admin_layout(title: "Inpatient Admissions") do
   .panel.radius.compact
-    | If the patient is not on Renalware yet, please&nbsp;
+    ' If the patient is not on Renalware yet, please
     = link_to("add them", new_patient_path)
-    | &nbsp;first
+    |  first
   = render "table", admissions: admissions
   = paginate admissions

data/app/views/renalware/admissions/consults/_filters.html.slim CHANGED

@@ -37,5 +37,5 @@
                   label: "Modality"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_consults_path(reset: 1)

data/app/views/renalware/admissions/consults/_form.html.slim CHANGED

@@ -8,7 +8,7 @@
   / selected yet) otherwise it will display the selected patient who will always be
   / at option index 1.
   = f.input :patient_id,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             collection: [[consult.patient&.to_s(:long), consult.patient&.id]],
             selected: 1,
             input_html: { \
@@ -19,39 +19,40 @@
   = f.input :consult_site_id,
             collection: Renalware::Admissions::ConsultSite.all,
-            wrapper: :horizontal_medium,
+            wrapper: :hz_md,
             include_blank: "Select local site (or enter other site below)",
             label: "Site"
   = ward_dropdown_grouped_by_hospital_unit(f,
     :hospital_ward_id,
-    include_blank: "Select local ward (or enter other ward below)")
+    include_blank: "Select local ward (or enter other ward below)",
+    wrapper: :hz_md)
-  = f.input :other_site_or_ward, wrapper: :horizontal_medium
-  = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :e_alert
+  = f.input :other_site_or_ward, wrapper: :hz_md
+  = f.input :started_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :e_alert, wrapper: :hz_md
   = f.association(:specialty,
-                  wrapper: :horizontal_medium,
+                  wrapper: :hz_md,
                   collection: Renalware::Admissions::Specialty.ordered)
-  = f.input :consult_type, wrapper: :horizontal_medium
-  = f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
-  = f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small
+  = f.input :consult_type, wrapper: :hz_md
+  = f.input :decided_on, as: :date_picker, wrapper: :hz_datepicker
+  = f.input :transfer_priority, include_blank: false, wrapper: :hz_sm
   = f.input :priority,
             include_blank: true,
             collection: Renalware::Admissions::Consult::PRIORITY_VALUES,
-            wrapper: :horizontal_tiny
-  = f.input :transferred_on, as: :date_picker, wrapper: :horizontal_datepicker
+            wrapper: :hz_xs
+  = f.input :transferred_on, as: :date_picker, wrapper: :hz_datepicker
   = f.association :seen_by,
                   as: :user_picker,
                   collection: Renalware::User.ordered,
-                  wrapper: :horizontal_medium
-  = f.input :contact_number, wrapper: :horizontal_medium
+                  wrapper: :hz_md
+  = f.input :contact_number, wrapper: :hz_md
-  = f.input :aki_risk, include_blank: "Please select", wrapper: :horizontal_small
-  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :rrt, as: :inline_radio_buttons, wrapper: :horizontal_small
-  = f.input :description, wrapper: :horizontal_large, input_html: { rows: 10 }
+  = f.input :aki_risk, include_blank: "Please select", wrapper: :hz_sm
+  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :rrt, as: :inline_radio_buttons, wrapper: :hz_sm
+  = f.input :description, wrapper: :hz_lg, input_html: { rows: 10 }
   = f.submit class: :button
-  span= " or "
+  '  or
   = link_to "Cancel", admissions_consults_path

data/app/views/renalware/admissions/consults/index.html.slim CHANGED

@@ -15,9 +15,9 @@
   = render "renalware/admissions/requests/modal_dialog_placeholder"
   .panel.radius.compact
-    | If the patient is not on Renalware yet, please&nbsp;
+    ' If the patient is not on Renalware yet, please
     = link_to("add them", new_patient_path)
-    | &nbsp;first
+    |  first
   = render "table", consults: consults, query: query
   = paginate consults

data/app/views/renalware/admissions/requests/_form.html.slim CHANGED

@@ -22,7 +22,7 @@
       = f.input :hospital_unit_id, collection: hospital_units, wrapper: :horizontal_medium
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
-      span= " or "
+      '  or
       = link_to "Cancel",
                "#",
                "aria-label" => "Close",

data/app/views/renalware/clinical/allergies/_new.html.slim CHANGED

@@ -7,7 +7,7 @@
     h2= t(".title")
     = f.input :description, as: :text, autofocus: true
     = f.submit t(".save"), class: :button, data: { disable_with: t(".save_disable_with") }
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

data/app/views/renalware/clinical/body_compositions/_form.html.slim CHANGED

@@ -44,5 +44,5 @@
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/dry_weights/_form.html.slim CHANGED

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

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

@@ -36,5 +36,5 @@
           .columns.large-12.form-actions
             = submit_tag "Update", class: "button"
-            span= " or "
+            '  or
             = link_to "Cancel", patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/profiles/show.html.slim CHANGED

@@ -2,7 +2,7 @@
   = link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
 = within_patient_layout(title: "Clinical Profile") do
-  .grid
+  .mgrid
     .row
       .columns.medium-6
         = article_tag("General") do
@@ -70,6 +70,16 @@
                  patient: patient,
                  limit: true
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::ClinicalFrailtyScore)
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::AdvancedCarePlan)
       .columns
         = render "renalware/clinical/body_compositions/list",
                  body_compositions: profile.body_compositions,

data/app/views/renalware/clinics/clinic_visits/_table.html.slim CHANGED

@@ -15,6 +15,8 @@ table.clinics.auto-layout
       th.col-width-tiny Temp
       th.col-width-tiny Urine blood
       th.col-width-tiny Urine protein
+      th.col-width-tiny(title="Body surface area") BSA
+      th.col-width-tiny(title="Total Body Water") TBW
       th.col-width-medium Created by
   tbody
     = render partial: "renalware/clinics/clinic_visits/table_row",

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim CHANGED

@@ -22,6 +22,8 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.bp= clinic_visit.temperature
   td= clinic_visit.urine_blood&.text
   td= clinic_visit.urine_protein&.text
+  td= clinic_visit.body_surface_area
+  td= clinic_visit.total_body_water
   td.created-by= clinic_visit.created_by
 = content_tag(:tr, id: "clinic_visit-quick-preview-#{clinic_visit.id}", style: "display: none")
   td(colspan=15)

data/app/views/renalware/clinics/clinic_visits/new.html.slim CHANGED

@@ -15,5 +15,5 @@
       = render "form", f: f
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_clinic_visits_path(patient)

data/app/views/renalware/clinics/visits/_filters.html.slim CHANGED

@@ -15,7 +15,7 @@
           = f.input :created_by_id_eq, as: :user_picker, collection: users, label: "Clinician"
         .medium-2.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), clinic_visits_path
   .filters__output

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

@@ -8,7 +8,7 @@ tr(class=letter.state.dasherize)
   td.actions
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).update?
+    - if Pundit.policy!(current_user, letter).update?
       = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td

data/app/views/renalware/deaths/edit.html.slim CHANGED

@@ -31,5 +31,5 @@
               wrapper: :horizontal_large
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_clinical_profile_path(patient)

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