updated as per comments
This commit is contained in:
parent
1a13291684
commit
478b7fda1b
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user