renalware-core 2.0.113 → 2.0.115

data/app/presenters/renalware/hd/scheduling/null_slot.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "renalware/hd"
+
+module Renalware
+  module HD
+    module Scheduling
+      NullSlot = Naught.build do |config|
+        config.black_hole
+        config.define_explicit_conversions
+        config.predicates_return false
+
+        attr_reader :diary_id, :diurnal_period_code_id, :station_id, :day_of_week
+
+        def initialize(diary_id, diurnal_period_code_id, station_id, day_of_week)
+          @diary_id = diary_id
+          @diurnal_period_code_id = diurnal_period_code_id
+          @station_id = station_id
+          @day_of_week = day_of_week
+        end
+
+        def master?
+          false
+        end
+
+        def cell_id
+          "#{diurnal_period_code_id}-#{station_id}-#{day_of_week}"
+        end
+
+        def cache_key
+          [
+            self.class.name,
+            diary_id,
+            diurnal_period_code_id,
+            station_id,
+            day_of_week
+          ].join("-")
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/pd/dashboard_presenter.rb

@@ -7,6 +7,7 @@ module Renalware
   module PD
     class DashboardPresenter
       include PresenterHelper
+      include Renalware::Concerns::Pageable
 
       attr_accessor :patient
 
@@ -19,11 +20,11 @@ module Renalware
       end
 
       def capd_regimes
-        @capd_regimes ||= CAPDRegime.for_patient(patient).with_bags.ordered
+        @capd_regimes ||= CAPDRegime.for_patient(patient).with_bags.ordered.page(1).per(5)
       end
 
       def apd_regimes
-        @apd_regimes ||= APDRegime.for_patient(patient).with_bags.ordered
+        @apd_regimes ||= APDRegime.for_patient(patient).with_bags.ordered.page(1).per(5)
       end
 
       def peritonitis_episodes

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

@@ -24,7 +24,11 @@ ruby:
                     label_method: :description,
                     value_method: :code,
                     wrapper: :horizontal_medium
-    = f.input :notes, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
+    - target = "procedure-notes-editor"
+    = f.label :notes
+    = snippets_modal_and_link_to_open_it(target_input_for_seleted_snippet: ".#{target}")
+    = f.trix_editor :notes, class: target
+    br
     = f.input :catheter_make, wrapper: :horizontal_small
     = f.input :catheter_lot_no, wrapper: :horizontal_small
 

data/app/views/renalware/accesses/procedures/_list.html.slim

@@ -13,8 +13,6 @@ article.access-procedures
       th.col-width-tiny Side
       th Performed By
       th.col-width-date First Use
-      th Notes
-      th Outcome
 
     tbody
       - procedures.each do |procedure|
@@ -23,10 +21,19 @@ article.access-procedures
             = link_to "View", patient_accesses_procedure_path(patient, procedure)
             = pipe_separator
             = link_to "Edit", edit_patient_accesses_procedure_path(patient, procedure)
+            = pipe_separator
+            = link_to("Toggle", "#procedure-quick-preview-#{procedure.id}", data: { behaviour: "toggler" })
           td= procedure.performed_on
           td= procedure.type&.long_name
           td= procedure.side
           td= procedure.performed_by
           td= procedure.first_used_on
-          td.col-width-mediumish-with-ellipsis(title=procedure.notes)=procedure.notes
-          td.col-width-mediumish-with-ellipsis(title=procedure.outcome)=procedure.outcome
+
+        = content_tag(:tr, id: "procedure-quick-preview-#{procedure.id}", style: "display: none")
+          td(colspan=6)
+            .quick-preview
+              dl.dl-horizontal
+                dt Notes
+                dd= simple_format(procedure.notes)
+                dt Outcome
+                dd= simple_format(procedure.outcome)

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

@@ -10,24 +10,22 @@
   .document-view
     .grid
       .row
