renalware-core 2.0.164 → 2.1.1

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

@@ -16,6 +16,11 @@
                       as: :select,
                       label: "Enclosure",
                       input_html: { disabled: form.disabled_inputs.include?(:enclosures_present) }
+        .small-6.medium-1.large-1.columns
+            = f.input :notes_present,
+                      as: :select,
+                      label: "Notes",
+                      input_html: { disabled: form.disabled_inputs.include?(:notes_present) }
         .small-6.medium-2.large-2.columns
           = f.input :state_eq,
                     collection: form.letter_state_options,
@@ -33,7 +38,7 @@
                     as: :user_picker,
                     collection: form.typist_options,
                     label: "Typist"
-        .small-6.medium-2.large-2.columns
+        .small-6.medium-2.large-1.columns
           = f.input :letterhead_id_eq,
                     collection: form.letterhead_options,
                     label: "Letterhead"
@@ -43,12 +48,12 @@
                     label: "Pages",
                     include_blank: form.allow_blank_inputs.include?(:page_count_in_array)
         .small-12.medium-2.large-2.columns.actions.end
-          = f.submit t("helpers.submit.filter"), class: "button secondary"
+          = f.submit t("btn.filter"), class: "button secondary"
           '  or
-          = link_to t("helpers.reset"), renalware.letters_filtered_letters_list_path(named_filter: named_filter)
+          = link_to t("btn.reset"), renalware.letters_filtered_letters_list_path(named_filter: named_filter)
 
   - if named_filter == :batch_printable
-    / Thus form wil all hidden fields and one button is otherwise a mirror of the above filter form.
+    / This form will all hidden fields and one button is otherwise a mirror of the above filter form.
     / It POSTs the form to create a batch and its items (which really just help us to keep track)
     / or what was printed and the user does not need to know about it) and once created
     / it pops up a dialog with a spinner and an asycn_render partial that, once the PDFs are compiled
@@ -62,6 +67,7 @@
                       method: :post,
                       remote: true do |f|
       = f.input :enclosures_present, as: :hidden
+      = f.input :notes_present, as: :hidden
       = f.input :state_eq, as: :hidden
       = f.input :author_id_eq, as: :hidden
       = f.input :created_by_id_eq, as: :hidden

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

@@ -1,6 +1,6 @@
 - content_for(:actions) do
   - if policy(Renalware::Letters::Mailshots::Mailshot).new?
-    = link_to "Add", new_letters_mailshot_path, class: :button
+    = link_to t("btn.add"), new_letters_mailshot_path, class: :button
 
 = within_new_admin_layout(title: "Mailshots") do
   table.toggleable.mailshots data-controller="toggle"

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

@@ -7,7 +7,7 @@ a.button.dropdown.with-icon(href="#"
                             aria-controls="pd-options"
                             aria-expanded="false")
   i.fas.fa-plus
-  | Add
+  = t("btn.add_")
 br
 ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
 

data/app/views/renalware/low_clearance/mdm/_low_clearance_profile.html.slim

@@ -1,4 +1,4 @@
 = render "renalware/shared/documents/attributes_group",
          group: mdm.low_clearance,
-         legend: "Low Clearance",
+         legend: t(".title"),
          width: "xlarge"

data/app/views/renalware/low_clearance/profiles/_summary.html.slim

@@ -4,7 +4,7 @@
     header
       h2.noprint= t(".title")
       ul
-        li= link_to "Edit",
+        li= link_to t("btn.edit"),
             edit_patient_low_clearance_profile_path(profile.patient),
             class: "button"
 
@@ -45,83 +45,3 @@
       dd= document.self_care_possible&.text
       dt= t(".access_notes")
       dd= document.access_notes
