renalware-core 2.0.153 → 2.0.155

data/app/views/renalware/pathology/requests/requests/request_form/_crs_form.html.slim

@@ -45,6 +45,6 @@
           p
             | ======== #{lab_name} ========
           - patient_rules.each do |patient_rule|
-            = patient_rule
+            p= patient_rule
       - else
         p No tests required.

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

@@ -1 +1,2 @@
 = render partial: "/renalware/patients/alerts/alert", collection: patient.alerts
+= render Renalware::Admissions::ActiveConsultAlertComponent.new(patient: patient, current_user: current_user)

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

@@ -0,0 +1,38 @@
+/ Render any filters defined in the view (ViewMetadata) #filters hash (hstore).
+/ The format of the filters is
+/   column_names: filter_type (list|search)
+/ e.g
+/   sex: :list => will render a dropdown of unique options pulled from the underlying view
+/   nhs_number: :search => maps to case insensitive ransack predicate
+/   nhs_number_or_local_patient_id: :search => will add _cont to end and use that as the predicate
+
+- return if options.current_view.filters.empty?
+
+- url = patients_mdms_path(scope: params[:scope], filter: params[:filter])
+= simple_form_for options.search,
+                  url: patients_mdms_path(scope: params[:scope], filter: params[:filter]),
+                  method: :get do |f|
+
+  .flex.flex-col.sm:flex-row.items-end.pb-4
+    - options.current_view.filters.each do |filter|
+      - column = filter.code
+      - type = filter.type
+      - filter_type = ActiveSupport::StringInquirer.new(type)
+
+      - if filter_type.list?
+        / Unique values selected from a dropdown
+        .w-full.sm:max-w-xs.pr-2
+          = f.input "#{column}_eq",
+                    include_blank: true,
+                    collection: options.search.klass.distinct(column.to_sym).pluck(column.to_sym).compact,
+                    label: column.humanize
+          / input_html: { onchange: "this.form.submit();" }
+      - elsif filter_type.search?
+        / Free text inputs
+        .w-full.sm:max-w-xs.pr-2
+          = f.input "#{column}_cont", label: column.humanize
+
+    .w-full.sm:max-w-xs.pr-2
+      = f.submit "Filter", class: "button secondary", style: "margin-bottom: 10px"
+      |  
+      = link_to "Clear", url

data/app/views/renalware/patients/mdms/_table.html.slim

@@ -0,0 +1,72 @@
+ruby:
+  view = options.current_view
+  attribute_names = options.patients.first.class.columns.map(&:name) - %w(id secure_id document)
+  attribute_names = (view.columns.map(&:code) + attribute_names).uniq
+  columns = attribute_names.map do |attr|
+    view.columns.detect{ |col| col.code == attr } || Renalware::System::ColumnDefinition.new(code: attr, hidden: false)
+  end
+  # TODO move to a helper or view object
+  # Sort column headers and remove hidden ones.
+  # attrs = options.patients.first.class.columns.map(&:name) - %w(id secure_id document)
+  # use the older of cols in view.columns to sort attrs - works even if only a few cols are in view.columns
+  #if options.current_view.columns.present?
+  #  attrs = options.current_view.columns & attrs
+  #end
+
+table
+  thead
+    tr
+      th.col-width-tiny
+      - columns.each do |col|
+        - code = col.code
+        - klasses = []
+        - klasses << "col-width-date" if code.end_with?("_date") || code.end_with?("_on")
+        - klasses << "col-width-date-time" if code.end_with?("_at")
+        - klasses << "col-width-nhs-no" if code == "nhs_number"
+        - klasses << "col-width-tiny" if code == "sex"
+        - klasses << "col-width-tiny" if code == "age"
+        - klasses << "col-width-large" if code == "patient_name"
+        - if klasses.empty? && col.width.present?
+          - klasses << "col-width-#{col.width}"
+
+        - next if col.hidden
+        th(class=klasses.join(" "))
+          = sort_link(options.search, col.code, col.title)
+      th
+        / empty to allow tabl;e to expand to the right
+  tbody
+    - options.patients.each do |patient|
+      tr
+        td.actions
+          = link_to options.view_proc.call(patient), target: "_blank" do
+            i.fa.fa-external-link-square-alt
+            | &nbsp;&nbsp;
+            | MDM
+        - columns.each do |col|
+          - next if col.hidden
+          - klass = "col-width-#{col.width}-with-ellipsis" if col.truncate
+          - code = col.code
+          - value = patient.attributes[code]
+          - if code == "patient_name"
+            td= default_patient_link(patient)
+          - else
+            - if value.respond_to?(:strftime)
+              - value = l(value)
+
+            / Add title attribute if the cell content is truncated, so its possible to see the
+            / entire content if you hover
+            - title = value if col.truncate
+
+            / Boolean values we will show as a tick icon
+            td(class=klass title=title)
+              - if value == true || value == "Y"
+                i.far.fa-check-circle.text-green-700
+              - elsif value == false || value == "N"
+                i.far.fa-circle.text-gray-400
+              - else
+                = value
+        td
+          / empty to allow table to expand to the right
+
+/= paginate options.patients
+== pagy_foundation_nav options.pagination

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

