add screen subview
This commit is contained in:
@@ -9,12 +9,13 @@ import Foundation
|
||||
|
||||
struct Equipment: Codable, Identifiable, Equatable {
|
||||
let id: Int
|
||||
let equipment: Int?
|
||||
let name, createdAt, updatedAt: String
|
||||
let is_weight: Bool?
|
||||
let category: String?
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case id, name
|
||||
case id, name, equipment
|
||||
case createdAt = "created_at"
|
||||
case updatedAt = "updated_at"
|
||||
case is_weight
|
||||
|
||||
@@ -9,10 +9,11 @@ import Foundation
|
||||
|
||||
struct Muscle: Codable, Identifiable, Equatable {
|
||||
let id: Int
|
||||
let muscle: Int?
|
||||
let name, createdAt, updatedAt: String
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case id, name
|
||||
case id, name, muscle
|
||||
case createdAt = "created_at"
|
||||
case updatedAt = "updated_at"
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ struct AddExerciseView: View {
|
||||
if selectedMuscles.count == 0 {
|
||||
hasCorrectMuscles = true
|
||||
} else {
|
||||
let exerciseMuscleIds = exercise.muscles.map({ $0.id })
|
||||
let exerciseMuscleIds = exercise.muscles.map({ $0.muscle ?? -1 })
|
||||
let selctedMuscleIds = selectedMuscles.map({ $0.id })
|
||||
// if one items match
|
||||
if exerciseMuscleIds.contains(where: selctedMuscleIds.contains) {
|
||||
@@ -73,7 +73,7 @@ struct AddExerciseView: View {
|
||||
if selectedEquipment.count == 0 {
|
||||
hasCorrectEquipment = true
|
||||
} else {
|
||||
let exerciseEquipmentIds = exercise.equipment.map({ $0.id })
|
||||
let exerciseEquipmentIds = exercise.equipment.map({ $0.equipment ?? -1 })
|
||||
let selctedEquipmentIds = selectedEquipment.map({ $0.id })
|
||||
// if one items match
|
||||
if exerciseEquipmentIds.contains(where: selctedEquipmentIds.contains) {
|
||||
|
||||
Reference in New Issue
Block a user