renalware-core 2.0.44 → 2.0.45

data/app/models/renalware/ukrdc/transmission_log.rb

@@ -25,7 +25,7 @@ module Renalware
       def self.formatted_exception(error)
         [
           "#{error.backtrace.first}: #{error.message} (#{error.class})",
-          error.backtrace.drop(1).map{ |s| "\t#{s}" }
+          error.backtrace.drop(1).map{ |line| "\t#{line}" }
         ].join("\n")
       end
     end

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -51,7 +51,7 @@ module Renalware
         CollectionPresenter.new(
           letters_patient
             .letters
-            .approved
+            .approved_or_completed
             .where("updated_at > ?", changes_since),
           Renalware::Letters::LetterPresenterFactory
         )

data/app/views/renalware/admin/users/index.html.slim

@@ -35,9 +35,9 @@
               span.tag(class=role.name)= role.name.humanize
           td.approved
             - if user.approved?
-              i.fa.fa-check-square-o
+              i.far.fa-check-square
             - else
-              i.unapproved.fa.fa-square-o
+              i.unapproved.far.fa-square
           td.expired= l(user.expired_at&.to_date)
           td.show-for-large-up= l(user.current_sign_in_at)
           td.show-for-large-up= l(user.last_sign_in_at)

data/app/views/renalware/admissions/consults/index.html.slim

@@ -3,7 +3,7 @@
 = content_for(:actions) do
   = link_to("Add", new_admissions_consult_path, class: :button)
   = link_to(admissions_consults_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
-    i.fa.fa-print
+    i.fas.fa-print
     | Print (PDF)
   /data: { target: admissions_consults_path(format: :pdf)
 

data/app/views/renalware/admissions/requests/_create_request_link.html.slim

@@ -7,5 +7,5 @@
          id: "create-admissions-request",
          data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }) do
   - if local_assigns.fetch(:use_icon, true)
-    i.fa.fa-link-annotation.fa-hand-o-right
+    i.far.fa-link-annotation.fa-hand-point-right
   = link_text

data/app/views/renalware/admissions/requests/_request.html.slim

@@ -23,7 +23,7 @@ ruby:
               method: :delete,
               class: "remove",
               data: { confirm: "Are you sure you want to remove this item?" } do
-      i.fa.fa-trash.fa-link-annotation
+      i.fas.fa-trash.fa-link-annotation
       |  |  
       = link_to "Edit",
                 edit_admissions_request_path(request, format: :html),
@@ -31,4 +31,4 @@ ruby:
                 method: :get,
                 data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }
   td.handle
-    i.fa.fa-reorder
+    i.fas.fa-bars

data/app/views/renalware/base/_modality_missing_warning.html.slim

@@ -1,3 +1,3 @@
 li.missing-modality-warning
-  i.fa.fa-info
+  i.fas.fa-info
   span= message

data/app/views/renalware/clinical/allergies/_mini.html.slim

@@ -4,7 +4,7 @@
 .allergies
   dl
     dt
-      span.fa.fa-warning
+      span.fas.fa-exclamation-triangle
       span.allergy_status
         = link_to "Allergies:", patient_clinical_profile_path(patient)
     dd

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -27,7 +27,7 @@
 
         = f.input :patient_ids, as: :hidden_array
         = button_tag(type: "submit", class: "button secondary") do
-          i.fa.fa-files-o
+          i.fas.fa-copy
           | Generate request forms
 
     table#appointments
@@ -63,13 +63,13 @@
               - if appointment.becomes_visit_id.present?
                 = link_to edit_patient_clinic_visit_path(appointment.patient,
                                                           id: appointment.becomes_visit_id) do
-                  i.fa.fa-file-o
+                  i.fas.fa-file
                   |   
                   | View Clinic Visit
               - else
                 = link_to new_patient_clinic_visit_path(appointment.patient,
                                                         appointment_id: appointment.id) do
-                  i.fa.fa-pencil
+                  i.fas.fa-pencil-alt
                   |   
                   | Create Clinic Visit
 

data/app/views/renalware/hd/dashboards/_page_actions.html.slim

