admin/WerkoutIOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add screen subview

Browse Source
This commit is contained in:
Trey t
2024-06-16 18:58:47 -07:00
parent c3509f0ee0
commit 95ffd8a544
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Werkout_ios/APIModels/Equipment.swift
View File

@@ -9,12 +9,13 @@ import Foundation
struct Equipment: Codable, Identifiable, Equatable { struct Equipment: Codable, Identifiable, Equatable {
let id: Int let id: Int
let equipment: Int?
let name, createdAt, updatedAt: String let name, createdAt, updatedAt: String
let is_weight: Bool? let is_weight: Bool?
let category: String? let category: String?
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id, name case id, name, equipment
case createdAt = "created_at" case createdAt = "created_at"
case updatedAt = "updated_at" case updatedAt = "updated_at"
case is_weight case is_weight

3
Werkout_ios/APIModels/Muscle.swift
View File

@@ -9,10 +9,11 @@ import Foundation
struct Muscle: Codable, Identifiable, Equatable { struct Muscle: Codable, Identifiable, Equatable {
let id: Int let id: Int
let muscle: Int?
let name, createdAt, updatedAt: String let name, createdAt, updatedAt: String
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id, name case id, name, muscle
case createdAt = "created_at" case createdAt = "created_at"
case updatedAt = "updated_at" case updatedAt = "updated_at"
} }

4
Werkout_ios/Views/AddExercise/AddExerciseView.swift
View File

@@ -60,7 +60,7 @@ struct AddExerciseView: View {
if selectedMuscles.count == 0 { if selectedMuscles.count == 0 {
hasCorrectMuscles = true hasCorrectMuscles = true
} else { } else {
let exerciseMuscleIds = exercise.muscles.map({ $0.id }) let exerciseMuscleIds = exercise.muscles.map({ $0.muscle ?? -1 })
let selctedMuscleIds = selectedMuscles.map({ $0.id }) let selctedMuscleIds = selectedMuscles.map({ $0.id })
// if one items match // if one items match
if exerciseMuscleIds.contains(where: selctedMuscleIds.contains) { if exerciseMuscleIds.contains(where: selctedMuscleIds.contains) {
@@ -73,7 +73,7 @@ struct AddExerciseView: View {
if selectedEquipment.count == 0 { if selectedEquipment.count == 0 {
hasCorrectEquipment = true hasCorrectEquipment = true
} else { } else {
let exerciseEquipmentIds = exercise.equipment.map({ $0.id }) let exerciseEquipmentIds = exercise.equipment.map({ $0.equipment ?? -1 })
let selctedEquipmentIds = selectedEquipment.map({ $0.id }) let selctedEquipmentIds = selectedEquipment.map({ $0.id })
// if one items match // if one items match
if exerciseEquipmentIds.contains(where: selctedEquipmentIds.contains) { if exerciseEquipmentIds.contains(where: selctedEquipmentIds.contains) {