renalware-core 2.0.123 → 2.0.124

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

@@ -1,26 +1,48 @@
+- patient = clinic_visit.patient
 tr(class="#{'dna' if clinic_visit.did_not_attend?}")
-  td.no-print
-    = link_to("Edit", edit_patient_clinic_visit_path(clinic_visit.patient, clinic_visit))
-    = pipe_separator
-    = link_to("Toggle",
-              "#clinic_visit-quick-preview-#{clinic_visit.id}",
-              data: { behaviour: "toggler" })
-    = pipe_separator
-    = link_to_clinic_visit_letter(clinic_visit.patient, clinic_visit)
+  td= toggler("#clinic_visit-quick-preview-#{clinic_visit.id}")
+  td.actions.no-print
+    / - uid = "visit-#{clinic_visit.id}-options"
+    / a.button.actions.dropdown.with-icon(href="#"
+    /                             data-dropdown=uid
+    /                             aria-controls=uid
+    /                             aria-expanded="false")
+
+    / ul.actions-dropdown.f-dropdown.f-dropdown-no-arrow(id="#{uid}" data-dropdown-content aria-hidden="true")
+    /   li= link_to_if_allowed policy(clinic_visit).edit?,
+    /               "Edit",
+    /               edit_patient_clinic_visit_path(patient, clinic_visit)
+    /   li= link_to_if_allowed policy(clinic_visit).destroy?,
+    /             "Delete",
+    /             patient_clinic_visit_path(patient, clinic_visit),
+    /             method: :delete,
+    /             data: { confirm: I18n.t("prompts.confirm_delete") }
+    /   li.separator
+    /   li= link_to_clinic_visit_letter(patient, clinic_visit)
+
+    = link_to_if_allowed policy(clinic_visit).edit?,
+      "Edit", edit_patient_clinic_visit_path(patient, clinic_visit)
+    = link_to_if_allowed policy(clinic_visit).destroy?,
+      "Delete",
+      patient_clinic_visit_path(patient, clinic_visit),
+      method: :delete,
+      data: { confirm: I18n.t("prompts.confirm_delete") }
+    = link_to_clinic_visit_letter(patient, clinic_visit)
   td.date-time= l clinic_visit.date
   td= yes_no(clinic_visit.did_not_attend)
   td= default_patient_link(clinic_visit.patient)
   td= clinic_visit.patient.nhs_number
   td= clinic_visit.patient.sex
   td= clinic_visit.patient.age
-  td= clinic_visit.patient.current_modality&.description&.name
-  td.clinic-type= clinic_visit.clinic
+  td.at-least.col-width-medium-with-ellipsis= clinic_visit.patient.current_modality&.description&.name
+  td.at-least.col-width-medium-with-ellipsis.clinic-type= clinic_visit.clinic
   td.bmi= clinic_visit.bmi
   td.bp= clinic_visit.bp
   td.no-print= link_to_mdm(clinic_visit.patient)
-  td.created-by= clinic_visit.created_by
+  td.col-width-medium-with-ellipsis.created-by= clinic_visit.created_by
+
 = content_tag(:tr, id: "clinic_visit-quick-preview-#{clinic_visit.id}", style: "display: none")
-  td(colspan=13)
+  td(colspan=14)
     .quick-preview
       = definition_list_for(clinic_visit, size: :large) do |list|
         = list.definition(:notes){ |value| simple_format(value) }

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

@@ -7,10 +7,8 @@ tr(class=letter.state.dasherize)
   td= letter.description
   td.actions
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
-    = pipe_separator
     = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
     - if policy(letter).update?
-      = pipe_separator
       = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td

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

@@ -1,11 +1,8 @@
+- row_id = "#{toggle_prefix}-quick-preview-#{event.id}"
 tr
-  td
-    = link_to("Toggle",
-              "##{toggle_prefix}-quick-preview-#{event.id}",
-              data: { behaviour: "toggler" })
-
-    - if local_assigns[:edit_proc]
-      = pipe_separator
+  td.noprint= toggler("##{row_id}")
+  - if local_assigns[:edit_proc]
+    td.noprint
       = link_to("Edit", edit_proc.call(event))
 
   td.nowrap= l event.created_at.to_date
@@ -16,8 +13,8 @@ tr
                locals: { event: event }
   td.created_at= l(event.date_time)
   td.created_by= event.created_by.full_name
-= content_tag(:tr, id: "#{toggle_prefix}-quick-preview-#{event.id}", style: "display: none")
-  td(colspan=6)
+= content_tag(:tr, id: row_id, style: "display: none")
+  td(colspan=7)
     .quick-preview
       = render partial: event.to_toggled_cell_partial_path,
                locals: { event: event }

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