-        = render "renalware/shared/attributes_group",
-            legend: "Access Procedure", destination: "procedure",
-            models: { procedure => [:performed_on,
-                                    :performed_by,
-                                    :type,
-                                    :side,
-                                    :pd_catheter_insertion_technique,
-                                    :notes,
-                                    :catheter_make,
-                                    :catheter_lot_no] }
+        .columns.small-12.large-6
+          = article_tag "Access Procedure" do
+            = definition_list_for(procedure) do |list|
+              = list.definition(:performed_on)
+              = list.definition(:performed_by)
+              = list.definition(:type)
+              = list.definition(:side)
+              = list.definition(:pd_catheter_insertion_technique)
+              = list.definition(:notes) { |str| simple_format(str) }
+              = list.definition(:catheter_make)
+              = list.definition(:catheter_lot_no)
 
-        = render "renalware/shared/attributes_group",
-            legend: "Follow-up", destination: "followup",
-            models: { procedure => [:outcome,
-                                    :first_used_on,
-                                    :failed_on] }
+      = render "renalware/shared/attributes_group",
+          legend: "Follow-up", destination: "followup",
+          models: { procedure => [:outcome, :first_used_on, :failed_on] }
 
-        = render "renalware/shared/attributes_group",
-            legend: "Admin", destination: "notes",
-            models: { procedure => [:updated_by,
-                                    :updated_at] }
+      = render "renalware/shared/attributes_group",
+          legend: "Admin", destination: "notes",
+          models: { procedure => [:updated_by, :updated_at] }

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

@@ -1,14 +1,19 @@
-/ = a.input :name,
-/           placeholder: "If different than above (optional)",
-/           wrapper: :horizontal_medium
-= a.input :street_1, wrapper: :horizontal_large
-= a.input :street_2, wrapper: :horizontal_large
-= a.input :street_3, wrapper: :horizontal_large
-= a.input :town, wrapper: :horizontal_medium
-= a.input :county, wrapper: :horizontal_small
-= a.input :postcode, wrapper: :horizontal_small
+/ line 1 of the address and the postcode are provided by a feed, so when editing a patient address
+/ the caller will pass in a controlled_by_feed_options hash - probably containing a data attribute
+/ which will cause the input to be disabled.
+/ When editing other kinds of addresses, or adding a new patient address, controlled_by_feed_options
+/ is not passed in.
+- controlled_by_feed_options = (defined?(:controlled_by_feed_options) && controlled_by_feed_options).presence || {}
+
+= a.input :street_1, wrapper: :horizontal_large, input_html: controlled_by_feed_options
+= a.input :street_2, wrapper: :horizontal_large, input_html: controlled_by_feed_options
+= a.input :street_3, wrapper: :horizontal_large, input_html: controlled_by_feed_options
+= a.input :town, wrapper: :horizontal_medium, input_html: controlled_by_feed_options
+= a.input :county, wrapper: :horizontal_small, input_html: controlled_by_feed_options
+= a.input :postcode, wrapper: :horizontal_small, input_html: controlled_by_feed_options
 = a.input :country_id,
           collection: Renalware::System::Country.pluck(:name, :id),
-          wrapper: :horizontal_small
-= a.input :telephone, wrapper: :horizontal_medium
-= a.input :email, wrapper: :horizontal_medium
+          wrapper: :horizontal_small,
+          input_html: controlled_by_feed_options
+= a.input :telephone, wrapper: :horizontal_medium, input_html: controlled_by_feed_options
+= a.input :email, wrapper: :horizontal_medium, input_html: controlled_by_feed_options

data/app/views/renalware/admin/cache/show.html.slim

@@ -42,3 +42,27 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
             class: "button alert"
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  br
+  hr
+  div(data-controller="clipboard")
+    input(data-target="clipboard.source" type="text" value="Clipbpoard test" style="width: 100px")
+    div(data-target="clipboard.result")
+    a(href="#" data-action="clipboard#copy")
+      | Copy

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

@@ -1,48 +1,12 @@
 article.body_compositions
   header
-    h2= t(".title")
-    = link_to t(".add"),
+    h2.title= defined?(limit) ? t(".recent.title") : t(".title")
+    ul
+      li= link_to t(".add"),
               new_patient_clinical_body_composition_path(patient),
               class: "button right"
