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

data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder

@@ -4,8 +4,10 @@ xml.LabOrders(start: Time.zone.today.iso8601, stop: Time.zone.today.iso8601) do
   xml.comment! "TODO: start and stop date"
 
   render partial: "renalware/api/ukrdc/patients/lab_orders/lab_order",
-       collection: patient.observation_requests.includes(:description,
-                                                         observations: {description: :measurement_unit}),
-       as: :request,
-       locals: { builder: builder }
+         collection: patient.observation_requests.includes(
+           :description,
+           observations: { description: :measurement_unit }
+         ),
+         as: :request,
+         locals: { builder: builder, patient: patient }
 end

data/app/views/renalware/api/ukrdc/patients/_name.xml.builder

@@ -1,4 +1,4 @@
-builder.Name do
+builder.Name(use: "L") do
   builder.Prefix nameable.title
   builder.Family nameable.family_name
   builder.Given nameable.given_name

data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder

@@ -5,4 +5,4 @@ xml.SendingFacility(
   channelId: "TODO",
   time: Time.zone.now.to_datetime) do
 end
-xml.SendingExtract "???"
+xml.SendingExtract "UKRDC"

data/app/views/renalware/api/ukrdc/patients/encounters/_hd_session.xml.builder

@@ -1,7 +1,8 @@
 xml = builder
 
 xml.Treatment do
-  xml.EncounterNumber "?can supply uuid if required?"
+  xml.comment! "EncounterNumber required by XSD. Could use a guid if required?"
+  xml.EncounterNumber "NA"
   xml.comment! "What EncounterType for HD Session?"
   xml.EncounterType "R"
   xml.FromTime session.start_datetime&.to_datetime
@@ -15,8 +16,7 @@ xml.Treatment do
     xml.HDP01 "Times per week - to confirm"
     xml.HDP02 session.duration
     xml.HDP03 session.document.dialysis.flow_rate
-    xml.comment! "HDP04 Sodium in Dialysate - to follow."
-    xml.HDP04 ""
+    xml.HDP04 session&.dialysate&.sodium_content
     xml.QBL05 session.access_type
     xml.QBL06 ""
     xml.comment! "QBL06 HD Shared Care - not implemented yet"

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -8,13 +8,13 @@ xml.LabOrder do
     xml.Description # request.pathology_lab.name
   end
   xml.PlacerId request.requestor_order_number
-  xml.FillerId "??ORC:3 Labs Order Id"
+  # xml.FillerId "??ORC:3 Labs Order Id"
   xml.OrderedBy do
     xml.Code "unknown"
     xml.Description request.requestor_name
   end
   xml.OrderItem do
-    xml.Code "TODO: LOIN code for request? E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
+    xml.Code "TODO: LOIN code for request E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
   end
   xml.OrderCategory do
     xml.Code request.description.code
@@ -31,13 +31,13 @@ xml.LabOrder do
     render partial: "renalware/api/ukrdc/patients/lab_orders/result_item",
            collection: request.observations,
            as: :observation,
-           locals: { builder: builder }
+           locals: { builder: builder, patient: patient }
   end
 
   xml.PatientClass do
     xml.CodingStandard "HL7_0004"
     xml.Code "e.g. I for Inpatient"
-    xml.Description "e.g. Inpatient?"
+    xml.Description "e.g. Inpatient"
   end
   xml.EnteredOn request.requested_at.iso8601
   xml.EnteredAt do

data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder

@@ -1,14 +1,16 @@
 xml = builder
 observation = Renalware::Pathology::ObservationPresenter.new(observation)
+observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
 
 xml.ResultItem do
-  xml.ResultType observation.description_name
   xml.EnteredOn observation.updated_at&.iso8601
   xml.ObservationTime observation.observed_at&.iso8601
-  xml.PrePost "?"
-  xml.ServiceId "?"
-  xml.SubId "?"
+  xml.PrePost observation.pre_post(patient.current_modality_hd?)
   xml.ResultValue observation.result
   xml.ResultValueUnits observation.measurement_unit_name
