renalware-core 2.0.0.pre.rc13 → 2.0.0

data/app/views/renalware/pathology/requests/rules/index.html.slim

@@ -1,20 +1,17 @@
-.row
-  h1 Pathology Request Form Algorithm
+ = within_admin_layout(title: "Pathology Request Form Algorithm") do
+  table
+    thead
+      tr
+        th Request Description
+        - clinics.each do |clinic|
+          th = clinic.name
 
-.row
-    table
-      thead
+    tbody
+      - rules_table.rows.each do |row|
         tr
-          th Request Description
-          - clinics.each do |clinic|
-            th = clinic.name
-
-      tbody
-        - rules_table.rows.each do |row|
-          tr
-            td = row.request_description.name
-            - row.columns.each do |column|
-              td data-clinic="#{column.clinic.id}" data-request="#{row.request_description.id}"
-                ul
-                - column.rule_sets.each do |rule_set|
-                  li = rule_set.to_s
+          td = row.request_description.name
+          - row.columns.each do |column|
+            td data-clinic="#{column.clinic.id}" data-request="#{row.request_description.id}"
+              ul
+              - column.rule_sets.each do |rule_set|
+                li = rule_set.to_s

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

@@ -5,4 +5,3 @@ ul.side-nav
   = render "renalware/patients/side_menu/transplants", patient: patient
   = render "renalware/patients/side_menu/actions", patient: patient
   = render "renalware/patients/side_menu/site_specific_actions", patient: patient
-  br

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

