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

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

@@ -1,4 +1,3 @@
 .patient-summary
   = render "renalware/renal/profiles/mini", patient: patient
   = render "renalware/clinical/allergies/mini", patient: patient
-

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

@@ -4,7 +4,7 @@
                   as: :patient_search,
                   url: search_form.url,
                   method: :get,
-                  html: { autocomplete: "off"} do |f|
+                  html: { autocomplete: "off" } do |f|
   .row
     .medium-5.columns
       = f.input :term, label: false, placeholder: "Search by patient surname, NHS or Hosp. no."

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

@@ -1,6 +1,6 @@
 / This is the create alert modal dialog content
 = simple_form_for alert,
-                  html: { autocomplete: "off"},
+                  html: { autocomplete: "off" },
                   remote: true,
                   url: patient_alerts_path(patient_id: patient) do |f|
     h2= t(".title")

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

@@ -1,5 +1,4 @@
-=link_to(bookmark_path(bookmark),
+=link_to link_text,
+         bookmark_path(bookmark),
          method: :delete,
-         data: { confirm: t(".confirm") }) do
-  i.fa.fa-link-annotation.fa-bookmark
-  = link_text
+         data: { confirm: t(".confirm") }

data/app/views/renalware/patients/clinical_summaries/_problems.html.slim

@@ -11,4 +11,3 @@ article
       li
         = problem.full_description
         = " - #{l(problem.created_at.to_date)}"
-

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

@@ -16,4 +16,3 @@
     .columns.large-12.xlarge-6
       #events
         = render "events", events: clinical_summary.current_events
-

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

@@ -6,8 +6,9 @@
 
     - Renalware.config.patient_hospital_identifiers.each do |key, field|
       = f.input field,
-                      label: "#{key} No",
-                      wrapper: :horizontal_small
+                as: :string,
+                label: "#{key} No",
+                wrapper: :horizontal_small
 
     = f.input :external_patient_id, wrapper: :horizontal_small
     = f.input :title, wrapper: :horizontal_tiny

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

@@ -1,9 +1,5 @@
 tr
-  td
-    = link_to "Clinical Summary", patient_clinical_summary_path(patient), title: "Clinical Summary"
-    = pipe_separator
-    = link_to "Admin", patient_path(patient), title: "Admin"
-  td.full-name= patient.to_s(format: :default)
+  td.full-name= default_patient_link(patient)
   td= patient.nhs_number
   - Renalware.config.patient_hospital_identifiers.values.each do |value|
     td= patient.public_send(value)

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

@@ -1,9 +1,8 @@
 table#patients
   thead
     tr
-      th.col-width-11
       th.col-width-medium= attr_name(Renalware::Patient, :name)
-      th.col-width-nhs-no= attr_name(Renalware::Patient, :nhs_number)
+      th.col-width-nhs-no NHS Number
       - Renalware.config.patient_hospital_identifiers.keys.each do |key|
         th.col-width-reference-without-prefix="#{key} No"
       th.col-width-tiny= attr_name(Renalware::Patient, :sex)

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

@@ -12,4 +12,3 @@ article
 
     dt External Hosp No:
     dd= patient.external_patient_id
-

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

@@ -10,7 +10,6 @@ article
     dt Date of Death:
     dd= default_for_blank_date(patient.died_on, "N/A")
 
-
   dl.dl-horizontal
 
     dt Title
@@ -44,7 +43,6 @@ article
     dt Religion
     dd= patient.religion
 
-
   dl.dl-horizontal
     dt Paediatric Patient:
     dd= yes_no(patient.paediatric_patient_indicator)

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

@@ -8,8 +8,9 @@
   = f.input :primary_care_physician_id,
             collection: available_primary_care_physicians,
             prompt: "Select a GP",
+            label: "Now choose a GP",
             input_html: { class: "searchable_select", required: :required, tabindex: 2001 }
-
+  br
   = f.submit "Save",
               class: "button",
               data: { disable_with: "Saving.." }

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

@@ -3,11 +3,9 @@
 
   h4 Search for a GP
 
