renalware-core 2.0.77 → 2.0.78

data/app/presenters/renalware/letters/part_class_filter.rb

@@ -29,7 +29,7 @@ module Renalware
       # put the site-specific configuration in say a jsonb field on the Site.
       def remove_recent_observations_part_if_no_pathology_required_in_body(part_klasses)
         unless include_pathology_in_letter_body
-          part_klasses = part_klasses.reject{ |key| key == :recent_pathology_results }
+          part_klasses = part_klasses.reject { |key| key == :recent_pathology_results }
         end
         part_klasses
       end

data/app/presenters/renalware/pathology/observations_diff.rb

@@ -107,7 +107,7 @@ module Renalware
       end
 
       def filter_observations_by_descriptions(observations)
-        observations.select!{ |code, _obs| description_codes.include?(code.to_sym) }
+        observations.select! { |code, _obs| description_codes.include?(code.to_sym) }
       end
 
       def description_codes

data/app/presenters/renalware/pathology/observations_for_codes_presenter.rb

@@ -36,11 +36,11 @@ module Renalware
       end
 
       def description_for(code)
-        descriptions.find{ |desc| desc.code.upcase == code } || NullObject.instance
+        descriptions.find { |desc| desc.code.upcase == code } || NullObject.instance
       end
 
       def observation_for(code)
-        matching_observations.find{ |observation| observation.description_code.upcase == code }
+        matching_observations.find { |observation| observation.description_code.upcase == code }
       end
     end
   end

data/app/presenters/renalware/system/users_presenter.rb

@@ -6,7 +6,7 @@ module Renalware
       def list_for_dropdown(user_to_promote_to_top: nil)
         return users if user_to_promote_to_top.blank?
 
-        matching_user = users.detect{ |user| user.id == user_to_promote_to_top.id }
+        matching_user = users.detect { |user| user.id == user_to_promote_to_top.id }
         make_user_first_in_list(matching_user) if matching_user.present?
         users
       end

data/app/views/renalware/admissions/_summary_part.html.slim

@@ -2,12 +2,12 @@
   article
     header
       h2= "Admissions (#{summary_part.admissions_count})"
-
       ul
         li= link_to admissions_admissions_path(query: { term: summary_part.patient_nhs_number }),
                     class: "button" do
           | View All
 
-    = render "renalware/admissions/admissions/table",
-             admissions: summary_part.admissions,
-             compact: true
+    - if summary_part.admissions.any?
+      = render "renalware/admissions/admissions/table",
+              admissions: summary_part.admissions,
+              compact: true

data/app/views/renalware/api/ukrdc/patients/show.xml.builder

@@ -23,7 +23,7 @@ xml.ukrdc(:PatientRecord, namespace_and_schema) do
   render "medications", builder: xml, patient: patient
   render "procedures", builder: xml, patient: patient
   render "documents", builder: xml, patient: patient
-  #render "encounters", builder: xml, patient: patient
+  # render "encounters", builder: xml, patient: patient
   render "program_memberships", builder: xml, patient: patient
   render "clinical_relationships", builder: xml, patient: patient
   render "surveys", builder: xml, patient: patient

data/app/views/renalware/devise/sessions/new.html.slim

@@ -1,6 +1,6 @@
  .main-content
   .row.small-8.large-12
-    h3 Log in to Renalware
+    h3= "Log in to #{Renalware.config.site_name}"
 
     = render "renalware/system/messages/list"
     = render "warning"

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

@@ -11,4 +11,5 @@
           li= link_to patient_events_path(summary_part.patient), class: "button" do
             | View All
 
-      = render "renalware/events/events/table", events: summary_part.recent_events
+      - if summary_part.recent_events.any?
+        = render "renalware/events/events/table", events: summary_part.recent_events

data/app/views/renalware/hd/accesses/_summary.html.slim

@@ -1,7 +1,7 @@
 article
   header
     h2= t(".title")
-    ul
+    ul.noprint
       li= link_to t(".view"), patient_accesses_profile_path(patient, access), class: :button
       li= link_to t(".edit"), edit_patient_accesses_profile_path(patient, access), class: :button
 

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

@@ -1,7 +1,7 @@
 article.hd-profile-summary
   header
-    h2.noprint= t(".title")
-    ul
+    h2= t(".title")
+    ul.noprint
       li= link_to "View", patient_hd_current_profile_path(patient), class: "button"
       li= link_to "Edit", edit_patient_hd_current_profile_path(patient), class: "button"
       li

data/app/views/renalware/hd/mdm/_sessions.html.slim

@@ -1,7 +1,8 @@
 article
   header
     h2= t(".title")
