renalware-core 2.0.167 → 2.1.0

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

@@ -5,7 +5,7 @@ table.global-clinic-visits
       th.col-width-actions-dropdown.no-print
       th.col-width-date Date
       th.col-width-tiny DNA
-      th.col-width-large Patient
+      th.col-width-large= t("thead.patient")
       th.col-width-nhs-no NHS Number
       th.col-width-tiny Sex
       th.col-width-tiny Age

data/app/views/renalware/dashboard/bookmarks/_bookmark.html.slim

@@ -13,4 +13,4 @@ tr class=("urgent" if bookmark.urgent?)
   td= I18n.l bookmark.created_at&.to_date
   td.nowrap= render "renalware/patients/bookmarks/delete",
                     bookmark: bookmark,
-                    link_text: "Remove"
+                    link_text: t("btn.remove")

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

@@ -1,16 +1,16 @@
 table.auto-layout
   thead
     tr
-      th.at-least.col-width-medium= t(".patient_name")
-      th.col-width-nhs-no= t(".nhs_number")
-      th.col-width-reference-no= t(".hospital_number")
-      th.show-for-medium-up.col-width-date= t(".born_on")
-      th.col-width-tiny= t(".age")
-      th.col-width-tiny= t(".sex")
-      th= t(".modality")
-      th.show-for-medium-up= t(".notes")
-      th.show-for-medium-up= t(".tags")
-      th.col-width-date= t(".bookmarked_on")
+      th.at-least.col-width-medium= t(".thead.patient_name", cascade: false)
+      th.col-width-nhs-no= t(".thead.nhs_number")
+      th.col-width-reference-no= t("thead.hospital_number")
+      th.show-for-medium-up.col-width-date= t(".thead.date_of_birth")
+      th.col-width-tiny= t(".thead.age")
+      th.col-width-tiny= t(".thead.sex")
+      th= t(".thead.modality")
+      th.show-for-medium-up= t(".thead.notes")
+      th.show-for-medium-up= t(".thead.tags")
+      th.col-width-date= t(".thead.bookmarked_on")
       th.col-width-tiny
 
   tbody

data/app/views/renalware/dashboard/dashboards/show.html.slim

@@ -1,3 +1,3 @@
-= within_admin_layout(title: composed_dashboard_title(current_user.full_name), page_title: "Dashboard") do
+= within_admin_layout(title: composed_dashboard_title(current_user.full_name), page_title: t(".title")) do
   = render Renalware::Users::LastSigninComponent.new(current_user: current_user)
   = render "content", dashboard: dashboard

data/app/views/renalware/dashboard/letters/_letter.html.slim

@@ -6,17 +6,12 @@ tr(class=letter.state.dasherize)
   td.col-width-medium-with-ellipsis= link_to letter.patient, patient_clinical_summary_path(letter.patient)
   td.col-width-medium-with-ellipsis= letter.description
   td.actions
-    = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
+    = link_to t("btn.toggle"), "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
     - if Pundit.policy!(current_user, letter).update?
-      = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
+      = link_to t("btn.edit"), edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td
   td(colspan=7)
     .quick-preview
-      p
-        = simple_format letter.body
-      - if letter.notes.present?
-        .admin-notes
-          i Notes:  
-          = letter.notes
+      = render "renalware/letters/letters/toggled_body", letter: letter

data/app/views/renalware/dashboard/letters/_table.html.slim

@@ -1,11 +1,11 @@
 table.auto-layout.letters
   thead
     tr
-      th.col-width-tiny State
-      th.col-width-date-time Date
-      th.col-width-medium Author
-      th.col-width-large Patient
-      th Description
+      th.col-width-tiny= t("thead.state")
+      th.col-width-date-time= t("thead.date_")
+      th.col-width-medium= t("thead.author")
+      th.col-width-large= t("thead.patient")
+      th= t("thead.description")
       th.col-width-small
 
   tbody

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

@@ -32,4 +32,4 @@
 
     = 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/deaths/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"
@@ -11,8 +11,8 @@
       tr
         th
         th.col-width-mediumish= sort_link([:renalware, q], :family_name, "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-tiny Age
         th.col-width-date= sort_link([:renalware, q], :born_on, "Date of Birth")

data/app/views/renalware/directory/people/_filters.html.slim

@@ -4,6 +4,6 @@
       .small-8.medium-6.large-4.columns
         = f.input :name_cont, label: "Name contains"
       .small-4.end.columns.actions
-        = f.submit t("helpers.submit.filter"), class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), directory_people_path
+        = link_to t("btn.reset"), directory_people_path

