renalware-core 2.0.149 → 2.0.151

data/app/views/renalware/accesses/procedures/show.html.slim

@@ -8,7 +8,7 @@
   - return unless procedure
 
   .document-view
-    .grid
+    .mgrid
       .row
         .columns.small-12.large-6
           = article_tag "Access Procedure" do

data/app/views/renalware/accesses/profiles/show.html.slim

@@ -8,7 +8,7 @@
   - return unless profile
 
   .document-view
-    .grid
+    .mgrid
       .row
         = render "renalware/shared/attributes_group",
             legend: "Access Profile", destination: "profile",

data/app/views/renalware/admin/cache/show.html.slim

@@ -42,3 +42,39 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
             class: "button alert"
+
+  <label class="block">
+    <span class="text-gray-700">Name</span>
+    <input class="form-input mt-1 block w-full" placeholder="Jane Doe">
+  </label>
+
+  <div class="mt-4">
+    <span class="text-gray-700">Account Type</span>
+    <div class="mt-2">
+      <label class="inline-flex items-center">
+        <input type="radio" class="form-radio" name="accountType" value="personal">
+        <span class="ml-2">Personal</span>
+      </label>
+      <label class="inline-flex items-center ml-6">
+        <input type="radio" class="form-radio" name="accountType" value="busines">
+        <span class="ml-2">Business</span>
+      </label>
+    </div>
+  </div>
+
+  <label class="block mt-4">
+    <span class="text-gray-700">Requested Limit</span>
+    <select class="form-select mt-1 block w-full">
+      <option>$1,000</option>
+      <option>$5,000</option>
+      <option>$10,000</option>
+      <option>$25,000</option>
+    </select>
+  </label>
+
+  <div class="flex mt-6">
+    <label class="flex items-center">
+      <input type="checkbox" class="form-checkbox">
+      <span class="ml-2">I agree to the <span class="underline">privacy policy</span></span>
+    </label>
+  </div>

data/app/views/renalware/admin/playgrounds/show.html.slim

@@ -57,3 +57,6 @@ css:
             = f.submit "Refresh", class: :button
 
       #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+
+    / To test tailwindcss
+    .max-w-sm.rounded.overflow-hidden.shadow-lg  

data/app/views/renalware/clinical/profiles/show.html.slim

@@ -2,7 +2,7 @@
   = link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
 
 = within_patient_layout(title: "Clinical Profile") do
-  .grid
+  .mgrid
     .row
       .columns.medium-6
         = article_tag("General") do
@@ -70,6 +70,16 @@
                  patient: patient,
                  limit: true
 
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::ClinicalFrailtyScore)
+      .columns.small-12.large-6
+        = render Renalware::Events::EventListComponent.new(\
+            patient: patient,
+            event_class: Renalware::Events::AdvancedCarePlan)
+
+
       .columns
         = render "renalware/clinical/body_compositions/list",
                  body_compositions: profile.body_compositions,

data/app/views/renalware/clinics/clinic_visits/_table.html.slim

@@ -15,6 +15,8 @@ table.clinics.auto-layout
       th.col-width-tiny Temp
       th.col-width-tiny Urine blood
       th.col-width-tiny Urine protein
+      th.col-width-tiny(title="Body surface area") BSA
+      th.col-width-tiny(title="Total Body Water") TBW
       th.col-width-medium Created by
   tbody
     = render partial: "renalware/clinics/clinic_visits/table_row",

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim

@@ -22,6 +22,8 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.bp= clinic_visit.temperature
   td= clinic_visit.urine_blood&.text
   td= clinic_visit.urine_protein&.text
+  td= clinic_visit.body_surface_area
+  td= clinic_visit.total_body_water
   td.created-by= clinic_visit.created_by
 = content_tag(:tr, id: "clinic_visit-quick-preview-#{clinic_visit.id}", style: "display: none")
   td(colspan=15)

data/app/views/renalware/dashboard/letters/_letter.html.slim

@@ -8,7 +8,7 @@ tr(class=letter.state.dasherize)
   td.actions
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
-    - if policy(letter).update?
+    - if Pundit.policy!(current_user, letter).update?
       = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td

data/app/views/renalware/directory/people/show.html.slim

@@ -6,7 +6,7 @@
 = within_admin_layout(title: "Person",
                       breadcrumbs: breadcrumb_for("Directory", directory_people_path))
 
-  .grid
+  .mgrid
     = article_tag "Person" do
       = definition_list_for(person, size: :large) do |list|
         = list.definition(:title)

data/app/views/renalware/events/advanced_care_plans/_cell.html.slim

@@ -0,0 +1,2 @@
+/ See Events::AdvancedCarePlan.to_partial_path etc
+= event.document.state.text

data/app/views/renalware/events/advanced_care_plans/_inputs.html.slim

@@ -0,0 +1,4 @@
+/ See Events::AdvancedCarePlan.to_partial_path etc
+/ Pulled into the New Event form via a js get to EventsController#new
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :state, wrapper: :horizontal_medium

data/app/views/renalware/events/advanced_care_plans/_toggled_cell.html.slim

@@ -0,0 +1,8 @@
+/ See Events::AdvancedCarePlan.to_partial_path etc
+- document = event.document
+
+dl.dl-horizontal
+  dt= attr_name(document, :state, suffix: ":")
+  dd= document.state&.text || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/clinical_frailty_score/_cell.html.slim