@@ -1,10 +1,10 @@
-tr.alerts--alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
-  td.icon
-  td.notes
-    span(title=alert.notes)= alert.notes
-  td.author= alert.created_by.username
-  td.col-width-date= l(alert.created_at.to_date)
-  td.actions
+li.patient-alert(class=("urgent" if alert.urgent) id="alert-#{alert.id}")
+  i.fa.fa-warning
+  span.title Alert:
+  span.body= alert.notes
+  span.author= alert.created_by.username
+  span.date= l(alert.created_at.to_date)
+  span.actions
     = link_to(patient_alert_path(alert.patient, alert),
               remote: true,
               method: :delete,

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

@@ -1,3 +1 @@
-table.alerts
-  tbody
-    = render patient.alerts
+= render patient.alerts

data/app/views/renalware/patients/alerts/create.js.erb

@@ -1,3 +1,3 @@
 <%= refresh(".flash-message", partial: "renalware/shared/flash_messages", locals: local_assigns) %>
-$(".alerts").append("<%= j(render alert, format: :html) %>");
+$(".patient-alerts ul").append("<%= j(render alert, format: :html) %>");
 $("#create-alert-modal").foundation('reveal', 'close');

data/app/views/renalware/patients/alerts/destroy.js.erb

@@ -1,2 +1,2 @@
 // Remove the deleted alert
-$("#alert-<%= alert.id %>", ".alerts").fadeOut(300, function(){ $(this).remove();})
+$("#alert-<%= alert.id %>", ".patient-alerts").fadeOut(300, function(){ $(this).remove();})

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

@@ -1,30 +1,27 @@
-.row
-  = render "header"
-  = render "renalware/shared/errors", model: @primary_care_physician
+= render "renalware/shared/errors", model: @primary_care_physician
 
-.row
-  .large-6.columns
-    = simple_form_for @primary_care_physician, html: { autocomplete: "off" } do |f|
-      = f.input :name, placeholder: "e.g. SMITH J"
-      = f.input :telephone
-      = f.input :code
-      = f.input :practitioner_type, collection: ["GP", "Other"]
-      = label_tag "patients_primary_care_physician[practice_ids]", "Practices"
-      = select_tag "patients_primary_care_physician[practice_ids]",
-                   practices_options_for_select(f.object),
-                   { include_hidden: false, multiple: true }
+.large-6.columns
+  = simple_form_for @primary_care_physician, html: { autocomplete: "off" } do |f|
+    = f.input :name, placeholder: "e.g. SMITH J"
+    = f.input :telephone
+    = f.input :code
+    = f.input :practitioner_type, collection: ["GP", "Other"]
+    = label_tag "patients_primary_care_physician[practice_ids]", "Practices"
+    = select_tag "patients_primary_care_physician[practice_ids]",
+                 practices_options_for_select(f.object),
+                 { include_hidden: false, multiple: true }
 
-      hr
+    hr
 
-      a#address-form-toggle href="#address-form" class="button tiny" Alternative address
+    a#address-form-toggle href="#address-form" class="button tiny" Alternative address
 
-      .row
-        .large-12.columns
-          fieldset#address-form style="display:none"
-            = f.simple_fields_for @alternative_address do |a|
-              = a.input :id, as: :hidden
-              = render "renalware/addresses/form", a: a
+    .row
+      .large-12.columns
+        fieldset#address-form style="display:none"
+          = f.simple_fields_for @alternative_address do |a|
+            = a.input :id, as: :hidden
+            = render "renalware/addresses/form", a: a
 
-      = f.button :submit
-      span= " or "
-      = link_to "cancel", patients_primary_care_physicians_path
+    = f.button :submit
+    span= " or "
+    = link_to "cancel", patients_primary_care_physicians_path

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

@@ -1 +1,2 @@
-= render "form"
+= within_admin_layout(title: "Edit Primary Care Physician") do
+  = render "form"

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

@@ -1,7 +1,8 @@
-.row
-  = render "header"
+= within_admin_layout(title: "Primary Care Physicians") do
+  dl.sub-nav
+    dd= link_to "List", patients_primary_care_physicians_path
+    dd= link_to "Add Primary Care Physician", new_patients_primary_care_physician_path
 
-.row
   table.primary-care-physicians
     thead
       tr

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

@@ -1 +1,2 @@
-= render "form"
+= within_admin_layout(title: "New Primary Care Physician") do
+  = render "form"

data/app/views/renalware/patients/side_menu/_general.html.slim

@@ -54,7 +54,7 @@ li.heading= t(".heading")
                     path: patient_letters_letters_path(patient),
                     active_when_controller_matches: %r{renalware/letters((?!\/contacts))}
 
-= patient_menu_item title: t(".access_profiles", count: summary.access_profiles_count),
+= patient_menu_item title: t(".access_profiles"),
                     path: patient_accesses_dashboard_path(patient),
                     active_when_controller_matches: %r{renalware/accesses}
 

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

@@ -1,38 +1,4 @@
-table.apd-regimes
-  thead
-    tr
-      th.col-width-9
-      th.col-width-date Started on
-      th.col-width-date Ended on
-      th.col-width-13 Treatment
-      th= t("glucose_volume_low_strength", scope: "renalware.pd.regimes")
-      th= t("glucose_volume_medium_strength", scope: "renalware.pd.regimes")
-      th= t("glucose_volume_high_strength", scope: "renalware.pd.regimes")
-      th.column-6-date Updated on
-
-  tbody
-    - apd_regimes.each do |r|
-      tr valign="top" data-regime-id=r.id
-        td
-          - if r.current? && !current_user.has_role?(:read_only)
-            = link_to "Update",
-                      edit_patient_pd_regime_path(patient, r.id),
-                      class: "update-pd-regime"
-            = pipe_separator
-          = link_to "View",
-                    patient_pd_regime_path(patient, r.id),
-                    class: "view-pd-regime"
-        td valign="top"
-          = l r.start_date
-        td valign="top"
-          = default_for_blank_date(r.end_date, "Pending")
-        td valign="top"
-          = r.treatment
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_low_strength)} ml"
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_medium_strength)} ml"
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_high_strength)} ml"
-        td
-          = r.updated_at.to_date
+= render "renalware/pd/regimes",
+         regimes: apd_regimes,
+         patient: patient,
+         table_class: "apd-regimes"

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

@@ -1,45 +1,4 @@
-table.capd-regimes
-  thead
-    tr
-      th.col-width-9
-      th.col-width-date Started on
-      th.col-width-date Ended on
-      th.col-width-13 Treatment
-      th= t("glucose_volume_low_strength", scope: "renalware.pd.regimes")
-      th= t("glucose_volume_medium_strength", scope: "renalware.pd.regimes")
-      th= t("glucose_volume_high_strength", scope: "renalware.pd.regimes")
-      th.column-width-date Updated on
-
-  tbody
-    - capd_regimes.each do |r|
-      tr valign="top" data-regime-id=r.id
-        td
-          - if r.current? && !current_user.has_role?(:read_only)
-            = link_to "Update",
-                      edit_patient_pd_regime_path(patient, r.id),
-                      class: "update-pd-regime"
-            = pipe_separator
-          = link_to "View",
-                    patient_pd_regime_path(patient, r.id),
-                    class: "view-pd-regime"
-
-        td valign="top"
-          = l r.start_date
-
-        td valign="top"
-          = default_for_blank_date(r.end_date, "Pending")
-
-        td valign="top"
-          = r.treatment
-
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_low_strength)} ml"
-
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_medium_strength)} ml"
-
-        td valign="top"
-          = "#{default_daily_glucose_average(r.glucose_volume_high_strength)} ml"
-
-        td
-          = r.updated_at.to_date
+= render "renalware/pd/regimes",
+         regimes: capd_regimes,
+         patient: patient,
+         table_class: "capd-regimes"

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

