renalware-core 2.0.164 → 2.1.1

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

@@ -1,5 +1,5 @@
 = simple_form_for event,
-    url: patient_events_path(patient, event),
+    url: url,
     as: :events_event,
     html: { autocomplete: "off" },
     wrapper: "horizontal_form" do |f|
@@ -34,4 +34,4 @@
 
   = submit_tag "Save", class: "button"
   '  or
-  = link_to "Cancel", return_url
+  = link_to t("btn.cancel"), return_url

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

@@ -2,14 +2,12 @@
   #events.summary-part--events
     article
       header
-        h2= link_to "Events (#{summary_part.recent_events_count})",
+        h2= link_to "#{t('titles.events')} (#{summary_part.recent_events_count})",
                     patient_events_path(summary_part.patient)
 
         ul
-          li= link_to new_patient_event_path(summary_part.patient), class: "button" do
-            | Add
-          li= link_to patient_events_path(summary_part.patient), class: "button" do
-            | View All
+          li= link_to t("btn.add"), new_patient_event_path(summary_part.patient), class: "button"
+          li= link_to t("btn.view_all"), patient_events_path(summary_part.patient), class: "button"
 
       - if summary_part.recent_events.any?
         = render "renalware/events/events/table", events: summary_part.recent_events

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

@@ -4,16 +4,15 @@ table.has-togglable-rows.events-table
   thead
     tr
       th.noprint.togglers= table_toggler
-      - if local_assigns[:edit_proc]
-        th.col-width-tiny
-      th.col-width-date=t(".created_at")
+      th.col-width-tiny
+      th.col-width-date=t(".thead.created_at")
       - unless local_assigns.fetch(:exclude_type_column, false)
-        th.col-width-large= t(".type")
+        th.col-width-large= t(".thead.type")
       - if local_assigns.fetch(:include_patient_column, false)
         th.col-width-large= t(".patient")
-      th= local_assigns.fetch(:description_column_title, t(".description"))
-      th.created_at.col-width-date-time= t(".date_time")
-      th.created_by.col-width-medium= t(".created_by")
+      th= local_assigns.fetch(:description_column_title, t(".thead.description"))
+      th.created_at.col-width-date-time= t(".thead.date_time")
+      th.created_by.col-width-medium= t(".thead.created_by")
   tbody
     / Note we can't use cached: true yet when rendering the events collection, as each row is
     / used in a different context and displays there slightly differently, for example showing

data/app/views/renalware/events/events/edit.html.slim

@@ -0,0 +1,10 @@
+= within_patient_layout(\
+    title: "Event / Edit",
+    breadcrumbs:  breadcrumb_for("Events", patient_events_path(patient)) \
+  ) do
+
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_event_path(patient, event)

data/app/views/renalware/events/events/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_event_path(events.patient),
             class: "button"
 

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

@@ -11,7 +11,7 @@
       wrapper: "horizontal_form" do |f|
 
     = render "form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_events_path(patient)

data/app/views/renalware/events/events/simple/_event.html.slim

@@ -1,5 +1,5 @@
 tr
-  td= link_to("Toggle",
+  td= link_to(t("btn.toggle"),
               "##{toggle_prefix}-quick-preview-#{event.id}",
               data: { behaviour: "toggler" })
   td.created_at= l(event.date_time)

data/app/views/renalware/events/events/simple/_table.html.slim

@@ -4,10 +4,10 @@ table.has_togglable_rows
   thead
     tr
       th.col-width-tiny
-      th.created_at.col-width-date-time= t(".date_time")
+      th.created_at.col-width-date-time= t(".thead.date_time")
       - unless local_assigns.fetch(:exclude_type_column, false)
-        th.col-width-large= t(".type")
-      th.created_by.col-width-medium= t(".created_by")
+        th.col-width-large= t(".thead.type")
+      th.created_by.col-width-medium= t(".thead.created_by")
   tbody
     = render partial: "renalware/events/events/simple/event",
              collection: events,

data/app/views/renalware/events/investigations/_list.html.slim

@@ -3,7 +3,7 @@
 article.investigations
   header
     h2= t(".title")
-    = link_to t(".add"),
+    = link_to t("btn.add"),
               new_patient_investigation_path(patient),
               class: "button right"
   = render "renalware/events/events/table",

data/app/views/renalware/events/investigations/edit.html.slim

@@ -1,13 +1,7 @@
 = within_patient_layout(title: "Investigations / Edit") do
 
-  = simple_form_for event,
-      url: patient_investigation_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+          event: event,
+          patient: patient,
+          event_types: event_types,
+          url: patient_investigation_path(patient, event)

data/app/views/renalware/events/lists/_filters.html.slim

@@ -24,6 +24,6 @@
                   as: :date_picker,
                   label: "To"
       .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.events_filtered_list_path(named_filter: :all)
+        = link_to t("btn.reset"), renalware.events_filtered_list_path(named_filter: :all)

data/app/views/renalware/events/swabs/_list.html.slim

@@ -1,22 +1,22 @@
 article.swabs
   header
     h2= t(".title")
-    = link_to t(".add"),
+    = link_to t("btn.add"),
               new_patient_swab_path(@patient),
               class: "button right"
   table
     thead
       tr
         th.col-width-tiny
-        th.col-width-date-time= t(".date_time")
-        th.col-width-tiny= t(".type")
-        th.col-width-tiny= t(".result")
-        th.col-width-tiny= t(".location")
-        th= t(".notes")
+        th.col-width-date-time= t(".thead.date_time")
+        th.col-width-tiny= t(".thead.type")
+        th.col-width-tiny= t(".thead.result")
+        th.col-width-tiny= t(".thead.location")
+        th= t(".thead.notes")
     tbody
       - swabs.each do |swab|
         tr
-          td= link_to("Edit", edit_patient_swab_path(patient, swab)) if policy(swab).edit?
+          td= link_to(t("btn.edit"), edit_patient_swab_path(patient, swab)) if policy(swab).edit?
           td= l(swab.date_time)
           td= swab.document.type&.text
           td= swab.document.result&.text

data/app/views/renalware/events/swabs/edit.html.slim

@@ -3,14 +3,8 @@
     breadcrumbs:  breadcrumb_for("Clinical Profile", patient_clinical_profile_path(patient))\
   ) do
 
