renalware-core 2.0.167 → 2.1.0

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

@@ -4,16 +4,16 @@ table.auto-layout
       th.at-least.col-width-medium= sort_link(search,
                                               :patient,
                                               ["patient_family_name", "patient_given_name asc"],
-                                              t(".patient_name"))
-      th.col-width-nhs-no= t(".nhs_number")
-      th.col-width-reference-no= t(".hospital_number")
-      th.col-width-date= t(".born_on")
-      th.col-width-tiny= t(".age")
-      th.col-width-tiny= t(".sex")
-      th.col-width-medium= sort_link(search, :modality_desc, t(".modality"))
-      th= t(".notes")
-      th= t(".tags")
-      th.col-width-date-time= sort_link(search, :created_at, t(".bookmarked_on"))
+                                              t(".thead.patient_name"))
+      th.col-width-nhs-no= t(".thead.nhs_number")
+      th.col-width-reference-no= t(".thead.hospital_number")
+      th.col-width-date= t(".thead.born_on")
+      th.col-width-tiny= t(".thead.age")
+      th.col-width-tiny= t(".thead.sex")
+      th.col-width-medium= sort_link(search, :modality_desc, t(".thead.modality"))
+      th= t(".thead.notes")
+      th= t(".thead.tags")
+      th.col-width-date-time= sort_link(search, :created_at, t(".thead.bookmarked_on"))
       th.col-width-tiny
 
   tbody

data/app/views/renalware/patients/clinical_summaries/show.html.slim

@@ -4,7 +4,7 @@
 / content in this show template and are concerned about catching markup changes in
 / nested templates
 -# Template Dependency: renalware/**/summary_part
-= within_patient_layout(title: "Clinical Summary") do
+= within_patient_layout(title: t(".page_title")) do
   .row
     - summary_parts = clinical_summary.summary_parts(current_user).each do |summary_part|
       = render summary_part

data/app/views/renalware/patients/mdms/_filters.html.slim

@@ -33,6 +33,6 @@
           = f.input "#{column}_cont", label: column.humanize
 
     .w-full.sm:max-w-xs.pr-2
-      = f.submit "Filter", class: "button secondary", style: "margin-bottom: 10px"
+      = f.submit t("btn.filter"), class: "button secondary", style: "margin-bottom: 10px"
       |  
-      = link_to "Clear", url
+      = link_to t("btn.clear"), url

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"), new_patient_path, class: "button"
+  = link_to t("btn.add"), new_patient_path, class: "button"
 
 = content_for(:tabs) do
   = render "renalware/patients/index_header"

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

@@ -1,7 +1,7 @@
 = content_for(:actions) do
-  = link_to "Edit", edit_patient_path(patient), class: "button"
+  = link_to t("btn.edit"), edit_patient_path(patient), class: "button"
 
-= within_patient_layout(title: "Demographics") do
+= within_patient_layout(title: t(".page_title")) do
   #patient-demographics
     .mgrid
       .row

data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim

@@ -2,14 +2,14 @@ article
   header
     h2 GP
     - if patient.primary_care_physician.present?
-      = link_to "Remove",
+      = link_to t("btn.remove"),
                 patient_primary_care_physician_path(patient, patient.primary_care_physician),
                 class: "button button-danger remove-gp",
                 data: { remote: true,
                         method: :delete,
                         confirm: "Are you sure you want to remove the patient's GP and practice?" }
 
-    = link_to "Change",
+    = link_to t("btn.change"),
               edit_patient_primary_care_physician_path(patient, format: :html),
               class: "button change-gp",
               data: { "reveal-id" => "change-gp-modal", "reveal-ajax" => "true" }

data/app/views/renalware/patients/primary_care_physician/_form.html.slim

@@ -11,11 +11,11 @@
             label: "Now choose a GP",
             input_html: { class: "searchable_select", required: :required, tabindex: 2001 }
   br
-  = f.submit "Save",
+  = f.submit t("btn.save"),
               class: "button",
               data: { disable_with: "Saving.." }
   |  
-  = link_to "Cancel",
+  = link_to t("btn.cancel"),
             "#",
             "aria-label" => "Close",
             class: "reveal-modal-close"

data/app/views/renalware/patients/primary_care_physicians/_form.html.slim

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

data/app/views/renalware/patients/primary_care_physicians/_primary_care_physician.html.slim

