renalware-core 2.0.167 → 2.1.0

data/app/views/renalware/accesses/profiles/_form.html.slim

@@ -5,7 +5,7 @@ ruby:
   .medium-6.columns
     = f.button :submit
     '  or
-    = link_to "cancel", back_path
+    = link_to t("btn.cancel"), back_path
 
 .form-content
   = render layout: "renalware/shared/fieldset",
@@ -32,4 +32,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/accesses/profiles/_list.html.slim

@@ -18,8 +18,8 @@ article.access-profiles
       - profiles.each do |profile|
         tr
           td.actions
-            = link_to "View", patient_accesses_profile_path(patient, profile)
-            = link_to "Edit", edit_patient_accesses_profile_path(patient, profile)
+            = link_to t("btn.view"), patient_accesses_profile_path(patient, profile)
+            = link_to t("btn.edit"), edit_patient_accesses_profile_path(patient, profile)
           td= profile.formed_on
           td= profile.started_on
           td= profile.terminated_on

data/app/views/renalware/accesses/profiles/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit",
+  = link_to t("btn.edit"),
           edit_patient_accesses_profile_path(patient, profile),
           class: "button"
 

data/app/views/renalware/admin/feeds/files/index.html.slim

@@ -38,7 +38,7 @@
           td= "#{(file.time_taken.to_f / 1000.0).round(2)}s" if file.time_taken?
           td.col-width-large-with-ellipsis.css-toggle-container
             - if file.result?
-              = link_to "Toggle",
+              = link_to t("btn.toggle"),
                 "#file-#{file.id} .css-toggle-container",
                 class: "button compact low-key",
                 title: file.result,

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

@@ -1,11 +1,11 @@
 .filters
   .filters__form
-    = search_form_for user_search, url: admin_users_path do |f|
+    = search_form_for user_search, url: admin_users_path, html: { class: "fn-form" } do |f|
       .row
         .small-9.large-4.columns
           = f.label "Name or username contains"
           = f.search_field :family_name_or_given_name_or_username_or_email_cont
         .small-3.large-4.columns.actions.end
-          = f.submit t("helpers.submit.filter"), class: "button"
+          = f.submit t("btn.filter"), class: "button"
           '  or
-          = link_to t("helpers.reset"), admin_users_path
+          = link_to t("btn.reset"), admin_users_path

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

@@ -1,6 +1,6 @@
 dl.sub-nav.no-js-selection
   dd(class=("active" if params.fetch(:q, {}).empty?))
-    = link_to "All", admin_users_path(q: nil)
+    = link_to t("btn.all"), admin_users_path(q: nil)
   dd(class=("active" if params.fetch(:q, {})[:unapproved]))
     = link_to "Unapproved", admin_unapproved_users_path
   dd(class=("active" if params.fetch(:q, {})[:expired]))

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

@@ -64,4 +64,4 @@
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
     '  or
-    = link_to "cancel", admin_users_path
+    = link_to t("btn.cancel"), admin_users_path

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

@@ -31,7 +31,7 @@
     tbody
       - users.each do |user|
         = content_tag_for(:tr, user) do
-          td= link_to "Edit", edit_admin_user_path(user) if policy(user).update?
+          td= link_to t("btn.edit"), edit_admin_user_path(user) if policy(user).update?
           td= user.id
           td= user.to_s
           td= user.username

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

@@ -4,9 +4,9 @@
   article
     header
       h2
-        = link_to "Admissions (#{summary_part.admissions_count})", view_all_url
+        = link_to "#{t('titles.admissions')} (#{summary_part.admissions_count})", view_all_url
       ul
-        li= link_to "View All", view_all_url, class: "button"
+        li= link_to t("btn.view_all"), view_all_url, class: "button"
 
     - if summary_part.admissions.any?
       = render "renalware/admissions/admissions/table",

data/app/views/renalware/admissions/admissions/_filters.html.slim

