WIP

Werkout_ios/Views/AllWorkouts/AllWorkoutsListView.swift

@@ -8,36 +8,27 @@
 import SwiftUI
 
 struct AllWorkoutsListView: View {
-    @State var searchString: String = ""
-    let workouts: [Workout]
-    
-    let selectedWorkout: ((Workout) -> Void)
-    
-    var filteredWorkouts: [Workout] {
-        if !searchString.isEmpty, searchString.count > 0 {
-            return workouts.filter({
-                if $0.name.lowercased().contains(searchString.lowercased()) {
-                    return true
-                }
-                if let equipment = $0.equipment?.joined(separator: "").lowercased(),
-                   equipment.contains(searchString.lowercased()) {
-                    return true
-                }
-                if let muscles = $0.muscles?.joined(separator: "").lowercased(),
-                   muscles.contains(searchString.lowercased()) {
-                    return true
-                }
-                
-                return false
-            })
-        } else {
-            return workouts
-        }
+    enum SortType: String, CaseIterable {
+        case name = "Name"
+        case date = "Date"
     }
+    
+    @State var searchString: String = ""
+    @Binding var uniqueWorkoutUsers: [RegisteredUser]?
+    @State private var filteredRegisterdUser: RegisteredUser?
+    
+    let workouts: [Workout]
+    let selectedWorkout: ((Workout) -> Void)
+    @State var filteredWorkouts = [Workout]()
     var refresh: (() -> Void)
+    @State var currentSort: SortType?
     
     var body: some View {
         VStack {
+            if let filteredRegisterdUser = filteredRegisterdUser {
+                Text((filteredRegisterdUser.firstName ?? "NA") + "'s Workouts")
+            }
+            
             ScrollView {
                 LazyVStack(spacing: 20) {
                     ForEach(filteredWorkouts, id:\.id) { workout in
@@ -51,24 +42,120 @@ struct AllWorkoutsListView: View {
                 }
             }
             .refreshable {
-                    refresh()
+                refresh()
             }
             
-            TextField("Filter" ,text: $searchString)
-                .padding()
-                .textFieldStyle(OvalTextFieldStyle())
+            HStack {
+                TextField("Filter" ,text: $searchString)
+                    .padding()
+                    .textFieldStyle(OvalTextFieldStyle())
+                
+                if let uniqueWorkoutUsers = uniqueWorkoutUsers {
+                    Menu(content: {
+                        ForEach(uniqueWorkoutUsers, id: \.self) { index in
+                            Button(action: {
+                                filteredRegisterdUser = index
+                                filteredWorkouts = filterWorkouts()
+                            }, label: {
+                                Text((index.firstName ?? "") + " -" + (index.lastName ?? ""))
+                            })
+                        }
+                        
+                        Button(action: {
+                            filteredRegisterdUser = nil
+                            filteredWorkouts = filterWorkouts()
+                        }, label: {
+                            Text("All")
+                        })
+                            
+                    }, label: {
+                        Image(systemName: filteredRegisterdUser == nil ? "person.2" : "person.2.fill")
+                            .padding(.trailing)
+                    })
+                }
+                
+                Menu(content: {
+                    ForEach(SortType.allCases, id: \.self) { index in
+                        Button(action: {
+                            sortWorkouts(sortType: index)
+                        }, label: {
+                            Text(index.rawValue)
+                        })
+                    }
+                }, label: {
+                    Image(systemName: "list.number")
+                        .padding(.trailing)
+                })
+            }
         }
+        .onChange(of: searchString) { newValue in
+            filteredWorkouts = filterWorkouts()
+        }
+        .onAppear{
+            filteredWorkouts = filterWorkouts()
+        }
+    }
+    
+    func sortWorkouts(sortType: SortType) {
+        if currentSort == sortType {
+            filteredWorkouts = filteredWorkouts.reversed()
+            return
+        }
+        switch sortType {
+        case .name:
+            filteredWorkouts = filteredWorkouts.sorted(by: {
+                $0.name < $1.name
+            })
+        case .date:
+            filteredWorkouts = filteredWorkouts.sorted(by: {
+                $0.createdAt ?? Date() < $1.createdAt ?? Date()
+            })
+        }
+        currentSort = sortType
+    }
+    
+    func filterWorkouts() -> [Workout] {
+        var matchingWorkouts = [Workout]()
+        
+        if (!searchString.isEmpty && searchString.count > 0) {
+            matchingWorkouts = workouts.filter({
+                if $0.name.lowercased().contains(searchString.lowercased()) {
+                    return true
+                }
+                
+                if let equipment = $0.equipment?.joined(separator: "").lowercased(),
+                   equipment.contains(searchString.lowercased()) {
+                    return true
+                }
+                
+                if let muscles = $0.muscles?.joined(separator: "").lowercased(),
+                   muscles.contains(searchString.lowercased()) {
+                    return true
+                }
+
+                return false
+            })
+        }
+        
+        if matchingWorkouts.isEmpty {
+            matchingWorkouts.append(contentsOf: workouts)
+        }
+        
+        if let filteredRegisterdUser = filteredRegisterdUser {
+            matchingWorkouts = matchingWorkouts.filter({
+                $0.registeredUser == filteredRegisterdUser
+            })
+        }
+
+        return matchingWorkouts
     }
 }
 
 struct AllWorkoutsListView_Previews: PreviewProvider {
     static var previews: some View {
-        AllWorkoutsListView(workouts: PreviewData.allWorkouts(),
-                            selectedWorkout: { workout in
-            
-        },
-                            refresh: {
-            
-        })
+        AllWorkoutsListView(uniqueWorkoutUsers: .constant([]),
+                            workouts: PreviewData.allWorkouts(),
+                            selectedWorkout: { workout in },
+                            refresh: {  })
     }
 }

Werkout_ios/Views/AllWorkouts/AllWorkoutsView.swift

@@ -24,9 +24,10 @@ enum MainViewTypes: Int, CaseIterable {
 }
 
 struct AllWorkoutsView: View {
-  
     @State var isUpdating = false
     @State var workouts: [Workout]?
+    @State var uniqueWorkoutUsers: [RegisteredUser]?
+    
     var bridgeModule = BridgeModule.shared
     @State public var needsUpdating: Bool = true
  
@@ -61,6 +62,7 @@ struct AllWorkoutsView: View {
                         selectedWorkout = bridgeModule.currentExerciseInfo.workout
                     })
                     
+                    
                     switch selectedSegment {
                     case .AllWorkout:
                         if isUpdating {
@@ -68,7 +70,9 @@ struct AllWorkoutsView: View {
                                 .progressViewStyle(.circular)
                         }
                         
-                        AllWorkoutsListView(workouts: workouts, selectedWorkout: { workout in
+                        AllWorkoutsListView(uniqueWorkoutUsers: $uniqueWorkoutUsers,
+                                            workouts: workouts,
+                                            selectedWorkout: { workout in
                             selectedWorkout = workout
                         }, refresh: {
                             self.needsUpdating = true
@@ -155,21 +159,19 @@ struct AllWorkoutsView: View {
             
             if needsUpdating {
                 self.isUpdating = true
-                dataStore.fetchAllData()
-                
-                AllWorkoutFetchable().fetch(completion: { result in
-                    needsUpdating = false
-                    switch result {
-                    case .success(let model):
-                        DispatchQueue.main.async {
-                            self.workouts = model
-                            self.isUpdating = false
-                        }
-                    case .failure(_):
-                        DispatchQueue.main.async {
-                            self.isUpdating = false
+                dataStore.fetchAllData(completion: {
+                    DispatchQueue.main.async {
+                        guard let allWorkouts = dataStore.allWorkouts else {
+                            return
                         }
+                        self.workouts = allWorkouts.sorted(by: {
+                            $0.createdAt ?? Date() < $1.createdAt ?? Date()
+                        })
+                        self.isUpdating = false
+                        self.uniqueWorkoutUsers = dataStore.workoutsUniqueUsers
                     }
+                    
+                    self.isUpdating = false
                 })
             }
         } else {

Werkout_ios/Views/AllWorkouts/WorkoutOverviewView.swift

@@ -19,6 +19,17 @@ struct WorkoutOverviewView: View {
                     
                     Text(workout.description ?? "")
                         .frame(maxWidth: .infinity, alignment: .leading)
+                    
+                    if let estimatedTime = workout.estimatedTime {
+                        Text("Time: " + estimatedTime.asString(style: .abbreviated))
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                    }
+                    
+                    if let createdAt = workout.createdAt {
+                        Text(createdAt, style: .date)
+                            .font(.footnote)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                    }
                 }
                 if let exerciseCount = workout.exercise_count {
                     VStack {