@@ -0,0 +1,32 @@
+table(class=table_class)
+  thead
+    tr
+      th.col-width-small
+      th.col-width-date Started on
+      th.col-width-date Ended on
+      th Treatment
+      th.col-width-small= t("glucose_volume_low_strength", scope: "renalware.pd.regimes")
+      th.col-width-small= t("glucose_volume_medium_strength", scope: "renalware.pd.regimes")
+      th.col-width-small= t("glucose_volume_high_strength", scope: "renalware.pd.regimes")
+      th.col-width-date Updated on
+
+  tbody
+    - regimes.each do |r|
+      tr(data-regime-id=r.id)
+        td
+          / TODO: Use a policy
+          - if r.current? && !current_user.has_role?(:read_only)
+            = link_to "Update",
+                      edit_patient_pd_regime_path(patient, r.id),
+                      class: "update-pd-regime"
+            = pipe_separator
+          = link_to "View",
+                    patient_pd_regime_path(patient, r.id),
+                    class: "view-pd-regime"
+        td= l r.start_date
+        td= default_for_blank_date(r.end_date, "Pending")
+        td= r.treatment
+        td= "#{default_daily_glucose_average(r.glucose_volume_low_strength)} ml"
+        td= "#{default_daily_glucose_average(r.glucose_volume_medium_strength)} ml"
+        td= "#{default_daily_glucose_average(r.glucose_volume_high_strength)} ml"
+        td= l(r.updated_at.to_date)

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

@@ -14,7 +14,7 @@
     = fdoc.input :had_home_visit, as: :inline_radio_buttons, wrapper: :horizontal_medium
     = fdoc.input :home_visit_on, as: :date_picker, wrapper: :horizontal_datepicker
     = fdoc.input :housing_type, as: :inline_radio_buttons, wrapper: :horizontal_medium
-    = fdoc.input :occupant_notes, as: :text, input_html: { rows: 5 }
+    = fdoc.input :occupant_notes, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
     = fdoc.input :exchange_area, wrapper: :horizontal_medium
     = fdoc.input :handwashing, wrapper: :horizontal_medium
     = fdoc.input :fluid_storage, wrapper: :horizontal_medium
@@ -23,7 +23,7 @@
                  collection: Renalware::PD::DeliveryIntervalPresenter.dropdown_options,
                  wrapper: :horizontal_small
     = fdoc.input :needs_rehousing, as: :inline_radio_buttons, wrapper: :horizontal_medium
-    = fdoc.input :rehousing_notes, as: :text, input_html: { rows: 5 }
+    = fdoc.input :rehousing_notes, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
     = fdoc.input :social_worker, as: :inline_radio_buttons, wrapper: :horizontal_medium
     = fdoc.input :seen_video, as: :inline_radio_buttons, wrapper: :horizontal_medium
     = fdoc.input :can_open_bag, as: :inline_radio_buttons, wrapper: :horizontal_medium
@@ -33,7 +33,7 @@
     = fdoc.input :dexterity, wrapper: :horizontal_medium
     = fdoc.input :motivation, wrapper: :horizontal_medium
     = fdoc.input :language, wrapper: :horizontal_medium
-    = fdoc.input :other_notes, as: :text, input_html: { rows: 5 }
+    = fdoc.input :other_notes, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
     = fdoc.input :suitable_for_pd, as: :inline_radio_buttons, wrapper: :horizontal_medium
     = fdoc.input :system_choice, as: :inline_radio_buttons, wrapper: :horizontal_medium
     = fdoc.input :insertion_discussed, as: :inline_radio_buttons, wrapper: :horizontal_medium
@@ -42,8 +42,11 @@
     = fdoc.input :access_clinic_on, as: :date_picker, wrapper: :horizontal_datepicker
     = fdoc.input :abdo_assessor, wrapper: :horizontal_medium
     = fdoc.input :bowel_disease, as: :inline_radio_buttons, wrapper: :horizontal_medium
-    = fdoc.input :bowel_disease_notes, as: :text, input_html: { rows: 5 }
-    = fdoc.input :added_comments, as: :text, input_html: { rows: 5 }
+    = fdoc.input :bowel_disease_notes,
+                  as: :text,
+                  input_html: { rows: 5 },
+                  wrapper: :horizontal_large
+    = fdoc.input :added_comments, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
 
   = f.submit "Save", class: "button"
   span= " or "

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