@@ -1,8 +1,8 @@
 tr
   td.actions
-    = link_to "Edit",
+    = link_to t("btn.edit"),
               edit_patients_primary_care_physician_path(primary_care_physician)
-    = link_to "Delete",
+    = link_to t("btn.delete"),
               patients_primary_care_physician_path(primary_care_physician),
               method: :delete
   td

data/app/views/renalware/patients/primary_care_physicians/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"), new_patients_primary_care_physician_path, class: "button"
+  = link_to t("btn.add"), new_patients_primary_care_physician_path, class: "button"
 
 = within_new_admin_layout(title: "Primary Care Physicians") do
   table.primary-care-physicians

data/app/views/renalware/patients/worryboard/_filters.html.slim

@@ -15,6 +15,6 @@
                   label: "Added by"
 
       .flex-shrink-0.pt-4.filters--actions
-        = f.submit "Filter", class: "button", style: "margin: 0"
+        = f.submit t("btn.filter"), class: "button", style: "margin: 0"
         '  or
-        = link_to t("helpers.reset"), worryboard_path
+        = link_to t("btn.reset"), worryboard_path

data/app/views/renalware/patients/worryboard/_table.html.slim

@@ -6,8 +6,8 @@ table#patients
                    :patient_family_name,
                    [:patient_family_name, "patient_given_name asc"],
                    "Name")
-      th.col-width-nhs-no NHS No.
-      th.col-width-reference-no Hosp No.
+      th.col-width-nhs-no= t("thead.nhs_number")
+      th.col-width-reference-no= t("thead.hospital_number")
       th.col-width-tiny Sex
       th.col-width-date Date of Birth
       th.col-width-tiny.show-for-large-up Age

data/app/views/renalware/pd/_exit_site_infections.html.slim

@@ -5,14 +5,14 @@ table
     th Organisms
     th Outcome
     th Treatment
-    th.col-width-date= t("updated_at")
+    th.col-width-date= t(".thead.updated_at")
 
   tbody
     - exit_site_infections.each do |e|
       tr valign="top"
         td valign="top"
           - unless current_user.has_role?(:read_only)
-          = link_to "View",
+          = link_to t("btn.view"),
                     patient_pd_exit_site_infection_path(patient, e.id),
                     class: "view-es-infection",
                     id: "view-es-infection-#{e.id}"

data/app/views/renalware/pd/_peritonitis_episodes.html.slim

@@ -12,13 +12,13 @@ table
       th Episode Type
       th Organisms
       th Outcome
-      th.col-width-date= t("updated_at")
+      th.col-width-date= t(".thead.updated_at")
 
   tbody
     - peritonitis_episodes.each do |episode|
       tr valign="top"
         td valign="top"
-          = link_to "View",
+          = link_to t("btn.view"),
                     patient_pd_peritonitis_episode_path(patient, episode.id),
                     class: "view-pe",
                     id: "view-pe-#{episode.id}"

data/app/views/renalware/pd/_pet_adequacies.html.slim

@@ -10,14 +10,14 @@ table
       th CrCl RRF
       th Daily urine
       th Daily UF
-      th.col-width-date=t("updated_at")
+      th.col-width-date=t(".thead.updated_at")
 
   tbody
     - pet_adequacies.each do |pet_adequacy|
       tr data-assessment-id="#{pet_adequacy.id}" valign="top"
         td.actions
-          = link_to "View", patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
-          = link_to "Edit", edit_patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
+          = link_to t("btn.view"), patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
+          = link_to t("btn.edit"), edit_patient_pd_pet_adequacy_result_path(patient, pet_adequacy.id)
         td= l(pet_adequacy.pet_date)
         td= pet_adequacy.pet_type&.text
         td= pet_adequacy.ktv_total

data/app/views/renalware/pd/_regimes.html.slim

@@ -16,10 +16,10 @@ table(class=table_class)
         td.actions
           / TODO: Use a policy
           - if r.current? && !current_user.has_role?(:read_only)
-            = link_to "Update",
+            = link_to t("btn.update"),
                       edit_patient_pd_regime_path(patient, r.id),
                       class: "update-pd-regime"
-          = link_to "View",
+          = link_to t("btn.view"),
                     patient_pd_regime_path(patient, r.id),
                     class: "view-pd-regime"
         td= l r.start_date

data/app/views/renalware/pd/adequacy_completions/_filters.html.slim

