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

Merge branch 'bugfix/radio_selection' into 'release/7_5_0'

Browse Source 
radio selection fix

See merge request BPHV_MIPS/mvm_core_ui!325
This commit is contained in:
Pfeil, Scott Robert 2020-03-20 19:56:41 -04:00
commit eb1a98dcb8
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atoms/Views/RadioButton.swift
View File

@ -128,9 +128,7 @@ import UIKit
self.delegateObject = delegateObject self.delegateObject = delegateObject
isSelected = model.state isSelected = model.state
let radioButtonModel = RadioButtonSelectionHelper.setupForRadioButtonGroup(model, RadioButtonSelectionHelper.setupForRadioButtonGroup(model, self, delegateObject: delegateObject)
formValidator: delegateObject?.formHolderDelegate?.formValidator)
FormValidator.setupValidation(molecule: radioButtonModel, delegate: delegateObject?.formHolderDelegate)
} }
public override func reset() { public override func reset() {

14
MVMCoreUI/Molecules/RadioButtonSelectionHelper.swift
View File

@ -14,7 +14,7 @@ import UIKit
public var fieldKey: String? public var fieldKey: String?
public var groupName: String? = FormValidator.defaultGroupName public var groupName: String? = FormValidator.defaultGroupName
private var selectedRadioButton: RadioButton? var selectedRadioButton: RadioButton?
private var fieldGroupName: String? private var fieldGroupName: String?
public var baseValue: AnyHashable? public var baseValue: AnyHashable?
@ -22,16 +22,20 @@ import UIKit
self.fieldKey = fieldKey self.fieldKey = fieldKey
} }
public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, formValidator: FormValidator?) -> RadioButtonSelectionHelper { public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton, delegateObject: MVMCoreUIDelegateObject?) {
guard let groupName = radioButtonModel.fieldKey, guard let groupName = radioButtonModel.fieldKey,
let formValidator = formValidator else { let formValidator = delegateObject?.formHolderDelegate?.formValidator else {
return RadioButtonSelectionHelper(radioButtonModel.fieldKey) return
} }
let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper(radioButtonModel.fieldKey) let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper(radioButtonModel.fieldKey)
radioButtonSelectionHelper.fieldGroupName = radioButtonModel.fieldKey radioButtonSelectionHelper.fieldGroupName = radioButtonModel.fieldKey
formValidator.radioButtonsModelByGroup[groupName] = radioButtonSelectionHelper formValidator.radioButtonsModelByGroup[groupName] = radioButtonSelectionHelper
return radioButtonSelectionHelper
if radioButtonModel.state {
radioButtonSelectionHelper.selectedRadioButton = radioButton
}
FormValidator.setupValidation(molecule: radioButtonSelectionHelper, delegate: delegateObject?.formHolderDelegate)
} }
public func selected(_ radioButton: RadioButton) { public func selected(_ radioButton: RadioButton) {