renalware-core 2.0.0.pre.beta11 → 2.0.0.pre.beta12

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

@@ -3,29 +3,30 @@
 xml = builder
 
 xml.LabOrder do
-  xml.ReceivingLocation do
-    xml.code "TODO"
-    xml.Description # request.pathology_lab.name
-  end
+  # xml.ReceivingLocation do
+  #   xml.Code ""
+  #   xml.Description # request.pathology_lab.name
+  # end
   xml.PlacerId request.requestor_order_number
   # 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|..'"
-  end
+  # xml.OrderedBy do
+  #   xml.Code "unknown"
+  #   xml.Description request.requestor_name
+  # end
+  # xml.OrderItem do
+  #   xml.comment! "Code TODO: LOIN code for request E.g. MB from 'OBR|1|^PCS|09B0099478^LA|FBC^FULL BLOOD COUNT^MB|..'"
+  #   xml.Code
+  # end
   xml.OrderCategory do
     xml.Code request.description.code
   end
-  xml.SpecimenCollectedTime "TODO"
-  xml.SpecimenReceivedTime "TODO"
-  xml.Priority do
-    xml.Code "TODO: Probably n/a"
-  end
+  # xml.SpecimenCollectedTime "TODO"
+  # xml.SpecimenReceivedTime "TODO"
+  # xml.Priority do
+  #   xml.Code "TODO: Probably n/a"
+  # end
   xml.SpecimenSource request.description.bottle_type
-  xml.Duration "OBR:27.3 but no available in the example messages I have"
+  # xml.Duration "OBR:27.3 but no available in the example messages I have"
 
   xml.ResultItems do
     render partial: "renalware/api/ukrdc/patients/lab_orders/result_item",
@@ -34,13 +35,13 @@ xml.LabOrder do
            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"
-  end
+  # xml.PatientClass do
+  #   xml.CodingStandard "HL7_0004"
+  #   xml.Code "e.g. I for Inpatient"
+  #   xml.Description "e.g. Inpatient"
+  # end
   xml.EnteredOn request.requested_at.iso8601
-  xml.EnteredAt do
-    xml.code "location code here"
-  end
+  # xml.EnteredAt do
+  #   xml.code "location code here"
+  # end
 end

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

@@ -5,7 +5,7 @@ observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)
 xml.ResultItem do
   xml.EnteredOn observation.updated_at&.iso8601
   xml.ObservationTime observation.observed_at&.iso8601
-  xml.PrePost observation.pre_post(patient.current_modality_hd?)
+  xml.PrePost observation.pre_post(patient_is_on_hd: patient.current_modality_hd?)
   xml.ResultValue observation.result
   xml.ResultValueUnits observation.measurement_unit_name
   xml.ServiceId do

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

@@ -1,7 +1,6 @@
 # See
 # https://www.ukrdc.org/2015/09/15/ukrdc-schema/
 # https://github.com/renalreg/ukrdc
-#
 xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
 
 namespace_and_schema = {
@@ -9,7 +8,7 @@ namespace_and_schema = {
   "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
   "xsi:schemaLocation" => [
     "http://www.rixg.org.uk/",
-    Renalware::Engine.root.join("vendor", "xsd", "ukrdc/UKRDC.xsd")
+    "https://github.com/renalreg/ukrdc/blob/master/Schema/UKRDC.xsd"
   ].join(" ")
 }
 

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

@@ -5,7 +5,7 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
     = link_to_clinic_visit_letter(clinic_visit.patient, clinic_visit)
   td.date-time= l clinic_visit.date
   td= yes_no(clinic_visit.did_not_attend)
-  td= link_to(clinic_visit.patient, patient_path(clinic_visit.patient))
+  td= default_patient_link(clinic_visit.patient)
   td= clinic_visit.patient.nhs_number
   td= clinic_visit.patient.sex
   td= clinic_visit.patient.age

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

@@ -9,6 +9,7 @@ tr class=("urgent" if bookmark.urgent?)
   td= patient.sex
   td= patient.current_modality
   td= bookmark.notes
+  td= bookmark.tags
   td= I18n.l bookmark.created_at
   td.nowrap= render "renalware/patients/bookmarks/delete",
                     bookmark: bookmark,

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

@@ -9,6 +9,7 @@ table.auto-layout
       th.col-width-tiny= t(".sex")
       th.col-width-small= t(".modality")
       th= t(".notes")
+      th= t(".tags")
       th.col-width-date-time= t(".bookmarked_on")
       th.col-width-tiny
 

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

@@ -1,8 +1,8 @@
 = within_patient_layout(title: "Cause of Death",
-    breadcrumbs: breadcrumb_for("Clinical Profile", patient_clinical_profile_path(@patient))) do
+    breadcrumbs: breadcrumb_for("Clinical Profile", patient_clinical_profile_path(patient))) do
 