-  xml.ReferenceRange "?"
+  xml.ServiceId do
+    xml.Code observation.description_code
+    xml.CodingStandard "LOCAL"
+    xml.Description observation.description_name
+  end
 end

data/app/views/renalware/clinical/allergies/_new.html.slim

@@ -1,4 +1,3 @@
-
 / The modal dialog
 #add-allergy-modal.reveal-modal.medium(data-reveal)
   = simple_form_for patient.allergies.new,

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

@@ -35,7 +35,6 @@
             wrapper: :horizontal_large,
             input_html: { rows: 5 }
 
-
 .row
   .large-12.columns
     = f.button :submit

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

@@ -1,7 +1,6 @@
 = within_patient_layout(title: "New Dry Weight",
                         breadcrumbs: clinical_profile_breadcrumb(patient)) do
 
-
   .document
     = simple_form_for dry_weight,
         url: patient_clinical_dry_weights_path(patient),

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

@@ -64,4 +64,3 @@
         = render "renalware/clinical/body_compositions/list",
                  body_compositions: profile.body_compositions,
                  patient: patient
-

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -34,8 +34,10 @@
             |
             = link_to "(Uncheck all)", "#", id: "uncheck_all_appointments_link"
           th.col-width-medium
-          th.col-width-date= sort_link([:renalware, query], :starts_at, "Date", default_order: :asc)
-          th.col-width-time= sort_link([:renalware, query], :start_time, "Time", default_order: :asc)
+          th.col-width-date
+            = sort_link([:renalware, query], :starts_at, "Date", default_order: :asc)
+          th.col-width-time
+            = sort_link([:renalware, query], :start_time, "Time", default_order: :asc)
           th.col-width-medium
             = sort_link([:renalware, query], :patient_family_name, "Patient", default_order: :asc)
           th.col-width-tiny Sex

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

@@ -31,4 +31,3 @@
       dd= users.detect{ |user| query.created_by_id_eq == user.id }&.to_s
       br
       br
-

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

@@ -18,4 +18,3 @@ table.global-clinic-visits
     = render partial: "table_row",
              collection: clinic_visits,
              as: :clinic_visit
-

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

@@ -1,10 +1,13 @@
+- patient = Renalware::PatientPresenter.new(bookmark.patient)
+
 tr class=("urgent" if bookmark.urgent?)
-  td= link_to bookmark.patient.to_s(:long), patient_clinical_summary_path(bookmark.patient)
-  td= bookmark.patient.hospital_identifier
-  td= I18n.l bookmark.patient.born_on
-  td= bookmark.patient.age
-  td= bookmark.patient.sex
-  td= bookmark.patient.current_modality
+  td= default_patient_link(patient)
+  td= patient.nhs_number
+  td= patient.hospital_identifier
+  td= I18n.l(patient.born_on)
+  td= patient.age
+  td= patient.sex
+  td= patient.current_modality
   td= bookmark.notes
   td= I18n.l bookmark.created_at
   td.nowrap= render "renalware/patients/bookmarks/delete",

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

@@ -1,7 +1,8 @@
 table.auto-layout
   thead
     tr
-      th.col-width-large= t(".patient_name")
+      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.col-width-date= t(".born_on")
       th.col-width-tiny= t(".age")

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

@@ -4,7 +4,6 @@
   table#patients-deceased
     thead
       tr
-        th.col-width-large
         th Name
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp No.
@@ -12,22 +11,21 @@
         th.col-width-date Date of Birth
         th.col-width-date Date of Death
         th.col-width-tiny Age
+        th.col-width-medium
 
     tbody
       - @patients.each do |patient|
         tr
-          td
-            = link_to "Demographics", patient_path(patient), title: "Demographics"
-            = pipe_separator
-            = link_to "Edit death details",
-                      edit_patient_death_path(patient),
-                      title: "Edit death details"
-          td= patient.to_s(format: :default)
+          td= default_patient_link(patient)
           td= patient.nhs_number
           td= patient.hospital_identifier
           td= patient.sex
           td= l patient.born_on
           td= l patient.died_on
           td= patient.age
