renalware-core 2.0.145 → 2.0.151

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

@@ -31,6 +31,9 @@
            pet_adequacies: dashboard.pet_adequacies,
            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.assessments.any?
     = render "renalware/pd/assessments/list",
               assessments: dashboard.assessments,

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

@@ -1,7 +1,7 @@
-= link_to(patient_pd_mdm_path(patient), class: "button with-icon secondary") do
+=> link_to(patient_pd_mdm_path(patient), class: "button with-icon secondary") do
   i.fas.fa-users
   = t(".mdm")
-= blank_separator
+
 a.button.dropdown.with-icon(href="#"
                   data-dropdown="pd-options"
                   aria-controls="pd-options"
@@ -40,5 +40,19 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
                       title: t(".add_pet_adequacy"),
                       url: new_patient_pd_pet_adequacy_result_path(patient)
 
+  - if current_user_is_super_admin?
+    li.separator
+
+    = 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")

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

@@ -6,7 +6,7 @@
   = render "fields", f: f
 
   = f.button :submit, "Save"
-  span= " or "
+  '  or
   = link_to "cancel",
             patient_pd_exit_site_infection_path(patient, exit_site_infection),
             remote: true

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

@@ -7,5 +7,5 @@
     = render partial: "renalware/pd/exit_site_infections/form", locals: { es: es }
 
     = submit_tag "Save", class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", patient_pd_exit_site_infection_path(patient, exit_site_infection)

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

@@ -7,5 +7,5 @@
     = render "renalware/pd/exit_site_infections/fields", f: f
 
     = submit_tag "Save", class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", patient_pd_dashboard_path(patient)

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

@@ -2,7 +2,7 @@
   = link_to(patient_pd_exit_site_infection_path(patient, exit_site_infection, format: :pdf),
             class: "button") do
     i.fas.fa-print
-    |  Print
+    |  Print
 
 = within_patient_layout(title: "Exit Site Infection",
                         breadcrumbs: pd_summary_breadcrumb(patient)) do

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

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

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

@@ -8,7 +8,7 @@
   .row
     .large-offset-3.large-7.columns
       = f.button :submit, "Save", class: :tiny
-      span= " or "
+      '  or
       = link_to "cancel",
                 patient_pd_peritonitis_episode_path(patient, peritonitis_episode),
                 remote: true

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

@@ -8,5 +8,5 @@
     = render "renalware/pd/peritonitis_episodes/fields", local_assigns.merge!(f: f)
 
     = submit_tag "Save", class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", patient_pd_dashboard_path(patient)

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

@@ -9,5 +9,5 @@
     = render "renalware/pd/peritonitis_episodes/fields", local_assigns.merge!(f: f)
 
     = submit_tag "Save", class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", patient_pd_dashboard_path(patient)

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

@@ -2,7 +2,7 @@
   = link_to(patient_pd_peritonitis_episode_path(patient, peritonitis_episode, format: :pdf),
             class: "button") do
     i.fas.fa-print
-    |  Print
+    |  Print
 
 - title = "Peritonitis Episode - Diagnosed: #{l(peritonitis_episode.diagnosis_date)}"
 

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

@@ -29,5 +29,5 @@
   = f.input :dietry_protein_intake, wrapper: :horizontal_small
 
   = submit_tag "Save", class: "button"
-  span= " or "
+  '  or
   = link_to "cancel", patient_pd_dashboard_path(patient)

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

@@ -0,0 +1,24 @@
+
+.search-form.filters
+  = simple_form_for query,
+      as: :q,
+      url: pd_pet_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
+        = f.input :test_type_eq,
+                  collection: Renalware::PD::PETResult.test_type.values.map{ |val| [val.text, val] },
+                  label: "Test type"
+
+      .columns.medium-2.large-2.actions.end
+        = f.submit "Filter", class: "button"
+        '  or
+        = link_to t("helpers.reset"), pd_pet_completions_path

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

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

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

@@ -0,0 +1,12 @@
+= form.input :patient_id, as: :hidden
+= form.input :performed_on, as: :date_picker, wrapper: :hz_datepicker
+= form.input :test_type, as: :inline_radio_buttons, wrapper: :hz_sm
+= form.input :dextrose_concentration_id, collection: Renalware::PD::PETDextroseConcentration.order(position: :asc), wrapper: :hz_sm
+= form.input :volume_in, wrapper: :hz_sm
+= form.input :volume_out, wrapper: :hz_sm
+= form.input :infusion_time, wrapper: :hz_sm
+= form.input :drain_time, wrapper: :hz_sm
+= form.input :overnight_dextrose_concentration_id, collection: Renalware::PD::PETDextroseConcentration.order(position: :asc), wrapper: :hz_sm
+= form.input :overnight_volume_in, wrapper: :hz_sm
+= form.input :overnight_volume_out, wrapper: :hz_sm
+= form.input :overnight_dwell_time, wrapper: :hz_sm

data/app/views/renalware/pd/pet_results/_pathology_results.html.slim

@@ -0,0 +1,36 @@
+/ These fields are only needed when editing the PET down the line
+article(style="max-width: 600px; display: block; float: none; clear: both")
+  header
+    h2 Pathology results
+
+  table.pet-results--samples-table
+    thead
+      th
+      th Time
+      th Urea
+      th Creatinine
+      th Glc
+      th Sodium
+      th Protein
+      th
+    tbody
+      tr
+        th.col-width-small.text-right Serum
+        td= form.text_field :serum_time
+        td= form.text_field :serum_urea
+        td= form.text_field :serum_creatinine
+        td= form.text_field :plasma_glc
+        td= form.text_field :serum_na
+        td= form.text_field :serum_ab
+        td
+          /= link_to "Refresh...", "#", class: "button secondary"
+      - [4, 2, 0, 6].each do |hr|
+        tr
+          th.text-right= "Sample #{hr}"
+          td= form.text_field :"sample_#{hr}hr_time"
+          td= form.text_field :"sample_#{hr}hr_urea"
+          td= form.text_field :"sample_#{hr}hr_creatinine"
+          td= form.text_field :"sample_#{hr}hr_glc"
+          td= form.text_field :"sample_#{hr}hr_sodium"
+          td= form.text_field :"sample_#{hr}hr_protein"
+          th

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

@@ -0,0 +1,62 @@
+table.toggleable(data-controller="toggle" )
+  thead
+    tr
+      th.togglers= rows_toggler
+      - if Pundit.policy(current_user, Renalware::PD::PETResult).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.col-width-tiny Type
+      th.bg-gray-100 D_Pcr
+      th.bg-gray-100 netUF
+      th Volume in
+      th Drain time
+      th Infusion time
+      th O/N dextrose
+      th O/N vol in
+      th O/N vol out
+      th O/N dwell time
+      th.col-width-date=t("updated_at")
+
+    - results.each do |result|
+      tbody
+        tr
+          td= row_toggler
+          - if Pundit.policy(current_user, Renalware::PD::PETResult).edit?
+            td.actions
+              - if Pundit.policy(current_user, result).edit?
+                - if local_assigns.fetch(:display_patient, false)
+                  = link_to renalware.edit_patient_pd_pet_result_path(result.patient, result)
+                    i.fas.fa-external-link-alt
+                    |  Edit
+                - else
+                  = link_to "Edit", renalware.edit_patient_pd_pet_result_path(result.patient, result)
+              - if Pundit.policy(current_user, result).destroy?
+                = link_to "Delete",
+                          renalware.patient_pd_pet_result_path(result.patient, result),
+                          data: { method: :delete, confirm: "Are you sure?" }
+          - if local_assigns.fetch(:display_patient, false)
+            td= result.patient
+          td= 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= result.test_type&.text
+          th.bg-gray-100= result.d_pcr
+          th.bg-gray-100= result.net_uf
+          td= result.volume_in
+          td= result.drain_time
+          td= result.infusion_time
+          td= result.overnight_dextrose_concentration
+          td= result.overnight_volume_in
+          td= result.overnight_volume_out
+          td= result.overnight_dwell_time
+          td= l(result.updated_at.to_date)
+        tr
+          td(colspan=14)  

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

@@ -0,0 +1,35 @@
+= within_patient_layout(breadcrumbs: pd_summary_breadcrumb(pet.patient),
+                        title: "Edit PET result") do
+
+  = simple_form_for(pet, url: renalware.patient_pd_pet_result_path(pet.patient, pet), wrapper: :horizontal_form) do |f|
+
+    / article(style="max-width: 600px; display: block; float: none; clear: both")
+    /   header
+    /     h2 Calculated output
+
+    .panel style="max-width:200px"
+      h2 Calculated output
+      /= f.input :net_uf, wrapper: :hz_sm
+      /= f.input :d_pcr, wrapper: :hz_sm
+      dl.dl-horizontal
+        dt
+          b netUF
+        dd
+          b= pet.calculated_net_uf
+        dt
+          b D_Pcr
+        dd
+          b= pet.calculated_d_pcr
+
+
+    / The same fields as used in #new
+    article(style="max-width: 600px; display: block; float: none; clear: both")
+      header
+        h2 Inputs
+      = render "form_fields", form: f
+
+    = render "pathology_results", form: f
+
+    = f.submit "Save", class: :button
+    '  or
+    = link_to "cancel", patient_pd_dashboard_path(pet.patient)

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

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

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

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

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

@@ -15,5 +15,5 @@
     .row
       .large-12.columns
         = submit_tag "Update", class: "button"
-        span= " or "
+        '  or
         = link_to "Cancel", patient_pd_dashboard_path(patient)

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

@@ -10,5 +10,5 @@
                            html: { class: "pd-form" } do |f|
     = render partial: "renalware/pd/regimes/form", locals: local_assigns.merge!(f: f)
     = submit_tag "Save", class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", patient_pd_dashboard_path(patient)

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

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

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

@@ -0,0 +1,22 @@
+= simple_form_for(form,  wrapper: :horizontal_form) do |f|
+  article.pet
+    header
+      h2 PET
+
+    = f.input :pet_missing, as: :boolean, label: "Test missing"
+
+    = f.simple_fields_for(:pet, form.pet) do |fp|
+      = render "renalware/pd/pet_results/form_fields", form: fp
+
+  article.adequacy
+    header
+      h2 Adequacy
+
+    = f.input :adequacy_missing, as: :boolean, label: "Test missing"
+
+    = f.simple_fields_for(:adequacy, form.adequacy) do |fa|
+      = render "renalware/pd/adequacy_results/form_fields", form: fa
+
+  = f.submit class: :button
+  '  or
+  = link_to "cancel", patient_pd_dashboard_path(form.patient)

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

@@ -0,0 +1,2 @@
+= within_patient_layout(breadcrumbs: pd_summary_breadcrumb(form.patient), title: "New PET and/or Adequacy Test") do
+  = render "form", form: form

data/app/views/renalware/problems/notes/_form.html.slim

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

data/app/views/renalware/problems/problems/edit.html.slim

@@ -8,5 +8,5 @@
 
       = f.input :description, as: :text, autofocus: true
       = f.button :button, "Save"
-      span= " or "
+      '  or
       = link_to "cancel", patient_problems_path(patient)

data/app/views/renalware/problems/problems/new.html.slim

@@ -7,5 +7,5 @@
     = f.input :description, as: :text, autofocus: true
 
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", patient_problems_path(patient)

data/app/views/renalware/renal/aki_alerts/_filters.html.slim

@@ -55,5 +55,5 @@ scss:
         a.link_to_right_of_input_label(href="javascript:$('#q_hospital_ward_id').val(null).trigger('change');") Clear
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), renal_aki_alerts_path

data/app/views/renalware/renal/aki_alerts/edit.html.slim

@@ -11,5 +11,5 @@
     = f.input :aki_date, as: :date_picker, wrapper: :horizontal_datepicker
     = f.input :notes, wrapper: :horizontal_large, input_html: { rows: 5 }
     = f.submit class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", renal_aki_alerts_path

data/app/views/renalware/renal/profiles/edit.html.slim

@@ -26,12 +26,12 @@
 
         .form-actions
           = submit_tag "Save", class: "button"
-          span= " or "
+          '  or
           = link_to "cancel", patient_clinical_summary_path(patient)
 
         = render "form", f: f, patient: patient
 
         .form-actions
           = submit_tag "Save", class: "button"
-          span= " or "
+          '  or
           = link_to "cancel", patient_clinical_summary_path(patient)