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

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

@@ -23,6 +23,7 @@ xml.ukrdc(:PatientRecord, namespace_and_schema) do
   render "observations", builder: xml, patient: patient
   render "allergies", builder: xml, patient: patient
   render "diagnoses", builder: xml, patient: patient
+  render "medications", builder: xml, patient: patient
   render "documents", builder: xml, patient: patient
   render "encounters", builder: xml, patient: patient
   render "program_memberships", builder: xml, patient: patient

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

@@ -11,6 +11,6 @@
   = fa.input :town, wrapper: :horizontal_small
   = fa.input :county, wrapper: :horizontal_small
   = fa.input :postcode, wrapper: :horizontal_small
-  = fa.input :country, as: :string, wrapper: :horizontal_small
+  = fa.association :country, wrapper: :horizontal_small
   = fa.input :telephone, wrapper: :horizontal_small
   = fa.input :email, wrapper: :horizontal_small

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

@@ -13,57 +13,67 @@ ruby:
         locals: { legend: "Sign-In", name: "signin" } do
       = f.input :performed_on, as: :date_picker, wrapper: :horizontal_datepicker
       = f.association :hospital_unit,
-          as: :grouped_select,
-          group_method: :hd_sites,
-          collection: Renalware::Hospitals::Centre.with_hd_sites.ordered,
-          label_method: :to_s
-      = f.input :start_time, as: :clock_picker, wrapper: :horizontal_clockpicker
-      = f.association :signed_on_by, as: :user_picker, collection: Renalware::User.ordered
+                      as: :grouped_select,
+                      group_method: :hd_sites,
+                      collection: Renalware::Hospitals::Centre.with_hd_sites.ordered,
+                      label_method: :to_s,
+                      wrapper: :horizontal_medium
+      = f.input :start_time,
+                as: :clock_picker,
+                wrapper: :horizontal_clockpicker
+      = f.association :signed_on_by,
+                      as: :user_picker,
+                      collection: Renalware::User.ordered,
+                      wrapper: :horizontal_medium
+
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Sign-Off", name: "signoff" } do
 
       = f.input :end_time, as: :clock_picker, wrapper: :horizontal_clockpicker
-      = f.association :signed_off_by, as: :user_picker, collection: Renalware::User.ordered
+      = f.association :signed_off_by,
+                      as: :user_picker,
+                      collection: Renalware::User.ordered,
+                      wrapper: :horizontal_medium
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Session Info", name: "info" } do
 
       = fd.simple_fields_for :info, fd.object.info do |fcm|
-        = fcm.input :hd_type, as: :inline_radio_buttons
+        = fcm.input :hd_type, as: :inline_radio_buttons, wrapper: :horizontal_medium
         fieldset
           legend Access
           = fcm.input :access_type, as: :select, value_method: :name,
               collection: Renalware::Accesses::Type.relevant_to_access_profiles,
               wrapper: :horizontal_small
-          = fcm.input :access_side, wrapper: :horizontal_tiny
+          = fcm.input :access_side, wrapper: :horizontal_small
           = fcm.input :access_confirmed, as: :boolean, wrapper: :horizontal_medium
-        = fcm.input :is_access_first_use, as: :inline_radio_buttons
-        = fcm.input :fistula_plus_line, as: :inline_radio_buttons
-        = fcm.input :single_needle, as: :inline_radio_buttons
-        = fcm.input :lines_reversed, as: :inline_radio_buttons
+        = fcm.input :is_access_first_use, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = fcm.input :fistula_plus_line, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        = 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
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Pre-Dialysis Observations", name: "before" } do
       = fd.simple_fields_for :observations_before, fd.object.observations_before do |fcm|
-        = fcm.input :weight_measured, as: :inline_radio_buttons
+        = fcm.input :weight_measured, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :weight, wrapper: :horizontal_tiny
         = fcm.input :pulse, wrapper: :horizontal_tiny
         = render_input fcm, :blood_pressure
-        = fcm.input :temperature_measured, as: :inline_radio_buttons
+        = fcm.input :temperature_measured, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :temperature, wrapper: :horizontal_tiny
         = fcm.input :bm_stix, wrapper: :horizontal_tiny
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Post-Dialysis Observations", name: "after" } do
       = fd.simple_fields_for :observations_after, fd.object.observations_after do |fcm|