-  label(for="practice-search") Search for a practice
-  select#practice-search.select2-hidden-accessible(
-    tabindex="2000"
-    aria-hidden="true"
-    data={ "ajax--url" => search_patients_practices_path,
+  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" }
     autofocus= "true"

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

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

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

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

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

@@ -1,7 +1,7 @@
 table#patients
   thead
     tr
-      th.at-least.col-width-medium
+      th.at-least.col-width-large
         = sort_link(query,
                    :patient_family_name,
                    [:patient_family_name, 'patient_given_name asc'],
@@ -14,7 +14,7 @@ table#patients
       th.col-width-small= sort_link(query, :created_at, "Date Added")
       th.col-width-medium Added By
       th Notes
-      th.col-width-small
+      th.col-width-medium
         = sort_link(query,
                    :patient_current_modality_description_name,
                    "Modality")

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

@@ -1,9 +1,6 @@
-- patient = worry.patient
+- patient = Renalware::PatientPresenter.new(worry.patient)
 tr
-  td.full-name
-    = link_to(patient.to_s(format: :default),
-              patient_clinical_summary_path(patient),
-              title: "Clinical Summary")
+  td.full-name= default_patient_link(patient)
   td= patient.nhs_number
   td= patient.hospital_identifier
   td= patient.sex.code

data/app/views/renalware/pd/_apd_regimes.html.slim

@@ -36,4 +36,3 @@ table.apd-regimes
           = "#{default_daily_glucose_average(r.glucose_volume_high_strength)} ml"
         td
           = r.updated_at.to_date
-

data/app/views/renalware/pd/_capd_regimes.html.slim

@@ -43,4 +43,3 @@ table.capd-regimes
 
         td
           = r.updated_at.to_date
-

data/app/views/renalware/pd/_exit_site_infections.html.slim

@@ -26,4 +26,3 @@ table
 
         td valign="top"
           = e.updated_at.to_date
-

data/app/views/renalware/pd/_peritonitis_episodes.html.slim

@@ -26,4 +26,3 @@ table
           = "Catheter Removed: #{yes_no(episode.catheter_removed)}"
         td valign="top"
           = episode.updated_at.to_date
-

data/app/views/renalware/pd/_pet_adequacies.html.slim

@@ -12,7 +12,6 @@ table
       th Daily UF
       th.col-width-date=t("updated_at")
 
-
   tbody
     - pet_adequacies.each do |pet_adequacy|
       tr data-assessment-id="#{pet_adequacy.id}" valign="top"

data/app/views/renalware/pd/assessments/show.html.slim

@@ -10,9 +10,9 @@
     = definition_list_for(assessment.document, size: :xlarge) do |list|
       = list.definition(:assessed_on) { |value| l(value) }
       = list.definition(:assessor)
-      = list.definition(:had_home_visit) { |value| value.text }
+      = list.definition(:had_home_visit, &:text)
       = list.definition(:home_visit_on) { |value| l(value) }
-      = list.definition(:housing_type) { |value| value.text }
+      = list.definition(:housing_type, &:text)
       = list.definition(:occupant_notes)
       = list.definition(:exchange_area)
       = list.definition(:handwashing)
@@ -20,25 +20,25 @@
       = list.definition(:bag_warming)
       = list.definition(:delivery_interval) do |iso8601duration|
         - Renalware::PD::DeliveryIntervalPresenter.new(iso8601duration).to_s
-      = list.definition(:needs_rehousing) { |value| value.text }
+      = list.definition(:needs_rehousing, &:text)
       = list.definition(:rehousing_notes)
-      = list.definition(:social_worker) { |value| value.text }
-      = list.definition(:seen_video) { |value| value.text }
-      = list.definition(:can_open_bag) { |value| value.text }
-      = list.definition(:can_lift_bag) { |value| value.text }
+      = list.definition(:social_worker, &:text)
+      = list.definition(:seen_video, &:text)
+      = list.definition(:can_open_bag, &:text)
+      = list.definition(:can_lift_bag, &:text)
       = list.definition(:eyesight)
       = list.definition(:hearing)
       = list.definition(:dexterity)
       = list.definition(:motivation)
       = list.definition(:language)
       = list.definition(:other_notes)
-      = list.definition(:suitable_for_pd) { |value| value.text }
-      = list.definition(:system_choice) { |value| value.text }
-      = list.definition(:insertion_discussed) { |value| value.text }
-      = list.definition(:method_chosen) { |value| value.text }
-      = list.definition(:access_clinic_referral) { |value| value.text }
+      = list.definition(:suitable_for_pd, &:text)
+      = list.definition(:system_choice, &:text)
+      = list.definition(:insertion_discussed, &:text)
+      = list.definition(:method_chosen, &:text)
+      = list.definition(:access_clinic_referral, &:text)
       = list.definition(:access_clinic_on) { |value| l(value) }
       = list.definition(:abdo_assessor)
-      = list.definition(:bowel_disease) { |value| value.text }
+      = list.definition(:bowel_disease, &:text)
       = list.definition(:bowel_disease_notes)
       = list.definition(:added_comments)

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

@@ -13,30 +13,30 @@ ul.f-dropdown#pd-options(data-dropdown-content aria-hidden="true")
   - patient_on_pd = patient.has_ever_been_on_pd?
 
   = dropdown_btn_item title: t(".add_pd_assessment"),
-                      path: new_patient_pd_assessment_path(patient)
+                      url: new_patient_pd_assessment_path(patient)
 
   = dropdown_btn_item title: t(".add_pd_training_session"),
-                      path: new_patient_pd_training_session_path(patient)
+                      url: new_patient_pd_training_session_path(patient)
 
   = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::CAPDRegime).new?,
                       title: t(".add_capd_regime"),
-                      path: new_patient_pd_regime_path(patient, type: "PD::CAPDRegime")
+                      url: new_patient_pd_regime_path(patient, type: "PD::CAPDRegime")
 
   = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::APDRegime).new?,
                       title: t(".add_apd_regime"),
