From 95e7442640cb9d73cdd0d8d36b1b77cacbd92226 Mon Sep 17 00:00:00 2001 From: Dushan Despotovic Date: Tue, 21 Jun 2022 09:36:51 +0100 Subject: [PATCH] remove condition --- app/models/validations/setup_validations.rb | 36 ++++++++++----------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index 2e9699a55..f27120e54 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -6,29 +6,27 @@ module Validations::SetupValidations end def validate_startdate(record) - if record.needstype == 2 - if record.startdate > Time.zone.today - record.errors.add :startdate, I18n.t("validations.setup.startdate.today_or_earlier") - end - - if record.voiddate.present? - if (record.startdate.to_date - record.voiddate.to_date).to_i.abs > 730 - record.errors.add :startdate, I18n.t("validations.setup.startdate.voiddate_difference") - end + if record.startdate > Time.zone.today + record.errors.add :startdate, I18n.t("validations.setup.startdate.today_or_earlier") + end + + if record.voiddate.present? + if (record.startdate.to_date - record.voiddate.to_date).to_i.abs > 730 + record.errors.add :startdate, I18n.t("validations.setup.startdate.voiddate_difference") end + end - if record.mrcdate.present? - if (record.startdate.to_date - record.mrcdate.to_date).to_i.abs > 730 - record.errors.add :startdate, I18n.t("validations.setup.startdate.mrcdate_difference") - end + if record.mrcdate.present? + if (record.startdate.to_date - record.mrcdate.to_date).to_i.abs > 730 + record.errors.add :startdate, I18n.t("validations.setup.startdate.mrcdate_difference") end + end - if record.scheme_id.present? - scheme_end_date = Scheme.find(record.scheme_id).end_date - if scheme_end_date.present? - if record.startdate > scheme_end_date - record.errors.add :startdate, I18n.t("validations.setup.startdate.before_scheme_end_date") - end + if record.scheme_id.present? + scheme_end_date = Scheme.find(record.scheme_id).end_date + if scheme_end_date.present? + if record.startdate > scheme_end_date + record.errors.add :startdate, I18n.t("validations.setup.startdate.before_scheme_end_date") end end end