renalware-core 2.0.147 → 2.0.153

data/app/views/renalware/navigation/_sign_out.html.slim

@@ -1,2 +1,6 @@
 li
-  = link_to "Log out", destroy_user_session_path, class: "right", method: :delete
+  = link_to "Log out",
+            destroy_user_session_path,
+            class: "right",
+            method: :delete,
+            data: { action: "click->session#sendLogoutMessageToAnyOpenTabs" }

data/app/views/renalware/pathology/charts/show.html.slim

@@ -0,0 +1,11 @@
+.modal
+  .modal__header
+    h2= "#{observation_description.code} (#{observation_description.name})"
+    br
+    h3= patient
+    = render "renalware/shared/modal_close_link"
+  .modal__body
+    = render Renalware::Pathology::ChartComponent.new(current_user: current_user,
+             patient: patient,
+             observation_description: observation_description)
+  .modal__footer

data/app/views/renalware/pathology/current_observation_results/index.html.slim

@@ -6,5 +6,11 @@
         - observations.each do |observation|
           tr
             th= observation.description
+            - if current_user.wants_feature?(2)
+              td
+                = render Renalware::Pathology::SparklineComponent.new(current_user: current_user,
+                  patient: patient,
+                  observation_description: observation.description)
+
             td= observation.result
             td= l(observation.observed_at&.to_date)

data/app/views/renalware/pathology/historical_observation_results/_table.html.slim

@@ -6,7 +6,8 @@ table#observations.column_hover
     tr
       th Date
       - table.observation_descriptions.each do |desc|
-         th(title=desc.name)= desc.code
+        th(title=desc.name style="text-align: center")= desc.code
+
   tbody
     - table.rows.each do |row|
       tr
@@ -14,8 +15,8 @@ table#observations.column_hover
         - table.observation_descriptions.each do |desc|
           - code = desc.code
           - if row.comment_for(code).present?
-            td(class=code.downcase aria-label=row.comment_for(code) data-balloon-pos="up")
+            td.triangle_in_corner(class=code.downcase aria-label=row.comment_for(code) data-balloon-pos="up")
               .triangle-top-right
               = row.result_for(code)
           - else
-            td(class=code.downcase)= row.result_for(code)
+            td(class=code.downcase title=row.result_for(code))= row.result_for(code)

data/app/views/renalware/pathology/historical_observation_results/index.html.slim

@@ -5,6 +5,6 @@
   - else
     p.hint Hover over table then scroll horizontally to view more results.
     .double-scroll.embedded-scroll.pathology
-      = render "table", table: table
+      = render "table", table: table, patient: patient
 
     = paginate(table)

data/app/views/renalware/pathology/observation_requests/_filters.html.slim

@@ -13,5 +13,5 @@
 
       .columns.medium-2.large-2.actions.end
         = f.submit t("helpers.submit.filter"), class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), renalware.patient_pathology_observation_requests_path(patient)

data/app/views/renalware/pathology/observations/_diff.html.slim

@@ -2,7 +2,7 @@
 .row
   - diff.to_h.to_a.in_groups_of(11, false) do |group|
     .columns.medium-6.large-4.end
-      table.table.pathology-observation-diff.columns
+      table.pathology-observation-diff.columns
         thead
           tr
             th.col-width-tiny(rowspan=2) Code

data/app/views/renalware/pathology/patient_rules/_form.html.slim

@@ -9,5 +9,5 @@
   = f.input :end_date, as: :date_picker, input_html: { class: "small-input" }
 
   = submit_tag "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "Cancel", patient_pathology_required_observations_path(@patient)

data/app/views/renalware/pathology/requests/requests/index.html.slim

@@ -13,7 +13,7 @@
               = f.input :created_on_eq, as: :date_picker, label: "Printed on"
             .large-8.columns.actions
               = f.submit t("helpers.submit.filter"), class: "button"
-              span= " or "
+              '  or
               = link_to t("helpers.reset"), pathology_requests_requests_path
 
   .row

data/app/views/renalware/patients/alerts/_form.html.slim

@@ -10,7 +10,7 @@
               label: false
     = f.input :notes, autofocus: true
     = f.submit "Create alert", class: :button
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

data/app/views/renalware/patients/bookmarks/_new.html.slim

@@ -13,7 +13,7 @@
     = f.input :tags, label: "Tags", placeholder: "Optional comma-delimited list"
     = f.input :notes, as: :text, input_html: { autofocus: :autofocus }
     = f.submit t(".save"), class: :button
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