@@ -3,7 +3,9 @@
 table.has-togglable-rows.events-table
   thead
     tr
-      th.col-width-tiny
+      th.noprint.togglers= table_toggler
+      - if local_assigns[:edit_proc]
+        th.col-width-tiny
       th.col-width-date=t(".created_at")
       - unless local_assigns.fetch(:exclude_type_column, false)
         th.col-width-large= t(".type")

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

@@ -1,13 +1,9 @@
 tr.hd-session-row(class=[session.state, stripe_class])
+  td.noprint(rowspan=2)= toggler("#hd-session-#{session.id}")
   td.noprint(rowspan=2)
-    = link_to("Toggle",
-              "#hd-session-#{session.id}",
-              data: { behaviour: "toggler" })
-    = pipe_separator
     = session.edit_or_view_url
   td.col-width-date(rowspan=2)= session.performed_on
   td= session.hospital_unit_unit_code
-
   td= session.start_time
   td.derived(rowspan=2)= session.duration
   td= session.before_measurement_for(:weight)
@@ -42,7 +38,7 @@ tr(class=[session.state, stripe_class])
   td.nowrap= session.after_measurement_for(:blood_pressure)
   td.print-only= session.signed_off_by
 = content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=19)
+  td(colspan=20)
     .quick-preview
       = definition_list_for(session, size: :large) do |list|
         = list.definition(:notes){ |value| simple_format(value) }

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

@@ -1,5 +1,6 @@
 thead
   tr
+    th.togglers.noprint(rowspan=3)= table_toggler
     th.noprint.col-width-small(rowspan=3)
     th.col-width-date(rowspan=3 valign="top")= t(".date")
     th.col-width-small= t(".site")

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

@@ -1,9 +1,6 @@
 tr(class=[session.state, stripe_class])
-  td
-    = link_to("Toggle",
-              "#hd-session-#{session.id}",
-              data: { behaviour: "toggler" })
-    = pipe_separator
+  td.noprint= toggler("#hd-session-#{session.id}")
+  td.noprint
     = session.edit_or_view_url
   td= session.performed_on
   td= session.hospital_unit_unit_code
@@ -11,7 +8,7 @@ tr(class=[session.state, stripe_class])
   td(colspan=13)
    i= session.truncated_notes
 = content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=19)
+  td(colspan=20)
     .quick-preview
       = definition_list_for(session, size: :large) do |list|
         = list.definition(:notes) { |value| simple_format(value) }

data/app/views/renalware/hospitals/units/index.html.slim

@@ -38,9 +38,7 @@
           td.actions
             - if pundit_policy_for(Renalware::HD::Station).index?
               = link_to("HD Stations", hd_unit_stations_path(unit))
-              = pipe_separator
             - if pundit_policy_for(Renalware::HD::Scheduling::Diary).index?
               = link_to("HD Diaries", hd_scheduling_unit_diaries_path(unit))
             - if pundit_policy_for(Renalware::Hospitals::Ward).index?
-              = pipe_separator
               = link_to("Wards", hospitals_unit_wards_path(unit))

data/app/views/renalware/layouts/error.html.slim

@@ -4,7 +4,7 @@ html lang="en"
     meta charset="utf-8"
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     title= yield(:page_title)
-    = stylesheet_link_tag "renalware/application", media: :all
+    = stylesheet_link_tag "renalware/core", media: :all
 
   body.error-page
     nav.top-bar(data-topbar role="navigation")

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

@@ -28,7 +28,6 @@ table.letters.electronic-ccs.has-togglable-rows
         td.col-width-medium-with-ellipsis= letter.description
         td.actions
           = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
-          = pipe_separator
           = link_to letter.view_label,
                     patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath)
 

data/app/views/renalware/letters/electronic_receipts/sent.html.slim

@@ -31,7 +31,6 @@
           td.col-width-medium-with-ellipsis= letter.description
           td.actions
             = link_to "Toggle", "##{receipt.html_preview_identifier}", data: { behaviour: "toggler" }
-            = pipe_separator
             = link_to(\
                 letter.view_label,
                 patient_letters_letter_path(letter.patient, letter, back_url: request.fullpath))

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

@@ -1,15 +1,12 @@
 - columns = local_assigns[:columns] || []
 - cache([letter, columns.join("-")]) do
   tr(class=letter.state.dasherize)
-    td
-      = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
-      = pipe_separator
+    td= toggler("#letter-quick-preview-#{letter.id}")
+    td.actions
       = link_to letter.view_label, patient_letters_letter_path(letter.patient, letter)
       - if policy(letter).update?
