revisions for review

This commit is contained in:
Kevin G Christiano 2020-05-15 16:14:16 -04:00
parent 6d3805c958
commit c144b07a83

View File

@ -29,23 +29,22 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol {
public func validate(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool { public func validate(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool {
var valid = false var valid = false
var compareValue: String? var compareText: String?
for formKey in fields { for formKey in fields {
guard let formField = fieldMolecules[formKey] else { continue } guard let formField = fieldMolecules[formKey] else { continue }
if compareValue == nil { guard let compareString = compareText else {
compareValue = formField.formFieldValue() as? String compareText = formField.formFieldValue() as? String
continue continue
} }
if let compareValue = compareValue, let fieldValue = formField.formFieldValue() as? String, if let fieldValue = formField.formFieldValue() as? String,
compareValue.caseInsensitiveCompare(fieldValue) == .orderedSame { compareString.caseInsensitiveCompare(fieldValue) == .orderedSame {
valid = true valid = true
(formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)
} else {
(formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)
} }
(formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)
} }
return valid return valid