renalware-core 2.0.167 → 2.1.0

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

@@ -6,7 +6,7 @@
     = simple_form_for session,
         as: :hd_session,
         url: patient_hd_session_path(@patient, session),
-        html: { autocomplete: "off", class: "form-with-multiple-submit-buttons" },
+        html: { autocomplete: "off", class: "fn-form form-with-multiple-submit-buttons" },
         wrapper: "horizontal_form" do |f|
 
       = render "renalware/hd/sessions/#{session.state}/form",

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

@@ -7,7 +7,7 @@
     = simple_form_for session,
         as: :hd_session,
         url: patient_hd_sessions_path(@patient),
-        html: { autocomplete: "off", class: "form-with-multiple-submit-buttons" },
+        html: { autocomplete: "off", class: "fn-form form-with-multiple-submit-buttons" },
         wrapper: "horizontal_form" do |f|
 
       = render "renalware/hd/sessions/#{session.state}/form",

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

@@ -1,6 +1,6 @@
 = content_for :actions do
   - if policy(session).edit?
-    li= link_to "Edit",
+    li= link_to t("btn.edit"),
                 edit_patient_hd_session_path(session.patient, session),
                 class: :button
 

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

@@ -8,6 +8,6 @@
             collection: Renalware::HD::StationLocation.pluck(:name, :id),
             wrapper: :horizontal_medium
 
-  = f.submit "Save", class: "button"
+  = f.submit t("btn.save"), class: "button"
   '  or
-  = link_to "cancel", hd_unit_stations_path(station.hospital_unit_id)
+  = link_to t("btn.cancel"), hd_unit_stations_path(station.hospital_unit_id)

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

@@ -1,7 +1,7 @@
 tr.sortable(id="hd-station-#{station.id}")
   td
     - if policy(station).update?
-      = link_to "Edit", edit_hd_unit_station_path(station.hospital_unit_id, station)
+      = link_to t("btn.edit"), edit_hd_unit_station_path(station.hospital_unit_id, station)
   td= station.name
   td= station.location&.name
   - if policy(station).sort?

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

@@ -5,7 +5,7 @@
 
 = content_for(:actions) do
   - if policy(Renalware::HD::Station.new).create?
-    = link_to t("new_record.link_title"),
+    = link_to t("btn.add"),
               new_hd_unit_station_path(unit_id: unit.id),
               class: "button"
 

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

@@ -8,7 +8,7 @@
           th.col-width-tiny Fmt
           th.col-width-tiny Payload
           th.col-width-large Filename
-          th.col-width-medium Patient
+          th.col-width-medium= t("thead.patient")
           th.col-width-small Ext Session Id
           th.col-width-small Session Id
           th.col-width-large Result

data/app/views/renalware/hd/unmet_preferences/_filters.html.slim

@@ -26,6 +26,6 @@
                     label: "or preferring schedule"
 
         .medium-3.large-3.columns.actions.end
-          = f.submit "Filter", class: "button"
+          = f.submit t("btn.filter"), class: "button"
           '  or
-          = link_to t("helpers.reset"), hd_unmet_preferences_path
+          = link_to t("btn.reset"), hd_unmet_preferences_path

data/app/views/renalware/hd/unmet_preferences/_table.html.slim

@@ -1,7 +1,7 @@
 table.hd-unmet-preferences
   thead
     tr.primary
-      th.col-width-medium(rowspan=2) Patient
+      th.col-width-medium(rowspan=2)= t("thead.patient")
       th.col-width-date (rowspan=2) Date entered
       th(colspan=3) Current
       th(colspan=3) Preferred

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

@@ -45,7 +45,7 @@
         |   
         = f.submit "Update User Only", name: "form[update_user_only]", class: "button secondary"
         '  or
-        = link_to "Cancel",
+        = link_to t("btn.cancel"),
                 "#",
                 "aria-label" => "Close",
                   class: "reveal-modal-close"

data/app/views/renalware/hospitals/units/_form.html.slim

@@ -14,4 +14,4 @@
 
   = f.button :submit
   '  or
