renalware-core 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c6d5676c20af6cae4347f70aab29e6f156d4280ab6d650c6e13633178cb128
-  data.tar.gz: ffaebb9b45c7820ae5a711ab2e203093a05d179268ca7240c50605db69fc96e3
+  metadata.gz: f58372406094a085ea5fd1ffe9a57724951450eb6db8adf1b2513513800479f3
+  data.tar.gz: c7a49293b5baf36736b8dc90695721328b57b6402243b9970e352859d233948b
 SHA512:
-  metadata.gz: 58f4bda8f4695d56e1c63be933ee5c7a0fa9cb70a177ea539ae6d6256a6191482687a18303eee0c85cf56eb44e688ed3ff1e45e43c4ae7d7b409eac8fe1933f4
-  data.tar.gz: 121933949b237cdbfc7b3c3b9ea4e9f516f8d55394353d15a8e119a3202189b9c4130e4cb9e086b69628b109c43afe7fcb20c3c0b95ed4e636610a1f696fc9a5
+  metadata.gz: 3a92d4849645611cfc0fe10f06c27e38fbf7e75cf0c445751e94be9c978b04c217377064dd69bce6a0c817dfb085cf865d011fc8ed415ee8ea3a7f0ec2b2902d
+  data.tar.gz: ad1af0c79116b59c41068e0f0dec65ab81c00da7842ef9c6acf1be37616ec3a829499683f292da0f3b25dad252e6120ccce2c91d51d988512beef7fb0ee3bb10

data/app/documents/renalware/blood_pressure.rb

@@ -3,6 +3,8 @@ module Renalware
     attribute :systolic, Integer
     attribute :diastolic, Integer
 
+    validates :systolic, numericality: { allow_blank: true }
+    validates :diastolic, numericality: { allow_blank: true }
     validates_with Renalware::Patients::BloodPressureValidator
 
     def to_s

data/app/documents/renalware/hd/session_document.rb

@@ -33,6 +33,13 @@ module Renalware
         attribute :temperature_measured, Document::Enum, enums: %i(yes no), default: :yes
         attribute :bm_stix, Float
 
+        %i(
+          weight
+          temperature
+          bm_stix
+          pulse
+        ).each { |att| validates(att, numericality: { allow_blank: true }) }
+
         validates :weight, "renalware/patients/weight" => true
         validates :temperature, "renalware/patients/temperature" => true
         validates :bm_stix, "renalware/patients/bm_stix" => true
@@ -55,6 +62,16 @@ module Renalware
           (100..800).step(100)
         end
 
+        %i(
+          arterial_pressure
+          venous_pressure
+          fluid_removed
+          flow_rate
+          machine_urr
+          machine_ktv
+          litres_processed
+        ).each { |att| validates(att, numericality: { allow_blank: true }) }
+
         validates :machine_urr, inclusion: { in: 0..100, allow_blank: true }
         validates :machine_ktv, inclusion: { in: (0.2..3.5), allow_blank: true }
         validates :blood_flow, numericality: {
@@ -70,6 +87,13 @@ module Renalware
         attribute :subs_goal, Float
         attribute :subs_rate, Float
         attribute :subs_volume, Float
+
+        %i(
+          subs_fluid_pct
+          subs_goal
+          subs_rate
+          subs_volume
+        ).each { |att| validates(att, numericality: { allow_blank: true }) }
       end
       attribute :hdf, HDF
 

data/app/views/renalware/addresses/_address.html.slim

@@ -1,27 +1,9 @@
-dl.dl-horizontal
-  / dt Name
-  / dd= address.name
-
-  dt Organisation Name
-  dd= address.organisation_name
-
-  dt Street 1
-  dd= address.street_1
-
-  dt Street 2
-  dd= address.street_2
-
-  dt Street 3
-  dd= address.street_3
-
-  dt Town
-  dd= address.town
-
-  dt County
-  dd= address.county
-
-  dt Postcode
-  dd= address.postcode
-
-  dt Country
-  dd= address.country
+= definition_list_for(address) do |list|
+  = list.definition(:organisation_name)
+  = list.definition(:street_1)
+  = list.definition(:street_2)
+  = list.definition(:street_3)
+  = list.definition(:town)
+  = list.definition(:county)
+  = list.definition(:postcode)
+  = list.definition(:country)

data/app/views/renalware/medications/prescriptions/_prescription.html.slim

@@ -1,16 +1,6 @@
 - recently_changed = defined?(recently_changed) && recently_changed
 
 li.prescription class=("recently_changed" if recently_changed)
-  - if recently_changed
-    | *
-    = blank_separator
-
-  / We pass in date_changed if the prescription is recently_changed or recently_stopped
-  / It could be the prescribed_on or terminated_on date
-  - if defined?(date_changed)
-    span.date-changed= l(date_changed)
-    = blank_separator
-
   = prescription.drug.name
   = blank_separator
   = prescription.dose
@@ -18,3 +8,13 @@ li.prescription class=("recently_changed" if recently_changed)
   = prescription.medication_route.code
   = blank_separator
   = prescription.frequency
+
+  / We pass in date_changed if the prescription is recently_changed or recently_stopped
+  / It could be the prescribed_on or terminated_on date
+  - if defined?(date_changed)
+    = blank_separator
+    span.date-changed= l(date_changed)
+
+  - if recently_changed
+    = blank_separator
+    | *

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

@@ -4,10 +4,15 @@ article
 
   dl.dl-horizontal
     dt Email
-    dd= patient.email
+    - if patient.email.present?
+      dd= patient.email
+    - if patient.current_address&.email.present?
+      dd= patient.current_address&.email
 
-    dt Telephone1
-    dd= patient.telephone1
-
-    dt Telephone2
-    dd= patient.telephone2
+    dt Telephone
+    - if patient.telephone1.present?
+      dd= patient.telephone1
+    - if patient.telephone2.present?
+      dd= patient.telephone2
+    - if patient.current_address&.telephone.present?
+      dd= patient.current_address&.telephone

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

@@ -4,12 +4,12 @@
       .small-5.medium-4.large-3.columns
         = fd.label :age, f.object.class.human_attribute_name(attribute), class: "right inline"
       .small-2.medium-1.columns
-        = fd.input :systolic, as: :integer,
+        = fd.input :systolic,
             placeholder: "syst",
             error: false,
             label: false, wrapper: "vertical_form"
       .small-2.medium-1.columns.end
-        = fd.input :diastolic, as: :integer,
+        = fd.input :diastolic,
             placeholder: "dias",
             error: false,
             label: false, wrapper: "vertical_form"

data/config/locales/renalware/address.yml

@@ -9,7 +9,7 @@ en:
         street_3: Line 3
         town: Town
         county: County
-        postcode: Postal Code
+        postcode: Postcode
         country: Country
         telephone: Telephone
         email: Email

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.12".freeze
+  VERSION = "2.0.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.13
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails