renalware-core 2.0.0.pre.beta9 → 2.0.0.pre.beta10

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

@@ -0,0 +1,9 @@
+= content_for(:actions) do
+  = render "page_actions", unit: unit
+  li.warning-block
+    i.fa.fa-info
+    span To create a new diary, view the most recent one and choose 'Next Week'
+
+= within_admin_layout(title: "HD Unit Diaries") do
+  = render "table", diaries: diaries
+  = paginate diaries

data/app/views/renalware/hd/diaries/show.pdf.slim

@@ -0,0 +1,32 @@
+- content_for(:head) do
+  = wicked_pdf_stylesheet_link_tag "renalware/hd_diary_pdf"
+
+.hd-diary-pdf
+  h3= unit&.name
+  h2= "HD Diary #{diary}"
+  .diary
+    .diary__grid
+      - diary.each_diurnal_period do |diurnal_period|
+        - day_columns_width_pct = (100 - 20) / diary.day_names.count
+        table.diary__period*{ "data-period-code" => diurnal_period.code }
+          thead
+            tr
+              th(colspan=8)
+                h3= diurnal_period.code.upcase
+            tr
+              th.col-width-medium(style="width: 20%") Station
+              - diary.day_names.each do |day|
+                th.col-width-small(style="width: #{day_columns_width_pct}%")= day.capitalize
+
+          tbody
+            - diary.each_station do |station, index|
+              tr
+                th= "#{index}. #{station.name}"
+
+                - diary.each_day(diurnal_period, station) do |slot, _day_of_week|
+                  - with_format(:html) do
+                    td
+                      - if slot.patient.present?
+                        = slot.patient.family_name
+                        br
+                        = slot.patient.given_name

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

@@ -0,0 +1,111 @@
+= render "renalware/shared/errors", model: slot
+
+= simple_form_for(slot,
+                  url: hd_diary_slots_path(slot.diary.id),
+                  html: { id: "slot-form", autocomplete: "off" },
+                  remote: true,
+                  method: :post,
+                  wrapper: :horizontal_form) do |f|
+
+  =f.input :station_id, as: :hidden
+  =f.input :diurnal_period_code_id, as: :hidden
+  =f.input :day_of_week, as: :hidden
+
+  .row
+    .col-small-4
+      = f.input :change_type,
+                input_html: { id: :change_type },
+                collection: slot.patient_search_options,
+                include_blank: false,
+                label: "Search"
+    .col-small-8
+
+      / We will post 3 patient_id values in hd_diary_slot[patient_id][]
+      / The value selected in in change_type above will determine which one to choose.
+      #patient_select2s
+        #dialysing_on_day_and_period
+          =f.input :patient_id,
+                   collection: slot.patients_preferring_to_dialyse_today_in_this_period,
+                   label_method: :text,
+                   value_method: :id,
+                   input_html: { class: "searchable_select patient-id-select2",
+                                 id: "patient_id1",
+                                 name: "hd_diary_slot[patient_id][]" }
+
+        #dialysing_on_day(style="display:none")
+          =f.input :patient_id,
+                   collection: slot.patients_preferring_to_dialyse_today,
+                   label_method: :text,
+                   value_method: :id,
+                   input_html: { class: "searchable_select patient-id-select2",
+                                 id: "patient_id2",
+                                 name: "hd_diary_slot[patient_id][]" }
+        #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][]",
+                      data: { "ajax--url" => hd_patients_dialysing_at_unit_path(unit_id: slot.diary.hospital_unit_id, format: :json),
+                              placeholder: "Type 3 or more characters" }\
+                    }
+
+        #dialysing_at_hospital(style="display:none")
+          = f.input :patient_id,
+                    collection: [],
+                    input_html: {\
+                      class: "patient-id-select2 patient-ajax-search",
+                      name: "hd_diary_slot[patient_id][]",
+                      data: { "ajax--url" => hd_patients_dialysing_at_hospital_path(format: :json),
+                              placeholder: "Type 3 or more characters" }\
+                    }
+  =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"
+
+  = blank_separator
+  =link_to "Cancel",
+           "#",
+           "aria-label" => "Close",
+           class: "reveal-modal-close"
+
+javascript:
+  $(document).ready(function() {
+
+    // 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");
+      $("#slot-form").attr('action', master_slots_url);
+    });
+
+    $('input.weekly[type=submit]').click(function (e) {
+      var weekly_slots_url = $(".diary").data("weekly-diary-slots-path");
+      $("#slot-form").attr('action', weekly_slots_url);
+    });
+
+    refreshSelect2s("#{slot.change_type}");
+
+    function resizeSelect2ToFitModalWidth(container) {
+      $('.select2', container).css('width', "100%");
+      $('#tabs').on('tabsactivate', function(event, ui) {
+        $('.select2').css('width', "100%");
+      });
+    }
+
+    function refreshSelect2s(change_type) {
+      if (change_type == '') return;
+      // Hide any showing patient select2's then display just the one corresponding to
+      // what was selected in change_type. The value in the change_type option
+      // will exist as an html id, wrapping the patient select2s
+      var container = $("#patient_select2s")
+      $("#patient_select2s > div").hide();
+      $("#patient_select2s > #" + change_type).show();
+      $("#patient_select2s .patient-id-select2").val("").trigger('change');
+      resizeSelect2ToFitModalWidth(container);
+    }
+
+    $("#change_type").on("change", function() {
+      change_type = $(this).val(); // e.g. "dialysing_at_unit"
+      refreshSelect2s(change_type);
+    })
+  });

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