-  table
-    thead
-      tr
-        th.col-width-tiny
-        th.col-width-date= t(".assessed_on")
-        th.col-width-small= t(".modality_description")
-        th.col-width-tiny= t(".assessor")
-        th.col-width-tiny= t(".overhydration")
-        th.col-width-tiny= t(".volume_of_distribution")
-        th.col-width-tiny= t(".total_body_water")
-        th.col-width-tiny= t(".extracellular_water")
-        th.col-width-tiny= t(".intracellular_water")
-        th.col-width-tiny= t(".lean_tissue_index")
-        th.col-width-tiny= t(".fat_tissue_index")
-        th.col-width-tiny= t(".lean_tissue_mass")
-        th.col-width-tiny= t(".fat_tissue_mass")
-        th.col-width-tiny= t(".adipose_tissue_mass")
-        th.col-width-tiny= t(".body_cell_mass")
-        th.col-width-tiny= t(".quality_of_reading")
+      li= link_to t(".view_all"),
+              patient_clinical_body_compositions_path(patient),
+              class: "button"
 
-    tbody
-      - body_compositions.each do |body_composition|
-        tr
-          td
-            = link_to "View", patient_clinical_body_composition_path(patient, body_composition)
-            = pipe_separator
-            = link_to "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
-          td= body_composition.overhydration
-          td= body_composition.volume_of_distribution
-          td= body_composition.total_body_water
-          td= body_composition.extracellular_water
-          td= body_composition.intracellular_water
-          td= body_composition.lean_tissue_index
-          td= body_composition.fat_tissue_index
-          td= body_composition.lean_tissue_mass
-          td= body_composition.fat_tissue_mass
-          td= body_composition.adipose_tissue_mass
-          td= body_composition.body_cell_mass
-          td= body_composition.quality_of_reading
+  = render "renalware/clinical/body_compositions/table", body_compositions: body_compositions, patient: patient

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

@@ -0,0 +1,42 @@
+table
+  thead
+    tr
+      th.col-width-tiny
+      th.col-width-date= t(".assessed_on")
+      th= t(".modality_description")
+      th= t(".assessor")
+      th.col-width-tiny= t(".overhydration")
+      th.col-width-tiny= t(".volume_of_distribution")
+      th.col-width-tiny= t(".total_body_water")
+      th.col-width-tiny= t(".extracellular_water")
+      th.col-width-tiny= t(".intracellular_water")
+      th.col-width-tiny= t(".lean_tissue_index")
+      th.col-width-tiny= t(".fat_tissue_index")
+      th.col-width-tiny= t(".lean_tissue_mass")
+      th.col-width-tiny= t(".fat_tissue_mass")
+      th.col-width-tiny= t(".adipose_tissue_mass")
+      th.col-width-tiny= t(".body_cell_mass")
+      th.col-width-tiny= t(".quality_of_reading")
+
+  tbody
+    - body_compositions.each do |body_composition|
+      tr
+        td
+          = link_to "View", patient_clinical_body_composition_path(patient, body_composition)
+          = pipe_separator
+          = link_to "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
+        td= body_composition.overhydration
+        td= body_composition.volume_of_distribution
+        td= body_composition.total_body_water
+        td= body_composition.extracellular_water
+        td= body_composition.intracellular_water
+        td= body_composition.lean_tissue_index
+        td= body_composition.fat_tissue_index
+        td= body_composition.lean_tissue_mass
+        td= body_composition.fat_tissue_mass
+        td= body_composition.adipose_tissue_mass
+        td= body_composition.body_cell_mass
+        td= body_composition.quality_of_reading

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

@@ -0,0 +1,9 @@
+= within_patient_layout( \
+  title: "Body Composition Measurements",
+  breadcrumbs: clinical_profile_breadcrumb(patient)) do
+
+  = render "renalware/clinical/body_compositions/table",
+          body_compositions: body_compositions,
+          patient: patient
+
+  = paginate body_compositions

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

@@ -11,12 +11,6 @@ article.dry-weights.simple.simple-table
     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"
