renalware-core 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f579d475315f2250e3bd086f651bcb9fc0c38838f74b649fb9f439fdb21b4db
-  data.tar.gz: 7ab7db9d4572a88eef14a8a0dd3ce0ed47c741c07f1838cb24cb856177aac239
+  metadata.gz: 03a33697674a37e0920fd04ad84fd5660c6b526e9084ff923e5ec277d8914a27
+  data.tar.gz: 138b635e40913eba766e0f995b38d14cecbcdf3054a330e35e372a40893a3d5c
 SHA512:
-  metadata.gz: cc57a5702a16893bdd206b58ec3b124b947d0c0694a45fb1dd63069de8521e8900f3b2496cb055ec75defcbad3935f8bbb93d9ef382f8859a826efa8b738524b
-  data.tar.gz: f01dbf8296ec8c9e1df88862270393dd0a19de91db300a1c30483d906ff6a60d7de24808a7089806b86f124bd09126e1673853d0edf0b39402dfb03c1b4ad4e0
+  metadata.gz: 19b2535e3b70433394f48cf4f74e714b3ca033c38d67cb43ea09a37a6070ea3bc32f678e1af665118d803615da213bec6241a80c8d101b336f5bdbdd43600718
+  data.tar.gz: f4ac2e6ef943e8c77e0c9f6b4ac8b0b860327fb19f7e3dc49f14c7ac2fe20c2e88ae6061facc707ef7040b01d4e0fa0ae5cbb8deda01b8228bf3ac6df7e400e8

data/app/views/renalware/admissions/consults/_filters.html.slim

@@ -4,19 +4,24 @@
       url: admissions_consults_path,
       method: :get do |f|
     .row
-      .columns.medium-4.large-3
+      .columns.medium-3.large-2
         = f.input :consult_site_id_eq,
                   collection: Renalware::Admissions::ConsultSite.pluck(:name, :id),
                   label: "Site"
-      .columns.medium-3.large-2
+      .columns.medium-2.large-1
         = f.input :requires_aki_nurse_eq,
                   collection: [["Yes", true], ["No", false]],
-                  label: "AKI Nurse required"
+                  label: "AKI Nurse req."
       .columns.medium-2.large-1
         = f.input :seen_by_id_eq,
                   include_blank: false,
                   collection: [["Anyone", nil], ["Me", current_user.id]],
                   label: "Seen by"
+      .columns.medium-2.large-1
+        = f.input :aki_risk_eq,
+                  include_blank: true,
+                  collection: Renalware::Admissions::Consult.aki_risk.values.map{ |value| [value.text, value] },
+                  label: "AKI Risk"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -2,15 +2,15 @@
   table
     thead
       tr
-        th.col-width-large Location
+        th.col-width-large= sort_link(query, :consult_site_id, "Location")
         th.at-least.col-width-medium Patient
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp Nos.
         th.col-width-medium Modality
         th.col-width-tiny Sex
         th.col-width-tiny Age
-        th.col-width-small AKI Risk
-        th.col-width-small AKI Nurse?
+        th.col-width-tiny= sort_link(query, :aki_risk, "AKI Risk")
+        th.col-width-tiny= sort_link(query, :requires_aki_nurse, " AKI Nurse?")
         th.show-for-large-up Author
         th.col-width-medium Description
         th.col-width-tiny

data/app/views/renalware/admissions/consults/index.html.slim

@@ -8,5 +8,5 @@
     |  first
 
   = render "filters", query: query
-  = render "table", consults: consults
+  = render "table", consults: consults, query: query
   = paginate consults

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

@@ -16,4 +16,5 @@
       .actions
         = f.submit "Log in", class: "button save"
 
+    = render "signup_help"
     = render "devise/shared/links"

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2055,6 +2055,7 @@ files:
 - app/views/renalware/devise/passwords/new.html.erb
 - app/views/renalware/devise/registrations/edit.html.slim
 - app/views/renalware/devise/registrations/new.html.slim
+- app/views/renalware/devise/sessions/_signup_help.html.slim
 - app/views/renalware/devise/sessions/_warning.html.slim
 - app/views/renalware/devise/sessions/new.html.slim
 - app/views/renalware/directory/people/_address_form.html.slim