renalware-core 2.0.26 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c79d277b0b81eceb715ec9f31c7a25cc280b0e3ec6ce8347136d6632cb5f8cc
-  data.tar.gz: 05aac190cf455654b306f86e6cdac5e46eefcb0f5aa9171fe9c3b52cc3d36aa0
+  metadata.gz: 3db179c3655e0116ae6346710b5ab13ee30478ebf6155dd148ed4297481b71cb
+  data.tar.gz: d6dec13d3ed966b1a334dcf1ed7a760b03f0745140b1fe91c2e2842060d91dc8
 SHA512:
-  metadata.gz: df11ef7661930acd45bc1a4c05d313abed4f9bb111602ebd1019fd8faf99b8c8514a1757329d6bfe0912f08177efca748f024dce62eff5c4d96f79bde64901a9
-  data.tar.gz: 6d82a3f8a45dba2cf167a6709a09a8c2b023b1d2b83b346cd60b53259acc101a9081f8605a77cbf0a6f6d9826d46826599144eccec515a5c0e67ec5e5c2ce891
+  metadata.gz: c42e3954747469956ebafe5df3a8228530ac36d2196ec541f08661c99a80be74167bc3c864ed9224e77bcd74d7e876f5ef8bc77fa6c00af3e74f040e2b98082e
+  data.tar.gz: cead17eef7473469f7d8fe9b31a99890e601a3d98f68098b0caa5a4d5e10270e97357b18a7871c29557dc18bbc577e32530876621d4e8ccf7dfadfe38c0f55c4

data/app/inputs/date_picker_input.rb

@@ -16,16 +16,18 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
     end
   end
 
+  # rubocop:disable Metrics/AbcSize
   def input_column(_wrapper_options = {})
     html_options = input_html_options
     html_options[:class] ||= []
     html_options[:class] << class_name
     template.content_tag(:div, class: "small-10 columns") do
       datestamp = @builder.object.public_send(attribute_name)
-      value = datestamp.present? ? I18n.l(datestamp) : ""
+      value = format_date(datestamp)
       template.concat @builder.text_field(attribute_name, html_options.merge(value: value))
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def icon_calendar
     "<span class='prefix'><i class='fa fa-calendar'></i></span>".html_safe
@@ -38,4 +40,20 @@ class DatePickerInput < SimpleForm::Inputs::StringInput
   def class_name
     "datepicker"
   end
+
+  private
+
+  # Note that datestamp will be some kind of Date object *unless* its an invalid date string
+  # e.g. "12-00-2010" that has for example been imported from another system, and its one we
+  # happen to store in Rw2 in jsonb where there is no database type checking.
+  # We have seen this in LowClerance::Profile.document.
+  # So if we get an error converting an invalid date string, return it as is and let the
+  # user correct it in the UI. Note that without this error handling, the user will
+  # not be able to view the form to correct the data.
+  def format_date(datestamp)
+    return "" if datestamp.blank?
+    I18n.l(datestamp)
+  rescue I18n::ArgumentError # e.g. its a string containing an invalid date
+    datestamp
+  end
 end

data/app/validators/renalware/patients/blood_pressure_validator.rb

@@ -22,7 +22,7 @@ module Renalware
       def validate_diastolic_less_than_systolic(bp)
         errors = bp.errors
         return if errors.any?
-        unless bp.diastolic < bp.systolic
+        unless bp.diastolic.to_f < bp.systolic.to_f
           errors.add(:diastolic, :must_be_less_than_systolic)
         end
       end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.26"
+  VERSION = "2.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.27
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type