+      li= link_to t(".view_all"), patient_clinical_dry_weights_path(patient), class: "button secondary"
 
-  table.auto-layout
-    thead
-      th.col-width-date= t(".date")
-      th.col-width-small= t(".weight")
-      th= t(".assessor")
-    tbody
-      = render presenter.dry_weights
+  = render "renalware/clinical/dry_weights/table", dry_weights: presenter.dry_weights

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

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

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

@@ -63,9 +63,11 @@
       .columns.medium-12.large-6
         = render "renalware/clinical/dry_weights/list",
                  dry_weights: profile.dry_weights,
-                 patient: patient
+                 patient: patient,
+                 limit: true
 
       .columns
         = render "renalware/clinical/body_compositions/list",
                  body_compositions: profile.body_compositions,
-                 patient: patient
+                 patient: patient,
+                 limit: true

data/app/views/renalware/feeds/hl7_test_messages/create.js.erb

@@ -0,0 +1,10 @@
+
+$("#output").html("<%= test_patient %>");
+$("#output").append("<br>")
+$("#output").append("<b>Changes</b>")
+$("#output").append("<br>")
+$("#output").append("<%= JSON.pretty_generate(version) %>")
+$("#output").append("<br>")
+$("#output").append("<b>Current Address</b>")
+$("#output").append("<br>")
+$("#output").append("<%=  test_patient.current_address %>")

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

@@ -0,0 +1,18 @@
+= within_admin_layout(title: "HL7 Test Messages") do
+
+  .row.hl7-file-browser
+    .columns.small-3
+      - test_messages.each do |msg|
+        .file
+          = link_to "#", data: { body: msg.body } do
+            .panel
+              = msg.name
+              |  
+              i.fas.fa-arrow-circle-right
+              p= msg.description
+  .row
+    .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
+      pre#output

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

@@ -28,14 +28,3 @@
       = f.submit t("helpers.submit.filter"), class: "button", name: nil
       span= " or "
       = link_to t("helpers.reset"), filter_form.url
-
-- if Renalware.config.batch_printing_enabled
-  = simple_form_for batch_print_form,
-                    as: :batch,
-                    url: hd_session_forms_batches_path,
-                    method: :post,
-                    remote: true do |f|
-        = f.input :patient_ids, as: :hidden
-        = f.submit "Batch Print #{presenter.patients.total_count} HD Session Forms",
-                  class: "button",
-                  disabled: presenter.patients.none?

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

@@ -0,0 +1,29 @@
+.page-action-inline-form
+
+  - if Renalware.config.batch_printing_enabled
+    / This form lets us batch print the HD Session Forms for all patients in the list (all pages)
+    = simple_form_for batch_print_form,
+                      as: :batch,
+                      url: hd_session_forms_batches_path,
+                      method: :post,
+                      remote: true do |f|
+      = f.input :patient_ids, as: :hidden_array
+      = button_tag(type: "submit",
+                  class: "button secondary",
+                  disabled: presenter.patients.none?) do
+        i.fas.fa-print
+        = "Batch Print #{presenter.patients.total_count} HD Session Forms"
+
+  / This form lets us generate pathology request forms (eg for monthly bloods) for all patients
+  / in the list (all pages)
+  - if Renalware.config.generate_pathology_request_forms_from_hd_mdm_listing
+    = simple_form_for pathology_requests_form,
+                      url: pathology_requests_new_request_path,
+                      html: { autocomplete: "off", style: "display: inline" },
+                      as: :request do |f|
+      = f.input :patient_ids, as: :hidden_array
+      = button_tag(type: "submit",
+                   class: "button secondary",
+                   disabled: presenter.patients.none?) do
+        i.fas.fa-copy
+        = "Generate #{presenter.patients.total_count} Request Forms"

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

@@ -1,11 +1,14 @@
-/ = content_for(:actions) do
-/   = render "page_actions", presenter: presenter, form: filter_form
+= content_for(:actions) do
+  = render "page_actions",
+            presenter: presenter,
+            batch_print_form: batch_print_form,
+            pathology_requests_form: pathology_requests_form
 
 = content_for(:filters) do
   = render "filters",
            presenter: presenter,
