From 478b7fda1bc8ef685cb36f887e63ca7c1afc7f07 Mon Sep 17 00:00:00 2001 From: "Tondapu, Alekhya" Date: Tue, 3 Aug 2021 20:05:21 +0530 Subject: [PATCH] updated as per comments --- .../Rules/Rules/RuleDateValidationModel.swift | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleDateValidationModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleDateValidationModel.swift index 7490c8b8..488812bf 100644 --- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleDateValidationModel.swift +++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleDateValidationModel.swift @@ -40,7 +40,7 @@ public class RuleDateValidationModel: RulesProtocol { compareValue = formField.formFieldValue() } - /// Fetch date format and apply them to selected date from picker and validationdate for comparision + /// Fetch date format and apply them to selected date from picker and validate date for comparision let dateFormatter = DateFormatter() dateFormatter.dateFormat = dateFormat let validDate = dateFormatter.date(from: date) ?? Date() @@ -48,19 +48,19 @@ public class RuleDateValidationModel: RulesProtocol { switch dateOperator { case "greaterThanOrEqual": - isValidDate = enteredDate.isGreaterThenOrEqualToDate(validDate) + isValidDate = enteredDate.isGreaterThanOrEqualToDate(validDate) break case "lessThanOrEqual": - isValidDate = enteredDate.isLessThenOrEqualToDate(validDate) + isValidDate = enteredDate.isLessThanOrEqualToDate(validDate) break case "equal": isValidDate = enteredDate.isEqualToDate(validDate) break case "greaterThan": - isValidDate = enteredDate.isGreaterThenDate(validDate) + isValidDate = enteredDate.isGreaterThanDate(validDate) break case "lessThan": - isValidDate = enteredDate.isLessThenDate(validDate) + isValidDate = enteredDate.isLessThanDate(validDate) break default: break } @@ -96,11 +96,11 @@ extension Date { return order } - func isLessThenDate(_ date: Date) -> Bool { + func isLessThanDate(_ date: Date) -> Bool { return compareWithDate(date) == .orderedAscending } - func isGreaterThenDate(_ date: Date) -> Bool { + func isGreaterThanDate(_ date: Date) -> Bool { return compareWithDate(date) == .orderedDescending } @@ -108,11 +108,11 @@ extension Date { return compareWithDate(date) == .orderedSame } - func isGreaterThenOrEqualToDate(_ date: Date) -> Bool { + func isGreaterThanOrEqualToDate(_ date: Date) -> Bool { return isEqualToDate(date) || isGreaterThenDate(date) } - func isLessThenOrEqualToDate(_ date: Date) -> Bool { + func isLessThanOrEqualToDate(_ date: Date) -> Bool { return isEqualToDate(date) || isLessThenDate(date) } /// Note: This methods compare two dates without considering the time