-        = fcm.input :weight_measured, as: :inline_radio_buttons
+        = fcm.input :weight_measured, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :weight, wrapper: :horizontal_tiny
         = fcm.input :pulse, wrapper: :horizontal_tiny
         = render_input fcm, :blood_pressure
-        = fcm.input :temperature_measured, as: :inline_radio_buttons
+        = fcm.input :temperature_measured, as: :inline_radio_buttons, wrapper: :horizontal_medium
         = fcm.input :temperature, wrapper: :horizontal_tiny
         = fcm.input :bm_stix, wrapper: :horizontal_tiny
 
@@ -83,10 +93,10 @@ ruby:
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "HDF", name: "hdf" } do
       = fd.simple_fields_for :hdf, fd.object.hdf do |fcm|
-        = fcm.input :subs_fluid_pct, input_html: { class: "small-input" }
-        = fcm.input :subs_rate, input_html: { class: "small-input" }
-        = fcm.input :subs_goal, input_html: { class: "small-input" }
-        = fcm.input :subs_volume, input_html: { class: "small-input" }
+        = fcm.input :subs_fluid_pct, wrapper: :horizontal_tiny
+        = fcm.input :subs_rate, wrapper: :horizontal_tiny
+        = fcm.input :subs_goal, wrapper: :horizontal_tiny
+        = fcm.input :subs_volume, wrapper: :horizontal_tiny
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "HD Drugs", name: "hd_prescriptions" } do
@@ -104,18 +114,18 @@ ruby:
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Notes/Complications", name: "complications" } do
       = fd.simple_fields_for :complications, fd.object.complications do |fcm|
-        = fcm.input :access_site_status, input_html: { class: "small-input" }
-        = fcm.input :was_dressing_changed, as: :inline_radio_buttons
-        = fcm.input :had_mrsa_swab, as: :inline_radio_buttons
-        = fcm.input :had_mssa_swab, as: :inline_radio_buttons
-        = fcm.input :had_intradialytic_hypotension, as: :inline_radio_buttons
-        = fcm.input :had_saline_administration, as: :inline_radio_buttons
-        = fcm.input :had_cramps, as: :inline_radio_buttons
-        = fcm.input :had_headache, as: :inline_radio_buttons
-        = fcm.input :had_chest_pain, as: :inline_radio_buttons
-        = fcm.input :had_alteplase_urokinase, as: :inline_radio_buttons
-        = fcm.input :had_blood_transfusion, as: :inline_radio_buttons
-        = f.input :notes, as: :text, input_html: { rows: 5 }
+        = fcm.input :access_site_status, wrapper: :horizontal_small
+        = fcm.input :was_dressing_changed, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_mrsa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_mssa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_intradialytic_hypotension, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_saline_administration, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_cramps, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_headache, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_chest_pain, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_alteplase_urokinase, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = fcm.input :had_blood_transfusion, as: :inline_radio_buttons, wrapper: :horizontal_small
+        = f.input :notes, as: :text, input_html: { rows: 5 }, wrapper: :horizontal_large
 
 .row
   .large-12.columns

data/app/views/renalware/letters/contacts/_person_form.html.slim

@@ -17,7 +17,7 @@
       = fa.input :town
       = fa.input :county
       = fa.input :postcode
-      = fa.input :country, as: :string
+      = fa.association :country
       = fa.input :telephone
       = fa.input :email
 

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

@@ -10,3 +10,4 @@ li.has-dropdown
     li= link_to t(".letters"), letters_list_path
     li= link_to t(".esa_prescriptions"), medications_esa_prescriptions_path
     li= link_to t(".audits"), reporting_audits_path
+    li= link_to t(".aki_alerts"), renal_aki_alerts_path

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

@@ -26,11 +26,14 @@
         wrapper: :horizontal_small
     = f.association :ethnicity,
         label_method: :name, value_method: :id,
-        include_blank: "Please select ethnicity",
+        include_blank: "Please select",
+        wrapper: :horizontal_small
+    = f.association :country_of_birth,
+        include_blank: "Please select",
         wrapper: :horizontal_small
     = f.association :religion,
         label_method: :name, value_method: :id,
-        include_blank: "Please select religion",
+        include_blank: "Please select",
         wrapper: :horizontal_small
     = f.association :language,
         label_method: :name, value_method: :id,

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

