WIP

Werkout_ios/Network/Network.swift

@@ -13,7 +13,7 @@ enum FetchableError: Error {
     case decodeError(Error)
     case endOfFileError
     case noPostData
-    case statusError(Int)
+    case statusError(Int, String?)
 }
 
 protocol Fetchable {
@@ -86,7 +86,12 @@ extension Postable {
             
             if let httpRespone = response as? HTTPURLResponse {
                 if httpRespone.statusCode != 201 {
-                    completion(.failure(.statusError(httpRespone.statusCode)))
+                    var returnStr: String?
+                    if let data = data {
+                        returnStr = String(data: data, encoding: .utf8)
+                    }
+                    
+                    completion(.failure(.statusError(httpRespone.statusCode, returnStr)))
                     return
                 }
             }

Werkout_ios/Views/CompletedWorkout/CompletedWorkoutView.swift

@@ -0,0 +1,103 @@
+//
+//  CompletedWorkoutView.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 6/22/23.
+//
+
+import SwiftUI
+
+struct CompletedWorkoutView: View {
+    @ObservedObject var bridgeModule = BridgeModule.shared
+    var postData: [String: Any]
+    let workout: Workout
+    @Environment(\.dismiss) var dismiss
+    
+    @State var difficulty: Float = 0
+    @State var notes: String = ""
+    let completedWorkoutDismissed: ((Bool) -> Void)?
+    
+    var body: some View {
+        VStack {
+            Text(workout.name)
+                .frame(maxWidth: .infinity, alignment: .leading)
+                .font(.title3)
+                .padding(.top
+                )
+            if let desc = workout.description {
+                Text(desc)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .font(.body)
+                    .padding(.top)
+                   
+            }
+            
+            Divider()
+            
+            Text("how hard was this shit")
+            
+            HStack {
+                Text("easy")
+                Spacer()
+                Text("Death")
+            }
+            
+            Slider(value: $difficulty, in: 0...5, step: 1)
+            
+            Divider()
+            
+            TextField("Notes", text: $notes)
+            
+//            Divider()
+            
+            Spacer()
+            
+            Button("Upload", action: {
+                upload(postBody: postData)
+            })
+            .frame(maxWidth: .infinity, alignment: .center)
+            .frame(height: 44)
+            .foregroundColor(.blue)
+            .background(.yellow)
+            .cornerRadius(8)
+            .padding()
+            .frame(maxWidth: .infinity)
+        }
+        .padding([.leading, .trailing])
+    }
+    
+    func upload(postBody: [String: Any]) {
+        var _postBody = postBody
+        _postBody["difficulty"] = difficulty
+        _postBody["notes"] = notes
+        
+        
+        CompleteWorkoutFetchable(postData: _postBody).fetch(completion: { result in
+            switch result {
+            case .success(_):
+                DispatchQueue.main.async {
+                    bridgeModule.resetCurrentWorkout()
+                    dismiss()
+                    completedWorkoutDismissed?(true)
+                }
+            case .failure(let failure):
+                print(failure)
+            }
+        })
+    }
+}
+
+//struct CompletedWorkoutView_Previews: PreviewProvider {
+//    static let postBody = [
+//        "difficulty": 1,
+//        "workout_start_time": Date().timeFormatForUpload,
+//        "workout": 1,
+//        "total_time": 140
+//    ] as [String : Any]
+//    
+//    static let workout = PreviewWorkout.workout()
+//    
+//    static var previews: some View {
+//        CompletedWorkoutView(postData: CompletedWorkoutView_Previews.postBody, workout: workout)
+//    }
+//}

Werkout_ios/Views/WorkoutDetail/WorkoutDetailView.swift

@@ -12,6 +12,13 @@ struct WorkoutDetailView: View {
     var bridgeModule = BridgeModule.shared
     @Environment(\.dismiss) var dismiss
     
+    enum Sheet: Identifiable {
+        case completedWorkout([String: Any])
+        var id: String { return UUID().uuidString }
+    }
+
+    @State var presentedSheet: Sheet?
+    
     var body: some View {
         ZStack {
             switch viewModel.status {
@@ -25,14 +32,45 @@ struct WorkoutDetailView: View {
                         .padding(.top)
                     CountdownView()
                     ExerciseListView(workout: workout)
-                    ActionsView(workout: workout)
+                    ActionsView(completedWorkout: {
+                        if let workoutData = createWorkoutData() {
+                            presentedSheet = .completedWorkout(workoutData)
+                            bridgeModule.resetCurrentWorkout()
+                        }
+                        
+                    }, workout: workout)
                         .frame(height: 44)
                     
                 }
+                .sheet(item: $presentedSheet) { item in
+                    switch item {
+                    case .completedWorkout(let data):
+                        CompletedWorkoutView(postData: data, workout: workout, completedWorkoutDismissed: { uploaded in
+                            if uploaded {
+                                dismiss()
+                            }
+                        })
+                    }
+                }
                 .interactiveDismissDisabled()
             }
         }
     }
+    
+    func createWorkoutData() -> [String:Any]? {
+        guard let workoutid = bridgeModule.currentWorkout?.id,
+              let startTime = bridgeModule.workoutStartDate?.timeFormatForUpload else {
+            return nil
+        }
+        let postBody = [
+            "difficulty": 1,
+            "workout_start_time": startTime,
+            "workout": workoutid,
+            "total_time": bridgeModule.currentWorkoutRunTimeInSeconds
+        ] as [String : Any]
+        
+        return postBody
+    }
 }
 
 struct InfoView: View {
@@ -59,6 +97,8 @@ struct InfoView: View {
 
 struct ActionsView: View {
     @ObservedObject var bridgeModule = BridgeModule.shared
+    var completedWorkout: (() -> Void)?
+    
     var workout: Workout
     @Environment(\.dismiss) var dismiss
     
@@ -100,7 +140,7 @@ struct ActionsView: View {
                 .foregroundColor(.white)
                 
                 Button(action: {
-                    completeWorkout()
+                    completedWorkout?()
                 }, label: {
                     Image(systemName: "checkmark")
                         .font(.title)
@@ -113,30 +153,7 @@ struct ActionsView: View {
         }
     }
     
-    func completeWorkout() {
-        guard let workoutid = bridgeModule.currentWorkout?.id,
-         let startTime = bridgeModule.workoutStartDate?.timeFormatForUpload else {
-            return
-        }
-        let postBody = [
-            "difficulty": 1,
-            "workout_start_time": startTime,
-            "workout": workoutid,
-            "total_time": bridgeModule.currentWorkoutRunTimeInSeconds
-        ] as [String : Any]
-        
-        CompleteWorkoutFetchable(postData: postBody).fetch(completion: { result in
-            switch result {
-            case .success(_):
-                DispatchQueue.main.async {
-                    bridgeModule.resetCurrentWorkout()
-                    dismiss()
-                }
-            case .failure(let failure):
-                print(failure)
-            }
-        })
-    }
+  
     
     func nextExercise() {
         bridgeModule.nextExercise()