mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated as per comments

Browse Source
This commit is contained in:
Tondapu, Alekhya 2021-08-03 20:05:21 +05:30
parent 1a13291684
commit 478b7fda1b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MVMCoreUI/FormUIHelpers/Rules/Rules/RuleDateValidationModel.swift
View File

@ -40,7 +40,7 @@ public class RuleDateValidationModel: RulesProtocol {
compareValue = formField.formFieldValue() 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() let dateFormatter = DateFormatter()
dateFormatter.dateFormat = dateFormat dateFormatter.dateFormat = dateFormat
let validDate = dateFormatter.date(from: date) ?? Date() let validDate = dateFormatter.date(from: date) ?? Date()
@ -48,19 +48,19 @@ public class RuleDateValidationModel: RulesProtocol {
switch dateOperator { switch dateOperator {
case "greaterThanOrEqual": case "greaterThanOrEqual":
isValidDate = enteredDate.isGreaterThenOrEqualToDate(validDate) isValidDate = enteredDate.isGreaterThanOrEqualToDate(validDate)
break break
case "lessThanOrEqual": case "lessThanOrEqual":
isValidDate = enteredDate.isLessThenOrEqualToDate(validDate) isValidDate = enteredDate.isLessThanOrEqualToDate(validDate)
break break
case "equal": case "equal":
isValidDate = enteredDate.isEqualToDate(validDate) isValidDate = enteredDate.isEqualToDate(validDate)
break break
case "greaterThan": case "greaterThan":
isValidDate = enteredDate.isGreaterThenDate(validDate) isValidDate = enteredDate.isGreaterThanDate(validDate)
break break
case "lessThan": case "lessThan":
isValidDate = enteredDate.isLessThenDate(validDate) isValidDate = enteredDate.isLessThanDate(validDate)
break break
default: break default: break
} }
@ -96,11 +96,11 @@ extension Date {
return order return order
} }
func isLessThenDate(_ date: Date) -> Bool { func isLessThanDate(_ date: Date) -> Bool {
return compareWithDate(date) == .orderedAscending return compareWithDate(date) == .orderedAscending
} }
func isGreaterThenDate(_ date: Date) -> Bool { func isGreaterThanDate(_ date: Date) -> Bool {
return compareWithDate(date) == .orderedDescending return compareWithDate(date) == .orderedDescending
} }
@ -108,11 +108,11 @@ extension Date {
return compareWithDate(date) == .orderedSame return compareWithDate(date) == .orderedSame
} }
func isGreaterThenOrEqualToDate(_ date: Date) -> Bool { func isGreaterThanOrEqualToDate(_ date: Date) -> Bool {
return isEqualToDate(date) || isGreaterThenDate(date) return isEqualToDate(date) || isGreaterThenDate(date)
} }
func isLessThenOrEqualToDate(_ date: Date) -> Bool { func isLessThanOrEqualToDate(_ date: Date) -> Bool {
return isEqualToDate(date) || isLessThenDate(date) return isEqualToDate(date) || isLessThenDate(date)
} }
/// Note: This methods compare two dates without considering the time /// Note: This methods compare two dates without considering the time