-  = simple_form_for @patient,
-      url: patient_death_path(@patient),
+  = simple_form_for patient,
+      url: patient_death_path(patient),
       html: { autocomplete: "off" },
       wrapper: "horizontal_form" do |f|
 
@@ -32,4 +32,4 @@
 
     = f.button :submit
     span= " or "
-    = link_to "cancel", patient_clinical_profile_path(@patient)
+    = link_to "cancel", patient_clinical_profile_path(patient)

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

@@ -14,7 +14,7 @@
         th.col-width-medium
 
     tbody
-      - @patients.each do |patient|
+      - patients.each do |patient|
         tr
           td= default_patient_link(patient)
           td= patient.nhs_number
@@ -28,4 +28,4 @@
                       edit_patient_death_path(patient),
                       title: "Edit death details"
 
-  = paginate @patients
+  = paginate patients

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

@@ -1,10 +1,10 @@
 .row
   = render "header"
-  = render "renalware/shared/errors", model: @cannulation_type
+  = render "renalware/shared/errors", model: cannulation_type
 
 .row
   .large-6.columns
-    = simple_form_for @cannulation_type, html: { autocomplete: "off" } do |f|
+    = simple_form_for cannulation_type, html: { autocomplete: "off" } do |f|
       = f.input :name, autofocus: true
 
       = f.button :submit

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

@@ -1 +1 @@
-= render "form"
+= render "form", cannulation_type: cannulation_type

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

@@ -8,7 +8,7 @@
         th.col-width-small
         th Name
     tbody
-      - @cannulation_types.each do |t|
+      - cannulation_types.each do |t|
         tr
           td
             = link_to "Edit", edit_hd_cannulation_type_path(t.id)

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

@@ -1 +1 @@
-= render "form"
+= render "form", cannulation_type: cannulation_type

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

@@ -1,5 +1,5 @@
 .search-form.filters
-  = simple_form_for @q,
+  = simple_form_for query,
                     as: :q,
                     url: hd_ongoing_sessions_path,
                     html: { autocomplete: "off" },

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

@@ -2,17 +2,17 @@ table.report
   thead
     tr
       th.noprint.col-width-11
-      th.col-width-medium= sort_link([:renalware, q], :patient_family_name, "Patient")
+      th.col-width-medium= sort_link([:renalware, query], :patient_family_name, "Patient")
       th.col-width-tiny Hosp No
-      th= sort_link([:renalware, q], :patient_born_on, "Age")
-      th= sort_link([:renalware, q], :patient_sex, "Sex")
+      th= sort_link([:renalware, query], :patient_born_on, "Age")
+      th= sort_link([:renalware, query], :patient_sex, "Sex")
       th Current Modality
-      th= sort_link([:renalware, q], :hospital_unit_name, "Unit")
-      th.col-width-date= sort_link([:renalware, q], :performed_on, "Date")
-      th.col-width-time= sort_link([:renalware, q], :start_time, "Start Time")
-      th.col-width-time= sort_link([:renalware, q], :end_time, "End Time")
-      td= sort_link([:renalware, q], :signed_on_by_family_name, "Signed On By")
-      td= sort_link([:renalware, q], :signed_off_by_family_name, "Signed Off By")
+      th= sort_link([:renalware, query], :hospital_unit_name, "Unit")
+      th.col-width-date= sort_link([:renalware, query], :performed_on, "Date")
+      th.col-width-time= sort_link([:renalware, query], :start_time, "Start Time")
+      th.col-width-time= sort_link([:renalware, query], :end_time, "End Time")
+      td= sort_link([:renalware, query], :signed_on_by_family_name, "Signed On By")
+      td= sort_link([:renalware, query], :signed_off_by_family_name, "Signed Off By")
 
   tbody
     - sessions.each do |session|

data/app/views/renalware/hd/ongoing_sessions/show.html.slim

@@ -1,3 +1,3 @@
 = within_admin_layout(title: "Ongoing HD Sessions") do
-  = render "filters"
-  = render "table", q: @q, sessions: @sessions
+  = render "filters", query: query
+  = render "table", query: query, sessions: sessions

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

@@ -38,7 +38,7 @@
       = render "renalware/shared/attributes_group",
           legend: "Notes/Complications", destination: "complications",
           models: { session.document.complications => attributes_list,
-                    session => [:notes]  }
+                    session => [:notes] }
   .row
     .columns.large-12
       = render "prescription_administrations", session: session

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