data/app/views/renalware/patients/patients/show.html.slim

@@ -3,7 +3,7 @@
 
 = within_patient_layout(title: "Demographics") do
   #patient-demographics
-    .grid
+    .mgrid
       .row
         .columns.medium-6.large-4.xlarge-3
           = render "renalware/patients/patients/show/patient_demographics", patient: patient

data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim

@@ -10,7 +10,7 @@ article
                         confirm: "Are you sure you want to remove the patient's GP and practice?" }
 
     = link_to "Change",
-              edit_patient_primary_care_physician_path(patient),
+              edit_patient_primary_care_physician_path(patient, format: :html),
               class: "button change-gp",
               data: { "reveal-id" => "change-gp-modal", "reveal-ajax" => "true" }
 

data/app/views/renalware/patients/primary_care_physicians/_form.html.slim

@@ -23,5 +23,5 @@
             = render "renalware/addresses/form", a: a
 
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patients_primary_care_physicians_path

data/app/views/renalware/patients/worries/_new.html.slim

@@ -15,7 +15,7 @@
              input_html: { autofocus: :autofocus },
              label: "Optional notes"
     = f.submit t(".save"), class: :button
-    span= " or "
+    '  or
     = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",

data/app/views/renalware/patients/worryboard/_filters.html.slim

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

data/app/views/renalware/pd/_exit_site_infections.html.slim

@@ -2,6 +2,7 @@ table
   thead
     th.col-width-tiny
     th.col-width-date Diagnosed on
+    th Organisms
     th Outcome
     th Treatment
     th.col-width-date= t("updated_at")
@@ -18,6 +19,9 @@ table
         td valign="top"
           = l e.diagnosis_date
 
+        td valign="top"
+          = e.infection_organisms.map { |io| io.organism_code&.name }.join(" + ")
+
         td valign="top"
           = e.outcome
 

data/app/views/renalware/pd/_peritonitis_episodes.html.slim

@@ -5,6 +5,7 @@ table
       th.col-width-date Diagnosed on
       th.col-width-date Treatment Started on
       th Episode Type
+      th Organisms
       th Outcome
       th.col-width-date= t("updated_at")
 
@@ -22,6 +23,8 @@ table
           = l episode.treatment_start_date
         td valign="top"
           = episode.episode_types_summary
+        td valign="top"
+          = episode.infection_organisms.map { |io| io.organism_code&.name }.join(" + ")
         td valign="top"
           = "Catheter Removed: #{yes_no(episode.catheter_removed)}"
         td valign="top"

data/app/views/renalware/pd/adequacy_completions/_filters.html.slim

@@ -0,0 +1,19 @@
+
+.search-form.filters
+  = simple_form_for query,
+      as: :q,
+      url: pd_adequacy_completions_path,
+      method: :get do |f|
+    .row
+      .columns.medium-2.large-2
+        = f.input :identity_match, label: "Hosp/NHS no or name"
+
+      .columns.medium-2.large-2
+        = f.input :complete_eq,
+                  collection: [["Yes", true], ["No", false]],
+                  label: "Complete"
+
+      .columns.medium-2.large-2.actions.end
+        = f.submit "Filter", class: "button"
+        '  or
+        = link_to t("helpers.reset"), pd_adequacy_completions_path

data/app/views/renalware/pd/adequacy_completions/index.html.slim

@@ -0,0 +1,4 @@
+= within_admin_layout(title: "Adequacy Results") do
+  = render "filters", query: query
+  = render "renalware/pd/adequacy_results/table", results: results, display_patient: true
+  == pagy_foundation_nav pagination

data/app/views/renalware/pd/adequacy_results/_form_fields.html.slim

@@ -0,0 +1,9 @@
+= form.input :patient_id, as: :hidden
+= form.input :performed_on, as: :date_picker, wrapper: :hz_datepicker
+= form.input :height, wrapper: :hz_xs
+= form.input :weight, wrapper: :hz_xs
+= form.input :dial_24_vol_in, wrapper: :hz_sm
+= form.input :dial_24_vol_out, wrapper: :hz_sm
+= form.input :dial_24_missing, as: :boolean, wrapper: :hz_sm
+= form.input :urine_24_vol, wrapper: :hz_sm
+= form.input :urine_24_missing, as: :boolean

