renalware-core 2.0.167 → 2.1.0

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             new_hd_cannulation_type_path,
             class: "button"
 
@@ -14,8 +14,8 @@
       - cannulation_types.each do |t|
         tr
           td.actions
-            = link_to "Edit", edit_hd_cannulation_type_path(t.id)
-            = link_to "Delete",
+            = link_to t("btn.edit"), edit_hd_cannulation_type_path(t.id)
+            = link_to t("btn.delete"),
                       hd_cannulation_type_path(t.id),
                       method: :delete,
                       data: { confirm: I18n.t("prompts.confirm_delete") }

data/app/views/renalware/hd/current_profile/_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
   = f.simple_fields_for :document, profile.document do |fd|
@@ -26,10 +26,11 @@ ruby:
                 hint: profile.schedule_hint
       = f.input :other_schedule,
                 wrapper: :horizontal_small
-      = f.association :named_nurse,
-                      as: :user_picker,
-                      collection: Renalware::User.ordered,
-                      wrapper: :horizontal_medium
+
+      = f.input :named_nurse_id,
+                as: :user_picker,
+                collection: Renalware::User.ordered,
+                wrapper: :horizontal_medium
 
     = render layout: "renalware/shared/fieldset",
              locals: { legend: "Prescription", name: "prescription" } do
@@ -134,4 +135,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/hd/current_profile/_show.html.slim

@@ -23,8 +23,7 @@
           legend: "Admin", destination: "admin",
           models: { profile => [:hospital_centre,
                                 :hospital_unit,
-                                :current_schedule,
-                                :named_nurse] }
+                                :current_schedule] }
 
       = render "renalware/shared/attributes_group",
           legend: "Transport", destination: "transport",

data/app/views/renalware/hd/current_profile/_summary.html.slim

@@ -2,8 +2,8 @@ article.hd-profile-summary
   header
     h2= t(".title")
     ul.noprint
-      li= link_to "View", patient_hd_current_profile_path(patient), class: "button"
-      li= link_to "Edit", edit_patient_hd_current_profile_path(patient), class: "button"
+      li= link_to t("btn.view"), patient_hd_current_profile_path(patient), class: "button"
+      li= link_to t("btn.edit"), edit_patient_hd_current_profile_path(patient), class: "button"
       li
         label.trigger-masonry-refresh#toggle-full-hd-profile(for="toggle-full-hd-profile-input") Toggle full profile
 
@@ -21,7 +21,7 @@ article.hd-profile-summary
     dt= t(".hd_type")
     dd= profile.hd_type
     dt= t(".named_nurse")
-    dd= profile.named_nurse
+    dd= profile.patient.named_nurse
     dt= t(".dialyser")
     dd= profile.dialyser
     dt= t(".dialysate")

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Edit", edit_patient_hd_current_profile_path(patient), class: :button
+  = link_to t("btn.edit"), edit_patient_hd_current_profile_path(patient), class: :button
 
 = within_patient_layout(title: "HD Profile",
                         breadcrumbs: hd_summary_breadcrumb(patient)) do

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

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

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

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

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to "Add",
+  = link_to t("btn.add"),
           new_hd_dialysate_path,
           class: "button"
 
@@ -17,12 +17,12 @@
         tr
           td
             - if policy(dialysate).edit?
-              = link_to "Edit", edit_hd_dialysate_path(dialysate)
+              = link_to t("btn.edit"), edit_hd_dialysate_path(dialysate)
             / Disabling destroy for now as it seems to let you delete a dialysate that is in use
             / Need to add a FK first
             / - if policy(dialysate).destroy?
             /   = pipe_separator
-            /   = link_to "Delete",
+            /   = link_to t("btn.delete"),
             /             hd_dialysate_path(dialysate),
             /             method: :delete,
             /             data: { confirm: "Are you sure?" }

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

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

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

@@ -1,6 +1,6 @@
 
 = content_for(:actions) do
-  = link_to "Add", new_hd_dialyser_path, class: "button"
+  = link_to t("btn.add"), new_hd_dialyser_path, class: "button"
 
 = within_new_admin_layout(title: "HD Dialysers") do
   table.auto-layout
@@ -15,8 +15,8 @@
       - dialysers.each do |dialyser|
         tr
           td.actions
