From 7073e3d9523af4b10856b460bd6b322a8ca25fab Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 21 Mar 2021 18:27:17 -0700 Subject: [PATCH] Fixes to skill saving --- iOS/MonsterCards/Models/MonsterViewModel.swift | 18 +++++++++--------- iOS/MonsterCards/Views/EditSkills.swift | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/iOS/MonsterCards/Models/MonsterViewModel.swift b/iOS/MonsterCards/Models/MonsterViewModel.swift index 053fef4..c8866b7 100644 --- a/iOS/MonsterCards/Models/MonsterViewModel.swift +++ b/iOS/MonsterCards/Models/MonsterViewModel.swift @@ -191,15 +191,15 @@ class MonsterViewModel: ObservableObject { monster.removeFromSkills(skill) } } -// // Add new skills to raw monster -// skills.forEach {skillVM in -// if (!(monster.skills?.contains( -// where: { -// skillVM.isEqualTo(rawSkill: $0 as? Skill) -// }) ?? true)){ -// monster.addToSkills(skillVM.buildRawSkill(context: monster.managedObjectContext)) -// } -// } + // Add new skills to raw monster + skills.forEach {skillVM in + if (!(monster.skills?.contains( + where: { + skillVM.isEqualTo(rawSkill: $0 as? Skill) + }) ?? true)){ + monster.addToSkills(skillVM.buildRawSkill(context: monster.managedObjectContext)) + } + } } func copyFromRaw() { diff --git a/iOS/MonsterCards/Views/EditSkills.swift b/iOS/MonsterCards/Views/EditSkills.swift index a72373c..4ad77e6 100644 --- a/iOS/MonsterCards/Views/EditSkills.swift +++ b/iOS/MonsterCards/Views/EditSkills.swift @@ -12,7 +12,7 @@ struct EditSkills: View { var body: some View { List { - ForEach(monsterViewModel.skills, id: \.self) { skill in + ForEach(monsterViewModel.skills) { skill in NavigationLink(skill.name, destination: EditSkill(skillViewModel: skill)) } .onDelete(perform: { indexSet in