@@ -0,0 +1,21 @@
+td*{ "data-slot-id" => slot.id.present? && slot.id,
+     "data-cell-id" => slot.cell_id,
+     "data-master" => slot.master?,
+     "data-weekly" => slot.id.present? && !slot.master?,
+     "data-patient-id" => slot.patient_id.present? && slot.patient_id,
+     "style" => defined?(animate) && animate && "animation: highlight 1.5s" }
+
+  - if slot.patient.present?
+    = link_to slot.patient.to_s,
+              edit_hd_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,
+                                     station_id: slot.station_id,
+                                     diurnal_period_code_id: slot.diurnal_period_code_id,
+                                     day_of_week: slot.day_of_week),
+              data: { "reveal-id" => "add-patient-to-diary-modal", "reveal-ajax" => "true" }

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

@@ -0,0 +1,27 @@
+- form_id = SecureRandom.hex(16)
+= simple_form_for(slot,
+                  html: { id: form_id },
+                  url: hd_diary_slot_path(weekly_diary.id, slot),
+                  remote: true,
+                  wrapper: :horizontal_form) do |f|
+
+  -if scheduled_only
+    =f.input :patient_id,
+             collection: patients,
+             label_method: ->(item){ item.to_s(:long) },
+             value_method: :id,
+             input_html: { class: "searchable_select" }
+  - else
+    = f.input :patient_id,
+              collection: [],
+              input_html: { \
+                id: "patient-ajax-search",
+                data: { "ajax--url" => search_patients_path(format: :json) }\
+              }
+
+  =f.submit "Select", class: :button
+  = blank_separator
+  =link_to "Cancel",
+           "#",
+           "aria-label" => "Close",
+           class: "reveal-modal-close"

data/app/views/renalware/hd/diary_slots/create.js.erb

@@ -0,0 +1,11 @@
+<% slot_path = hd_diary_refresh_slot_path(
+  diary_id: "weekly_diary_id",
+  day_of_week: slot.day_of_week,
+  diurnal_period_code_id: slot.diurnal_period_code_id,
+  station_id: slot.station_id,
+  format: :js)
+%>
+
+// Only JS knows the weekly diary id by looking at the html
+var weekly_diary_id = $(".diary").data("weekly-diary-id")
+$.getScript('<%= slot_path %>'.replace('weekly_diary_id', weekly_diary_id));

data/app/views/renalware/hd/diary_slots/destroy.js.erb