@@ -14,6 +14,6 @@
                   label: "Complete"
 
       .columns.medium-2.large-2.actions.end
-        = f.submit "Filter", class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), pd_adequacy_completions_path
+        = link_to t("btn.reset"), pd_adequacy_completions_path

data/app/views/renalware/pd/adequacy_results/_table.html.slim

@@ -13,7 +13,7 @@ table.toggleable(data-controller="toggle")
       - if Pundit.policy(current_user, Renalware::PD::AdequacyResult).edit? # only eg admin can edit or delete
         th.col-width-tiny
       - if local_assigns.fetch(:display_patient, false)
-        th.col-width-medium Patient
+        th.col-width-medium= t("thead.patient")
       th.col-width-date Date
       th.col-width-tiny
         i.far.fa-check-circle(title="Complete")
@@ -27,7 +27,7 @@ table.toggleable(data-controller="toggle")
       th Dial 24 vol in
       th Dial24UF
       th DPI
-      th.col-width-date=t("updated_at")
+      th.col-width-date=t(".thead.updated_at")
 
   - results.each do |result|
     tbody
@@ -41,11 +41,11 @@ table.toggleable(data-controller="toggle")
                   i.fas.fa-external-link-alt
                   |  Edit
               - else
-                = link_to "Edit",
+                = link_to t("btn.edit"),
                           renalware.edit_patient_pd_adequacy_result_path(result.patient, result)
 
             - if Pundit.policy(current_user, result).destroy?
-              = link_to "Delete",
+              = link_to t("btn.delete"),
                         renalware.patient_pd_adequacy_result_path(result.patient, result),
                         data: { method: :delete, confirm: "Are you sure?" }
         - if local_assigns.fetch(:display_patient, false)

data/app/views/renalware/pd/adequacy_results/edit.html.slim

@@ -84,6 +84,6 @@
             td= f.text_field :urine_k
 
     br
-    = f.submit "Save", class: :button
+    = f.submit t("btn.save"), class: :button
     '  or
-    = link_to "cancel", patient_pd_dashboard_path(patient)
+    = link_to t("btn.cancel"), patient_pd_dashboard_path(patient)

data/app/views/renalware/pd/adequacy_results/new.html.slim

@@ -3,6 +3,6 @@
 
   = simple_form_for(adequacy, url: renalware.patient_pd_adequacy_results_path(adequacy.patient), wrapper: :horizontal_form) do |f|
     = render "form_fields", form: f
-    = f.submit "Save", class: :button
+    = f.submit t("btn.save"), class: :button
     '  or
-    = link_to "cancel", patient_pd_dashboard_path(adequacy.patient)
+    = link_to t("btn.cancel"), patient_pd_dashboard_path(adequacy.patient)

data/app/views/renalware/pd/assessments/_form.html.slim

@@ -48,6 +48,6 @@
                   wrapper: :horizontal_large
     = fdoc.input :added_comments, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
 
-  = f.submit "Save", class: "button"
+  = f.submit t("btn.save"), class: "button"
   '  or
-  = link_to "cancel", patient_pd_dashboard_path(patient)
+  = link_to t("btn.cancel"), patient_pd_dashboard_path(patient)

data/app/views/renalware/pd/assessments/_list.html.slim

@@ -18,9 +18,9 @@ article.pd_assessments
         tr
           td.actions
             - if policy(assessment).edit?
-              = link_to("Edit", edit_patient_pd_assessment_path(patient, assessment))
+              = link_to(t("btn.edit"), edit_patient_pd_assessment_path(patient, assessment))
             - if policy(assessment).show?
-              = link_to("View", [patient, assessment])
+              = link_to(t("btn.view"), [patient, assessment])
           td= l(assessment.created_at)
           td= document.assessed_on.is_a?(Date) ? l(document.assessed_on) : document.assessed_on
           td= document.assessor

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("edit_record.link_title"),
+  = link_to t("btn.edit"),
             edit_patient_pd_assessment_path(patient, assessment),
             class: "button"
 

data/app/views/renalware/pd/bag_types/_form.html.slim

@@ -5,7 +5,7 @@
   = f.input :id, as: :hidden unless f.object.new_record?
   = f.input :manufacturer,
             collection: manufacturer_options,
-            prompt: t(".collection.blank_option"),
+            prompt: t("collection.blank_option"),
             input_html: { class: "manufacturer-select" },
             wrapper: :horizontal_small
   = f.input :description, wrapper: :horizontal_medium