-  = simple_form_for event,
-      url: patient_swab_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_swab_path(patient, event)

data/app/views/renalware/events/swabs/new.html.slim

@@ -1,13 +1,7 @@
 = within_patient_layout(title: "New Swab", breadcrumbs: clinical_profile_breadcrumb(patient)) do
 
-  = simple_form_for event,
-      url: patient_swabs_path(patient, event),
-      as: :events_event,
-      html: { autocomplete: "off" },
-      wrapper: "horizontal_form" do |f|
-
-    = render "renalware/events/events/form",
-             event: event,
-             patient: patient,
-             event_types: event_types,
-             f: f
+  = render "renalware/events/events/form",
+            event: event,
+            patient: patient,
+            event_types: event_types,
+            url: patient_swabs_path(patient, event)

data/app/views/renalware/events/types/_form.html.slim

@@ -5,6 +5,7 @@
   .large-6.columns
     = simple_form_for event_type, html: { autocomplete: "off" } do |f|
       = f.input :name, label: "Event Type"
+      = f.association :category
       = f.button :submit
       '  or
-      = link_to "cancel", events_types_path
+      = link_to t("btn.cancel"), events_types_path

data/app/views/renalware/events/types/_table.html.slim

@@ -7,8 +7,8 @@ table
     - event_types.each do |t|
       tr
         td.actions
-          = link_to "Edit", edit_events_type_path(t.id)
-          = link_to "Delete",
+          = link_to t("btn.edit"), edit_events_type_path(t.id)
+          = link_to t("btn.delete"),
                     events_type_path(t.id),
                     method: :delete,
                     data: { confirm: I18n.t("prompts.confirm_delete") }

data/app/views/renalware/events/types/edit.html.slim

@@ -1,4 +1,4 @@
-= within_new_admin_layout(title: t("edit_record.link_title"),
+= within_new_admin_layout(title: t("btn.edit"),
                       breadcrumbs: breadcrumb_for("Patient Event Types", events_types_path)) do
 
   = render "form", event_type: event_type

data/app/views/renalware/events/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_events_type_path,
             class: "button"
 

data/app/views/renalware/feeds/hl7_test_messages/new.slim

@@ -14,5 +14,5 @@
     .columns.small-12.file-viewer
       = simple_form_for(form, remote: true, url: renalware.feeds_hl7_test_messages_path) do |f|
         = f.input :body, as: :text, input_html: { style: "font-family: monospace", rows: 11 }
-        = f.submit "Submit", class: :button
+        = f.submit t("btn.submit"), class: :button
       pre#output

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

@@ -14,5 +14,5 @@ article
     dd= access.plan_type
     dt= t(".plan_date")
     dd= l(access.plan_date)
-    dt= t(".notes")
+    dt= t(".thead.notes")
     dd= access.notes

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

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

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
@@ -14,10 +14,9 @@
     tbody
       - dialysers.each do |dialyser|
         tr
-          td
-            = link_to "Edit", edit_hd_dialyser_path(dialyser.id)
-            = pipe_separator
-            = link_to "Delete",
+          td.actions
+            = 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") }