diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index 18633e3e8..3bef3944c 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -86,7 +86,7 @@ private year = params[@log.model_name.param_key]["#{question.id}(1i)"] next unless [day, month, year].any?(&:present?) - result[question.id] = if Date.valid_date?(year.to_i, month.to_i, day.to_i) && year.to_i > 0 + result[question.id] = if Date.valid_date?(year.to_i, month.to_i, day.to_i) && year.to_i.positive? Date.new(year.to_i, month.to_i, day.to_i) else Date.new(0, 1, 1) diff --git a/app/models/validations/sales/sale_information_validations.rb b/app/models/validations/sales/sale_information_validations.rb index 46176b63a..4239c2759 100644 --- a/app/models/validations/sales/sale_information_validations.rb +++ b/app/models/validations/sales/sale_information_validations.rb @@ -4,7 +4,7 @@ module Validations::Sales::SaleInformationValidations include MoneyFormattingHelper def validate_practical_completion_date(record) - return unless !record.hodate.blank? && date_valid?("hodate", record) + return unless record.hodate.present? && date_valid?("hodate", record) return if record.saledate.blank? if record.hodate > record.saledate