-            = link_to "Edit", edit_hd_dialyser_path(dialyser.id)
-            = link_to "Delete",
+            = link_to t("btn.edit"), edit_hd_dialyser_path(dialyser.id)
+            = link_to t("btn.delete"),
                       hd_dialyser_path(dialyser.id),
                       method: :delete,
                       data: { confirm: I18n.t("prompts.confirm_delete") }

data/app/views/renalware/hd/historical_profiles/_summary.html.slim

@@ -2,7 +2,7 @@ article
   header
     h2.noprint= "HD Profile History (#{historical_profiles.length} of #{historical_profile_count})"
     ul
-      li= link_to "View All", patient_hd_historical_profiles_path(patient), class: "button"
+      li= link_to t("btn.view_all"), patient_hd_historical_profiles_path(patient), class: "button"
 
   = render "renalware/hd/historical_profiles/table",
            patient: patient,

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

@@ -19,7 +19,7 @@ table
     - historical_profiles.each do |profile|
       tbody
         tr
-          td= link_to("View", patient_hd_historical_profile_path(patient, profile))
+          td= link_to(t("btn.view"), patient_hd_historical_profile_path(patient, profile))
           - if compact
             td= l(profile.created_at&.to_date)
             td= l(profile.deactivated_at&.to_date)

data/app/views/renalware/hd/mdm/_sessions.html.slim

@@ -2,7 +2,7 @@ article
   header
     h2= t(".title")
     .noprint
-      =link_to t(".view_all"),
+      =link_to t("btn.view_all"),
                patient_hd_sessions_path(mdm.patient),
                class: "button left secondary"
   = render "renalware/hd/sessions/table", sessions: mdm.sessions

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

@@ -25,6 +25,6 @@
                 collection: Renalware::User.ordered.select(:id, :given_name, :family_name)
 
     .medium-2.columns.actions
-      = 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"), filter_form.url
+      = link_to t("btn.reset"), filter_form.url

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

@@ -3,29 +3,29 @@ 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= 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= sort_link(path, :current_access, t(".access"))
-      th.col-width-date= t(".access_started_on")
-      th.col-width-medium= sort_link(path, :access_plan_type, t(".access_plan"))
-      th.col-width-date= sort_link(path, :access_plan_date, t(".access_plan_date"))
-      th.col-width-date= t(".dialysing_at")
-      th.col-width-date= sort_link(path, :transplant_registration_status, t(".registration_status"))
-      th.show-for-xlarge-up.col-width-date= t(".schedule")
-      th.at-least.col-width-small= t(".transport_type")
-      th.col-width-tiny= sort_link(path, :hgb, t(".hgb"))
-      th.col-width-date= sort_link(path, :hgb_date, t(".hgb_date"))
-      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :phos, t(".phos"))
-      th.show-for-xlarge-up.col-width-date= sort_link(path, :phos_date, t(".phos_date"))
-      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :pot, t(".pot"))
-      th.show-for-xlarge-up.col-width-date= sort_link(path, :pot_date, t(".pot_date"))
-      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :pthi, t(".pthi"))
-      th.show-for-xlarge-up.col-width-date= sort_link(path, :pthi_date, t(".pthi_date"))
-      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :urr, t(".urr"))
-      th.show-for-xlarge-up.col-width-date= sort_link(path, :urr_date, t(".urr_date"))
+      th.col-width-large= sort_link(path, :family_name, 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-tiny= t(".thead.sex")
+      th.col-width-tiny= t(".thead.age")
+      th.col-width-medium= sort_link(path, :current_access, t(".thead.access"))
+      th.col-width-date= t(".thead.access_started_on")
+      th.col-width-medium= sort_link(path, :access_plan_type, t(".thead.access_plan"))
+      th.col-width-date= sort_link(path, :access_plan_date, t(".thead.access_plan_date"))
+      th.col-width-date= t(".thead.dialysing_at")
+      th.col-width-date= sort_link(path, :transplant_registration_status, t(".thead.registration_status"))
+      th.show-for-xlarge-up.col-width-date= t(".thead.schedule")
+      th.at-least.col-width-small= t(".thead.transport_type")
+      th.col-width-tiny= sort_link(path, :hgb, t(".thead.hgb"))
+      th.col-width-date= sort_link(path, :hgb_date, t(".thead.hgb_date"))
+      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :phos, t(".thead.phos"))
+      th.show-for-xlarge-up.col-width-date= sort_link(path, :phos_date, t(".thead.phos_date"))
+      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :pot, t(".thead.pot"))
+      th.show-for-xlarge-up.col-width-date= sort_link(path, :pot_date, t(".thead.pot_date"))
+      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :pthi, t(".thead.pthi"))
+      th.show-for-xlarge-up.col-width-date= sort_link(path, :pthi_date, t(".thead.pthi_date"))
+      th.show-for-xlarge-up.col-width-tiny= sort_link(path, :urr, t(".thead.urr"))
+      th.show-for-xlarge-up.col-width-date= sort_link(path, :urr_date, t(".thead.urr_date"))
 
   tbody
     = render partial: "patient",

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

@@ -12,6 +12,6 @@
             :hd_sites, :to_s, :id, :to_s,
             include_blank: true
       .small-4.medium-4.large-3.columns.actions.end
-        = f.submit t("helpers.submit.filter"), class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), hd_ongoing_sessions_path
+        = link_to t("btn.reset"), hd_ongoing_sessions_path

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

@@ -23,4 +23,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/hd/preference_sets/_summary.html.slim

@@ -2,7 +2,7 @@ article.hd-preference-sets
   header
     h2= t(".title")
     ul
-      li= link_to "Edit", edit_patient_hd_preference_set_path(patient), class: "button"
+      li= link_to t("btn.edit"), edit_patient_hd_preference_set_path(patient), class: "button"
 
   = definition_list_for(preference_set) do |list|
     = list.definition(:schedule_definition)

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

@@ -84,7 +84,7 @@
 
       .modal__footer
         .right
-          = fpa.submit "Save", class: "button"
+          = fpa.submit t("btn.save"), class: "button"
           |   
           = fpa.submit "Save and Witness Later",
                        name: "hd_prescription_administration[skip_witness_validation]",
@@ -92,7 +92,7 @@
                        class: "button secondary"
 
           '  or
-          = link_to "Cancel",
+          = link_to t("btn.cancel"),
                   "#",
                   "aria-label" => "Close",
                     class: "reveal-modal-close"

data/app/views/renalware/hd/protocols/_profile.html.slim

@@ -9,7 +9,7 @@ dl
   dd= profile.hd_type
 
   dt.new_line= t(".named_nurse")
-  dd= profile.named_nurse
+  dd= profile.patient.named_nurse
   dt= t(".needle_size")
   dd= profile.needle_size
   dt= t(".single_needle")

data/app/views/renalware/hd/scheduling/diaries/_page_actions.html.slim

@@ -19,5 +19,5 @@ li
     li= link_to "Edit stations", hd_unit_stations_path(unit)
 
 - if defined?(diary)
-  li= link_to "Print", hd_scheduling_unit_diary_path(unit, diary.id, format: :pdf), class: "button"
+  li= link_to t("btn.print"), hd_scheduling_unit_diary_path(unit, diary.id, format: :pdf), class: "button"
 / hd_unit_show_diary_path(year: date.year, week_number: date.cweek, format: :pdf),

data/app/views/renalware/hd/scheduling/diaries/_weekly_diary.html.slim

@@ -1,5 +1,5 @@
 tr[class = "#{'current-week' if weekly_diary.applies_to_current_week?}"]
-  td= link_to "View",
+  td= link_to t("btn.view"),
               hd_scheduling_unit_edit_diary_path(week_number: weekly_diary.week.week_number,
                                       year: weekly_diary.week.year)
   td= weekly_diary.week_number

data/app/views/renalware/hd/scheduling/diary_slots/_form.html.slim

@@ -67,7 +67,7 @@
   = f.submit "Add to this and all future weeks", class: "button secondary master", name: "master"
 
   = blank_separator
-  = link_to "Cancel",
+  = link_to t("btn.cancel"),
            "#",
            "aria-label" => "Close",
            class: "reveal-modal-close"

data/app/views/renalware/hd/scheduling/diary_slots/_slot.html.slim