@@ -0,0 +1,11 @@
+<% slot_path = hd_diary_refresh_slot_path(
+  diary_id: "weekly_diary_id",
+  day_of_week: slot.day_of_week,
+  diurnal_period_code_id: slot.diurnal_period_code_id,
+  station_id: slot.station_id,
+  format: :js)
+%>
+
+// Only JS knows the weekly diary id by looking at the html
+var weekly_diary_id = $(".diary").data("weekly-diary-id")
+$.getScript('<%= slot_path %>'.replace('weekly_diary_id', weekly_diary_id));

data/app/views/renalware/hd/diary_slots/edit.html.slim

@@ -0,0 +1,26 @@
+.modal
+  .modal__header
+    h2= slot.patient
+    = render "renalware/shared/modal_close_link"
+
+  .modal__body
+    = render "renalware/shared/errors", model: slot
+
+    p.which-diary= slot.description
+
+    /- unless slot.diary.master?
+    = link_to "Remove them",
+            hd_diary_slot_path(slot.diary, slot),
+            method: :delete,
+            remote: true,
+            class: "button alert"
+
+    / - destroy_btn_title = slot.diary.master ? "Remove" : "Remove and revert to master diary"
+    / = link_to destroy_btn_title,
+    /           hd_diary_slot_path(slot.diary, slot),
+    /           method: :delete,
+    /           remote: true,
+    /           class: "button alert"
+
+    h2 Replace with another patient
+    = render "form", slot: slot

data/app/views/renalware/hd/diary_slots/new.html.slim

@@ -0,0 +1,12 @@
+/ Invoked by Foundation Reveal from an Add Patient to Diary link
+/ which is marked up as using data-reveal-ajax=true and links to this action
+/ - and a format of html (would otherwise default to js)
+/ We render the modal content html here and foundation will display the modal itself.
+
+.modal
+  .modal__header
+    h2 Add patient
+    = render "renalware/shared/modal_close_link"
+
+  .modal__body
+    = render "form", slot: slot

data/app/views/renalware/hd/diary_slots/new.js.erb

@@ -0,0 +1,6 @@
+// We render this view if there was a validation error submitting the foundation reveal modal.
+// Replace the original content so that error messages are displayed.
+var modal = $("#add-patient-to-diary-modal .modal__body")
+$(modal).html("<%= j(render 'form', slot: slot) %>");
+$('.searchable_select', modal).select2();
+Renalware.PatientSearch.init();

data/app/views/renalware/hd/diary_slots/show.js.erb

@@ -0,0 +1,5 @@
+
+$("td[data-cell-id='<%= slot.cell_id %>']").replaceWith("<%= escape_javascript(
+  render "slot", slot: slot, diary: slot.diary, animate: true
+) %>");
+$(".reveal-modal").foundation('reveal', 'close');

data/app/views/renalware/hd/diary_slots/update.js.erb

@@ -0,0 +1,11 @@
+<% slot_path = hd_diary_refresh_slot_path(
+  diary_id: "weekly_diary_id",
+  day_of_week: slot.day_of_week,
+  diurnal_period_code_id: slot.diurnal_period_code_id,
+  station_id: slot.station_id,
+  format: :js)
+%>
+
+// Only JS knows the weekly diary id by looking at the html
+var weekly_diary_id = $(".diary").data("weekly-diary-id")
+$.getScript('<%= slot_path %>'.replace('weekly_diary_id', weekly_diary_id));

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

@@ -9,4 +9,3 @@ article
            historical_profiles: historical_profiles,
            historical_profile_count: historical_profile_count,
            compact: true
-

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

@@ -12,8 +12,8 @@
           label: t(".hospital_unit")
 
     .medium-4.columns
-      = f.input :hd_profile_schedule_eq,
-          collection: Renalware::HD::Profile.schedule.options,
+      = f.input :hd_profile_schedule_definition_id_eq,
+          collection: Renalware::HD::ScheduleDefinition.ordered,
           include_blank: true,
           label:  t(".schedule")
 

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

@@ -4,8 +4,7 @@
 - transplant_patient = Renalware::Transplants::PatientPresenter.new(patient)
 
 tr