+          td.actions
+            = link_to "Edit death details",
+                      edit_patient_death_path(patient),
+                      title: "Edit death details"
 
   = paginate @patients

data/app/views/renalware/devise/registrations/new.html.slim

@@ -22,4 +22,3 @@
     = f.submit "Sign up", class: "button save"
 
   = render "devise/shared/links"
-

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

@@ -12,4 +12,3 @@
   = f.button :submit
   span= " or "
   = link_to "cancel", directory_people_path
-

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

@@ -1,5 +1,7 @@
 tr
-  td = link_to "Toggle", "##{toggle_prefix}-quick-preview-#{event.id}", data: { behaviour: "toggler" }
+  td= link_to("Toggle",
+              "##{toggle_prefix}-quick-preview-#{event.id}",
+              data: { behaviour: "toggler" })
   td.nowrap= l event.created_at.to_date
   - unless local_assigns.fetch(:exclude_type_column, false)
     td= event.event_type

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

@@ -18,4 +18,3 @@
         = f.submit "Filter", class: "button"
         span= " or "
         = link_to t("helpers.reset"), patient_events_path(events.patient)
-

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

@@ -16,10 +16,10 @@
     = f.input :event_type_id,
               collection: event_types,
               wrapper: :horizontal_medium,
-              input_html: {  id: "event-type-dropdown",
-                             class: "searchable_select",
-                             required: :required,
-                             tabindex: 2001 }
+              input_html: { id: "event-type-dropdown",
+                            class: "searchable_select",
+                            required: :required,
+                            tabindex: 2001 }
 
   / The contents of this div will get replaced if a user selects an alternative
   / event type in the drop-down above. See events.js.

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

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

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

@@ -1 +1 @@
-= render "form"
+= render "form"

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

@@ -1 +1 @@
-= render "form"
+= render "form"

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

@@ -20,7 +20,8 @@ ruby:
           autofocus: true,
           hint: profile.hospital_unit_hint,
           wrapper: :horizontal_medium
-      = f.input :schedule,
+      = f.input :schedule_definition_id,
+                collection: profile.schedule_definitions,
                 wrapper: :horizontal_small,
                 hint: profile.schedule_hint
       = f.input :other_schedule,
@@ -62,8 +63,8 @@ ruby:
         = fcm.input :single_needle,
                     as: :inline_radio_buttons,
                     wrapper: :horizontal_medium
-        = fcm.input :dialysate,
-                    wrapper: :horizontal_small
+        = f.association :dialysate,
+                        wrapper: :horizontal_small
         = fcm.input :flow_rate,
                     collection: fcm.object.class.flow_rates,
                     wrapper: :horizontal_tiny

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

@@ -15,27 +15,27 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
 
   = dropdown_btn_item enabled: dashboard.can_add_hd_profile?,
                       title: t(".add_hd_profile"),
-                      path: edit_patient_hd_current_profile_path(patient)
+                      url: edit_patient_hd_current_profile_path(patient)
 
   = dropdown_btn_item enabled: dashboard.can_add_access_profile?,
                       title: t(".add_access_profile"),
-                      path: new_patient_accesses_profile_path(patient)
+                      url: new_patient_accesses_profile_path(patient)
 
   = dropdown_btn_item enabled: dashboard.can_add_preference_set?,
                       title: t(".add_preferences"),
-                      path: edit_patient_hd_preference_set_path(patient)
+                      url: edit_patient_hd_preference_set_path(patient)
 
   = dropdown_btn_item enabled: dashboard.can_add_session?,
                       title: t(".add_session"),
-                      path: new_patient_hd_session_path(patient)
+                      url: new_patient_hd_session_path(patient)
 
   = dropdown_btn_item enabled: dashboard.can_add_dna_session?,
                       title: t(".add_dna_session"),