@@ -28,4 +28,4 @@
 
   = f.button :submit
   '  or
-  = link_to "Cancel", pd_bag_types_path
+  = link_to t("btn.cancel"), pd_bag_types_path

data/app/views/renalware/pd/bag_types/_header.html.slim

@@ -1,5 +1,5 @@
 h1 PD Bags
 
 dl.sub-nav
-  dd= link_to "List", pd_bag_types_path
+  dd= link_to t("btn.list"), pd_bag_types_path
   dd= link_to "Add bag type", new_pd_bag_type_path

data/app/views/renalware/pd/bag_types/index.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"), new_pd_bag_type_path, class: "button"
+  = link_to t("btn.add"), new_pd_bag_type_path, class: "button"
 
 = within_new_admin_layout do
   table
@@ -7,7 +7,7 @@
       tr
         th
         th Manufacturer
-        th Description
+        th= t("thead.description")
         th Glucose (g/l)
         th Glucose Strength
         th Amino acid
@@ -24,8 +24,8 @@
       - bag_types.each do |bt|
         tr
           td.actions
-            = link_to "Edit", edit_pd_bag_type_path(bt.id), id: "edit-bag-type-#{bt.id}"
-            = link_to "Delete",
+            = link_to t("btn.edit"), edit_pd_bag_type_path(bt.id), id: "edit-bag-type-#{bt.id}"
+            = link_to t("btn.delete"),
                       pd_bag_type_path(bt.id),
                       method: :delete,
                       id: "delete-bag-type-#{bt.id}",

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

@@ -4,7 +4,7 @@ article.apd-regimes
     .supplemental
       = collection_count(apd_regimes)
     span.noprint
-      = link_to "View All",
+      = link_to t("btn.view_all"),
                 patient_pd_apd_regimes_path(patient),
                 class: "button secondary"
 

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

@@ -4,7 +4,7 @@ article.capd-regimes
     .supplemental
       = collection_count(capd_regimes)
     span.noprint
-      = link_to "View All",
+      = link_to t("btn.view_all"),
                 patient_pd_capd_regimes_path(patient),
                 class: "button secondary"
 

data/app/views/renalware/pd/dashboards/show/_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/pd/exit_site_infections/_details.html.slim

@@ -17,7 +17,7 @@
       dd= yes_no_if_set(exit_site_infection.public_send(option))
 
   .right
-    = link_to "Edit",
+    = link_to t("btn.edit"),
               edit_patient_pd_exit_site_infection_path(patient, exit_site_infection),
               remote: true,
               class: %i(button tiny)

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

@@ -1,5 +1,5 @@
 = simple_form_for [patient, exit_site_infection],
-                  html: { class: local_assigns[:form_class], autocomplete: "off" },
+                  html: { class: [local_assigns[:form_class], "fn-form"].compact.join(" "), autocomplete: "off" },
                   remote: true,
                   wrapper: :horizontal_form do |f|
 
@@ -7,6 +7,6 @@
 
   = f.button :submit, "Save"
   '  or
-  = link_to "cancel",
+  = link_to t("btn.cancel"),
             patient_pd_exit_site_infection_path(patient, exit_site_infection),
             remote: true

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

@@ -8,4 +8,4 @@
 
     = submit_tag "Save", class: "button"
     '  or
-    = link_to "cancel", patient_pd_exit_site_infection_path(patient, exit_site_infection)
+    = link_to t("btn.cancel"), patient_pd_exit_site_infection_path(patient, exit_site_infection)

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

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

data/app/views/renalware/pd/infection_organisms/_form.html.slim

@@ -1,4 +1,4 @@
-= simple_form_for infection_organism, url: url, html: { class: local_assigns[:form_class] },
+= simple_form_for infection_organism, url: url, html: { class: [local_assigns[:form_class], "fn-form"].compact.join(" ") },
     wrapper: :horizontal_form, remote: true do |f|
 
   = f.input :organism_code_id, collection: Renalware::PD::OrganismCode.all,
@@ -13,4 +13,4 @@
     .large-offset-3.large-7.columns
       = f.button :submit, "Save", class: :tiny
       '  or
-      = link_to "cancel", pd_infection_organisms_path(infectable), remote: true
+      = link_to t("btn.cancel"), pd_infection_organisms_path(infectable), remote: true