data/app/views/renalware/pd/adequacy_results/_table.html.slim

@@ -0,0 +1,72 @@
+table.toggleable(data-controller="toggle")
+  thead
+    tr
+      - if local_assigns.fetch(:display_patient, false)
+        th style="border-bottom: none" colspan=4
+      - else
+        th style="border-bottom: none" colspan=3
+      th.bg-gray-100 style="text-align:center; font-style:italic" colspan=3 Creatinine Clearance
+      th.bg-gray-200 style="text-align:center; font-style:italic" colspan=3 kt/V
+
+    tr
+      th.togglers= rows_toggler
+      - if Pundit.policy(current_user, Renalware::PD::AdequacyResult).edit? # only eg admin can edit or delete
+        th.col-width-tiny
+      - if local_assigns.fetch(:display_patient, false)
+        th.col-width-medium Patient
+      th.col-width-date Date
+      th.col-width-tiny
+        i.far.fa-check-circle(title="Complete")
+      th.bg-gray-100 Total
+      th.bg-gray-100 Perit
+      th.bg-gray-100 Renal
+      th.bg-gray-200 Total
+      th.bg-gray-200 Perit
+      th.bg-gray-200 Renal
+      th Urine 24 vol
+      th Dial 24 vol in
+      th Dial24UF
+      th DPI
+      th.col-width-date=t("updated_at")
+
+  - results.each do |result|
+    tbody
+      tr
+        td= row_toggler
+        - if Pundit.policy(current_user, Renalware::PD::AdequacyResult).edit?
+          td.actions
+            - if Pundit.policy(current_user, result).edit?
+              - if local_assigns.fetch(:display_patient, false)
+                = link_to renalware.edit_patient_pd_adequacy_result_path(result.patient, result), target: :blank do
+                  i.fas.fa-external-link-alt
+                  |  Edit
+              - else
+                = link_to "Edit",
+                          renalware.edit_patient_pd_adequacy_result_path(result.patient, result)
+
+            - if Pundit.policy(current_user, result).destroy?
+              = link_to "Delete",
+                        renalware.patient_pd_adequacy_result_path(result.patient, result),
+                        data: { method: :delete, confirm: "Are you sure?" }
+        - if local_assigns.fetch(:display_patient, false)
+          td= result.patient
+        td.col-width-date= l(result.performed_on)
+        -if result.complete?
+          td.text-green-500
+            i.fas.fa-check-circle(title="Complete")
+        - else
+          td.text-red-600
+            i.far.fa-circle
+        th.bg-gray-100= result.total_creatinine_clearance&.to_i
+        td.bg-gray-100= result.pertitoneal_creatinine_clearance&.to_i
+        td.bg-gray-100= result.renal_creatinine_clearance&.to_i
+        th.bg-gray-200= result.total_ktv
+        td.bg-gray-200= result.pertitoneal_ktv
+        td.bg-gray-200= result.renal_ktv
+        td= result.urine_24_vol
+        td= result.dial_24_vol_in
+        td= result.dial_24_vol_out.to_i - result.dial_24_vol_in.to_i
+        td= result.dietry_protein_intake
+        td= l(result.updated_at.to_date)
+      tr
+        td(colspan=9)  

data/app/views/renalware/pd/adequacy_results/edit.html.slim