@@ -22,6 +22,7 @@
 
     = field_set_tag t(".fieldset_titles.additional_info") do
       = f.input :fill_volume, wrapper: :horizontal_small
+      = f.input :dwell_time, wrapper: :horizontal_small
       = f.input :therapy_time,
                 collection: therapy_times,
                 include_blank: t("collection.blank_option"),

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

@@ -14,6 +14,8 @@
         dd = "#{regime.last_fill_volume} ml"
         dt Add'l man exchange volume:
         dd = "#{regime.additional_manual_exchange_volume} ml"
+        dt Dwell time:
+        dd= regime.dwell_time
         dt Therapy time:
         dd= Renalware::Duration.from_minutes(regime.therapy_time).to_s
         dt Cycles per session:

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

@@ -17,6 +17,9 @@ dl.columns.medium-6.dl-horizontal.xlarge.apd-regime-details
   dt Add'l man exchange volume:
   dd = "#{regime.additional_manual_exchange_volume} ml"
 
+  dt Dwell time:
+  dd= regime.dwell_time
+
   dt Therapy time:
   dd= Renalware::Duration.from_minutes(regime.therapy_time).to_s
 

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

@@ -9,7 +9,7 @@
 /  renalware/problems/problems/...86-6-20180218160613719105/1ff2cfc1505d571ac18a3d1d3708ebb4
 /
 / Note you can get the partial digest value using `cache_fragment_name[0]`
-- cache(summary_part) do
+- cache_if(summary_part.cache?, summary_part) do
   .summary-part--problems
     article
       header

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

@@ -0,0 +1,25 @@
+.search-form.filters
+  = simple_form_for form,
+      as: :q,
+      url: renal_aki_alerts_path,
+      method: :get do |f|
+
+    .row
+      .columns.medium-2.large-3
+        = f.input :term
+      .columns.medium-1.large-1
+        = f.input :on_hotlist,
+                  collection: [["Yes",true],["No",false]]
+      .columns.medium-2.large-2
+        = f.input :action,
+                  collection: Renalware::Renal::AKIAlertAction.pluck(:name, :id)
+      .columns.medium-3.large-2
+        = f.input :hospital_unit_id,
+                  collection: Renalware::Hospitals::Unit.pluck(:name, :id)
+      .columns.medium-2.large-2
+        = f.input :hospital_ward_id,
+                  collection: Renalware::Hospitals::Ward.pluck(:name, :id)
+      .columns.medium-2.large-2.actions.end
+        = f.submit "Filter", class: "button"
+        span= " or "
+        = link_to t("helpers.reset"), renal_aki_alerts_path

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

@@ -1,36 +1,40 @@
 = within_admin_layout(title: "AKI Alerts") do
+  = render "filters", form: form
   table.aki-alerts
     thead
       th
-      th Patient
-      th.col-width-nhs-no NHS No.
-      th.col-width-reference Hosp. No.
+      th.col-width-large Patient
+      /th.col-width-nhs-no NHS No.
+      th.col-width-reference-no Hosp. No.
       th.col-width-tiny Sex
       th.col-width-tiny Age
-      th.col-width-date Born on
-      th Action
-      th Ward
-      th Hotlist
-      th Max CRE
-      th.col-width-date  CRE Date
-      th Max AKI
-      th.col-width-date  AKI Date
+      /th.col-width-date= sort_link(search, :patient_born_on, "Born on")
+      th= sort_link(search, :action_name, "Action")
+      th.col-width-medium Ward
+      th= sort_link(search, :hotlist, "Hotlist")
+      th= sort_link(search, :max_cre, "Max CRE")
+      th.col-width-date.col-width-date= sort_link(search, :cre_date, "CRE Date")
+      th= sort_link(search, :max_aki, "Max AKI")
+      th.col-width-date= sort_link(search, :aki_date, "AKI Date")
       th Decided by
     tbody
       - alerts.each do |alert|
         tr
           td= link_to("Edit", edit_renal_aki_alert_path(alert))
           td= default_patient_link(alert.patient)
-          td= alert.patient.nhs_number
+          /td= alert.patient.nhs_number
           td= alert.patient.hospital_identifiers
           td= alert.patient.sex
           td= alert.patient.age
-          td= alert.patient.born_on
+          /td= alert.patient.born_on
           td= alert.action
-          td= alert.hospital_ward
+          td= [alert.hospital_ward, alert.hospital_ward&.hospital_unit&.unit_code]\
+              .compact.join(" - ")
           td= yes_no alert.hotlist?
           td= alert.max_cre
           td= l(alert.cre_date)
           td= alert.max_aki
           td= l(alert.aki_date)
           td= alert.decided_by
+
+  = paginate alerts