-  = link_to "cancel", hospitals_units_path
+  = link_to t("btn.cancel"), hospitals_units_path

data/app/views/renalware/hospitals/units/index.html.slim

@@ -1,6 +1,6 @@
 = content_for(:actions) do
   - if pundit_policy_for(Renalware::Hospitals::Centre).create?
-    = link_to t("new_record.link_title"), new_hospitals_unit_path, class: "button"
+    = link_to t("btn.add"), new_hospitals_unit_path, class: "button"
 
 = within_admin_layout(title: "Hospital Units") do
 
@@ -21,9 +21,9 @@
         tr
           td.actions
             - if policy(unit).edit?
-              = link_to "Edit", edit_hospitals_unit_path(unit.id)
+              = link_to t("btn.edit"), edit_hospitals_unit_path(unit.id)
             - if policy(unit).destroy?
-              = link_to "Delete",
+              = link_to t("btn.delete"),
                         hospitals_unit_path(unit.id),
                         method: :delete,
                         data: { confirm: I18n.t("prompts.confirm_delete") }

data/app/views/renalware/hospitals/wards/index.html.slim

@@ -1,6 +1,6 @@
 = content_for(:actions) do
   - if policy(Renalware::Hospitals::Ward.new).create?
-    = link_to "Add",
+    = link_to t("btn.add"),
             new_hospitals_unit_ward_path(unit),
             class: "button"
 
@@ -18,11 +18,11 @@
         tr
           td
             - if policy(ward).edit?
-              = link_to "Edit", edit_hospitals_unit_ward_path(unit, ward)
+              = link_to t("btn.edit"), edit_hospitals_unit_ward_path(unit, ward)
             / For now, no longer support deleting a ward
             / - if policy(ward).destroy?
             /   = pipe_separator
-            /   = link_to "Delete",
+            /   = link_to t("btn.delete"),
             /             hospitals_unit_ward_path(unit, ward),
             /             method: :delete,
             /             data: { confirm: "Are you sure?" }

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

@@ -3,14 +3,12 @@
     article
       header
         h2
-          = link_to "Letters (#{summary_part.letters_count})",
+          = link_to "#{t('titles.letters')} (#{summary_part.letters_count})",
                     patient_letters_letters_path(summary_part.patient)
 
         ul
-          li= link_to patient_letters_letters_path(summary_part.patient), class: "button" do
-                | Draft letter
-          li= link_to patient_letters_letters_path(summary_part.patient), class: "button" do
-                | View All
+          li= link_to t(".btn.draft_letter"), patient_letters_letters_path(summary_part.patient), class: "button"
+          li= link_to t("btn.view_all"), patient_letters_letters_path(summary_part.patient), class: "button"
 
       - if summary_part.letters.any?
         = render "renalware/letters/letters/table",

data/app/views/renalware/letters/batches/_create.html.slim

@@ -21,7 +21,7 @@
     .left
       = "##{batch.id}"
     .right
-      = link_to "Cancel",
+      = link_to t("btn.cancel"),
         "#",
         "aria-label" => "Close",
         class: "reveal-modal-close cancel-link"

data/app/views/renalware/letters/completed_batches/new.html.slim

@@ -2,15 +2,6 @@
   .modal__header
     h2= "Was printing successful?"
   .modal__body
-    / dl.dl-horizontal
-    /   dt Patient
-    /   dd= letter.patient.to_s
-    /   dt Letter
-    /   dd= letter.description
-    /   dt Date
-    /   dd= l(letter.issued_on)
-    /   dt Author
-    /   dd= letter.author
     br
   .modal__footer
     = link_to "No - leave in the Print Queue",

data/app/views/renalware/letters/completed_letters/new.html.slim

@@ -8,7 +8,7 @@
       dt Letter
       dd= letter.description
       dt Date
-      dd= l(letter.issued_on)
+      dd= l(letter.date)
       dt Author
       dd= letter.author
     br

data/app/views/renalware/letters/contacts/_contact.html.slim

