Merge pull request #393 from af83/6139-generic-compliance-control-numericality-validation

6139 generic compliance control numericality validation

1 files changed, 3 insertions, 1 deletions

diff --git a/app/models/concerns/min_max_values_validation.rb b/app/models/concerns/min_max_values_validation.rb
index eff779d81..91e760c5a 100644
--- a/app/models/concerns/min_max_values_validation.rb
+++ b/app/models/concerns/min_max_values_validation.rb
@@ -3,11 +3,13 @@ module MinMaxValuesValidation
 
   included do
     validates_presence_of :minimum, :maximum
+    validates_numericality_of :minimum, :maximum, allow_nil: true, greater_than_or_equal_to: 0
+    validates_format_of :minimum, :maximum, with: %r{\A\d+\.\d{2}\Z}
     validate :min_max_values_validation
   end
 
   def min_max_values_validation
-    return true if (minimum && maximum) && (minimum.to_i < maximum.to_i)
+    return true if (minimum && maximum) && (minimum.to_f < maximum.to_f)
     errors.add(:minimum, I18n.t('compliance_controls.min_max_values', min: minimum, max: maximum))
   end
 end