@@ -0,0 +1,89 @@
+- patient = adequacy.patient
+= within_patient_layout(breadcrumbs: pd_summary_breadcrumb(patient),
+                        title: "Edit Adequacy result") do
+
+  = simple_form_for(adequacy, url: renalware.patient_pd_adequacy_result_path(patient, adequacy), wrapper: :horizontal_form) do |f|
+
+    .panel style="max-width: 600px; padding: 1rem 1.2rem 0"
+      table.adequacy-path-table(style="max-width: 600px;")
+        thead
+          tr
+            th.bottom-border colspan=3 Creatinine Clearance
+            th style="width:20px"
+            th.bottom-border colspan=3 kt/V
+            th colspan=2 style="width:20px;"
+          tr
+            th Total
+            th Peritoneal
+            th Renal
+            th
+            th Total
+            th Peritoneal
+            th Renal
+            th
+            th(title="Dietry Protein Intake") DPI
+        tbody
+          tr
+            td= adequacy.total_creatinine_clearance
+            td= adequacy.pertitoneal_creatinine_clearance
+            td= adequacy.renal_creatinine_clearance
+            td
+            td= adequacy.total_ktv
+            td= adequacy.pertitoneal_ktv
+            td= adequacy.renal_ktv
+            td
+            td= adequacy.dietry_protein_intake
+
+
+    article(style="max-width: 600px; display: block; float: none; clear: both")
+      header
+        h2 Inputs
+      = render "form_fields", form: f
+
+    article(style="max-width: 600px; display: block; float: none; clear: both")
+      header
+        h2 Pathology
+        /= link_to "Refresh...", "#", class: :button
+
+      table.pet-results--samples-table(style="max-width: 600px")
+        thead
+          tr
+            th
+            th Date
+            th Urea
+            th Creatinine
+            th Glu
+            th Na
+            th K
+            th Protein
+        tbody
+          tr
+            th.text-right Serum
+            td
+            td= f.text_field :serum_urea
+            td= f.text_field :serum_creatinine
+            td
+            td
+            td
+          tr
+            th.text-right Dialysate
+            td
+            td= f.text_field :dialysate_urea
+            td= f.text_field :dialysate_creatinine
+            td= f.text_field :dialysate_glu
+            td
+            td= f.text_field :dialysate_na
+            td= f.text_field :dialysate_protein
+          tr
+            th.text-right Urine
+            td
+            td= f.text_field :urine_urea
+            td= f.text_field :urine_creatinine
+            td
+            td= f.text_field :urine_na
+            td= f.text_field :urine_k
+
+    br
+    = f.submit "Save", class: :button
+    '  or
+    = link_to "cancel", patient_pd_dashboard_path(patient)

data/app/views/renalware/pd/adequacy_results/index.js.erb

@@ -0,0 +1 @@
+<%= refresh("#adequacy-results-table", partial: "table", locals: local_assigns) %>

data/app/views/renalware/pd/adequacy_results/new.html.slim

@@ -0,0 +1,8 @@
+= within_patient_layout(breadcrumbs: pd_summary_breadcrumb(adequacy.patient),
+                        title: "New Adequacy result") do
+
+  = simple_form_for(adequacy, url: renalware.patient_pd_adequacy_results_path(adequacy.patient), wrapper: :horizontal_form) do |f|
+    = render "form_fields", form: f
+    = f.submit "Save", class: :button
+    '  or
+    = link_to "cancel", patient_pd_dashboard_path(adequacy.patient)

data/app/views/renalware/pd/assessments/_form.html.slim

@@ -49,5 +49,5 @@
     = fdoc.input :added_comments, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
 
   = f.submit "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "cancel", patient_pd_dashboard_path(patient)

data/app/views/renalware/pd/bag_types/_form.html.slim

@@ -27,5 +27,5 @@
   = f.input :magnesium_content, wrapper: :horizontal_small
 
   = f.button :submit
-  span= " or "
+  '  or
   = link_to "Cancel", pd_bag_types_path

data/app/views/renalware/pd/dashboards/show.html.slim

@@ -26,6 +26,9 @@
            exit_site_infections: dashboard.exit_site_infections,
            patient: patient
 
+  = render Renalware::PD::PETResultsComponent.new(patient: patient, current_user: current_user)
+  = render Renalware::PD::AdequacyResultsComponent.new(patient: patient, current_user: current_user)
+
   - if dashboard.pet_adequacies.any?
     = render "renalware/pd/dashboards/show/pet_adequacies",
            pet_adequacies: dashboard.pet_adequacies,

data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim

@@ -36,9 +36,16 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
                       title: t(".add_exit_site_infection"),
                       url: new_patient_pd_exit_site_infection_path(patient)
 
-  = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::PETAdequacyResult).new?,
-                      title: t(".add_pet_adequacy"),
-                      url: new_patient_pd_pet_adequacy_result_path(patient)
+  = dropdown_btn_item enabled: patient_on_pd,
+                      title: t(".add_unified_pet_adequacy"),
+                      url: new_patient_pd_unified_pet_adequacy_path(patient)
 
+  = dropdown_btn_item enabled: patient_on_pd,
+                      title: t(".add_pet"),
+                      url: new_patient_pd_pet_result_path(patient)
+
+  = dropdown_btn_item enabled: patient_on_pd,
+                      title: t(".add_adequacy"),
+                      url: new_patient_pd_adequacy_result_path(patient)
 - unless patient_on_pd
   = render "modality_missing_warning", message: t(".missing_modality_warning")