WIP

Werkout_ios/Views/CreateWorkout/CreateExerciseActionsView.swift

@@ -19,6 +19,8 @@ struct CreateExerciseActionsView: View {
                     VStack {
                         Text("Reps: ")
                         Text("\(workoutExercise.reps)")
+                            .foregroundColor(workoutExercise.reps == 0 && workoutExercise.duration == 0 ? .red : Color(uiColor: .label))
+                            .bold()
                     }
                     Stepper("", onIncrement: {
                         workoutExercise.increaseReps()
@@ -51,6 +53,8 @@ struct CreateExerciseActionsView: View {
                     VStack {
                         Text("Duration: ")
                         Text("\(workoutExercise.duration)")
+                            .foregroundColor(workoutExercise.reps == 0 && workoutExercise.duration == 0 ? .red : Color(uiColor: .label))
+                            .bold()
                     }
                     Stepper("", onIncrement: {
                         workoutExercise.increaseDuration()

Werkout_ios/Views/CreateWorkout/CreateViewModels.swift

@@ -107,32 +107,42 @@ class WorkoutViewModel: ObservableObject {
     }
     
     func uploadWorkout() {
-        var exercises = [[String: Any]]()
+        var supersets = [[String: Any]]()
+        var supersetOrder = 1
         superSets.forEach({ superset in
             if superset.numberOfRounds == 0 {
                 showRoundsError()
                 return
             }
+            var supersetInfo = [String: Any]()
+            supersetInfo["name"] = ""
+            supersetInfo["rounds"] = superset.numberOfRounds
+            supersetInfo["order"] = supersetOrder
             
-            for _ in 0 ..< superset.numberOfRounds {
-                for exercise in superset.exercises {
-                    
-                    if exercise.reps == 0 && exercise.duration == 0 {
-                        showNoDurationOrReps()
-                        return
-                    }
-                    
-                    let item = ["id": exercise.exercise.id,
-                                "reps": exercise.reps,
-                                "weight": exercise.weight,
-                                "duration": exercise.duration] as [String : Any]
-                    exercises.append(item)
+            var exercises = [[String: Any]]()
+            var exerciseOrder = 1
+            for exercise in superset.exercises {
+                if exercise.reps == 0 && exercise.duration == 0 {
+                    showNoDurationOrReps()
+                    return
                 }
+                
+                let item = ["id": exercise.exercise.id,
+                            "reps": exercise.reps,
+                            "weight": exercise.weight,
+                            "duration": exercise.duration,
+                            "order": exerciseOrder] as [String : Any]
+                exercises.append(item)
+                exerciseOrder += 1
             }
+            supersetInfo["exercises"] = exercises
+            
+            supersets.append(supersetInfo)
+            supersetOrder += 1
         })
         let uploadBody = ["name": title,
                           "description": description,
-                          "exercise_data": exercises] as [String : Any]
+                          "supersets": supersets] as [String : Any]
         CreateWorkoutFetchable(postData: uploadBody).fetch(completion: { result in
             DispatchQueue.main.async {
                 switch result {

Werkout_ios/Views/CreateWorkout/CreateWorkoutMainView.swift

@@ -47,7 +47,6 @@ struct CreateWorkoutMainView: View {
                             }
                         }
                         
-
                         HStack {
                             Stepper("Number of rounds", onIncrement: {
                                 superset.wrappedValue.increaseNumberOfRounds()
@@ -58,6 +57,7 @@ struct CreateWorkoutMainView: View {
                             })
                             Text("\(superset.wrappedValue.numberOfRounds)")
                                 .foregroundColor(superset.numberOfRounds.wrappedValue > 0 ? .black : .red)
+                                .bold()
                         }
                         
                         CreateWorkoutSupersetActionsView(workoutSuperSet: superset.wrappedValue,
@@ -111,6 +111,32 @@ struct CreateWorkoutMainView: View {
             AddExerciseView(selectedExercise: { exercise in
                 let workoutExercise = CreateWorkoutExercise(exercise: exercise)
                 selectedCreateWorkoutSuperSet?.exercises.append(workoutExercise)
+                
+                
+                // if left or right auto add the other side
+                // with a recover in between b/c its
+                // eaiser to delete a recover than add one
+                if exercise.side.count > 0 {
+                    let exercises = DataStore.shared.allExercise?.filter({
+                        $0.name == exercise.name
+                    })
+                    let recover = DataStore.shared.allExercise?.first(where: {
+                        $0.name.lowercased() == "recover"
+                    })
+                    if let exercises = exercises, let recover = recover {
+                        if exercises.count == 2 {
+                            let recoverWorkoutExercise = CreateWorkoutExercise(exercise: recover)
+                            selectedCreateWorkoutSuperSet?.exercises.append(recoverWorkoutExercise)
+                            for LRExercise in exercises {
+                                if LRExercise.id != exercise.id {
+                                    let otherSideExercise = CreateWorkoutExercise(exercise: LRExercise)
+                                    selectedCreateWorkoutSuperSet?.exercises.append(otherSideExercise)
+                                }
+                            }
+                        }
+                    }
+                }
+                
                 viewModel.objectWillChange.send()
                 selectedCreateWorkoutSuperSet = nil
             })