@@ -0,0 +1,18 @@
+= content_for(:filters) do
+  = render "filters", options: options
+
+= within_admin_layout(title: "#{options.current_view.scope.humanize} MDMS") do
+  - if options.patients.size.zero?
+    p No matching patients
+  - else
+    = render "table", options: options
+
+    - if current_user_is_super_admin?
+      = link_to edit_system_view_metadatum_path(options.current_view, format: :html),
+                data: { "reveal-id" => "system-view-metadata-modal", "reveal-ajax" => "true" },
+                class: "right rounded px-2 py-1 bg-orange-300 text-gray-800 text-sm" do
+          i.fas.fa-cogs.pr-2
+          | Configure this table for everyone
+
+      / The modal dialog container for internal message sending
+      #system-view-metadata-modal.reveal-modal.medium(data-reveal)

data/app/views/renalware/patients/side_menu/_general.html.slim

@@ -62,6 +62,10 @@ li.heading= t(".heading")
                     path: patient_admissions_path(patient),
                     active_when_controller_matches: %r{renalware/admissions}
 
+= patient_menu_item title: t(".messages", count: 1),
+                    path: patient_messaging_internal_messages_path(patient),
+                    active_when_controller_matches: %r{messaging/internal}
+
 = patient_menu_item title: t(".proms"),
                     path: patient_surveys_dashboard_path(patient),
                     active_when_controller_matches: %r{renalware/surveys}

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

@@ -1,15 +1,20 @@
-.row.search-form.filters
-  = simple_form_for query,
-      as: :q,
-      url: worryboard_path,
-      method: :get do |f|
+/ This is required for now - its to do with the page title being a float and perhaps not clearing
+.clear-both
 
-    .small-6.medium-2.large-2.columns
-      = f.input :patient_current_modality_description_id_eq,
-                collection: modalities,
-                label: "Modality"
+.search-form.filters.filters--flex.max-w-screen-md
+  = simple_form_for query, as: :q, url: worryboard_path, method: :get do |f|
 
-    .medium-2.large-3.columns.actions.end
-      = f.submit "Filter", class: "button"
-      '  or
-      = link_to t("helpers.reset"), worryboard_path
+    .flex.flex-col.sm:flex-row.items-end.pb-4
+      .w-full.sm:max-w-xs.pr-2
+        = f.input :patient_current_modality_description_id_eq,
+                  collection: modalities,
+                  label: "Modality"
+      .w-full.sm:max-w-xs.pr-2
+        = f.input :created_by_id_eq,
+                  collection: Renalware::User.where("id in (select distinct created_by_id from patient_worries)"),
+                  label: "Added by"
+
+      .flex-shrink-0.pt-4.filters--actions
+        = f.submit "Filter", class: "button", style: "margin: 0"
+        '  or
+        = link_to t("helpers.reset"), worryboard_path

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

@@ -1,9 +1,14 @@
 table
   thead
+    tr
+      th.border-none(colspan=2)
+      th.text-center(colspan=2) Treatment
+      th.border-none(colspan=4)
     tr
       th.col-width-tiny
       th.col-width-date Diagnosed on
-      th.col-width-date Treatment Started on
+      th.col-width-date Started on
+      th.col-width-date Ended on
       th Episode Type
       th Organisms
       th Outcome
@@ -17,15 +22,10 @@ table
                     patient_pd_peritonitis_episode_path(patient, episode.id),
                     class: "view-pe",
                     id: "view-pe-#{episode.id}"
-        td valign="top"
-          = l episode.diagnosis_date
-        td valign="top"
-          = 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"
-          = episode.updated_at.to_date
+        td valign="top"= l episode.diagnosis_date
+        td valign="top"= l episode.treatment_start_date
+        td valign="top"= l episode.treatment_end_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"= episode.updated_at.to_date

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

@@ -5,5 +5,5 @@
 = 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_vol, wrapper: :hz_sm, hint: "0 indicates anuric"
 = form.input :urine_24_missing, as: :boolean

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

@@ -2,9 +2,9 @@ table.toggleable(data-controller="toggle")
   thead
     tr
       - if local_assigns.fetch(:display_patient, false)
-        th style="border-bottom: none" colspan=4
+        th style="border-bottom: none" colspan=5
       - else
-        th style="border-bottom: none" colspan=3
+        th style="border-bottom: none" colspan=4
       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
 

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

@@ -1,8 +1,9 @@
-= content_for(:actions) do
-  = link_to(patient_pd_peritonitis_episode_path(patient, peritonitis_episode, format: :pdf),
-            class: "button") do
-    i.fas.fa-print
-    |  Print
+/ Removing Print button for now
+/ = content_for(:actions) do
+/   = link_to(patient_pd_peritonitis_episode_path(patient, peritonitis_episode, format: :pdf),
+/             class: "button") do
+/     i.fas.fa-print
+/     |  Print
 
 - title = "Peritonitis Episode - Diagnosed: #{l(peritonitis_episode.diagnosis_date)}"
 
@@ -26,4 +27,5 @@
              patient: patient,
              treatable: treatable,
              current_search: nil,
-             current_prescriptions: prescriptions
+             current_prescriptions: prescriptions,
+             display_termination_date: true

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/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();