@@ -1,14 +1,14 @@
 = link_to(patient_hd_mdm_path(patient), class: "button with-icon secondary") do
-  i.fa.fa-group
+  i.fas.fa-users
   = t(".mdm")
 = link_to(patient_hd_protocol_path(patient), class: "button with-icon secondary") do
-  i.fa.fa-print
+  i.fas.fa-print
   = t(".protocol")
 a.button.dropdown.with-icon(href="#"
                             data-dropdown="pd-options"
                             aria-controls="pd-options"
                             aria-expanded="false")
-  i.fa.fa-plus
+  i.fas.fa-plus
   | Add
 br
 ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")

data/app/views/renalware/hd/diaries/edit.html.slim

@@ -9,11 +9,11 @@
 
   .diary__navigation
     = link_to hd_unit_edit_diary_path(**diary.week.previous.to_h), class: "button secondary" do
-      i.fa.fa-arrow-left
+      i.fas.fa-arrow-left
       | Previous week
 
     = link_to hd_unit_edit_diary_path(**diary.week.next.to_h), class: "button secondary" do
-      i.fa.fa-arrow-right
+      i.fas.fa-arrow-right
       | Next week
 
   .diary__key

data/app/views/renalware/hd/diaries/index.html.slim

@@ -1,7 +1,7 @@
 = content_for(:actions) do
   = render "page_actions", unit: unit
   li.warning-block
-    i.fa.fa-info
+    i.fas.fa-info
     span To create a new diary, view the most recent one and choose 'Next Week'
 
 = within_admin_layout(title: "HD Unit Diaries") do

data/app/views/renalware/hd/stations/_station.html.slim

@@ -3,4 +3,4 @@ tr.sortable(id="hd-station-#{station.id}")
   td= station.name
   td= station.location&.name
   td.handle
-    i.fa.fa-reorder
+    i.fas.fa-bars

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

@@ -50,5 +50,5 @@ table.letters.electronic-ccs.has-togglable-rows
                           class: "button mark-as-read",
                           method: :patch,
                           remote: true) do
-                i.fa.fa-check
+                i.fas.fa-check
                 | Mark as read

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

@@ -14,7 +14,7 @@ tr(class=letter.state.dasherize)
                 data: { \
                   "modal-url" => new_patient_letters_letter_completed_path(letter.patient, letter) \
                 } do
-         i.fa.fa-print
+         i.fas.fa-print
          | Print
     |   
     = link_to "Toggle",

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

@@ -1,12 +1,12 @@
 = link_to(patient_low_clearance_mdm_path(patient), class: "button with-icon secondary") do
-  i.fa.fa-group
+  i.fas.fa-users
   = t(".mdm")
 
 a.button.dropdown.with-icon(href="#"
                             data-dropdown="pd-options"
                             aria-controls="pd-options"
                             aria-expanded="false")
-  i.fa.fa-plus
+  i.fas.fa-plus
   | Add
 br
 ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")

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

@@ -1,5 +1,5 @@
 nav.top-bar.mdm-top-bar(data-topbar role="navigation")
   ul.title-area
     li.name
-      i.fa.fa-arrow-left
+      i.fas.fa-arrow-left
       = link_to "Back to Patients List", :back

data/app/views/renalware/medications/prescriptions/index.html.slim

@@ -8,7 +8,7 @@
                                        treatable,
                                        format: :pdf),
             class: "button secondary with-icon" do
-    i.fa.fa-print
+    i.fas.fa-print
     | Print
 
 = within_patient_layout(title: "Prescriptions") do

data/app/views/renalware/messaging/internal/messages/_send_message_link.html.slim

@@ -7,5 +7,5 @@
 = link_to(url,
          id: "send-patient-message",
          data: { "reveal-id" => "send-message-modal", "reveal-ajax" => "true" }) do
-  i.fa.fa-link-annotation.fa-envelope
+  i.fas.fa-link-annotation.fa-envelope
   = link_text

data/app/views/renalware/messaging/internal/messages/_send_reply_link.html.slim

@@ -8,5 +8,5 @@
 = link_to(url,
          data: { "reveal-id" => "send-message-modal", "reveal-ajax" => "true" },
          class: "button secondary") do
