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

Merge branch 'feature/form_cleaning' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/form_cleaning

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-04-01 16:11:37 -04:00
commit df641b3093
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -170,8 +170,8 @@ import UIKit
navigationModel.line = LineModel(type: .none)
}
pageModel?.navigationItem = navigationModel
if self.formValidator == nil,
let rules = pageModel?.formRules {
if self.formValidator == nil {
let rules = pageModel?.formRules
self.formValidator = FormValidator(rules)
}
}

7
MVMCoreUI/FormUIHelpers/FormValidator.swift
View File

@ -12,13 +12,13 @@ import MVMCore
@objcMembers public class FormValidator: NSObject {
static var defaultGroupName: String = "default"
var formRules: [FormGroupRule]
var formRules: [FormGroupRule]?
weak var delegate: FormHolderProtocol?
var fields: [String: FormFieldProtocol] = [:]
var groupWatchers: [FormGroupWatcherFieldProtocol] = []
var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
public init(_ formRules: [FormGroupRule]) {
public init(_ formRules: [FormGroupRule]?) {
self.formRules = formRules
}
@ -59,6 +59,9 @@ import MVMCore
/// Validates all rule groups. Returns if valid
public func validate() -> Bool {
var valid = true
guard let formRules = formRules else {
return valid
}
for group in formRules {
valid = valid && validateGroup(group)
}