-  / Date first seen
-  / Dialysis plan
-  / Dialysis plan date
-  / Predicted ESRF date
-  / Referral CRE
-  / Referred by
-  / Education status
-  / Referral eGFR
-  / Education type
-  / Date attended educ.
-  / 'Your Kidneys' DVD
-  / 'Dialysis Choices' DVD
-  / Tx team referral
-  / Referral date
-  / Home HD
-  / Self Care
-  / Low Clearance access notes
-    / dl.dl-horizontal.large
-    /   dt= t(".last_update")
-    /   dd= profile.datw
-    /   dt= t(".schedule")
-    /   dd= profile.current_schedule
-    /   dt= t(".hospital_unit")
-    /   dd= profile.hospital_unit
-    /   dt= t(".prescribed_time")
-    /   dd= profile.formatted_prescribed_time
-    /   dt= t(".hd_type")
-    /   dd= profile.hd_type
-    /   dt= t(".named_nurse")
-    /   dd= profile.named_nurse
-    /   dt= t(".dialyser")
-    /   dd= profile.dialyser
-    /   dt= t(".dialysate")
-    /   dd= profile.dialysate
-    /   dt= t(".cannulation_type")
-    /   dd= profile.cannulation_type
-    /   dt= t(".anticoagulant.type")
-    /   dd= profile.anticoagulant_type.try!(:text)
-
-    / dl.dl-horizontal.large.full-hd-profile
-    /   dt.inset=t(".anticoagulant.loading_dose")
-    /   dd.inset= profile.anticoagulant_loading_dose
-    /   dt.inset= t(".anticoagulant.hourly_dose")
-    /   dd.inset= profile.anticoagulant_hourly_dose
-    /   dt.inset= t(".anticoagulant.stop_time")
-    /   dd.inset= profile.anticoagulant_stop_time
-
-    /   dt= t(".needle_size")
-    /   dd= profile.needle_size
-    /   dt= t(".single_needle")
-    /   dd= profile.single_needle.try!(:text)
-    /   dt= t(".blood_flow")
-    /   dd= profile.blood_flow
-    /   dt= t(".temperature")
-    /   dd= profile.temperature
-    /   dt= t(".bicarbonate")
-    /   dd= profile.bicarbonate
-    /   dt= t(".has_sodium_profiling")
-    /   dd= profile.has_sodium_profiling.try!(:text)
-    /   dt.inset= t(".sodium_first_half")
-    /   dd.inset= profile.sodium_first_half
-    /   dt.inset= t(".sodium_second_half")
-    /   dd.inset= profile.sodium_second_half
-
-    /   dt= t(".drugs.on_esa")
-    /   dd= profile.drugs_on_esa.try!(:text)
-    /   dt= t(".drugs.on_iron")
-    /   dd= profile.drugs_on_iron.try!(:text)
-    /   dt= t(".drugs.on_warfarin")
-    /   dd= profile.drugs_on_warfarin.try!(:text)
-
-    /   dt= t(".transport.has_transport")
-    /   dd= profile.transport.has_transport.try!(:text)
-    /   dt.inset= t(".transport.type")
-    /   dd.inset= profile.transport.type.try!(:text)
-    /   dt.inset= t(".transport.decided_on")
-    /   dd.inset= profile.transport.present? && I18n.l(profile.transport&.decided_on)
-
-    /   dt= t(".care_level.summary")
-    /   dd= profile.care_level

data/app/views/renalware/low_clearance/profiles/edit.html.slim

@@ -1,11 +1,5 @@
 = within_patient_layout(title: "Profile",
-  breadcrumbs: breadcrumb_for("Low Clearance Summary", patient_low_clearance_dashboard_path(patient))) do
-
-  / in show
-  /        = render "renalware/shared/documents/attributes_group",
-                   group: profile.document.low_clearance,
-                   legend: "Low Clearance",
-                   width: "xlarge"
+  breadcrumbs: breadcrumb_for(t(".akcc_summary.title"), patient_low_clearance_dashboard_path(patient))) do
 
   = simple_form_for profile,
                     url: patient_low_clearance_profile_path(patient),
@@ -41,6 +35,6 @@
       = flc.input :access_notes, as: :text, wrapper: :horizontal_large
 
     .form-actions
-      = f.submit "Save", class: "button"
+      = f.submit t("btn.save"), class: "button"
       '  or
-      = link_to "cancel", patient_low_clearance_dashboard_path(patient)
+      = link_to t("btn.cancel"), patient_low_clearance_dashboard_path(patient)

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

@@ -5,14 +5,14 @@
       .supplemental
         span= "#{mdm.clinic_visits.length} of #{mdm.patient.summary.clinic_visits_count}"
         span.noprint
-          = link_to "View All",
+          = link_to t("btn.view_all"),
                       patient_clinic_visits_path(mdm.patient),
                       class: "button secondary"
           = link_to new_patient_clinic_visit_path(mdm.patient),
                     class: "button",
                     target: "_blank" do
               i.fa.fa-external-link-square-alt
-              | Add
+              = t("btn.add")
 
     = render "renalware/clinics/clinic_visits/table",
             clinic_visits: mdm.clinic_visits,

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

@@ -6,7 +6,7 @@
       .supplemental
         span= "#{events.length} of #{mdm.patient.summary.events_count}"
         span.noprint
-          = link_to "View All",
+          = link_to t("btn.view_all"),
                     patient_events_path(mdm.patient),
                     class: "button secondary"
 

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

@@ -8,7 +8,7 @@
           = render "renalware/letters/letters/create_letter_button_dropdown",
                   patient: mdm.patient
 
-          = link_to t(".view_all"),
+          = link_to t("btn.view_all"),
                     patient_letters_letters_path(mdm.patient),
                     class: "button secondary"
 

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