@@ -5,6 +5,6 @@
   td= contact.address
   td= contact.notes
   td
-    = link_to("Edit",
+    = link_to(t("btn.edit"),
                 edit_patient_letters_contact_path(patient, contact, format: :html),
                 data: { "reveal-id" => "edit-patient-contact-modal", "reveal-ajax" => "true" })

data/app/views/renalware/letters/contacts/_edit.html.slim

@@ -22,7 +22,7 @@
 
       = f.submit class: :button
       '  or
-      = link_to "Cancel",
+      = link_to t("btn.cancel"),
                "#",
                "aria-label" => "Close",
                 class: "reveal-modal-close"

data/app/views/renalware/letters/contacts/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             "#",
             data: { behaviour: "add-new-contact" },
             class: "button"

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

@@ -1,14 +1,14 @@
 table.letters.electronic-ccs.has-togglable-rows
   thead
     tr
-      th.col-width-tiny State
-      th.col-width-date Date
+      th.col-width-tiny= t("thead.state")
+      th.col-width-date= t("thead.date_")
       th.col-width-date-time Read at
-      th.col-width-medium Author
-      th.at-least.col-width-medium Patient
-      th.col-width-nhs-no NHS no.
-      th.col-width-reference-no Hosp no.
-      th Description
+      th.col-width-medium= t("thead.author")
+      th.at-least.col-width-medium= t("thead.patient")
+      th.col-width-nhs-no= t("thead.nhs_number")
+      th.col-width-reference-no= t("thead.hospital_number")
+      th= t("thead.description")
       th.col-width-small
 
   tbody
@@ -19,7 +19,7 @@ table.letters.electronic-ccs.has-togglable-rows
       tr(id=receipt.html_identifier class=letter.state.dasherize)
         td.state
           span= letter.state_description
-        td= l(letter.issued_on)
+        td= l(letter.date)
         td= l(receipt.read_at)
         td= letter.author
         td= default_patient_link(patient)
@@ -27,7 +27,7 @@ table.letters.electronic-ccs.has-togglable-rows
         td= patient.hospital_identifiers
         td.col-width-medium-with-ellipsis= letter.description
         td.actions
-          = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
+          = link_to t("btn.toggle"), "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
           = link_to letter.view_label,
                     patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath)
 

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

@@ -12,17 +12,17 @@
         th.col-width-date Sent at
         th Recipient
         th.col-width-date-time Read at
-        th.col-width-large Patient
-        th.col-width-nhs-no NHS no.
-        th.col-width-reference-no Hosp no.
-        th Description
+        th.col-width-large= t("thead.patient")
+        th.col-width-nhs-no= t("thead.nhs_number")
+        th.col-width-reference-no= t("thead.hospital_number")
+        th= t("thead.description")
         th
     tbody
       - receipts.each do |receipt|
         - letter = Renalware::Letters::LetterPresenter.new(receipt.letter)
         - patient = letter.patient
         tr
-          td= l(letter.issued_on)
+          td= l(letter.date)
           td.col-width-medium-with-ellipsis= receipt.recipient
           td= l(receipt.read_at)
           td= default_patient_link(patient)
@@ -30,7 +30,7 @@
           td= patient.hospital_identifiers
           td.col-width-medium-with-ellipsis= letter.description
           td.actions
-            = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
+            = link_to t("btn.toggle"), "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
             = link_to(\
                 letter.view_label,
                 patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath))

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

@@ -283,7 +283,7 @@ scss:
 
       .description-block
         p
-          = l letter.issued_on
+          = l letter.date
           br
           span.description= letter.description
           br

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

@@ -19,7 +19,7 @@ ul.f-dropdown#download-options(data-dropdown-content aria-hidden="true")
 
 = blank_separator
 - if policy(letter).update?
-  = link_to "Edit",
+  = link_to t("btn.edit"),
             edit_patient_letters_letter_path(letter.patient, letter),
             class: "button tiny"
   = blank_separator

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

