renalware-core 2.0.148 → 2.0.155

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

@@ -0,0 +1,38 @@
+= content_for :filters do
+  = render "filters", query: query, url: renalware.pathology_observation_descriptions_path
+
+= within_admin_layout(title: "Observation descriptions (OBX)") do
+  table
+    thead
+      tr
+        th(colspan=5)
+        th.text-center.bg-gray-100(colspan=3) Measurement unit
+      tr
+        th.col-width-tiny
+        th.col-width-small= sort_link(query, :code, "Code")
+        th.col-width-large= sort_link(query, :name, "Name")
+        th.col-width-small RR Type
+        th.col-width-medium RR Coding Standard
+        th.bg-gray-100.text-center= sort_link(query, :measurement_unit_name, "Current")
+        th.bg-gray-100.text-center= sort_link(query, :suggested_measurement_unit, "Suggested")
+        th.bg-gray-100.text-center UKRDC unit
+    tbody
+      - descriptions.each do |description|
+        tr
+          td.actions= link_to_if(policy(description).edit?, "Edit", [:edit, description])
+          td= description.code
+          td= description.name
+          td= description.rr_type
+          td
+            = description.rr_coding_standard
+          td
+            - unit = description.measurement_unit
+            = unit&.title
+          td
+            - unit = description.suggested_measurement_unit
+            = unit&.title
+          td
+            - unit = description.measurement_unit&.ukrdc_measurement_unit
+            = unit&.title
+
+  == pagy_foundation_nav pagy

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/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/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/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/_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

@@ -1,10 +1,16 @@
 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
       th.col-width-date= t("updated_at")
 
@@ -16,13 +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"
-          = "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_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, hint: "0 indicates anuric"
+= 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=5
+      - else
+        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
+
+    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)