-    =link_to t(".view_all"),
-             patient_hd_sessions_path(mdm.patient),
-             class: "button left secondary"
+    .noprint
+      =link_to t(".view_all"),
+               patient_hd_sessions_path(mdm.patient),
+               class: "button left secondary"
   = render "renalware/hd/sessions/table", sessions: mdm.sessions

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

@@ -56,10 +56,24 @@ ruby:
             = fcm.input :access_site_status, wrapper: :horizontal_small
             = fcm.input :line_exit_site_status,
                         wrapper: :horizontal_tiny,
-                        hint: link_to("", asset_path("renalware/hd/mr_victor.jpg"),
+                        hint: link_to("", "#",
                                       data: {"reveal-id" => "mr-vistor-help-modal" }),
                         hint_html: { class: "hint-help-link" }
 
+    = render layout: "renalware/shared/fieldset",
+        locals: { legend: "AVF/AVG Assessment", name: "avf_avg_assessment" } do
+      = fd.simple_fields_for :avf_avg_assessment, fd.object.avf_avg_assessment do |favf|
+        = favf.input :score,
+                     wrapper: :horizontal_small,
+                     hint: link_to("", "#",
+                           data: {"reveal-id" => "avf-assessment-help-modal" }),
+                     hint_html: { class: "hint-help-link" }
+        = favf.input :aneurysm, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = favf.input :bruit, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = favf.input :thrill, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = favf.input :feel, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = favf.input :safe_to_use, as: :inline_radio_buttons, wrapper: :horizontal_medium
+
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Pre-Dialysis Observations", name: "before" } do
       = fd.simple_fields_for :observations_before, fd.object.observations_before do |fcm|
@@ -140,17 +154,20 @@ ruby:
   .large-12.columns
     = render "form_actions", f: f, back_path: back_path, session: session, patient: @patient
 
-/ Failed in all attempts to override close_on_background_click using eg data-options or any
-/ variation of e.g. data-options="closeOnBackgroundClick:false"
-/ data-options="close_on_background_click:false"
-/ I can only assume its not possible so we would need to use another handler top initialize modals
-/ that allow a bg click to close.
 #mr-vistor-help-modal.reveal-modal.medium(data-reveal style="width: 600px")
   .modal
     .modal__header
       h2 MR VICTOR
-      |  
-      span Multi Racial Visual Inspection Catheter Tool Observation Record
+      .modal__header-subtitle Multi Racial Visual Inspection Catheter Tool Observation Record
       = render "renalware/shared/modal_close_link"
     .modal__body(style="text-align: center")
       = image_tag(asset_path("renalware/hd/mr_victor.jpg"))
+
+#avf-assessment-help-modal.reveal-modal.medium(data-reveal style="width: 600px")
+  .modal
+    .modal__header
+      h2 AVF/AVG Assessment
+      .modal__header-subtitle Arteriovenous Fistula/Graft (AVF/AVG) Pre-Needling Assessment Tool
+      = render "renalware/shared/modal_close_link"
+    .modal__body(style="text-align: center")
+      = image_tag(asset_path("renalware/hd/avf_avg_assessment.jpg"))

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

@@ -38,6 +38,11 @@
           legend: "Notes/Complications", destination: "complications",
           models: { session.document.complications => attributes_list,
                     session => [:notes] }
+
+      = render "renalware/shared/documents/attributes_group",
+          group: session.document.avf_avg_assessment,
+          legend: "AVF/AVG Assessment", destination: "avf_avg_assessment"
+
     .row
       .columns
         = render "prescription_administrations", session: session

data/app/views/renalware/layouts/_patient.html.slim

@@ -11,6 +11,8 @@ nav.patient-side-nav.full-screenable
 .main-content.patient-content.full-screenable
   .layout-wrapper
     = render "renalware/patients/mini_profile", patient: current_patient
+    / adding .patient-alerts--sticky will stick the alerts under the patient header on scroll
+    /.patient-alerts.patient-alerts--sticky.lozenge
     .patient-alerts.lozenge
       ul
         = render "renalware/patients/alerts/list", patient: current_patient

data/app/views/renalware/letters/_summary_part.html.slim

@@ -12,6 +12,7 @@
           li= link_to patient_letters_letters_path(summary_part.patient), class: "button" do
                 | View All
 
-      = render "renalware/letters/letters/table",
-               letters: summary_part.letters,
-               patient: summary_part.patient
+      - if summary_part.letters.any?
+        = render "renalware/letters/letters/table",
+                 letters: summary_part.letters,
+                 patient: summary_part.patient

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

@@ -7,9 +7,10 @@ article.events
     h2 Biopsies
     .supplemental
       span= "#{biopsies.length} of #{total_biopsies}"
-      = link_to "View All",
-                patient_events_path(mdm.patient),
-                class: "button secondary"
+      span.noprint
+        = link_to "View All",
+                  patient_events_path(mdm.patient),
+                  class: "button secondary"
 
   = render "renalware/events/events/table",
            events: biopsies,

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

@@ -1,12 +1,14 @@
-article
-  header
-    h2 Clinic Visits
-    .supplemental
-      span= "#{mdm.clinic_visits.length} of #{mdm.patient.summary.clinic_visits_count}"
-      = link_to "View All",
-                  patient_clinic_visits_path(mdm.patient),
-                  class: "button secondary"
+.columns.medium-12
+  article
+    header
+      h2 Clinic Visits
+      .supplemental
+        span= "#{mdm.clinic_visits.length} of #{mdm.patient.summary.clinic_visits_count}"
+        span.noprint
+          = link_to "View All",
+                      patient_clinic_visits_path(mdm.patient),
+                      class: "button secondary"
 
-  = render "renalware/clinics/clinic_visits/table",
-           clinic_visits: mdm.clinic_visits,
-           patient: mdm.patient
+    = render "renalware/clinics/clinic_visits/table",
+            clinic_visits: mdm.clinic_visits,
+            patient: mdm.patient

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

@@ -5,7 +5,8 @@
       h2 Events
       .supplemental
         span= "#{events.length} of #{mdm.patient.summary.events_count}"
-        = link_to "View All",
+        span.noprint
+          = link_to "View All",
                     patient_events_path(mdm.patient),
                     class: "button secondary"
 

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

@@ -4,12 +4,12 @@
       h2= t(".title")
       .supplemental
         span= "#{mdm.letters.length} of #{mdm.patient.summary.letters_count}"
+        span.noprint
+          = render "renalware/letters/letters/create_letter_button_dropdown",
+                  patient: mdm.patient
 
-        = render "renalware/letters/letters/create_letter_button_dropdown",
-                 patient: mdm.patient
-
-        = link_to t(".view_all"),
-                  patient_letters_letters_path(mdm.patient),
-                  class: "button secondary"
+          = link_to t(".view_all"),
+                    patient_letters_letters_path(mdm.patient),
+                    class: "button secondary"
 
     = render "renalware/letters/letters/table", letters: mdm.letters

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

@@ -2,9 +2,10 @@
   article
     header
       h2= t(".title")
-      = link_to t(".view"),
-                patient_pathology_historical_observations_path(mdm.patient),
-                class: " button secondary left"
+      span.noprint
+        = link_to t(".view"),
+                  patient_pathology_historical_observations_path(mdm.patient),
+                  class: " button secondary left"
 
     = render "renalware/pathology/historical_observation_results/table",
               table: mdm.pathology

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

@@ -3,7 +3,8 @@ article
     h2= t(".title")
     .supplemental
       span= "#{mdm.current_prescriptions.length} of #{mdm.patient.summary.prescriptions_count}"
-      = render "prescription_buttons", patient: mdm.patient
+      span.noprint
+        = render "prescription_buttons", patient: mdm.patient
 
   #prescriptions.expandable
     - if local_assigns[:with_esa] == true

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

@@ -3,13 +3,15 @@ article
     h2 Current Problems
     .supplemental
       span= "#{mdm.current_problems.length} of #{mdm.patient.summary.problems_count}"
-      = link_to t(".view_all"),
-                patient_problems_path(mdm.patient),
-                class: "button secondary"
-      = link_to "Toggle",
-                "#problems",
-                class: "button secondary",
-                data: { behaviour: "css-toggler" }
+
+      span.noprint
+        = link_to t(".view_all"),
+                  patient_problems_path(mdm.patient),
+                  class: "button secondary"
+        = link_to "Toggle",
+                  "#problems",
+                  class: "button secondary",
+                  data: { behaviour: "css-toggler" }
 
   #problems.expandable
     = render "renalware/problems/problems/current_list",

data/app/views/renalware/mdm/prescriptions/_table.html.slim

@@ -2,7 +2,8 @@ table.mdm.prescriptions
   thead
     tr
       th.col-width-medium= t(".drug_name")
-      th.col-width-small= t(".drug_type")
+      - if local_assigns[:show_drug_types]
+        th.col-width-small= t(".drug_type")
       th.col-width-small= t(".dose")
       th.col-width-tiny= t(".frequency")
       th.col-width-tiny= t(".route")
@@ -16,7 +17,8 @@ table.mdm.prescriptions
     - prescriptions.each do |prescription|
       tr class="drug-#{drug_types_colour_tag(prescription.drug_types)}"
         td= prescription.drug.name
-        td= prescription.drug_type_names
+        - if local_assigns[:show_drug_types]
+          td= prescription.drug_type_names
         td= prescription.dose
         td= prescription.frequency
         td= prescription.route_code

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

@@ -14,3 +14,4 @@
       = render_if_exists "bottom", mdm: mdm
       .row= render "letters", mdm: mdm
       .row= render "events", mdm: mdm
+      .row= render "clinic_visits", mdm: mdm

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

@@ -1,4 +1,4 @@
 ul.title-area
   li.name.has-dropdown.active
     h1.brand-name
-      = "Renalware"
+      = Renalware.config.site_name

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

@@ -1,6 +1,7 @@
 li.has-dropdown
-  = link_to "Help", "#"
+  = link_to "Help", system_downloads_path
   ul.dropdown
+    li= link_to "Downloads", system_downloads_path
     li
       = link_to "Renal Reg HD/PD Reasons for Change", modalities_reasons_path
     = render "renalware/navigation/more_help_items"

data/app/views/renalware/pathology/historical_observation_results/_table.html.slim

@@ -1,4 +1,7 @@
-table#observations
+table#observations.column_hover
+  / colgroups are required for js highlighting of column on hover - see table.js
+  - (table.observation_descriptions.size + 1).times do
+    <colgroup></colgroup>
   thead
     tr
       th Date

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

@@ -3,7 +3,7 @@
   - if table.rows.empty?
     p No results available for this patient.
   - else
-    .embedded-scroll
+    .embedded-scroll.pathology
       p.hint Hover over table then scroll horizontally to view more results.
       = render "table", table: table
 

data/app/views/renalware/pathology/recent_observation_results/_table.html.slim

@@ -1,7 +1,10 @@
 / Here we build a table of results grouped by date, but in contrast to
 / historical results, we transpose the cols and rows so we have
 / dates along the top and OBX codes down the left.
-table#observations
+table#observations.column_hover
+  / colgroups are required for js highlighting of column on hover - see table.js
+  - (table.rows.size + 1).times do
+    <colgroup></colgroup>
   thead
     tr
       th Year

data/app/views/renalware/system/downloads/_form.html.slim

@@ -0,0 +1,11 @@
+= render "renalware/shared/errors", model: download
+= simple_form_for download,
+                  url: download.new_record? ? system_downloads_path : system_download_path(download),
+                  as: :download,
+                  html: { autocomplete: "off" },
+                  wrapper: "horizontal_form" do |form|
+
+  = form.input :name
+  = form.input :description, as: :text
+  = form.input :file, as: :file
+  = form.submit "Save", class: :button

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

@@ -0,0 +1,2 @@
+= within_admin_layout(title: "Edit Download") do
+  = render "form", download: download

data/app/views/renalware/system/downloads/index.html.slim

@@ -0,0 +1,47 @@
+= content_for(:actions) do
+  - if policy(Renalware::System::Download).new?
+    = link_to t("new_record.link_title"),
+              new_system_download_path,
+              class: "button"
+
+= within_admin_layout(title: "Downloads") do
+
+  .filters
+    .filters__form
+      = search_form_for search, url: system_downloads_path do |f|
+        .row
+          .small-7.large-4.columns
+            = f.label "Name or description contains"
+            = f.search_field :name_or_description_cont
+          .small-5.large-4.columns.actions.end
+            = f.submit "Search", class: "button secondary"
+            span= " or "
+            = link_to t("helpers.reset"), system_downloads_path
+
+  .downloads
+    - items.each do |item|
+      .download
+        .file
+          = link_to(system_download_path(item), target: "_blank") do
+            i.far.fa-file-alt
+        .details
+          h3= link_to(item.name, system_download_path(item), target: "_blank")
+          p= item.description
+          .updated_at
+            = "Viewed #{item.view_count} times."
+            |   
+            = "Updated #{l(item.updated_at)} by #{item.updated_by}"
+
+          - if policy(Renalware::System::Download).edit? || policy(Renalware::System::Download).destroy?
+            .actions
+              = link_to_if policy(Renalware::System::Download).edit?,
+                            "Edit",
+                            edit_system_download_path(item)
+              = pipe_separator
+              = link_to_if policy(Renalware::System::Download).destroy?,
+                            "Delete",
+                            system_download_path(item),
+                            method: :delete,
+                            data: { confirm: "Are you sure you want to delete this item?" }
+
+  = paginate items