renalware-core 2.0.167 → 2.1.0

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

data/app/views/renalware/messaging/shared/_key.html.slim

@@ -1,3 +1,2 @@
 .messages-key
-  span.urgent
-    | Urgent
+  span.urgent= t("btn.urgent")

data/app/views/renalware/modalities/descriptions/_form.html.slim

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

data/app/views/renalware/modalities/descriptions/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             new_modalities_description_path,
             class: "button"
 
@@ -15,9 +15,9 @@
         tr
           td.actions
             - if policy(description).edit?
-              = link_to "Edit", edit_modalities_description_path(description.id)
+              = link_to t("btn.edit"), edit_modalities_description_path(description.id)
             - if policy(description).destroy?
-              = link_to "Delete",
+              = link_to t("btn.delete"),
                         modalities_description_path(description.id),
                         method: :delete,
                         data: { confirm: "Are you sure you want to delete this modal?" }

data/app/views/renalware/modalities/modalities/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             new_patient_modality_path(patient),
             class: "button"
 

data/app/views/renalware/modalities/modalities/new.html.slim

@@ -48,6 +48,6 @@
                           input_html: { rows: 5 },
                           wrapper: :horizontal_large
 
-              = m.submit "Save", class: "button"
+              = m.submit t("btn.save"), class: "button"
               '  or
-              = link_to "cancel", patient_modalities_path(patient)
+              = link_to t("btn.cancel"), patient_modalities_path(patient)

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

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

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

@@ -1,2 +1,2 @@
 li
-  = link_to "Directory", directory_people_path
+  = link_to t(".directory"), directory_people_path

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

@@ -1,5 +1,5 @@
 li.has-dropdown
-  = link_to "Help", system_downloads_path
+  = link_to t("btn.help"), system_downloads_path
   ul.dropdown
     li= link_to "Downloads", system_downloads_path
     li

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

@@ -4,7 +4,7 @@
       = search_form_for the_patient_search,
                         url: patients_path,
                         as: :patient_search,
-                        class: "patient-search-form" do |f|
+                        class: "fn-form patient-search-form" do |f|
         .row.collapse
           .columns.small-12
             .row.collapse

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

@@ -1,5 +1,5 @@
 li.has-dropdown
-  = link_to "Patients", patients_path
+  = link_to t(".patients"), patients_path
   ul.dropdown
     li= link_to "Patients List", patients_path
     li= link_to "Add a New Patient", new_patient_path

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

@@ -1,5 +1,5 @@
 li
-  = link_to "Log out",
+  = link_to t(".log_out"),
             destroy_user_session_path,
             class: "right",
             method: :delete,

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

@@ -7,7 +7,7 @@ li.has-dropdown.menu-item.menu-item--home
     i
     =current_user.username
   ul.dropdown
-    li= link_to "My Dashboard", dashboard_path
+    li= link_to t(".my_dashboard"), dashboard_path
     li= link_to "Update Profile", edit_user_registration_path
     li= link_to "View Letters", author_letters_path(current_user.id)
     li= link_to "Manage Snippets", snippets_path

data/app/views/renalware/pathology/code_groups/edit.html.slim

@@ -1,8 +1,8 @@
-= within_new_admin_layout(title: "Code group <code>#{group.name}</code>".html_safe) do
+= within_new_admin_layout(title: "Pathology Code Group <code>#{group.name}</code>".html_safe) do
 
   = simple_form_for(group,
                     url: renalware.pathology_code_group_path(group),
                     method: :patch,
                     as: :code_group) do |f|
     = f.input :description
-    = f.submit "Save", class: :button
+    = f.submit t("btn.save"), class: :button

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

@@ -4,12 +4,12 @@
     thead
       tr
         th Group name
-        th Description
+        th= t("thead.description")
     tbody
       - groups.each do |group|
         tr
           td.actions
             - if policy(group).edit?
-              = link_to "View", pathology_code_group_path(group)
+              = link_to t("btn.view"), pathology_code_group_path(group)
           td= group.name
           td= group.description

data/app/views/renalware/pathology/code_groups/show.html.slim

@@ -7,7 +7,7 @@
   span
     .text-lg.font-bold Description
     .mr-2.inline = group.description
-    = link_to "Edit", edit_pathology_code_group_path(group)
+    = link_to t("btn.edit"), edit_pathology_code_group_path(group)
 
   br
   br

data/app/views/renalware/pathology/observation_descriptions/_filters.html.slim

@@ -9,6 +9,6 @@
         = f.input :code_cont, label: "Code contains"
       .w-full.md:w-1/2.px-3.mb-6.md:mb-0
 
-        = f.submit t("helpers.submit.filter"), class: "button", name: nil
+        = f.submit t("btn.filter"), class: "button", name: nil
         '  or
-        = link_to t("helpers.reset"), url
+        = link_to t("btn.reset"), url

data/app/views/renalware/pathology/observation_descriptions/edit.html.slim