-                      path: new_patient_pd_regime_path(patient, type: "PD::APDRegime")
+                      url: new_patient_pd_regime_path(patient, type: "PD::APDRegime")
 
   = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::PeritonitisEpisode).new?,
                       title: t(".add_peritonitis_episode"),
-                      path: new_patient_pd_peritonitis_episode_path(patient)
+                      url: new_patient_pd_peritonitis_episode_path(patient)
 
   = dropdown_btn_item enabled: patient_on_pd && policy(Renalware::PD::ExitSiteInfection).new?,
                       title: t(".add_exit_site_infection"),
-                      path: new_patient_pd_exit_site_infection_path(patient)
+                      url: new_patient_pd_exit_site_infection_path(patient)
 
   = dropdown_btn_item enabled: patient_on_pd  && policy(Renalware::PD::PETAdequacyResult).new?,
                       title: t(".add_pet_adequacy"),
-                      path: new_patient_pd_pet_adequacy_result_path(patient)
+                      url: new_patient_pd_pet_adequacy_result_path(patient)
 
 - unless patient_on_pd
   = render "modality_missing_warning", message: t(".missing_modality_warning")

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

@@ -28,4 +28,3 @@
     .columns
       = article_tag "Bags" do
         = render "renalware/pd/regime_bags/regime_bags", regime: regime
-

data/app/views/renalware/problems/notes/form.js.erb

@@ -1,3 +1,2 @@
 <%= refresh("#new-note-area", partial: "form", locals: local_assigns) %>
 $("#problems_note_description").focus();
-

data/app/views/renalware/problems/problems/_current_list.html.slim

@@ -14,4 +14,3 @@ table#current_problems
               li= note.description
         td= l problem.updated_on
         td= problem.created_by.full_name
-

data/app/views/renalware/renal/aki_alerts/edit.html.slim

@@ -9,9 +9,8 @@
           collection: Renalware::Hospitals::Unit.includes(:wards).ordered,
           label_method: :to_s,
           wrapper: :horizontal_medium
-    = f.input :hotlist,  wrapper: :horizontal_small, as: :inline_radio_buttons
-    = f.input :notes,  wrapper: :horizontal_large, input_html: { rows: 5 }
+    = f.input :hotlist, wrapper: :horizontal_small, as: :inline_radio_buttons
+    = f.input :notes, wrapper: :horizontal_large, input_html: { rows: 5 }
     = f.submit class: "button"
     span= " or "
     = link_to "cancel", renal_aki_alerts_path
-

data/app/views/renalware/renal/profiles/_form.html.slim

@@ -73,7 +73,8 @@
     - label = "Address at ESRF Date"
 
     / If the user wants to overwrite or copy in the patient's current address, we use js to
-    / clone the hidden current address form and replace the visible address form with it.
+    / clone the hidden current address form fields in edit.slim and replace the visible
+    / address form fields below with them.
     #visible-address-form
       = f.simple_fields_for :address_at_diagnosis_attributes, f.object.address_at_diagnosis do |a|
         article#address_at_diagnosis