@@ -1,4 +1,3 @@
-
 - content_for(:header) do
   = render "renalware/patients/header", patient: current_patient
 

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

@@ -2,7 +2,7 @@
   = link_to "Preview", patient_letters_letter_path(patient, letter), class: "button secondary"
 
 = within_patient_layout(title: "Edit Letter",
-    breadcrumbs: [ breadcrumb_for("Letters", patient_letters_letters_path(patient)) ]) do
+    breadcrumbs: [breadcrumb_for("Letters", patient_letters_letters_path(patient))]) do
 
   .document
     = simple_form_for letter,

data/app/views/renalware/medications/drug_types/prescriptions/_table.html.slim

@@ -17,8 +17,8 @@ table#drug-type-prescriptions
   tbody
     - prescriptions.each do |prescription|
       tr
-        td= link_to(prescription.patient_local_patient_id, patient_path(prescription.patient_id))
-        td= prescription.patient_name
+        td= prescription.patient_local_patient_id
+        td= default_patient_link(prescription.patient)
         td= prescription.patient_age
         td= prescription.patient_sex
         td= prescription.patient_current_modality_name

data/app/views/renalware/messaging/internal/receipts/_receipt.html.slim

@@ -18,7 +18,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
 = content_tag(:tr,
               id: "#{message.html_preview_identifier}",
               style: "display: none",
-              class: "#{ "urgent" if message.urgent?}")
+              class: "#{ 'urgent' if message.urgent?}")
   td(colspan=6)
     .message-preview
       .subject= message.subject

data/app/views/renalware/messaging/internal/receipts/_sent_receipt.html.slim

@@ -16,7 +16,7 @@ tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
 = content_tag(:tr,
               id: "#{message.html_preview_identifier}",
               style: "display: none",
-              class: "#{ "urgent" if message.urgent?}")
+              class: "#{ 'urgent' if message.urgent?}")
   td(colspan=6)
     .message-preview
       .subject= message.subject

data/app/views/renalware/navigation/_renal.html.slim

@@ -13,4 +13,3 @@ li.has-dropdown
     li= link_to t(".aki_alerts"), renal_aki_alerts_path
     li= link_to t(".studies"), research_studies_path
     li= link_to t(".renal_registry_checks"), patients_renal_registry_preflight_checks_path
-

data/app/views/renalware/pathology/required_observations/index.html.slim

@@ -7,7 +7,7 @@
           label for="clinic_id" Clinic
           = form_tag(patient_pathology_required_observations_path(patient_id: @patient), method: :get) do
             = select_tag "request[clinic_id]",
-                options_from_collection_for_select(all_clinics, 'id', 'name', request_html_form_params.clinic_id),
+                options_from_collection_for_select(all_clinics, "id", "name", request_html_form_params.clinic_id),
                 onchange: raw("this.form.submit();")
       .row
         .large-12.columns

data/app/views/renalware/patients/alerts/_alert.html.slim

@@ -1,4 +1,4 @@
-tr.alerts--alert(class=("urgent" if alert.urgent ) id="alert-#{alert.id}")
+tr.alerts--alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
   td.icon
   td.notes
     span(title=alert.notes)= alert.notes

data/app/views/renalware/patients/bookmarks/_new.html.slim

@@ -10,6 +10,7 @@
                    url: patient_bookmarks_path(patient_id: patient) do |f|
     h2= t(".title")
     =f.input :urgent, as: :boolean, boolean_style: :inline
+    =f.input :tags, label: "Tags"
     =f.input :notes, as: :text, input_html: { autofocus: :autofocus }
     =f.submit t(".save"), class: :button
     span= " or "

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

@@ -72,10 +72,10 @@
   = field_set_tag do
     legend UKRDC Preferences
 
-    = f.input :send_to_renalreg,  as: :inline_radio_buttons, wrapper: :horizontal_small
+    = f.input :send_to_renalreg, as: :inline_radio_buttons, wrapper: :horizontal_small
     = f.input :renalreg_decision_on, as: :date_picker, wrapper: :horizontal_datepicker
     = f.input :renalreg_recorded_by, wrapper: :horizontal_medium
-    = f.input :send_to_rpv,  as: :inline_radio_buttons, wrapper: :horizontal_small
+    = f.input :send_to_rpv, as: :inline_radio_buttons, wrapper: :horizontal_small
     = f.input :rpv_decision_on, as: :date_picker, wrapper: :horizontal_datepicker
     = f.input :rpv_recorded_by, wrapper: :horizontal_medium
 

data/app/views/renalware/patients/patients/_patient.html.slim

@@ -1,7 +1,7 @@
 tr
   td.full-name= default_patient_link(patient)
   td= patient.nhs_number