-           filter_form: filter_form,
-           batch_print_form: batch_print_form
+           filter_form: filter_form
+
 
 = content_for(:tabs) do
   = render_if_exists "tabs", presenter: presenter

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

@@ -8,16 +8,16 @@ li
   ul.f-dropdown#diary-options(data-dropdown-content aria-hidden="true")
     - date = Time.zone.today
     = dropdown_btn_item title: "This week",
-                        url: hd_unit_edit_diary_path(year: date.year, week_number: date.cweek)
+                        url: hd_scheduling_unit_edit_diary_path(year: date.year, week_number: date.cweek)
     - date = Time.zone.today + 1.week
     = dropdown_btn_item title: "Next week",
-                        url: hd_unit_edit_diary_path(year: date.year, week_number: date.cweek)
+                        url: hd_scheduling_unit_edit_diary_path(year: date.year, week_number: date.cweek)
     - date = Time.zone.today - 1.week
     = dropdown_btn_item title: "Last week",
-                        url: hd_unit_edit_diary_path(year: date.year, week_number: date.cweek)
+                        url: hd_scheduling_unit_edit_diary_path(year: date.year, week_number: date.cweek)
     hr
     li= link_to "Edit stations", hd_unit_stations_path(unit)
 
 - if defined?(diary)
-  li= link_to "Print", hd_unit_diary_path(unit, diary.id, format: :pdf), class: "button"
+  li= link_to "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/{diaries → scheduling/diaries}/_weekly_diary.html.slim

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

data/app/views/renalware/hd/{diaries → scheduling/diaries}/edit.html.slim

@@ -4,15 +4,15 @@
 = within_admin_layout(title: diary,
                       breadcrumbs: [\
                         breadcrumb_for(unit.name, edit_hospitals_unit_path(unit)),
-                        breadcrumb_for("HD Diaries", hd_unit_diaries_path(unit))\
+                        breadcrumb_for("HD Diaries", hd_scheduling_unit_diaries_path(unit))\
                       ]) do
 
   .diary__navigation
-    = link_to hd_unit_edit_diary_path(**diary.week.previous.to_h), class: "button secondary" do
+    = link_to hd_scheduling_unit_edit_diary_path(**diary.week.previous.to_h), class: "button secondary" do
       i.fas.fa-arrow-left
       | Previous week
 
-    = link_to hd_unit_edit_diary_path(**diary.week.next.to_h), class: "button secondary" do
+    = link_to hd_scheduling_unit_edit_diary_path(**diary.week.next.to_h), class: "button secondary" do
       i.fas.fa-arrow-right
       | Next week
 
@@ -25,9 +25,9 @@
           li(style="background-color: #{location.colour}")= location.name
 
   .diary(data={"weekly-diary-id" => diary.id,
-               "weekly-diary-slots-path" => hd_diary_slots_path(diary_id: diary.id),
+               "weekly-diary-slots-path" => hd_scheduling_diary_slots_path(diary_id: diary.id),
                "master-diary-id" => diary.master_diary.id,
-               "master-diary-slots-path" => hd_diary_slots_path(diary.master_diary)})
+               "master-diary-slots-path" => hd_scheduling_diary_slots_path(diary.master_diary)})
 
     .diary__grid
 
@@ -52,7 +52,7 @@
 
                   - diary.each_day(diurnal_period, station) do |slot, _day_of_week|
                     /- cache(slot.cache_key) do
-                    = render "renalware/hd/diary_slots/slot", slot: slot
+                    = render "renalware/hd/scheduling/diary_slots/slot", slot: slot
 
   / Modal dialog container
   #add-patient-to-diary-modal.reveal-modal.medium(data-reveal)

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

@@ -1,8 +1,9 @@
 = render "renalware/shared/errors", model: slot
 
 = simple_form_for(slot,
-                  url: hd_diary_slots_path(slot.diary.id),
+                  url: hd_scheduling_diary_slots_path(slot.diary.id),
                   html: { id: "slot-form", autocomplete: "off" },
+                  as: :slot,
                   remote: true,
                   method: :post,
                   wrapper: :horizontal_form) do |f|