-  i.fa.fa-link-annotation.fa-reply
+  i.fas.fa-link-annotation.fa-reply
   = link_text

data/app/views/renalware/messaging/internal/receipts/_receipt.html.slim

@@ -39,5 +39,5 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
                   class: "button mark-as-read",
                   method: :patch,
                   remote: true) do
-        i.fa.fa-check
+        i.fas.fa-check
         | Mark as read

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

@@ -15,4 +15,4 @@
                                    class: "radius"
               .small-2.columns
                 = f.button class: "button tiny postfix radius radius-right" do
-                  i.fa.fa-search
+                  i.fas.fa-search

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

@@ -4,7 +4,7 @@
               class: "button secondary")
 li.has-dropdown
   = link_to dashboard_path do
-    i.fa.fa-home
+    i.fas.fa-home
     |  
     = current_user.username
   ul.dropdown

data/app/views/renalware/patients/_header.html.slim

@@ -11,11 +11,11 @@
       dt
       dd.back-link
         = link_to back_path do
-          i.fa.fa-arrow-left
+          i.fas.fa-arrow-left
           |  Back
     dd.name.patient-menu-toggler
       a
-        i.fa.fa-ellipsis-v
+        i.fas.fa-ellipsis-v
         = patient
     - if patient.hospital_identifiers.all.count > 1
       - patient.hospital_identifiers.all.each do |hospital_identifier|

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

@@ -1,5 +1,5 @@
 li.patient-alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
-  i.fa.fa-warning
+  i.fas.fa-exclamation-triangle
   span.title Alert:
   span.body= alert.notes
   span.author= alert.created_by.username
@@ -9,4 +9,4 @@ li.patient-alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
               remote: true,
               method: :delete,
               data: { confirm: "Are you sure you want to remove this alert?" }) do
-      i.fa.fa-trash-o
+      i.fas.fa-trash

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

@@ -4,5 +4,5 @@
 
 / Link to launch the modal dialog
 = link_to(url, data: { "reveal-id" => "create-alert-modal", "reveal-ajax" => "true" }) do
-  i.fa.fa-link-annotation.fa-exclamation-circle
+  i.fas.fa-link-annotation.fa-exclamation-circle
   = link_text

data/app/views/renalware/patients/bookmarks/_delete.html.slim

@@ -1,4 +1,5 @@
-= link_to link_text,
-         bookmark_path(bookmark),
-         method: :delete,
-         data: { confirm: t(".confirm") }
+= link_to(bookmark_path(bookmark),
+          method: :delete,
+          data: { confirm: t(".confirm") }) do
+  i.fas.fa-link-annotation.fa-bookmark
+  = link_text

data/app/views/renalware/patients/bookmarks/_new.html.slim

@@ -1,6 +1,6 @@
 / Link to launch the modal dialog
 = link_to("#", data: { "reveal-id" => "add-patient-bookmark-modal" }) do
-  i.fa.fa-link-annotation.fa-bookmark-o
+  i.far.fa-link-annotation.fa-bookmark
   = link_text
 
 / The modal dialog

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

@@ -8,12 +8,12 @@ tr
   td= patient.age
   - if(patient.send_to_rpv?)
     td(title="#{patient.rpv_decision}")
-      i.fa.fa-check
+      i.fas.fa-check
   -else
     td
   - if(patient.send_to_renalreg?)
     td(title="#{patient.renalreg_decision}")
-      i.fa.fa-check
+      i.fas.fa-check
   -else
     td
   td= patient.current_modality

data/app/views/renalware/patients/worries/_delete.html.slim

@@ -1,5 +1,5 @@
 = link_to(patient_worry_path(patient, patient.worry),
          method: :delete,
          data: { confirm: t(".confirm") }) do
-  i.fa.fa-link-annotation.fa-flag
+  i.fas.fa-link-annotation.fa-flag
   = t(".title")

data/app/views/renalware/patients/worries/_new.html.slim

@@ -1,7 +1,7 @@
 / Link to launch the modal dialog
 = link_to("#",
           data: { "reveal-id" => "add-patient-worry-modal" }) do
