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

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

Browse Source
This commit is contained in:
Xinlei(Ryan) Pan 2020-01-24 11:46:00 -05:00
commit 86e6a0aba7
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
View File

@ -40,7 +40,9 @@ import UIKit
for moleculeList in molecules { for moleculeList in molecules {
var json1d = [[AnyHashable: Any]]() var json1d = [[AnyHashable: Any]]()
for molecule in moleculeList { for molecule in moleculeList {
json1d.append((molecule as? ListItemModel)!.toJSON()!) if let moleculeDictionary = (molecule as? ListItemModel)?.toJSON() {
json1d.append(moleculeDictionary)
}
} }
json2d.append(json1d) json2d.append(json1d)
} }

14
MVMCoreUI/Templates/MoleculeListTemplate.swift
View File

@ -151,11 +151,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
var tmpMolecules = [ListItemModelProtocol]() var tmpMolecules = [ListItemModelProtocol]()
molecules.forEach { molecule in molecules.forEach { molecule in
let data = try? JSONSerialization.data(withJSONObject: molecule) if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data) {
let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data!) tmpMolecules.append(listItemModel)
 let jsonData = try? JSONSerialization.jsonObject(with: data!, options: .allowFragments) }
let json = String(data: data!, encoding: String.Encoding.utf8)
tmpMolecules.append(listItemModel!)
} }
DispatchQueue.main.async { DispatchQueue.main.async {
@ -180,9 +178,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
var tmpMolecules = [ListItemModelProtocol]() var tmpMolecules = [ListItemModelProtocol]()
molecules.forEach { molecule in molecules.forEach { molecule in
let data = try? JSONSerialization.data(withJSONObject: molecule) if let data = try? JSONSerialization.data(withJSONObject: molecule), let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data) {
let listItemModel = try? JSONDecoder().decode(ListItemModel.self, from: data!) tmpMolecules.append(listItemModel)
tmpMolecules.append(listItemModel!) }
} }
var indexPaths: [IndexPath] = [] var indexPaths: [IndexPath] = []