@@ -10,6 +10,6 @@
       .w-full.sm:min-w-md.pr-2= ward_dropdown_grouped_by_hospital_unit(f, :hospital_ward_id, label: "Ward", wrapper: nil)
       .w-full.sm:min-w-xs.pr-2= f.input :status, collection: form.status_dropdown_options, include_blank: "Any"
       .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"), admissions_admissions_path
+        = link_to t("btn.reset"), admissions_admissions_path

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

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

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

@@ -7,7 +7,7 @@
           th.col-width-tiny(rowspan=2)
         th.col-width-medium(rowspan=2) Site/Ward
         - unless compact
-          th.at-least.col-width-medium(rowspan=2) Patient
+          th.at-least.col-width-medium(rowspan=2)= t("thead.patient")
           th.col-width-nhs-no(rowspan=2) NHS No.
           th.col-width-reference-no(rowspan=2) Hosp Nos.
           th.col-width-smal(rowspan=2) Modality
@@ -32,7 +32,7 @@
           - unless compact
             td
               - if policy(admission).edit?
-                = link_to "Edit", edit_admissions_admission_path(admission)
+                = link_to t("btn.edit"), edit_admissions_admission_path(admission)
           td= admission.unit_and_ward
           - unless compact
             td= default_patient_link(admission.patient)
@@ -49,7 +49,7 @@
           td= admission.summarised_on
           td
             - if admission.discharge_summary.present?
-             = link_to("Toggle",
+             = link_to(t("btn.toggle"),
                        "#admission-quick-preview-#{admission.id}",
                        data: { behaviour: "toggler" })
             - else

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to("Add", new_admissions_admission_path, class: :button)
+  = link_to(t("btn.add"), new_admissions_admission_path, class: :button)
 
 = content_for(:filters) do
   = render "filters", form: form

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

@@ -36,6 +36,6 @@
                   collection: Renalware::Modalities::Description.pluck("name", "id"),
                   label: "Modality"
       .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"), admissions_consults_path(reset: 1)
+        = link_to t("btn.reset"), admissions_consults_path(reset: 1)

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

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

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

@@ -6,10 +6,10 @@
 #consults.summary-part--consults
   article
     header
-      h2= link_to("Consults (#{summary_part.consults_count})", view_all_url)
+      h2= link_to("#{t('titles.consults')} (#{summary_part.consults_count})", view_all_url)
 
       ul
-        li= link_to("View All", view_all_url, class: "button")
+        li= link_to(t("btn.view_all"), view_all_url, class: "button")
 
     - if summary_part.consults.any?
       = render "renalware/admissions/consults/table",

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

@@ -1,7 +1,7 @@
 - content_for(:body_class) { "consults-list" }
 
 = content_for(:actions) do
-  = link_to("Add", new_admissions_consult_path, class: :button)
+  = link_to(t("btn.add"), new_admissions_consult_path, class: :button)
   = link_to(admissions_consults_path(q: params[:q]&.permit!, format: :pdf), class: "button secondary") do
     i.fas.fa-print
     | Print (PDF)

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

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

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

@@ -23,7 +23,7 @@
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
       '  or
-      = link_to "Cancel",
+      = link_to t("btn.cancel"),
                "#",
                "aria-label" => "Close",
                 class: "reveal-modal-close"

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

@@ -25,7 +25,7 @@ ruby:
               data: { confirm: "Are you sure you want to remove this item?" } do
       i.fas.fa-trash.fa-link-annotation
       |  |  
-      = link_to "Edit",
+      = link_to t("btn.edit"),
                 edit_admissions_request_path(request, format: :html),
                 data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }
   td.handle

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

@@ -2,7 +2,7 @@ article.clinical-allergies
   header
     h2= t(".legend")
     / Link to launch the modal dialog
-    = link_to t(".add"),
+    = link_to t("btn.add"),
               "#",
               class: "button right",
               data: { "reveal-id" => "add-allergy-modal" }
@@ -14,7 +14,7 @@ article.clinical-allergies
   table.natural-width
     thead
       tr