@@ -13,7 +13,7 @@ td*{ "data-slot-id" => slot.id.present? && slot.id,
               data: { "reveal-id" => "add-patient-to-diary-modal",
                       "reveal-ajax" => "true" }
   - else
-    = link_to "Add",
+    = link_to t("btn.add"),
               new_hd_scheduling_diary_slot_path(diary_id: slot.diary_id,
                                      station_id: slot.station_id,
                                      diurnal_period_code_id: slot.diurnal_period_code_id,

data/app/views/renalware/hd/scheduling/diary_slots/_tab.html.slim

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

data/app/views/renalware/hd/session_forms/batches/_create.html.slim

@@ -19,7 +19,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/hd/sessions/_form_actions.html.slim

@@ -11,10 +11,10 @@
             data: { disable_with: t(".signoff_disable_with") }
   - if policy(session).destroy?
     |  
-    = link_to("Delete", patient_hd_session_path(patient, session),
+    = link_to(t("btn.delete"), patient_hd_session_path(patient, session),
               data: { confirm: t(".delete_confirmation") },
               method: :delete,
               class: "button alert")
   |  
   '  or
-  = link_to "cancel", back_path
+  = link_to t("btn.cancel"), back_path

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

@@ -2,7 +2,7 @@
   /with-tabs
   dl
     dd
-      = link_to "Details",
+      = link_to t("btn.details"),
                 patient_hd_sessions_path(patient)
                 /,data: { "trigger-masonry-refresh" => true }
     dd

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

@@ -15,14 +15,14 @@ article.hd-sessions
                     new_patient_hd_session_path(@patient, type: :dna),
                     class: :button
       - if policy.can_add_session?
-        li= link_to t(".add"),
+        li= link_to t("btn.add"),
                     new_patient_hd_session_path(@patient),
                     class: "button"
 
   .sub-nav.with-tabs
     dl
       dd.active
-        = link_to "Details", "#hd-sessions", data: { "trigger-masonry-refresh" => true }
+        = link_to t("btn.details"), "#hd-sessions", data: { "trigger-masonry-refresh" => true }
       dd
         = link_to "Drugs given", "#hd-session-drugs", data: { "trigger-masonry-refresh" => true }
 

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

@@ -1,6 +1,6 @@
 - if session.persisted?
   dl.sub-nav
     dd= link_to "HD Summary", patient_hd_dashboard_path(@patient)
-    dd= link_to "View", patient_hd_session_path(@patient, session)
+    dd= link_to t("btn.view"), patient_hd_session_path(@patient, session)
     - if policy(session).edit?
-      dd= link_to "Edit", edit_patient_hd_session_path(@patient, session)
+      dd= link_to t("btn.edit"), edit_patient_hd_session_path(@patient, session)

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

@@ -4,9 +4,9 @@ thead
   tr
     th.noprint
     th.noprint.col-width-small(rowspan=3)
-    th.col-width-date(rowspan=3 valign="top")= t(".date")
+    th.col-width-date(rowspan=3 valign="top")= t(".thead.date_")
     th.col-width-small= t(".site")
-    th.col-width-time= t(".time")
+    th.col-width-time= t(".thead.time_")
     th.col-width-time(rowspan=3)= t(".duration")
     th.col-width-tiny= t(".weight")
     th.col-width-tiny= t(".pulse")
@@ -21,7 +21,7 @@ thead
     th.col-width-tiny(rowspan=3)= t(".fluid_removed")
     th.col-width-tiny.text-center(colspan=3)= t(".machine")
     th.col-width-drugs.text-center.print-only(rowspan=3)= t(".hd_drugs_administered")
-    th.col-width-notes.text-center.print-only(rowspan=3)= t(".notes")
+    th.col-width-notes.text-center.print-only(rowspan=3)= t(".thead.notes")
     th.col-width-user.text-center.print-only= t(".user")
 
   tr.row2

data/app/views/renalware/hd/sessions/dna/_form.html.slim

@@ -33,9 +33,9 @@ ruby:
       = f.button :submit, value: t(".save")
       - if policy(session).destroy?
         |  
-        = link_to("Delete", patient_hd_session_path(patient, session),
+        = link_to(t("btn.delete"), patient_hd_session_path(patient, session),
                   data: { confirm: t(".delete_confirmation") },
                   method: :delete,
                   class: "button alert")
       |  
-      = link_to "cancel", back_path
+      = link_to t("btn.cancel"), back_path