data/app/views/renalware/directory/people/_form.html.slim

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

data/app/views/renalware/directory/people/_person.html.slim

@@ -1,7 +1,7 @@
 tr
   td.actions
-    = link_to "View", directory_person_path(person)
-    = link_to "Edit", edit_directory_person_path(person)
+    = link_to t("btn.view"), directory_person_path(person)
+    = link_to t("btn.edit"), edit_directory_person_path(person)
   td= person.title
   td= link_to person.family_name, directory_person_path(person)
   td= link_to person.given_name, directory_person_path(person)

data/app/views/renalware/directory/people/show.html.slim

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

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

@@ -1,11 +1,11 @@
 .filters
   .filters__form
-    = search_form_for drugs_search do |f|
+    = search_form_for drugs_search, html: { class: "fn-form" } do |f|
       .row
         .small-9.large-4.columns
           = f.label "Name or type"
           = f.search_field :name_or_drug_types_name_start
         .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"), drugs_drugs_path
+          = link_to t("btn.reset"), drugs_drugs_path

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

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

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

@@ -1,3 +1,3 @@
-= within_new_admin_layout(title: t("edit_record.link_title"),
+= within_new_admin_layout(title: t("btn.edit"),
                       breadcrumbs: breadcrumb_for("Drugs", drugs_drugs_path)) do
   = render "form"

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
+  = link_to t("btn.add"),
             new_drugs_drug_path,
             class: "button"
 
@@ -17,8 +17,8 @@
       - @drugs.each do |drug|
         tr
           td.actions
-            = link_to "Edit", edit_drugs_drug_path(drug)
-            = link_to "Delete", drugs_drug_path(drug),
+            = link_to t("btn.edit"), edit_drugs_drug_path(drug)
+            = link_to t("btn.delete"), drugs_drug_path(drug),
               id: "#{drug.id}-drug",
               method: :delete,
               data: { confirm: I18n.t("prompts.confirm_delete") }

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

@@ -1,3 +1,3 @@
-= within_new_admin_layout(title: t("new_record.link_title"),
+= within_new_admin_layout(title: t("btn.add"),
                       breadcrumbs: breadcrumb_for("Drugs", drugs_drugs_path)) do
   = render "form"

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

@@ -7,11 +7,11 @@ tr
     / custom edit link (e.g. the Investigations event subclass, has its own slug, controllwe and
     / and form) otherwise render a standard Event edit link.
     - if policy(event).edit?
-      = link_to("Edit", local_assigns[:edit_proc] ? edit_proc.call(event) : edit_patient_event_path(event.patient, event))
+      = link_to(t("btn.edit"), local_assigns[:edit_proc] ? edit_proc.call(event) : edit_patient_event_path(event.patient, event))
 
     - if policy(event).destroy?
       - if local_assigns[:destroy_proc]
-        = link_to("Delete", destroy_proc.call(event))
+        = link_to(t("btn.delete"), destroy_proc.call(event))
       - else
         = link_to(patient_event_path(event.patient, event),
                   method: :delete,

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

@@ -4,8 +4,14 @@
       url: patient_events_path(events.patient),
       method: :get do |f|
     .row
-      .medium-5.large-4.columns
+      .medium-3.large-2.columns
+        = f.input :event_type_category_id_eq,
+                  collection: Renalware::Events::Category.all,
+                  label: "Category"
+      .medium-3.large-3.columns
         = f.input :event_type_id_eq,
+                  as: :grouped_select,
+                  group_method: :types,
                   collection: events.event_types_for_filtering,
                   label: "Type",
                   input_html: { class: "searchable_select" }
@@ -13,8 +19,8 @@
         = f.input :created_by_id_eq,
                   as: :user_picker,
                   collection: events.users_for_filtering,
-                  label: "Created by"
+                  label: "Added by"
       .medium-3.large-3.columns.actions.end
-        = f.submit "Filter", class: "button"
+        = f.submit t("btn.filter"), class: "button"
         '  or
-        = link_to t("helpers.reset"), patient_events_path(events.patient)
+        = link_to t("btn.reset"), patient_events_path(events.patient)

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

@@ -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

@@ -5,14 +5,14 @@ table.has-togglable-rows.events-table
     tr
       th.noprint.togglers= table_toggler
       th.col-width-tiny
-      th.col-width-date=t(".created_at")
+      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/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/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/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/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