-        = pipe_separator
         = link_to "Edit", edit_patient_letters_letter_path(letter.patient, letter)
       - if policy(letter).destroy?
-        = pipe_separator
         = link_to "Delete",
                   patient_letters_letter_path(letter.patient, letter),
                   method: :delete,
@@ -25,9 +22,9 @@
     td.recipient= letter.main_recipient.address
     td.col-width-medium-with-ellipsis= letter.description
 
-  = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
+  = content_tag(:tr, id: "letter-quick-preview-#{letter.id}", style: "display: none")
     td
-    td(colspan=8)
+    td(colspan=9)
       .quick-preview
         = simple_format letter.body
         - if letter.notes.present?

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

@@ -3,7 +3,8 @@
 table.auto-layout.letters.has-togglable-rows
   thead
     tr
-      th.col-width-small
+      th.noprint.togglers= table_toggler
+      th.col-width-11
       th.col-width-tiny State
       th.col-width-date-time Date
       - if columns.include?(:author)

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

@@ -1,6 +1,9 @@
 tr(class=letter.state.dasherize)
+  td= toggler("#letter-quick-preview-#{letter.id}")
   td.noprint
+    = link_to "View", patient_letters_letter_path(letter.patient, letter)
     - if letter.approved?
+      |  
       / The Print link will:
       / - open a new tab with the PDF, ready to print
       / - display a modal on this page (ready for when the user returns here after
@@ -16,8 +19,8 @@ tr(class=letter.state.dasherize)
                 } do
         i.fas.fa-print
         | Print
-      |  
     - if letter.approved? && letter.page_count
+      |  
       = link_to patient_letters_letter_printable_path(letter.patient, letter),
                 target: "_blank",
                 class: "printing-pdf button secondary compact",
@@ -26,13 +29,6 @@ tr(class=letter.state.dasherize)
                 } do
         i.fas.fa-envelope
         | Env Print
-      |  
-    = link_to "Toggle",
-              "#quick-preview-#{letter.id}",
-              data: { behaviour: "toggler" }
-    = pipe_separator
-    = link_to "View", patient_letters_letter_path(letter.patient, letter)
-
   td.col-width-medium-with-ellipsis= letter.type
   td.state
     span= letter.state_description
@@ -40,14 +36,14 @@ tr(class=letter.state.dasherize)
   td= letter.patient.nhs_number
   td= letter.enclosures&.truncate(6)
   td= l(letter.effective_date)
-  td= letter.author
-  td= letter.typist
+  td.col-width-medium-with-ellipsis= letter.author
+  td.col-width-medium-with-ellipsis= letter.typist
   td= letter.page_count
   td.col-width-medium-with-ellipsis= letter.main_recipient.address
   td.col-width-medium-with-ellipsis= letter.description
-= content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
+= content_tag(:tr, id: "letter-quick-preview-#{letter.id}", style: "display: none")
   td
-  td(colspan=11)
+  td(colspan=12)
     .quick-preview
       = simple_format letter.body
       - if letter.notes.present?

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

@@ -2,9 +2,10 @@
   table.report.letters
     thead
       tr
-        th.noprint.col-width-large
-        th Type
-        th= sort_link([:renalware, q], :type, "State")
+        th.noprint.togglers
+        th.noprint.col-width-15
+        th.col-width-small Type
+        th.col-width-small= sort_link([:renalware, q], :type, "State")
         th.col-width-medium= sort_link([:renalware, q], :patient_family_name, "Patient")
         th.col-width-nhs-no= sort_link([:renalware, q], :patient_nhs_number, "NHS No")
         th= sort_link([:renalware, q], :enclosures, "Enc.")

data/app/views/renalware/mdm/_clinic_visits.html.slim

@@ -8,6 +8,11 @@
           = link_to "View All",
                       patient_clinic_visits_path(mdm.patient),
                       class: "button secondary"
+          = link_to new_patient_clinic_visit_path(mdm.patient),
+                    class: "button",
+                    target: "_blank" do
+              i.fa.fa-external-link-square-alt
+              | Add
 
     = render "renalware/clinics/clinic_visits/table",
             clinic_visits: mdm.clinic_visits,

data/app/views/renalware/pathology/requests/requests/create.pdf.slim

@@ -1,5 +1,5 @@
 = content_for(:head2) do
-  = wicked_pdf_stylesheet_link_tag "renalware/print/pathology_request_forms.css"
+  = wicked_pdf_stylesheet_link_tag "renalware/pathology_request_forms.css"
 
 = render partial: "renalware/pathology/requests/requests/request_form/#{request_html_form_params.template}",
          locals: { requests: requests }