-  td= link_to t(".view"), view_proc.call(patient)
-  td.full-name= patient
+  td.full-name= link_to patient, view_proc.call(patient)
   td.nowrap= patient.nhs_number
   td.nowrap= patient.hospital_identifier
   td= patient.sex.code
@@ -16,7 +15,7 @@ tr
   td= l(access_patient.access_plan_created_at.to_date)
   td= patient.dialysing_at_unit
   td= transplant_patient.current_registration_status
-  td= patient.has_transport&.text
-  td= patient.transport_type&.text
+  td= patient.transport_summary
   td= pathology_patient.hgb_result
   td= l(pathology_patient.hgb_observed_at&.to_date)
+  td.actions= link_to t(".view"), view_proc.call(patient)

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

@@ -1,23 +1,21 @@
 table#patients.mdm-patients.columns
   thead
     tr
-      th.col-width-tiny
       th.col-width-large= sort_link([:renalware, presenter.q], :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-small= t(".access")
-      th.col-width-small= t(".access_started_on")
+      th.col-width-medium= t(".access")
+      th.col-width-date= t(".access_started_on")
       th.col-width-small= t(".access_plan")
       th.col-width-date= t(".access_plan_date")
       th.col-width-date= t(".dialysing_at")
       th.col-width-date= t(".registration_status")
-      th.col-width-tiny= t(".has_transport")
-      th.col-width-tiny= t(".transport_type")
+      th.at-least.col-width-small= t(".transport_type")
       th.col-width-tiny= t(".hgb")
       th.col-width-date= t(".hgb_date")
-
+      th.col-width-tiny
   tbody
     - presenter.patients.each do |patient|
       = render "patient",

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

@@ -3,10 +3,11 @@ ruby:
 
 .form-content
   = render layout: "renalware/shared/fieldset",
-      locals: { legend: "Preferences", name: "preferences" } do
-    = f.input :schedule,
-              input_html: { class: "small-input" },
-              autofocus: true
+           locals: { legend: "Preferences", name: "preferences" } do
+
+    = f.input :schedule_definition_id,
+              collection: Renalware::HD::ScheduleDefinition.ordered,
+              wrapper: :horizontal_small
     = f.input :other_schedule,
               input_html: { class: "small-input" }
     = f.association :hospital_unit,

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

@@ -5,6 +5,6 @@ article
       li= link_to "Edit", edit_patient_hd_preference_set_path(patient), class: "button"
 
   = definition_list_for(preference_set) do |list|
-    = list.definition(:schedule) { |value|  value&.text }
+    = list.definition(:schedule_definition)
     = list.definition(:hospital_centre)
     = list.definition(:hospital_unit)

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

@@ -26,7 +26,6 @@ ruby:
                       collection: Renalware::User.ordered,
                       wrapper: :horizontal_medium
 
-
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Sign-Off", name: "signoff" } do
 
@@ -53,7 +52,7 @@ ruby:
         = fcm.input :single_needle, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :lines_reversed, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :machine_no, wrapper: :horizontal_tiny
-        = fcm.input :dialysis_fluid_used, wrapper: :horizontal_tiny
+        = f.association :dialysate, wrapper: :horizontal_small
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Pre-Dialysis Observations", name: "before" } do

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

@@ -13,7 +13,8 @@
           legend: "Sign-Off", destination: "signoff",
           models: { session => [:end_time,
                                 :duration,
-                                :signed_off_by] }
+                                :signed_off_by,
+                                :dialysate] }
 
       = render "renalware/shared/documents/attributes_group",
           group: session.document.info,

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

@@ -5,4 +5,3 @@ tr(class=[session.state, stripe_class])
   td(colspan=3) Did not attend
   td(colspan=12)
    i= session.truncated_notes
-

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

@@ -4,7 +4,9 @@
                   wrapper: :horizontal_form do |f|
 
   = f.input :name, wrapper: :horizontal_medium
-  = f.input :location, wrapper: :horizontal_medium
+  = f.input :location_id,
+            collection: Renalware::HD::StationLocation.pluck(:name, :id),
+            wrapper: :horizontal_medium
 
   = f.submit "Save", class: "button"
   span= " or "