@@ -0,0 +1,2 @@
+/ See ClinicalFrailtyScore.to_partial_path etc
+= event.document.score.text

data/app/views/renalware/events/clinical_frailty_score/_inputs.html.slim

@@ -0,0 +1,4 @@
+/ See ClinicalFrailtyScore.to_partial_path etc
+/ Pulled into the New Event form via a js get to EventsController#new
+= f.simple_fields_for :document, event.document do |fd|
+  = fd.input :score, wrapper: :horizontal_tiny

data/app/views/renalware/events/clinical_frailty_score/_toggled_cell.html.slim

@@ -0,0 +1,8 @@
+/ See ClinicalFrailtyScore.to_partial_path etc
+- document = event.document
+
+dl.dl-horizontal
+  dt= attr_name(document, :score, suffix: ":")
+  dd= document.score&.text || t("unspecified")
+  dt= attr_name(event, :notes, suffix: ":")
+  dd= event.notes&.html_safe || t("unspecified")

data/app/views/renalware/events/events/_table.html.slim

@@ -11,7 +11,7 @@ table.has-togglable-rows.events-table
         th.col-width-large= t(".type")
       - if local_assigns.fetch(:include_patient_column, false)
         th.col-width-large= t(".patient")
-      th= t(".description")
+      th= local_assigns.fetch(:description_column_title, t(".description"))
       th.created_at.col-width-date-time= t(".date_time")
       th.created_by.col-width-medium= t(".created_by")
   tbody

data/app/views/renalware/hd/current_profile/_show.html.slim

@@ -1,4 +1,4 @@
-.grid
+.mgrid
     .row
       .columns.small-6
         article

data/app/views/renalware/hd/current_profile/show.html.slim

@@ -4,6 +4,6 @@
 = within_patient_layout(title: "HD Profile",
                         breadcrumbs: hd_summary_breadcrumb(patient)) do
 
-  .grid
+  .mgrid
     .row
       = render "show", patient: patient, profile: profile

data/app/views/renalware/hd/prescription_administrations/_form.html.slim

@@ -25,6 +25,8 @@
             .hd-drug--frequency= prescription.frequency
             .hd-drug--prescribed-on= l(prescription.prescribed_on)
             .hd-drug--prescriber-name= prescription.updated_by
+            - position = prescription.updated_by&.professional_position
+            .hd-drug--prescriber-position= position && "(#{position})"
 
             - if prescription.terminated_on.present?
               .hd-drug--termination

data/app/views/renalware/hd/sessions/_show.html.slim

@@ -1,5 +1,5 @@
 .document-view
-  .grid
+  .mgrid
     .row
       = render "renalware/shared/attributes_group",
           legend: "Sign-In", destination: "signin",

data/app/views/renalware/hd/witnesses/_form.html.slim

@@ -21,6 +21,8 @@
             .hd-drug--frequency= prescription.frequency
             .hd-drug--prescribed-on= l(prescription.prescribed_on)
             .hd-drug--prescriber-name= prescription.updated_by
+            - position = prescription.updated_by&.professional_position
+            .hd-drug--prescriber-position= position && "(#{position})"
 
             - if prescription.terminated_on.present?
               .hd-drug--termination

data/app/views/renalware/letters/electronic_receipts/_table.html.slim

@@ -38,7 +38,7 @@ table.letters.electronic-ccs.has-togglable-rows
             = simple_format letter.body
 
         td.nowrap
-          - if policy(receipt).mark_as_read?
+          - if Pundit.policy!(current_user, receipt).mark_as_read?
             ul.actions
               li= link_to "Keep as unread",
                           "##{receipt.html_preview_identifier}",

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

@@ -5,3 +5,13 @@
   - if dashboard.profile&.persisted?
     .row
       = render "renalware/low_clearance/profiles/summary", profile: dashboard.profile
+
+  .row
+    .columns
+      .small-12.medium-9.large-6
+        = render Renalware::Events::EventListComponent.new(\
+          patient: patient,
+          event_class: Renalware::Events::ClinicalFrailtyScore)
+        = render Renalware::Events::EventListComponent.new(\
+          patient: patient,
+          event_class: Renalware::Events::AdvancedCarePlan)

data/app/views/renalware/mdm/_pathology.html.slim

@@ -9,4 +9,3 @@
 
     = render "renalware/pathology/historical_observation_results/table",
               table: mdm.pathology
-    /= mdm.pathology.table.render(mdm.pathology.rows)

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

@@ -7,7 +7,7 @@
   br
   / TODO: a.trigger-full-screen Full screen
   .full-screen-container.mdm-page.no-side-gutters
-    .grid
+    .mgrid
       .row
         = render_if_exists "top", mdm: mdm
 

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

@@ -5,6 +5,7 @@ section.top-bar-section
     = render "renalware/navigation/user"
     li.divider
     = render "renalware/navigation/renal"
+    = render "renalware/navigation/pd"
     = render "renalware/navigation/mdms"
     = render "renalware/navigation/patients_admin"
     = render "renalware/navigation/directory"

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

@@ -0,0 +1,5 @@
+li.has-dropdown
+  = link_to "PD", "#"
+  ul.dropdown
+    li= link_to "PET results", pd_pet_completions_path
+    li= link_to "Adequacy results", pd_adequacy_completions_path

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