-                      path: new_patient_hd_session_path(@patient, type: :dna)
+                      url: new_patient_hd_session_path(@patient, type: :dna)
 
   = dropdown_btn_item enabled: policy(Renalware::Clinical::DryWeight).new?,
                       title: t(".add_dry_weight"),
-                      path: new_patient_clinical_dry_weight_path(@patient)
+                      url: new_patient_clinical_dry_weight_path(@patient)
 
 - unless dashboard.has_ever_been_on_hd?
   = render "modality_missing_warning", message: t(".missing_modality_warning")

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

@@ -11,4 +11,3 @@
       = f.button :submit
       span= " or "
       = link_to "cancel", hd_dialysers_path
-

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

@@ -0,0 +1,23 @@
+li
+  a.button.dropdown.with-icon(href="#"
+                              data-dropdown="diary-options"
+                              aria-controls="diary-options"
+                              aria-expanded="false")
+    | Go to...
+  br
+  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)
+    - 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)
+    - 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)
+    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"
+/ hd_unit_show_diary_path(year: date.year, week_number: date.cweek, format: :pdf),

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

@@ -0,0 +1,12 @@
+table.hd-unit-diaries
+  thead
+    tr
+      th.col-width-small
+      th.col-width-tiny Week
+      th.col-width-tiny Year
+      th.col-width-large Period
+      th.col-width-tiny Archived
+      th.col-width-small Current
+      th Last updated
+  tbody
+    = render partial: "weekly_diary", collection: diaries

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

@@ -0,0 +1,10 @@
+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,
+                                      year: weekly_diary.week.year)
+  td= weekly_diary.week_number
+  td= weekly_diary.year
+  td= weekly_diary.to_s
+  td= yes_no(weekly_diary.archived?)
+  td= "Yes" if weekly_diary.applies_to_current_week?
+  td= "#{l(weekly_diary.updated_at)} by #{weekly_diary.updated_by}"

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

@@ -0,0 +1,58 @@
+= content_for(:actions) do
+  = render "page_actions", unit: unit, diary: diary
+
+= within_admin_layout(title: diary,
+                      breadcrumbs: [\
+                        breadcrumb_for(unit.name, edit_hospitals_unit_path(unit)),
+                        breadcrumb_for("HD Diaries", hd_unit_diaries_path(unit))\
+                      ]) do
+
+  .diary__navigation
+    = link_to hd_unit_edit_diary_path(**diary.week.previous.to_h), class: "button secondary" do
+      i.fa.fa-arrow-left
+      | Previous week
+
+    = link_to hd_unit_edit_diary_path(**diary.week.next.to_h), class: "button secondary" do
+      i.fa.fa-arrow-right
+      | Next week
+
+  .diary__key
+      h4.title Key:
+      ul
+        li.diary__key--master-diary Master Diary
+        li.diary__key--weekly-diary This week only
+        - diary.station_locations.each do |location|
+          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),
+               "master-diary-id" => diary.master_diary.id,
+               "master-diary-slots-path" => hd_diary_slots_path(diary.master_diary)})
+
+    .diary__grid
+
+      - diary.each_diurnal_period do |diurnal_period|
+
+          table.diary__period*{ "data-period-code" => diurnal_period.code }
+            thead
+              tr
+                th(colspan=8)
+                  h3= diurnal_period.code.upcase
+              tr
+                th.col-width-medium Station
+                - diary.day_names.each do |day|
+                  th.col-width-small= day.capitalize
+
+            tbody
+
+              - diary.each_station do |station, index|
+                tr*{ "data-station-id" => station.id }
+                  th(style=station.css)
+                    = "#{index}. #{station.name}"
+
+                  - diary.each_day(diurnal_period, station) do |slot, _day_of_week|
+                    /- cache(slot.cache_key) do
+                    = render "renalware/hd/diary_slots/slot", slot: slot
+
+  / Modal dialog container
+  #add-patient-to-diary-modal.reveal-modal.medium(data-reveal)