-        th.col-width-large= t(".description")
+        th.col-width-large= t(".thead.description")
         th.col-width-date-time= t(".recorded_at")
         th.col-width-medium= t(".recorded_by")
         th.col-width-tiny
@@ -32,7 +32,7 @@ article.clinical-allergies
                       data: { confirm: delete_confirmation_msg }
 
   = render "renalware/clinical/allergies/new",
-           link_text: t(".add"),
+           link_text: t("btn.add"),
            patient: patient
 
   = render "renalware/clinical/allergy_statuses/form", patient: patient

data/app/views/renalware/clinical/body_compositions/_form.html.slim

@@ -45,4 +45,4 @@
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", patient_clinical_profile_path(patient)
+    = link_to t("btn.cancel"), patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/body_compositions/_list.html.slim

@@ -2,10 +2,10 @@ article.body_compositions
   header
     h2.title= defined?(limit) ? t(".recent.title") : t(".title")
     ul
-      li= link_to t(".add"),
+      li= link_to t("btn.add"),
               new_patient_clinical_body_composition_path(patient),
               class: "button right"
-      li= link_to t(".view_all"),
+      li= link_to t("btn.view_all"),
               patient_clinical_body_compositions_path(patient),
               class: "button"
 

data/app/views/renalware/clinical/body_compositions/_table.html.slim

@@ -4,7 +4,7 @@ table
       th.togglers= table_toggler
       th.col-width-tiny
       th.col-width-date= t(".assessed_on")
-      th= t(".modality_description")
+      th= t(".thead.modality")
       th= t(".assessor")
       th.col-width-tiny= t(".pre_post_hd")
       th.col-width-tiny= t(".weight")
@@ -26,8 +26,8 @@ table
       tr
         td= toggler("#bcm-quick-preview-#{body_composition.id}")
         td.actions
-          = link_to "View", patient_clinical_body_composition_path(patient, body_composition)
-          = link_to "Edit", edit_patient_clinical_body_composition_path(patient, body_composition)
+          = link_to t("btn.view"), patient_clinical_body_composition_path(patient, body_composition)
+          = link_to t("btn.edit"), edit_patient_clinical_body_composition_path(patient, body_composition)
         td= body_composition.assessed_on
         td= body_composition.modality_description&.name
         td= body_composition.assessor

data/app/views/renalware/clinical/body_compositions/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_clinical_body_composition_path(patient, body_composition),
             class: "button"
 

data/app/views/renalware/clinical/dry_weights/_form.html.slim

@@ -15,4 +15,4 @@
   .large-12.columns
     = f.button :submit
     '  or
-    = link_to "cancel", return_url
+    = link_to t("btn.cancel"), return_url

data/app/views/renalware/clinical/dry_weights/_list.html.slim

@@ -10,7 +10,7 @@ article.dry-weights.simple.simple-table
   header
     h2.title= defined?(limit) ? t(".recent.title") : t(".title")
     ul
-      li= link_to t(".add"), new_patient_clinical_dry_weight_path(patient), class: "button"
-      li= link_to t(".view_all"), patient_clinical_dry_weights_path(patient), class: "button secondary"
+      li= link_to t("btn.add"), new_patient_clinical_dry_weight_path(patient), class: "button"
+      li= link_to t("btn.view_all"), patient_clinical_dry_weights_path(patient), class: "button secondary"
 
   = render "renalware/clinical/dry_weights/table", dry_weights: presenter.dry_weights

data/app/views/renalware/clinical/dry_weights/_table.html.slim

@@ -1,7 +1,7 @@
 table.auto-layout
   thead
-    th.col-width-date= t(".date")
-    th.col-width-small= t(".weight")
-    th= t(".assessor")
+    th.col-width-date= t(".thead.date_")
+    th.col-width-small= t(".thead.weight")
+    th= t(".thead.assessor")
   tbody
     = render dry_weights

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

@@ -17,6 +17,10 @@
                           as: :user_picker,
                           collection: Renalware::User.consultants,
                           wrapper: :horizontal_medium