@@ -20,7 +21,7 @@
                 label: "Search"
     .col-small-8
 
-      / We will post 3 patient_id values in hd_diary_slot[patient_id][]
+      / We will post 3 patient_id values in slot[patient_id][]
       / The value selected in in change_type above will determine which one to choose.
       #patient_select2s
         #dialysing_on_day_and_period
@@ -30,7 +31,7 @@
                    value_method: :id,
                    input_html: { class: "searchable_select patient-id-select2",
                                  id: "patient_id1",
-                                 name: "hd_diary_slot[patient_id][]" }
+                                 name: "slot[patient_ids][]" }
 
         #dialysing_on_day(style="display:none")
           = f.input :patient_id,
@@ -39,13 +40,13 @@
                    value_method: :id,
                    input_html: { class: "searchable_select patient-id-select2",
                                  id: "patient_id2",
-                                 name: "hd_diary_slot[patient_id][]" }
+                                 name: "slot[patient_ids][]" }
         #dialysing_at_unit(style="display:none")
           = f.input :patient_id,
                     collection: [],
                     input_html: { \
                       class: "patient-id-select2 patient-ajax-search",
-                      name: "hd_diary_slot[patient_id][]",
+                      name: "slot[patient_ids][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_unit_path(unit_id: slot.diary.hospital_unit_id, format: :json),
                               placeholder: "Search by patient name or NHS/hosp no." } \
                     }
@@ -55,10 +56,12 @@
                     collection: [],
                     input_html: { \
                       class: "patient-id-select2 patient-ajax-search",
-                      name: "hd_diary_slot[patient_id][]",
+                      name: "slot[patient_ids][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_hospital_path(format: :json),
                               placeholder: "Search by patient name or NHS/hosp no." } \
                     }
+  / This is the one that actually gets posted
+  = f.input :patient_id, as: :hidden, input_html: { id: "patient_id" }
   = f.submit "Add for this week only", class: "button save weekly"
   |  
   = f.submit "Add to this and all future weeks", class: "button secondary master", name: "master"
@@ -72,6 +75,11 @@
 javascript:
   $(document).ready(function() {
 
+    $(".patient-id-select2").on("select2:select", function(e) {
+      var selected_patient_id = $(this).find(':selected').val();
+      $("#patient_id").val(selected_patient_id);
+    })
+
     // 1. add handler for button if master set action
     $('input.master[type=submit]').click(function (e) {
       var master_slots_url = $(".diary").data("master-diary-slots-path");
@@ -103,6 +111,7 @@ javascript:
 
     $("#change_type").on("change", function() {
       change_type = $(this).val(); // e.g. "dialysing_at_unit"
+       $("#patient_id").val("");
       refreshSelect2s(change_type);
     })
   });

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

@@ -7,14 +7,14 @@ td*{ "data-slot-id" => slot.id.present? && slot.id,
 
   - if slot.patient.present?
     = link_to slot.patient.to_s,
-              edit_hd_diary_slot_path(diary_id: slot.diary_id, id: slot.id),
+              edit_hd_scheduling_diary_slot_path(diary_id: slot.diary_id, id: slot.id),
               class: "button diary__button diary__target",
               title: slot.patient,
               data: { "reveal-id" => "add-patient-to-diary-modal",
                       "reveal-ajax" => "true" }
   - else
     = link_to "Add",
-              new_hd_diary_slot_path(diary_id: slot.diary_id,
+              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,
                                      day_of_week: slot.day_of_week),

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

@@ -1,7 +1,7 @@
 - form_id = SecureRandom.hex(16)
 = simple_form_for(slot,
                   html: { id: form_id },
-                  url: hd_diary_slot_path(weekly_diary.id, slot),
+                  url: hd_scheduling_diary_slot_path(weekly_diary.id, slot),
                   remote: true,
                   wrapper: :horizontal_form) do |f|