data/app/views/renalware/pathology/requests/requests/new.html.slim

@@ -1,21 +1,6 @@
-/ doctype html
-/ html lang="en"
-/   head
-/     meta charset="utf-8"
-
-/     title= content_for?(:title) ? yield(:title) : "Renalware v#{Renalware::VERSION}"
-
-/     = stylesheet_link_tag "renalware/application", media: :all
-/     = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
-/     = javascript_include_tag "renalware/modernizr"
-
-/     = csrf_meta_tag
-
-
-/  body.overflow
-
 = content_for(:css) do
-  = stylesheet_link_tag "renalware/print/pathology_request_forms", media: :all
+  = stylesheet_link_tag "renalware/pathology_request_forms", media: :all
+
 = within_admin_layout(title: "Pathology Request CRS Form Preview") do
     / .row
     /   h4 Pathology Request CRS Form Preview
@@ -59,5 +44,3 @@
 
     = render partial: "renalware/pathology/requests/requests/request_form/#{request_html_form_params.template}",
              locals: { requests: requests, format: :html }
-
-    /= javascript_include_tag "renalware/application"

data/app/views/renalware/pathology/requests/requests/show.pdf.slim

@@ -1,5 +1,5 @@
 = content_for(:head2) do
-  = wicked_pdf_stylesheet_link_tag "renalware/print/pathology_request_forms.css"
+  = wicked_pdf_stylesheet_link_tag "renalware/pathology_request_forms.css"
 
 = render partial: "renalware/pathology/requests/requests/request_form/#{request.template}",
   locals: { requests: [request] }

data/app/views/renalware/problems/notes/_table.html.slim

@@ -15,9 +15,18 @@
       - notes.each do |note|
         tr
           - unless problem.archived?
-            td= link_to "Edit",
-                        edit_patient_problem_note_path(problem.patient, problem, note),
-                        remote: true
+            td
+              - if policy(note).edit?
+                = link_to "Edit",
+                          edit_patient_problem_note_path(problem.patient, problem, note),
+                          remote: true
+              - if policy(note).destroy?
+                = pipe_separator
+                = link_to "Delete",
+                          patient_problem_note_path(problem.patient, problem, note),
+                          method: :delete,
+                          remote: true,
+                          data: { confirm: "Are you sure you want to delete this note?" }
           td(class="problem-note-#{note.id}")= note.description
           td= note.updated_by
           td= l(note.updated_at)

data/app/views/renalware/snippets/snippets/_row.html.slim

@@ -32,11 +32,9 @@ tr(data={ "snippet-id" => snippet.id, invocation_url: snippet_invocations_path(s
 
       - if snippet_authored_by_me
         = link_to t(".edit"), edit_snippet_path(snippet)
-        = pipe_separator
         = link_to t(".duplicate"),
                    snippet_clones_path(snippet_id: snippet),
                    method: :post
-        = pipe_separator
         = link_to t(".delete"),
                   snippet_path(snippet),
                   method: :delete,

data/app/views/renalware/surveys/_eq5d_summary_part.html.slim

@@ -15,7 +15,7 @@
     table
       thead
         tr
-          th Date
+          th.col-width-date Date
           - eq5d_summary_part.question_labels.each do |code, label|
             th= label
       tbody

data/app/views/renalware/surveys/_pos_s_summary_part.html.slim

@@ -15,7 +15,7 @@
     table
       thead
         tr
-          th Date
+          th.col-width-date Date
           - pos_s_summary_part.question_labels.each do |code, label|
             th= label
       tbody

data/config/routes/patients.rb

@@ -36,7 +36,7 @@ resources :patients, except: [:destroy], controller: "patients/patients" do
   # Problems
   resources :problems, controller: "problems/problems" do
     post :sort, on: :collection
-    resources :notes, only: [:index, :new, :create, :edit, :update], controller: "problems/notes"
+    resources :notes, controller: "problems/notes"
   end
 
   namespace :surveys do

data/lib/renalware.rb

@@ -4,17 +4,4 @@ require "renalware/engine"
 require "renalware/configuration"
 
 module Renalware
-  # Configure Webpacker instance.
-  # See https://github.com/rails/webpacker/blob/master/docs/engines.md
-  class << self
-    def webpacker
-      @webpacker ||= begin
-        root_path = Pathname.new(File.join(__dir__, ".."))
-        ::Webpacker::Instance.new(
-          root_path: root_path,
-          config_path: root_path.join("config/webpacker.yml")
-        )
-      end
-    end
-  end
 end