-  - Renalware.config.patient_hospital_identifiers.values.each do |value|
+  - Renalware.config.patient_hospital_identifiers.each_value do |value|
     td= patient.public_send(value)
   td= patient.sex.code
   td= patient.born_on

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

@@ -3,7 +3,7 @@ table#patients
     tr
       th.col-width-medium= attr_name(Renalware::Patient, :name)
       th.col-width-nhs-no NHS Number
-      - Renalware.config.patient_hospital_identifiers.keys.each do |key|
+      - Renalware.config.patient_hospital_identifiers.each_key do |key|
         th.col-width-reference-without-prefix="#{key} No"
       th.col-width-tiny= attr_name(Renalware::Patient, :sex)
       th.col-width-date= attr_name(Renalware::Patient, :born_on)

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

@@ -1,4 +1,3 @@
-
 = within_admin_layout(title: "New", breadcrumbs: breadcrumb_for("Patients", patients_path)) do
   .row
     = render "renalware/shared/errors", model: patient

data/app/views/renalware/patients/patients/show/_primary_care_physician.html.slim

@@ -1,4 +1,3 @@
-
 article
   header
     h2 GP

data/app/views/renalware/patients/primary_care_physician/edit.html.slim

@@ -1,13 +1,12 @@
-
 .finda-a-gp
 
   h4 Search for a GP
 
   label(for="practice-search") First find the practice
   select#practice-search(
-    data={"ajax--url" => search_patients_practices_path,
-          "form-refresh-url" => edit_patient_primary_care_physician_path(patient),
-          "hint" => "Enter first few letters of practice name or its postcode" }
+    data={ "ajax--url" => search_patients_practices_path,
+           "form-refresh-url" => edit_patient_primary_care_physician_path(patient),
+           "hint" => "Enter first few letters of practice name or its postcode" }
     autofocus= "true"
   )
 

data/app/views/renalware/patients/worries/_new.html.slim

@@ -1,4 +1,3 @@
-
 / Link to launch the modal dialog
 = link_to("#",
           data: { "reveal-id" => "add-patient-worry-modal" }) do

data/app/views/renalware/patients/worryboard/_table.html.slim

@@ -4,7 +4,7 @@ table#patients
       th.at-least.col-width-large
         = sort_link(query,
                    :patient_family_name,
-                   [:patient_family_name, 'patient_given_name asc'],
+                   [:patient_family_name, "patient_given_name asc"],
                    "Name")
       th.col-width-nhs-no NHS No.
       th.col-width-reference-no Hosp No.

data/app/views/renalware/pd/dashboards/show/_page_actions.html.slim

@@ -34,7 +34,7 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
                       title: t(".add_exit_site_infection"),
                       url: new_patient_pd_exit_site_infection_path(patient)
 
-  = dropdown_btn_item enabled: patient_on_pd  && policy(Renalware::PD::PETAdequacyResult).new?,
+  = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::PETAdequacyResult).new?,
                       title: t(".add_pet_adequacy"),
                       url: new_patient_pd_pet_adequacy_result_path(patient)
 

data/app/views/renalware/pd/exit_site_infections/_details.html.slim

@@ -1,11 +1,3 @@
-
-/ .section-actions
-/   = link_to "Edit",
-/             edit_patient_pd_exit_site_infection_path(patient, exit_site_infection),
-/             remote: true
-
-/ .section-content
-
 #infection
   dl.dl-horizontal
     dt Diagnosed:

data/app/views/renalware/pd/pet_adequacy_results/new.html.slim

@@ -1,4 +1,3 @@
-
 = within_patient_layout(breadcrumbs: pd_summary_breadcrumb(@patient)) do
   = render "renalware/shared/errors", model: pet_adequacy_result
   = render "form", patient: patient, pet_adequacy_result: pet_adequacy_result

data/app/views/renalware/pd/regimes/_current_regime.html.slim

@@ -14,13 +14,13 @@
         dd= default_for_blank_date(regime.end_date, "Pending")
         dt Treatment:
         dd= regime.treatment
-        = render("renalware/pd/regimes/assistance_type", regime: regime)  if regime.apd?
+        = render("renalware/pd/regimes/assistance_type", regime: regime) if regime.apd?
         dt Delivery frequency:
         dd= Renalware::PD::DeliveryIntervalPresenter.new(regime.delivery_interval).to_s
         dt On additional HD?:
         dd= yes_no(regime.add_hd)
 
-        = render"renalware/pd/regimes/glucose", regime: regime
+        = render "renalware/pd/regimes/glucose", regime: regime
 
     - if regime.type == "Renalware::PD::APDRegime"
       = render "renalware/pd/regimes/current_apd_regime", regime: regime