@@ -18,4 +18,4 @@
       = f.input :upper_threshold, hint: "Value above which a result can be deemed abnormal"
       = f.submit class: :button
       '  or
-      = link_to "Cancel", pathology_observation_descriptions_path
+      = link_to t("btn.cancel"), pathology_observation_descriptions_path

data/app/views/renalware/pathology/observation_requests/_filters.html.slim

@@ -12,6 +12,6 @@
                   input_html: { class: "searchable_select" }
 
       .columns.medium-2.large-2.actions.end
-        = f.submit t("helpers.submit.filter"), class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), renalware.patient_pathology_observation_requests_path(patient)
+        = link_to t("btn.reset"), renalware.patient_pathology_observation_requests_path(patient)

data/app/views/renalware/pathology/patient_rules/_form.html.slim

@@ -10,4 +10,4 @@
 
   = submit_tag "Save", class: "button"
   '  or
-  = link_to "Cancel", patient_pathology_required_observations_path(@patient)
+  = link_to t("btn.cancel"), patient_pathology_required_observations_path(@patient)

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

@@ -12,9 +12,9 @@
             .large-4.columns
               = f.input :created_on_eq, as: :date_picker, label: "Printed on"
             .large-8.columns.actions
-              = f.submit t("helpers.submit.filter"), class: "button"
+              = f.submit t("btn.filter"), class: "button"
               '  or
-              = link_to t("helpers.reset"), pathology_requests_requests_path
+              = link_to t("btn.reset"), pathology_requests_requests_path
 
   .row
     - if requests.empty?
@@ -33,7 +33,7 @@
         tbody
           - requests.each do |request|
             tr
-              td = link_to "View", pathology_requests_request_path(id: request.id, format: "pdf")
+              td = link_to t("btn.view"), pathology_requests_request_path(id: request.id, format: "pdf")
               td = request.patient.full_name
               td = request.clinic.name
               td = request.consultant

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

@@ -5,7 +5,7 @@
       .row
         .large-12.columns
           label for="clinic_id" Clinic
-          = form_tag(patient_pathology_required_observations_path(patient_id: @patient), method: :get) do
+          = form_tag(patient_pathology_required_observations_path(patient_id: @patient), method: :get, class: "fn-form" ) do
             = select_tag "request[clinic_id]",
                 options_from_collection_for_select(all_clinics, "id", "name", request_html_form_params.clinic_id),
                 onchange: raw("this.form.submit();")
@@ -54,7 +54,7 @@
           thead
             tr
               th Lab
-              th Description
+              th= t("thead.description")
               th Sample # Bottles
               th Sample Type
               th Frequency
@@ -74,8 +74,8 @@
               td = patient_rule.last_observed_at
               td = patient_rule.start_date
               td = patient_rule.end_date
-              th = link_to "Edit",
+              th = link_to t("btn.edit"),
                     edit_patient_pathology_patient_rule_path(patient_id: @patient, id: patient_rule.id)
-              th = link_to "Delete",
+              th = link_to t("btn.delete"),
                     patient_pathology_patient_rule_path(patient_id: @patient, id: patient_rule.id),
                     method: :delete

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

@@ -25,11 +25,11 @@
     - else
       dt= patient.hospital_identifier.name
       dd.selectable.clipboardable= patient.hospital_identifier.id
-    dt= t(".nhs_number")
+    dt= t(".thead.nhs_number")
     dd.selectable.clipboardable= formatted_nhs_number(patient)
-    dt= t(".sex")
+    dt= t(".thead.sex")
     dd= patient.sex
-    dt= t(".born_on")
+    dt= t(".thead.born_on")
     dd= "#{l(patient.born_on)} (#{patient.age}y)"
-    dt= t(".modality")
+    dt= t(".thead.modality")
     dd= patient.current_modality_description

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

@@ -1,3 +1,3 @@
 dl.sub-nav
-  dd= link_to "All", patients_path
+  dd= link_to t("btn.all"), patients_path
   dd= link_to "Deceased", patient_deaths_path

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

@@ -4,7 +4,7 @@
                   as: :patient_search,
                   url: search_form.url,
                   method: :get,
-                  html: { autocomplete: "off" } do |f|
+                  html: { autocomplete: "off", class: "fn-form" } do |f|
   .row
     .medium-5.columns
       = f.input :term, label: false, placeholder: "Search by patient surname, NHS or Hosp. no."

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

@@ -3,8 +3,8 @@
   .summary-part--bookmark-notes
     article
       header
-        h2 Bookmark
-        = link_to("Remove",
+        h2= t("titles.bookmark")
+        = link_to(t("btn.remove"),
                   bookmark_path(bookmark),
                   method: :delete,
                   data: { confirm: "Are you sure?" },
@@ -23,7 +23,7 @@
     article
       header
         h2 Worryboard notes
-        = link_to("Remove",
+        = link_to(t("btn.remove"),
                   patient_worry_path(summary_part.patient, summary_part.worry),
                   method: :delete,
                   data: { confirm: "Are you sure you want to remove the patient from the worryboard?" },