+          = f.association :named_nurse,
+                      as: :user_picker,
+                      collection: Renalware::User.ordered,
+                      wrapper: :horizontal_medium
 
       = f.simple_fields_for :document, patient.document do |fdoc|
         .columns.large-12
@@ -37,4 +41,4 @@
           .columns.large-12.form-actions
             = submit_tag "Update", class: "button"
             '  or
-            = link_to "Cancel", patient_clinical_profile_path(patient)
+            = link_to t("btn.cancel"), patient_clinical_profile_path(patient)

data/app/views/renalware/clinical/profiles/show.html.slim

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
+  = link_to t("btn.edit"), edit_patient_clinical_profile_path(patient), class: "button"
 
 = within_patient_layout(title: "Clinical Profile") do
   .mgrid
@@ -8,6 +8,7 @@
         = article_tag("General") do
           = definition_list_for(patient) do |list|
             = list.definition(:named_consultant)
+            = list.definition(:named_nurse)
 
       .columns.medium-6
         article
@@ -39,7 +40,7 @@
         article
           header
             h2 Death Record
-            = link_to "Update", edit_patient_death_path(patient), class: "button"
+            = link_to t("btn.update"), edit_patient_death_path(patient), class: "button"
 
           - if patient.died_on.present?
 

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

@@ -14,10 +14,10 @@
                     collection: Renalware::Renal::Consultant.pluck(:name, :id),
                     label: "Consultant")
         .medium-3.large-3.columns.actions.end
-          = f.submit "Filter", class: "button"
+          = f.submit t("btn.filter"), class: "button"
 
 = content_for(:actions) do
-  = link_to "Add",
+  = link_to t("btn.add"),
           new_appointment_path,
           class: "button"
   = simple_form_for request_html_form_params,
@@ -74,7 +74,7 @@
           tr
             td= check_box_tag nil, appointment.patient.id, true, class: "patient_checkbox"
             td.nowrap.actions
-              = link_to("Toggle",
+              = link_to(t("btn.toggle"),
                        "#appointment-quick-preview-#{appointment.id}",
                        data: { behaviour: "toggler" })
               - if appointment.becomes_visit_id.present?

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim

@@ -2,10 +2,10 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.noprint= toggler("#clinic_visit-quick-preview-#{clinic_visit.id}")
   td.noprint.actions
     - if policy(clinic_visit).edit?
-      = link_to "Edit",
+      = link_to t("btn.edit"),
                 edit_patient_clinic_visit_path(patient, clinic_visit)
     - if policy(clinic_visit).destroy?
-      = link_to "Delete",
+      = link_to t("btn.delete"),
                 patient_clinic_visit_path(patient, clinic_visit),
                 method: :delete,
                 data: { confirm: I18n.t("prompts.confirm_delete") }

data/app/views/renalware/clinics/clinic_visits/edit.html.slim

@@ -11,4 +11,4 @@
       wrapper: :horizontal_form do |f|
 
       = render "form", f: f
-      = f.submit "Update", class: "button"
+      = f.submit t("btn.update"), class: "button"

data/app/views/renalware/clinics/clinic_visits/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_clinic_visit_path(patient),
             class: "button"
 

data/app/views/renalware/clinics/clinic_visits/new.html.slim

@@ -14,6 +14,6 @@
 
       = render "form", f: f
 
-      = f.submit "Save", class: "button"
+      = f.submit t("btn.save"), class: "button"
       '  or
-      = link_to "cancel", patient_clinic_visits_path(patient)
+      = link_to t("btn.cancel"), patient_clinic_visits_path(patient)

data/app/views/renalware/clinics/visits/_filters.html.slim

@@ -14,9 +14,9 @@
         .medium-3.large-2.columns
           = f.input :created_by_id_eq, as: :user_picker, collection: users, label: "Clinician"
         .medium-2.large-3.columns.actions.end
-          = f.submit "Filter", class: "button"
+          = f.submit t("btn.filter"), class: "button"
           '  or
-          = link_to t("helpers.reset"), clinic_visits_path
+          = link_to t("btn.reset"), clinic_visits_path
 
   .filters__output