@@ -3,7 +3,7 @@
     header
       h2= t(".title")
       span.noprint
-        = link_to t(".view"),
+        = link_to t("btn.view_all"),
                   patient_pathology_historical_observations_path(mdm.patient),
                   class: " button secondary left"
 

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

@@ -5,11 +5,11 @@
     | Update
     end
 
-= link_to "View all",
+= link_to t("btn.view_all"),
           patient_prescriptions_path(patient),
           class: "button secondary"
 
-= link_to "Toggle",
+= link_to t("btn.toggle"),
           "#prescriptions",
           class: "button secondary",
           data: { behaviour: "css-toggler" }

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

@@ -5,10 +5,10 @@ article
       span= "#{mdm.current_problems.length} of #{mdm.patient.summary.problems_count}"
 
       span.noprint
-        = link_to t(".view_all"),
+        = link_to t("btn.view_all"),
                   patient_problems_path(mdm.patient),
                   class: "button secondary"
-        = link_to "Toggle",
+        = link_to t("btn.toggle"),
                   "#problems",
                   class: "button secondary",
                   data: { behaviour: "css-toggler" }

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

@@ -3,12 +3,12 @@ table#patients.mdm-patients.columns
   thead
     tr
       th.col-width-tiny
-      th.col-width-large= sort_link(path, :family_name, t(".name"))
-      th.col-width-nhs-no= sort_link(path, :nhs_number, t(".nhs_no"))
-      th.col-width-reference-no= t(".hosp_no")
-      th.col-width-tiny= t(".sex")
-      th.col-width-tiny= t(".age")
-      th.col-width-medium= t(".modality")
+      th.col-width-large= sort_link(path, :family_name, t(".thead.patient_name"))
+      th.col-width-nhs-no= sort_link(path, :nhs_number, t(".thead.nhs_number"))
+      th.col-width-reference-no= t(".thead.hospital_number")
+      th.col-width-tiny= t(".thead.sex")
+      th.col-width-tiny= t(".thead.age")
+      th.col-width-medium= t(".thead.modality")
       th.col-width-date= sort_link(path, :transplant_registration_status, t(".registration_status"))
       - %i(hgb ure cre).each do |code|
         th.col-width-tiny= sort_link(path, code, t(".#{code}"))

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

@@ -5,11 +5,10 @@
     article
       header
         h2
-          = link_to "Current Prescriptions (#{summary_part.current_prescriptions.length})",
+          = link_to "#{t('titles.current_prescriptions')} (#{summary_part.current_prescriptions.length})",
                     patient_prescriptions_path(summary_part.patient)
 
-        = link_to patient_prescriptions_path(summary_part.patient), class: "button" do
-          | Add
+        = link_to t("btn.add"), patient_prescriptions_path(summary_part.patient), class: "button"
 
       ul.no-bullet
         - summary_part.current_prescriptions.each do |prescription|

data/app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim

@@ -8,7 +8,6 @@
   = simple_form_for search,
     url: medications_esa_prescriptions_path,
     method: :get do |f|
-    /= search_form_for(search, url: medications_esa_prescriptions_path) do |f|
     .small-6.columns
       = f.input search_scope, label: t(".search_prompt")
     .small-3.columns
@@ -19,5 +18,4 @@
     .small-3.columns.actions.end
       = f.submit "Search", class: "button"
       '  or
-      = link_to "Reset", medications_esa_prescriptions_path
-      /class: "cancel-link #{'disabled' unless searching}"
+      = link_to t("btn.reset"), medications_esa_prescriptions_path

data/app/views/renalware/medications/drug_types/prescriptions/_table.html.slim

@@ -6,7 +6,7 @@ div
         th.col-width-medium= sort_link([:renalware, search], "patient_family_name", t(".patient_name"))
         th.patient_age= sort_link([:renalware, search], "patient_born_on", t(".patient_age"))
         th.patient_sex= t(".patient_sex")
-        th.col-width-medium= sort_link([:renalware, search], "patient_current_modality_description_name", t(".modality"))
+        th.col-width-medium= sort_link([:renalware, search], "patient_current_modality_description_name", t(".thead.modality"))
         th.col-width-date= sort_link([:renalware, search], "prescribed_on", t(".prescribed_on"))
         th.col-width-date.hide-for-small-only
           = sort_link([:renalware, search], "terminated_on", t(".terminated_on"))

data/app/views/renalware/medications/home_delivery/events/_edit.html.slim

@@ -52,7 +52,7 @@
           = "#{event.homecare_form&.supplier&.name} '#{event.homecare_form&.form_name} version #{event.homecare_form&.form_version}'"
 
         - disabled_args = event.errors.any? ? { disabled: "disabled" } : {}