@@ -2,7 +2,7 @@ button.button.dropdown(href="#"
                        data-dropdown="draft-letter-options"
                        aria-controls="draft-letter-options"
                        aria-expanded="false")
-  | Create
+  = t("btn.create_")
 
 ul.f-dropdown#draft-letter-options(data-dropdown-content aria-hidden="true")
   li= link_to(t(".draft_clinical_letter"),

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

@@ -6,7 +6,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content data-controller="letters-form"
   = render event if event.present?
@@ -21,7 +21,6 @@ ruby:
               input_html: { class: "searchable_select" }
     = hidden_field_tag "description_id"
     = f.input :clinical, as: :hidden
-    = f.input :issued_on, as: :date_picker
     = f.association :author,
         as: :user_picker,
         collection: Renalware::System::UsersPresenter.new.list_for_dropdown( \
@@ -68,4 +67,4 @@ ruby:
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path

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

@@ -5,13 +5,19 @@
     td.noprint.actions
       = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
       - if policy(letter).update?
-        = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
+        = link_to t("btn.edit"), edit_patient_letters_letter_path(letter.patient, letter)
       - if policy(letter).destroy?
-        = link_to "Delete",
+        = link_to t("btn.delete"),
                   patient_letters_letter_path(letter.patient, letter),
                   method: :delete,
                   data: { confirm: I18n.t("prompts.confirm_delete") }
 
+    td.text-center
+      - if letter.notes.present?
+        i.fas.fa-comment.text-yellow-500.hover:text-yellow-600(title=letter.notes)
+    td.text-center
+      - if letter.enclosures.present?
+        i.fas.fa-paperclip.text-green-500.pr-1(title=letter.enclosures)
     td.state
       span= letter.state_description
     td= l(letter.effective_date)
@@ -26,8 +32,4 @@
     td
     td(colspan=9)
       .quick-preview
-        = simple_format letter.body
-        - if letter.notes.present?
-          .admin-notes
-            i Notes:  
-            = letter.notes
+        = render "renalware/letters/letters/toggled_body", letter: letter

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

@@ -5,7 +5,7 @@
         p.unit-info= raw letter.letterhead.unit_info
 
         p.letter-description-block
-          = l letter.issued_on
+          = l letter.date
           br
           span.letter-description= letter.description
           br

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

@@ -2,7 +2,7 @@ article.letter-form-problems-and-prescriptions
   header
     h2 Problems and Prescriptions
     .supplemental
-      = link_to "Toggle",
+      = link_to t("btn.toggle"),
                 "#problems_prescriptions",
                 class: "button secondary",
                 data: { behaviour: "css-toggler" }

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

@@ -5,14 +5,16 @@ table.auto-layout.letters.has-togglable-rows
     tr
       th.noprint.togglers= table_toggler
       th.noprint.col-width-11
-      th.col-width-tiny State
-      th.col-width-date-time Date
+      th.col-width-tiny Notes
+      th.col-width-tiny Enc.
+      th.col-width-tiny= t(".thead.state")
+      th.col-width-date-time= t(".thead.date_")
       - if columns.include?(:author)
-        th.col-width-medium Author
+        th.col-width-medium = t(".thead.author")
       - if columns.include?(:patient)
-        th.col-width-medium Patient
-      th.at-least.col-width-medium Recipient
-      th.col-width-medium Description
+        th.col-width-medium = t(".thead.patient")
+      th.at-least.col-width-medium= t(".thead.recipient")
+      th.col-width-medium= t(".thead.description")
 
   tbody
     = render partial: "renalware/letters/letters/letter",

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

@@ -0,0 +1,15 @@
+.py-1= simple_format letter.body
+
+- if letter.notes.presence
+  div
+    span.pr-2.text-gray-600.font-bold
+      i.fas.fa-comment.text-yellow-500.pr-2
+      | Notes:
+    span.pl-1= letter.notes
+
+- if letter.enclosures.present?
+  div
+    span.pr-2.text-gray-600.font-bold
+      i.fas.fa-paperclip.text-green-500.pr-2
+      | Enclosures:
+    span.pl-1= letter.enclosures