-  i.fa.fa-link-annotation.fa-flag-o
+  i.far.fa-link-annotation.fa-flag
   = t(".title")
 
 / The modal dialog

data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim

@@ -1,13 +1,13 @@
 = link_to(patient_pd_mdm_path(patient), class: "button with-icon secondary") do
-  i.fa.fa-group
+  i.fas.fa-users
   = t(".mdm")
 = blank_separator
-= blank_separator
-a.button.dropdown(href="#"
+a.button.dropdown.with-icon(href="#"
                   data-dropdown="pd-options"
                   aria-controls="pd-options"
                   aria-expanded="false")
-  | Add...
+  i.fas.fa-plus
+  | Add
 br
 
 ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")

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

@@ -1,7 +1,7 @@
 = content_for(:actions) do
   = link_to(patient_pd_exit_site_infection_path(patient, exit_site_infection, format: :pdf),
             class: "button") do
-    i.fa.fa-print
+    i.fas.fa-print
     |  Print
 
 = within_patient_layout(title: "Exit Site Infection",

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

@@ -1,7 +1,7 @@
 = content_for(:actions) do
   = link_to(patient_pd_peritonitis_episode_path(patient, peritonitis_episode, format: :pdf),
             class: "button") do
-    i.fa.fa-print
+    i.fas.fa-print
     |  Print
 
 - title = "Peritonitis Episode - Diagnosed: #{l(peritonitis_episode.diagnosis_date)}"

data/app/views/renalware/problems/problems/_current_table.html.slim

@@ -24,4 +24,4 @@ table#current_problems.manual-stripes.auto-layout
         td= l problem.updated_on
         td= problem.created_by.full_name
         td.handle
-          i.fa.fa-reorder
+          i.fas.fa-bars

data/app/views/renalware/renal/aki_alerts/index.html.slim

@@ -4,7 +4,7 @@
   /   url_for(request.filtered_parameters&.merge({format: :pdf})
   / however this seems to loose the ransack sort option in  params[:q][:s]
   = link_to(renal_aki_alerts_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
-    i.fa.fa-print
+    i.fas.fa-print
     | Print (PDF)
 
 = within_admin_layout(title: "AKI Alerts") do

data/app/views/renalware/reporting/report_mailer/daily_summary.html.slim

@@ -0,0 +1,14 @@
+h4= l(Time.zone.now)
+
+- view_data.each do |view_name, data|
+  - rows = data["data"].first
+  h3= t(:title, scope: "renalware.reporting.#{view_name}", default: view_name)
+  table
+    - rows.each do |row|
+      - description = row[0]
+      - value = row[1]
+      tr
+        td= t(description,
+              scope: "renalware.reporting.#{view_name}",
+              default: description.humanize)
+        td= value

data/app/views/renalware/reporting/report_mailer/daily_summary.text.erb

@@ -0,0 +1,15 @@
+<%= l(Time.zone.now) %>
+
+<% view_data.each do |view_name, data| %>
+<% rows = data["data"].first %>
+<% title =  t(:title, scope: "renalware.reporting.#{view_name}", default: view_name) %>
+<%= title %>
+<%= "-" * title.length %>
+<% rows.each do |row| %>
+<% description = row[0] %>
+<% value = row[1] %>
+<%= t(description,scope: "renalware.reporting.#{view_name}", default: description.humanize) -%>
+<%= ": #{value}" %>
+<% end %>
+
+<% end %>

data/app/views/renalware/research/_alert.html.slim

@@ -1,5 +1,5 @@
 li.patient-alert.research-study-participant
-  i.fa.fa-warning
+  i.fas.fa-exclamation-triangle
   span.title= link_to(participation.study.code, research_study_participants_path(participation.study))
   span.body participant
 
@@ -8,7 +8,7 @@ li.patient-alert.research-study-participant
   - if participation.external_application_participant_url.present?
     span.external_application_link
       = link_to(participation.external_application_participant_url, target: "_blank") do
-        i.fa.fa-external-link
+        i.fas.fa-external-link-alt
         |  Launch application
 
   span.date= l(participation.joined_on)