@@ -22,10 +22,5 @@
           = render "renalware/patients/patients/show/ukrdc_preferences", patient: patient
         .columns.medium-6.large-4.xlarge-3
           = render "renalware/patients/patients/show/contact_details", patient: patient
-        .columns.medium-6.large-4.xlarge-3
-          article
-            header
-              h2 Current Address
-            = render patient.current_address if patient.current_address
         .columns.medium-6.large-4.xlarge-3
           = render "renalware/patients/patients/show/referral", patient: patient

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

@@ -28,13 +28,13 @@ article
     dt Ethnicity:
     dd= default_for_associated(patient.ethnicity, :name, "Unspecified")
 
+    dt Country of Birth:
+    dd= default_for_associated(patient.country_of_birth, :name, "Unspecified")
+
   dl.dl-horizontal
     dt Sex:
     dd= patient.sex
 
-    dt Ethnicity:
-    dd= default_for_associated(patient.ethnicity, :name, "Unspecified")
-
     dt Marital Status
     dd= patient.marital_status
 

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

@@ -27,5 +27,8 @@ li.link.action
            locals: { patient: patient, link_text: t(".create_alert") }
   = render "renalware/patients/alerts/modal_dialog_placeholder"
 
+- if policy(patient).debug?
+  li.link.action
+    = link_to "Debug: UKRDC XML", api_ukrdc_patient_path(patient)
 = render "renalware/admissions/requests/modal_dialog_placeholder"
 = render "renalware/messaging/internal/messages/modal_dialog_placeholder"

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

@@ -0,0 +1,17 @@
+= within_admin_layout(title: "Edit",
+                      breadcrumbs: breadcrumb_for("AKI Alerts", renal_aki_alerts_path)) do
+
+  = simple_form_for(alert, wrapper: :horizontal_form) do |f|
+    = f.association :action, wrapper: :horizontal_small
+    = f.association :hospital_ward,
+          as: :grouped_select,
+          group_method: :wards,
+          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.submit class: "button"
+    span= " or "
+    = link_to "cancel", renal_aki_alerts_path
+

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

@@ -0,0 +1,28 @@
+= within_admin_layout(title: "AKI Alerts") do
+  table.aki-alerts
+    thead
+      th
+      th Patient
+      th.col-width-nhs-no NHS No.
+      th.col-width-reference 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 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.hospital_identifiers
+          td= alert.patient.sex
+          td= alert.patient.age
+          td= alert.patient.born_on
+          td= alert.action
+          td= alert.hospital_ward
+          td= yes_no alert.hotlist?
+          td= alert.decided_by

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

@@ -11,7 +11,7 @@
               as: :text,
               wrapper: :horizontal_medium,
               input_html: { rows: 2 }
-    = f.input :materialized_view_name,
+    = f.input :view_name,
               collection: available_data_sources,
               wrapper: :horizontal_medium
     = f.input :display_configuration,

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

@@ -5,7 +5,8 @@
       tr
         th.col-width-small
         th.col-width-medium Name
-        th Materialized view name
+        th Postgres view name
+        th Materialized
         th Schedule
         th.col-width-date-time Updated on
         th.col-width-date-time Data last refreshed
@@ -18,12 +19,15 @@
             = pipe_separator
             = link_to("Edit", edit_reporting_audit_path(audit))
           td= audit.name
-          td= audit.materialized_view_name
+          td= audit.view_name
+          td= yes_no audit.materialized?
           td= audit.refresh_schedule
           td= l(audit.updated_at)
           td= l(audit.refreshed_at)
-          td= link_to("Refresh Data",
-                      reporting_audit_refreshments_path(audit_id: audit.id),
-                      remote: true,
-                      method: :post,
-                      class: "button compact warning")
+          td
+            -if audit.materialized?
+              = link_to("Refresh Data",
+                        reporting_audit_refreshments_path(audit_id: audit.id),
+                        remote: true,
+                        method: :post,
+                        class: "button compact warning")

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

