renalware-core 2.0.149 → 2.0.156

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/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/renal/profiles/show.html.slim

@@ -4,7 +4,7 @@
             class: "button"
 
 = within_patient_layout(title: "Renal Profile & Comorbidity Data") do
-    .grid
+    .mgrid
       .row
         -
         - attrs = %i(esrf_on weight_at_esrf modality_at_esrf first_seen_on)

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

@@ -4,15 +4,17 @@
                     method: :get,
                     html: { autocomplete: "off" } do |f|
     .row
-      .medium-2.columns
-        = f.input :profile_esrf_on_gteq, as: :date_picker, label: "ESRF after"
+      - if local_assigns.fetch(:display_esrf_date_filter, true)
+        .medium-2.columns
+          = f.input :profile_esrf_on_gteq, as: :date_picker, label: "ESRF after"
 
-      -if defined?(display_modality_filter) && display_modality_filter
+      -if local_assigns.fetch(:display_modality_filter, true)
         .medium-3.columns
           = f.input :current_modality_description_id_eq,
                     collection: Renalware::Modalities::Description.pluck("name", "id"),
                     label: "Modality"
 
+      -if local_assigns.fetch(:display_hd_site_filter, true)
         .medium-3.columns
           = f.input :hd_profile_unit_id_eq,
                     collection: Renalware::Hospitals::Unit.pluck("name", "id"),

data/app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim

@@ -1,3 +1,4 @@
 dl.sub-nav
   dd= link_to "Patients with incomplete data", patients_renal_registry_preflight_checks_path
   dd= link_to "Deceased patients with incomplete data", deaths_renal_registry_preflight_checks_path
+  dd= link_to "Patients with missing ESRF", missing_esrf_renal_registry_preflight_checks_path

data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim

@@ -2,7 +2,8 @@
   = render "filters",
            query: query,
            url: deaths_renal_registry_preflight_checks_path,
-           display_modality_filter: false
+           display_modality_filter: false,
+           display_hd_site_filter: false
 
 = content_for(:tabs) do
   = render "navigation"

data/app/views/renalware/renal/registry_preflight_checks/missing_esrf.html.slim

@@ -0,0 +1,12 @@
+= content_for(:tabs) do
+  = render "navigation"
+
+= content_for(:filters) do
+  = render "filters",
+           query: query,
+           url: missing_esrf_renal_registry_preflight_checks_path,
+           display_esrf_date_filter: false
+
+= within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
+  = render "table", patients: patients, query: query, death_configuration: false
+  = paginate patients

data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim

@@ -1,8 +1,7 @@
 = content_for(:filters) do
   = render "filters",
            query: query,
-           url: patients_renal_registry_preflight_checks_path,
-           display_modality_filter: true
+           url: patients_renal_registry_preflight_checks_path
 
 = content_for(:tabs) do
   = render "navigation"

data/app/views/renalware/shared/_fieldset.html.slim

@@ -1,6 +1,5 @@
-.row data-magellan-destination="#{name}"
+.row
   .large-12.columns
-    a name="#{name}"
     fieldset
       legend
         = legend

data/app/views/renalware/shared/_magellan_block.html.slim

@@ -1,5 +1,4 @@
 .columns.small-12.medium-6.large-6.xlarge-4
-  div data-magellan-destination="#{local_assigns[:destination]}"
-    a name="#{local_assigns[:destination]}"
+  div
     = article_tag(legend) do
       = yield

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

@@ -1,8 +1,8 @@
 = within_patient_layout(title: "PROMS") do
 
-  = render Renalware::Surveys::EQ5DSummaryPart.new(patient, current_user)
+  = render Renalware::Surveys::EQ5DComponent.new(patient: patient)
   br
-  = render Renalware::Surveys::POSSSummaryPart.new(patient, current_user)
+  = render Renalware::Surveys::POSSComponent.new(patient: patient)
 
   / .summary-part--eq5d
   /   article

data/app/views/renalware/system/view_metadata/_columns_table.html.slim

@@ -0,0 +1,44 @@
+table.sortables(style="list-style-type: none;")
+  thead(style="position: sticky; top: 0; background-color:#fff;")
+    th.col-width-tiny
+      i.fas.fa-arrows-alt-v
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="Drag the 'hamburger' icon to change the order of columns in the table")
+    th.col-width-medium
+      | SQL column name
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="The programatic name for the data item, determined by the 'SQL view' in use.")
+    th.col-width-tiny
+      | Hide
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="Don't show this column in the table")
+    th
+      | Label
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="The text displayed in the column heading")
+    th.col-width-medium
+      | Width
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="Controls the table column width")
+    th.col-width-tiny
+      | Truncate
+      i.fas.fa-question-circle.inline.ml-1.text-blue-500(title="Will truncate and append an ellipsis to text constrained by its cell width")
+
+  tbody
+    - view.columns.each_with_index do |col, _idx|
+      tr.sortable
+          td.handle.border-0.text-left
+            i.fas.fa-bars
+            input(type="hidden" name="view_metadata[columns][][code]" value=col.code)
+          td.border-0
+            code= col.code
+          td.text-center.border-0
+            input.m-0(type="checkbox" name="view_metadata[columns][][hidden]" checked=col.hidden)
+          td.border-0
+            input.m-0(type="text" name="view_metadata[columns][][name]" value=col.name)
+          td.border-0
+            select.m-0(name="view_metadata[columns][][width]")
+              option(value="")
+              - Renalware::System::ColumnDefinition.new.width_values.each do |val, x|
+                option(value=val selected=(col.width == val.to_s))=val.to_s.humanize
+          td.text-center.border-0
+            input.m-0(type="checkbox" name="view_metadata[columns][][truncate]" checked=col.truncate)
+
+            / fc.input(type="checkbox" value=col checked=view.columns.include?(col) name="view_metadata[columns][visible]")
+            / input(bestchecked=view.columns.include?(col) name="view_metadata[columns][title]")
+            / label(class="" for="view_metadata_columns_#{col}" style="display: inline-block; width: auto")= col.humanize