@@ -85,8 +86,3 @@
                        class: "button left"
           = a.input :id, as: :hidden
           .form-content= render("renalware/addresses/form", a: a)
-
-    #hidden-current-address-form(style="display:none")
-      = f.simple_fields_for :address_at_diagnosis_attributes, patient.current_address do |a|
-        .form-content= render("renalware/addresses/form", a: a)
-

data/app/views/renalware/renal/profiles/edit.html.slim

@@ -9,6 +9,15 @@
 
   .row
     .large-12.columns
+      / This first form is a dummy one to hold address fields for the patient's current address.
+      / If the user wants to overwrite or copy in the patient's current address, we use JS to
+      / clone this hidden current address form and replace the actual address form fields
+      / in _form.slim with this one.
+      #hidden-current-address-form(style="display:none")
+        = simple_form_for profile, url: patient_renal_profile_path(patient) do |f|
+          = f.simple_fields_for :address_at_diagnosis_attributes, patient.current_address do |add|
+            .form-content= render("renalware/addresses/form", a: add)
+
       = simple_form_for profile,
           url: patient_renal_profile_path(patient),
           method: :patch,

data/app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim

@@ -0,0 +1,3 @@
+dl.sub-nav
+  dd= link_to "Patients with incomplete data", patients_renal_registry_preflight_checks_path
+  dd= link_to "Deceased patients with incomplete data", deaths_renal_registry_preflight_checks_path

data/app/views/renalware/renal/registry_preflight_checks/_table.html.slim

@@ -0,0 +1,20 @@
+table.renal-registry-preflight-checks
+  thead
+    tr
+      th.col-width-large Patient
+      td.col-width-nhs-no NHS No.
+      td.col-width-reference-no Hospital Nos.
+      td.col-width-reference-no Modality
+      td.col-width-small HD Site
+      td Missing data
+  tbody
+    - patients.each do |patient|
+      tr
+        td= default_patient_link(patient)
+        td= patient.nhs_number
+        td= patient.hospital_identifiers
+        td= patient.current_modality
+        td= patient.hd_unit
+        td.missing-data
+          - patient.missing_data.map do |data_item|
+            span(class=data_item)= t(".#{data_item}")

data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim

@@ -0,0 +1,4 @@
+= within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
+  = render "navigation"
+  = render "table", patients: patients
+  = paginate patients

data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim

@@ -0,0 +1,4 @@
+= within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
+  = render "navigation"
+  = render "table", patients: patients
+  = paginate patients

data/app/views/renalware/reporting/audits/show.html.slim

@@ -2,14 +2,12 @@
 
 - content_for(:javascript) do
   javascript:
-    var dataSet = #{raw(values)};
-    var databaseColumns = eval(#{raw(columns)});
     var userConfiguredColumns = eval(#{raw(audit.display_configuration)})['columnDefs'];
 
     $("body").ready(function() {
       $("body.audits-show table#audit").DataTable(
         {
-          data: dataSet,
+          ajax: "#{reporting_audit_path(audit, format: :json)}",
           columns: userConfiguredColumns
         }
       );
@@ -21,6 +19,6 @@
     .panel.radius.compact= audit.description
 
   / jQuery dataTables will build this table; for the columns it will use column definitions in
-  / audit.display_configuration. Row data comes from a select on the audit view
-  / specified by the audit row, inserted as a js var into the page above.
+  / audit.display_configuration. Json data comes from the the audit view
+  / specified by the audit row; the json data is fetched via a separate ajax call.
   table#audit.display.natural-width

data/app/views/renalware/research/studies/_form.html.slim

@@ -0,0 +1,9 @@
+= simple_form_for(study, wrapper: :horizontal_form, html: { autocomplete: "off" }) do |f|
+  = f.input :code, wrapper: :horizontal_small
+  = f.input :description, wrapper: :horizontal_large
+  = f.input :leader, wrapper: :horizontal_small
+  = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :terminated_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 6 }
+  = save_or_cancel(form: f, back_path: research_studies_path)
+

data/app/views/renalware/research/studies/edit.html.slim

@@ -0,0 +1,5 @@
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("Clinical Studies",
+                                   research_studies_path)) do
+
+  = render "form", study: study