@@ -6,19 +6,6 @@
     var databaseColumns = eval(#{raw(columns)});
     var userConfiguredColumns = eval(#{raw(audit.display_configuration)})['columnDefs'];
 
-    // You would now have to merge two hashes - one from config into one from db
-    // becuase we want to
-    // change the name, wht width, hide
-
-    // if we just use ruby, we can
-    // build col headers and table
-    // need some config to add names, widths, hide
-    // hide can be driven by sql view
-    // width and name are display logic and need config outside of view.
-    // could display a table of cols and you tick Hide and enter label to change name and width
-    // | name | apped name | hide | width |
-    // | x_y_x| My X Y Z   | no   | 100   |
-
     $("body").ready(function() {
       $("body.audits-show table#audit").DataTable(
         {
@@ -33,9 +20,7 @@
   - if audit.description.present?
     .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 materialized_view
+  / 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.
-  /
   table#audit.display.natural-width

data/app/views/renalware/shared/documents/_blood_pressure_input.html.slim

@@ -1,21 +1,20 @@
 = f.simple_fields_for attribute, f.object.public_send(attribute) do |fd|
   .blood-pressure class=('with-errors' if fd.object.errors.any?)
     .row
-      .small-3.columns
+      .small-5.medium-4.large-3.columns
         = fd.label :age, f.object.class.human_attribute_name(attribute), class: "right inline"
-      .small-1.columns
+      .small-2.medium-1.columns
         = fd.input :systolic, as: :integer,
             placeholder: "syst",
             error: false,
             label: false, wrapper: "vertical_form"
-      .small-1.columns
+      .small-2.medium-1.columns.end
         = fd.input :diastolic, as: :integer,
             placeholder: "dias",
             error: false,
             label: false, wrapper: "vertical_form"
-      .small-7.columns
+
     - if fd.object.errors.any?
       .row
-        .small-offset-3.small-9.columns
-          =fd.error(:systolic)
-          =fd.error(:diastolic)
+        .error.small-offset-5.medium-offset-4.large-offset-3.small-3.columns
+          =fd.error(:systolic) || fd.error(:diastolic)

data/config/initializers/inflections.rb

@@ -12,6 +12,7 @@
 
 # These inflection rules are supported but not enabled by default:
 ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym "AKI"
   inflect.acronym "APD"
   inflect.acronym "API"
   inflect.acronym "CAPD"
@@ -21,6 +22,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "DNA"
   inflect.acronym "EDTA"
   inflect.acronym "ESRF"
+  inflect.acronym "GP"
   inflect.acronym "HD"
   inflect.acronym "HDF"
   inflect.acronym "HL7"
@@ -28,8 +30,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "PD"
   inflect.acronym "PET"
   inflect.acronym "PRD"
-  inflect.acronym "XHR"
-  inflect.acronym "GP"
   inflect.acronym "RTF"
   inflect.acronym "UKRDC"
+  inflect.acronym "XHR"
 end

data/config/locales/renalware/navigation/renal.en.yml

@@ -12,6 +12,7 @@ en:
         letters: Letters
         esa_prescriptions: ESA Patients
         audits: Audits
+        aki_alerts: AKI Alerts
       mdms:
         menu_title: MDMs
         hd: HD

data/config/locales/renalware/renal/aki_alerts.en.yml

@@ -0,0 +1,5 @@
+en:
+  activerecord:
+    attributes:
+      renalware/renal/aki_alert:
+        hotlist: On Hotlist

data/config/locales/renalware/reporting/audit.en.yml

@@ -6,4 +6,4 @@ en:
         refresh_schedule: Refresh schedule (cron format)
         name: Name
         description: Description
-        materialized_view_name: Name of materialized view (the data source)
+        view_name: Name of materialized view (the data source)

data/config/routes.rb

@@ -203,6 +203,7 @@ Renalware::Engine.routes.draw do
         get :search
       end
     end
+    resources :aki_alerts, except: [:new, :create, :destroy]
   end
 
   namespace :system do

data/db/migrate/20150312113937_create_drug_types_drugs.rb

@@ -1,9 +1,9 @@
 class CreateDrugTypesDrugs < ActiveRecord::Migration[4.2]
   def change
-    create_table :drug_types_drugs, id: false do |t|
+    create_table :drug_types_drugs, primary_key: [:drug_id, :drug_type_id] do |t|
       t.references :drug,      foreign_key: true
       t.references :drug_type, foreign_key: true
     end
-    add_index(:drug_types_drugs, [:drug_id, :drug_type_id], unique: true)
+    #add_index(:drug_types_drugs, [:drug_id, :drug_type_id], unique: true)
   end
 end