-        = link_to "Print",
+        = link_to t("btn.print"),
                   renalware.patient_medications_home_delivery_event_path(id: event.id, format: :pdf),
                   target: "_blank",
                   class: "button primary right home-delivery--print",

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

@@ -24,6 +24,6 @@
                     label: "Give on HD"
 
         .flex-shrink-0.pt-4.filters--actions
-          = f.submit t("helpers.submit.filter"), class: "button secondary"
+          = f.submit t("btn.filter"), class: "button secondary"
           '  or
-          = link_to "reset", patient_prescriptions_path(@patient)
+          = link_to t("btn.reset"), patient_prescriptions_path(@patient)

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

@@ -8,7 +8,7 @@ ruby:
   br
   = simple_form_for prescription,
                     url: url,
-                    html: { class: "prescription-form", autocomplete: "off" },
+                    html: { class: "fn-form prescription-form", autocomplete: "off" },
                     remote: true,
                     wrapper: :horizontal_form do |f|
 
@@ -65,4 +65,4 @@ ruby:
         - if policy(prescription).create?
           = f.button :submit, "Save"
           '  or
-        = link_to "cancel", patient_prescriptions_path(patient, treatable), remote: true
+        = link_to t("btn.cancel"), patient_prescriptions_path(patient, treatable), remote: true

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

@@ -1,8 +1,8 @@
 - if prescription.current? && policy(prescription).edit?
-  = link_to "Edit", edit_patient_prescription_path(patient, prescription), remote: true
+  = link_to t("btn.edit"), edit_patient_prescription_path(patient, prescription), remote: true
 - unless prescription.terminated_or_marked_for_termination?
   - if policy(prescription).destroy?
-    = link_to "Terminate",
+    = link_to t("btn.terminate"),
               new_patient_medications_prescription_termination_path(patient,
                                                                     prescription,
                                                                     @treatable),

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

@@ -1,6 +1,6 @@
 = content_for(:actions) do
   - if policy(Renalware::Medications::Prescription).new?
-    = link_to "Add",
+    = link_to t("btn.add"),
               new_patient_prescription_path(@patient),
               remote: true,
               class: "button"

data/app/views/renalware/medications/terminations/_form.html.slim

@@ -13,4 +13,4 @@ p
     .large-offset-3.large-7.columns
       = f.button :submit, "Save", class: :tiny
       '  or
-      = link_to "cancel", patient_prescriptions_path(patient, treatable), remote: true
+      = link_to t("btn.cancel"), patient_prescriptions_path(patient, treatable), remote: true

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

@@ -11,7 +11,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
   td= patient.hospital_identifier
   td.col-width-medium-with-ellipsis= message.subject
   td
-    = link_to "Toggle",
+    = link_to t("btn.toggle"),
               "##{message.html_preview_identifier}",
               data: { behaviour: "toggler" },
               class: :right

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

@@ -10,7 +10,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
   td= message.patient.hospital_identifier
   td.col-width-medium-with-ellipsis= message.subject
   td
-    = link_to "View",
+    = link_to t("btn.view"),
               "##{message.html_preview_identifier}",
               data: { behaviour: "toggler" },
               class: :right

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

@@ -2,13 +2,13 @@
   table.messages.messages-sent.has_togglable_content
     thead
       tr
-        th.col-width-date-time= t(".sent_at")
-        th= t(".recipient")
-        th.col-width-date-time= t(".read_at")
-        th.col-width-large= t(".patient_name")
-        th.col-width-nhs-no= t(".nhs_no")
-        th.col-width-reference-no= t(".hosp_no")
-        th= t(".subject")
+        th.col-width-date-time= t(".thead.sent_at")
+        th= t(".thead.recipient")
+        th.col-width-date-time= t(".thead.read_at")
+        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.subject")
         td
     tbody
       = render partial: "sent_receipt", collection: receipts

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

@@ -1,14 +1,14 @@
 table.auto-layout.align-top.messages.has-togglable-rows
   thead
     tr
-      th.col-width-tinyish= t(".age")
-      th.col-width-medium= t(".from")
-      th.col-width-date-time= t(".sent_at")
-      th.col-width-date-time= t(".read_at")
-      th.at-least.col-width-medium= t(".patient_name")
-      th.col-width-nhs-no= t(".nhs_no")
-      th.col-width-reference-no= t(".hosp_no")
-      th= t(".subject")
+      th.col-width-tinyish= t(".thead.age")
+      th.col-width-medium= t(".thead.sent_from")
+      th.col-width-date-time= t(".thead.sent_at")
+      th.col-width-date-time= t(".thead.read_at")
+      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.subject")
       td.col-width-tiny
 
   tbody