data/app/views/renalware/system/view_metadata/_filters_form.html.slim

@@ -0,0 +1,19 @@
+.rounded-md.bg-orange-200.px-3.py-2.flex.items-start.shadow.mx-1.mb-5
+  i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+  | Editing filters is not possible yet
+
+table
+  thead
+    th SQL column name
+    th Filter type
+  tbody
+    - view.filters.each do |filter|
+      tr
+        td.border-0
+          code= filter.code
+        td.border-0
+          = filter.type
+          / select.m-0(name="view_metadata[filters][][1]")
+          /   option(value="")
+          /   - Renalware::System::ColumnDefinition.new.width_values.each do |val, x|
+          /     option(value=val selected=(col.width == val.to_s))=val.to_s.humanize filter[1]

data/app/views/renalware/system/view_metadata/_versions.html.slim

@@ -0,0 +1,23 @@
+/ Note we can't do vioew.versions.order(...) here
+- versions = view.versions.to_a.sort{ |a, b| b.created_at <=> a.created_at }
+.rounded-md.bg-orange-200.px-3.py-2.flex.items-start.shadow.mx-1.mb-5
+  i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+  | Restore column and filter configuration to a point in time.
+  | Unsaved column/filter changes will be lost.
+table
+  thead
+    th.col-width-date-time Last updated
+    th.col-width-small Event
+    th By
+    th
+  tbody
+    - versions.each do |version|
+      tr
+        td= l(version.created_at)
+        td= version.event
+        td= Renalware::User.find(version.whodunnit)
+        td.text-right
+          = link_to("Restore",
+                    renalware.restore_system_view_metadatum_path(view, version_at: version.created_at),
+                    data: { method: :patch },
+                    class: "button compact secondary")

data/app/views/renalware/system/view_metadata/edit.html.slim

@@ -0,0 +1,66 @@
+
+/ To remember
+/ We have klass.columns which are the actual SQL view columns
+/ We view (view metadata) columns, which is an array of hashes, each representing a column
+/ with its title. and width. Its position comes from the position inthe array.
+/
+/ Here loop through all avail columns on klass and find the matching
+/ col in view.columns. If there are columns we don't recognise (the view config is stale) they
+/ will be discarded when we save. If there are new cols we given them an empty object and it will be
+/ saved away.
+/ We need to handle validation
+/ also serialisation - see https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
+
+ruby:
+  # attribute_names = klass.columns.map(&:name) - %w(id secure_id document)
+  # view.columns = attribute_names.map do |attr|
+  #  view.columns.detect{ |col| col.code == attr } || Renalware::System::ColumnDefinition.new(code: attr)
+  # end
+
+  attribute_names = klass.columns.map(&:name) - %w(id secure_id document)
+  attribute_names = (view.columns.map(&:code) + attribute_names).uniq
+  view.columns = attribute_names.map do |attr|
+    view.columns.detect{ |col| col.code == attr } || Renalware::System::ColumnDefinition.new(code: attr)
+  end
+
+= simple_form_for(view, as: "view_metadata", method: :patch) do |f|
+  = f.input :id, as: :hidden
+  .modal
+    .modal__header
+      = render "renalware/shared/modal_close_link"
+      - title = [view.category&.humanize, view.scope&.humanize, view.title&.humanize].join(" / ")
+      h2= "Edit columns for #{title}"
+    .modal__body(style="max-height: 400px")
+      .rounded-md.bg-blue-100.px-3.py-2.flex.items-start.shadow.mx-1.mb-5
+        i.fas.fa-info-circle.mr-2.mt-1.text-blue-500
+        | Please bear in mind that changes you make will be visible by all users.
+
+      / Tabs - see also js stimulus tabs-controller
+      div(data-controller="tabs" data-tabs-active-tab="-mb-px border-l border-t border-r rounded-t")
+        ul.list-reset.flex.border-b.ml-0
+          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+            a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Columns
+          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+            a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Filters
+          li.-mb-px.mr-1(data-target="tabs.tab" data-action="click->tabs#change")
+            a.bg-white.inline-block.py-2.px-4.text-blue-500.hover:text-blue-700.font-semibold.no-underline(href="#") Previous versions
+
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+          = render "columns_table", view: view
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+          = render "filters_form", view: view
+        .hidden.py-4.px-4.border-l.border-b.border-r(data-target="tabs.panel")
+          = render "versions", view: view
+
+    .modal__footer
+      br
+      .right
+        = f.submit "Save", class: "button"
+        span= " or "
+        = link_to "Cancel",
+                "#",
+                "aria-label" => "Close",
+                  class: "reveal-modal-close"
+
+javascript:
+  initSortables();

data/app/views/renalware/transplants/donor_workups/show.html.slim

@@ -6,7 +6,7 @@
 = within_patient_layout(title: "Workup", breadcrumbs: donor_summary_breadcrumb(patient)) do
   - return unless workup
   .document-view
-    .grid
+    .mgrid
         .row
             = render "renalware/shared/documents/attributes_group",
                 group: workup.document.comorbidities,