Corrections for PIs.

Stronger.xcodeproj/project.pbxproj

@@ -84,6 +84,7 @@
 		38756AB22B946D0E00FDF599 /* ExerciseInfo.json in Resources */ = {isa = PBXBuildFile; fileRef = 38756AB12B946D0E00FDF599 /* ExerciseInfo.json */; };
 		38C4563E2B96CF3B009D69AA /* WorkoutHomeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38C4563D2B96CF3B009D69AA /* WorkoutHomeButton.swift */; };
 		38FE1D022B716A42008F8BE0 /* WorkoutVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38FE1D012B7169DF008F8BE0 /* WorkoutVideoView.swift */; };
+		4002F0AC2B9AFC4D00AD3D47 /* MissedWorkoutTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4002F0AB2B9AFC4D00AD3D47 /* MissedWorkoutTest.swift */; };
 		4011141A2B7EE59A000083A2 /* ProgressCircle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 401114192B7EE59A000083A2 /* ProgressCircle.swift */; };
 		4011141D2B83FCD1000083A2 /* SummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4011141C2B83FCD1000083A2 /* SummaryView.swift */; };
 		401114232B8489D1000083A2 /* GoalResist.swift in Sources */ = {isa = PBXBuildFile; fileRef = 401114222B8489D1000083A2 /* GoalResist.swift */; };
@@ -218,6 +219,7 @@
 		38756AB12B946D0E00FDF599 /* ExerciseInfo.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = ExerciseInfo.json; sourceTree = "<group>"; };
 		38C4563D2B96CF3B009D69AA /* WorkoutHomeButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WorkoutHomeButton.swift; sourceTree = "<group>"; };
 		38FE1D012B7169DF008F8BE0 /* WorkoutVideoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutVideoView.swift; sourceTree = "<group>"; };
+		4002F0AB2B9AFC4D00AD3D47 /* MissedWorkoutTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MissedWorkoutTest.swift; sourceTree = "<group>"; };
 		401114192B7EE59A000083A2 /* ProgressCircle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressCircle.swift; sourceTree = "<group>"; };
 		4011141C2B83FCD1000083A2 /* SummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryView.swift; sourceTree = "<group>"; };
 		401114222B8489D1000083A2 /* GoalResist.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoalResist.swift; sourceTree = "<group>"; };
@@ -566,6 +568,7 @@
 				40D4E47E2B97CB9900261632 /* HomeTest.swift */,
 				40D4E4812B97CBB800261632 /* TapSwitchTest.swift */,
 				40D4E4832B97CD0A00261632 /* WorkoutTest.swift */,
+				4002F0AB2B9AFC4D00AD3D47 /* MissedWorkoutTest.swift */,
 			);
 			path = StrongerUITests;
 			sourceTree = "<group>";
@@ -920,6 +923,7 @@
 				40D4E47F2B97CB9900261632 /* HomeTest.swift in Sources */,
 				2F4E237E2989A2FE0013F3D9 /* LaunchTests.swift in Sources */,
 				40D4E4822B97CBB800261632 /* TapSwitchTest.swift in Sources */,
+				4002F0AC2B9AFC4D00AD3D47 /* MissedWorkoutTest.swift in Sources */,
 				40D4E4842B97CD0A00261632 /* WorkoutTest.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Stronger/Account/Height.swift

@@ -60,7 +60,7 @@
         @Binding private var height: Int
         public var body: some View {
             HStack {
-                    Text(HeightKey.name)
+                    Text("\(HeightKey.name): inches")
                     Spacer()
                     TextField("Height", value: $height, formatter: NumberFormatter())
                          .frame(width: 120) // set frame width to enable more spaces.

Stronger/Account/StartDate.swift

@@ -23,8 +23,11 @@
     public static let category: AccountKeyCategory = .personalDetails
 
     public static var initialValue: InitialValue<Value> {
-        .empty(Date())
+        .default(Date())
     }
+//    public static var initialValue: Date {
+//        Date()
+//    }
 }
 
 extension AccountKeys {

Stronger/Account/StartDatePicker.swift

@@ -30,7 +30,10 @@
     private var dateRange: ClosedRange<Date> {
         let calendar = Calendar.current
         let startDateComponents = DateComponents(year: 1800, month: 1, day: 1)
-        let endDate = Date.now
+        let curDate = Date.now
+        guard let endDate = Calendar.current.date(byAdding: .day, value: 1, to: curDate) else {
+            fatalError("Could not translate \(startDateComponents) to a valid date.")
+        }
 
         guard let startDate = calendar.date(from: startDateComponents) else {
             fatalError("Could not translate \(startDateComponents) to a valid date.")

Stronger/Account/Weight.swift

@@ -64,7 +64,7 @@
 
         public var body: some View {
             HStack {
-                Text(WeightKey.name)
+                Text("\(WeightKey.name): lbs")
                 Spacer()
                 Button(action: {
                     showAlert.toggle() // Toggle alert visibility
@@ -81,7 +81,7 @@
                     )
                 }
 
-                TextField("Weight", value: $weight, formatter: NumberFormatter())
+                TextField("Weight: lbs", value: $weight, formatter: NumberFormatter())
                     .frame(width: 120) // set frame width to enable more spaces.
             }
         }

Stronger/Exercise/WorkoutHome.swift

@@ -56,8 +56,8 @@
                 NavigationLink(
                     destination: WorkoutSelections(
                                     presentingAccount: $presentingAccount,
-                                    selectedWeek: selectedWeek,
-                                    selectedDay: selectedDay
+                                    selectedWeek: selectedWeek + 1,
+                                    selectedDay: selectedDay + 1
                     )
                 ) {
                     Text("Enter Workout Information\n for Week \(selectedWeek + 1) Day \(selectedDay + 1).")

Stronger/Exercise/WorkoutSelection.swift

@@ -160,20 +160,6 @@
         // Ensure the width does not exceed the screen width
         return min(desiredWidth, geometry.size.width * 0.5) // Set width as 50% of screen width
     }
-//    private func adjustSelectedWeek(_ week: Int) -> Int {
-//        switch week {
-//        case 1...3:
-//            return 1
-//        case 4...6:
-//            return 4
-//        case 7...9:
-//            return 7
-//        case 10...12:
-//            return 10
-//        default:
-//            return week // Return the original value for any other cases
-//        }
-//    }
 
     private func parseExercises(week: Int, day: Int) -> Workout? {
         // Get the URL of the JSON file in the app bundle
@@ -255,6 +241,19 @@
             }
         }
 
+    private func populateUniqueValuesSet(from documents: [QueryDocumentSnapshot] = []) -> Set<String> {
+        var uniqueValuesSet = Set<String>()
+
+        // Iterate over documents to populate the set
+        documents.forEach { document in
+            if let exercise = document["exercise"] as? String {
+                uniqueValuesSet.insert(exercise)
+            }
+        }
+
+        return uniqueValuesSet
+    }
+
     private func updateExerciseDate() async throws {
         // Get current user ID
         guard let userID = try await getCurrentUserID() else {
@@ -266,14 +265,18 @@
         let dbe = Firestore.firestore()
 
         let userDocRef = dbe.collection("users").document(userID).collection("exerciseLog")
-        let query = userDocRef.whereField("week", isEqualTo: self.selectedWeek)
+        let query = userDocRef.whereField("week", isEqualTo: self.selectedWeek ?? 1)
 
         query.getDocuments { querySnapshot, error in
             if let error = error {
                 print("Error fetching documents: \(error)")
             } else {
+                guard let querySnapshot = querySnapshot else {
+                    print("querySnapshot is nil")
+                    return
+                }
                 // Get the count of documents
-                let documentCount = querySnapshot?.documents.count ?? 0
+                let documentCount = querySnapshot.documents.count
 
                 print("Number of documents returned: \(documentCount)")
 
@@ -283,14 +286,16 @@
                     self.selectedDay = 1
                 } else {
                     // Check if there are documents with selectedDay equal to 1
-                    let selectedDay1Count = querySnapshot?.documents.filter { $0["exerciseDay"] as? Int == 2 }.count ?? 0
-                    if selectedDay1Count > 3 {
+                    let selectedDay2Count = populateUniqueValuesSet(from: querySnapshot.documents.filter { $0["exerciseDay"] as? Int == 2 }).count
+                    if selectedDay2Count > 3 {
                         print("Documents found with selectedDay equal to 2. Setting selectedDay to 3.")
                         self.selectedDay = 3
                     } else {
                         // Check if there are documents with selectedDay equal to 2
-                        let selectedDay2Count = querySnapshot?.documents.filter { $0["exerciseDay"] as? Int == 1 }.count ?? 0
-                        if selectedDay2Count > 3 {
+                        let selectedDay1Count = populateUniqueValuesSet(
+                            from: querySnapshot.documents.filter { $0["exerciseDay"] as? Int == 1 }
+                        ).count
+                        if selectedDay1Count > 3 {
                             print("Documents found with selectedDay equal to 1. Setting selectedDay to 2.")
                             self.selectedDay = 2
                         } else {
@@ -313,54 +318,11 @@
         return details.accountId
     }
 
-//    private func calculateWeeksElapsed(completion: @escaping (Int) -> Void) {
-//        // Get current user ID
-//        guard let userID = try await getCurrentUserID() else {
-//            completion(1) // Return default value if user ID cannot be retrieved
-//            return
-//        }
-//
-//        // Reference to Firestore database
-//        let dbe = Firestore.firestore()
-//
-//        // Reference to document for current user
-//        let userDocRef = dbe.collection("users").document(userID)
-//
-//        // Get snapshot of document
-//        userDocRef.getDocument { userDocSnapshot, error in
-//            guard let userData = userDocSnapshot?.data(),
-//                  let startDayTimestamp = userData["StartDateKey"] as? Timestamp else {
-//                print("Error retrieving start day timestamp:", error?.localizedDescription ?? "Unknown error")
-//                completion(1) // Return default value if start day timestamp cannot be retrieved
-//                return
-//            }
-//
-//            // Get start date from Timestamp
-//            var startDayDate = startDayTimestamp.dateValue()
-//
-//            // Get current date
-//            let currentDate = Date()
-//
-//            // Get Calendar instance
-//            let calendar = Calendar.current
-//
-//            // Move start day to closest Monday
-//            let weekday = calendar.component(.weekday, from: startDayDate)
-//            let daysToMonday = (7 - weekday + 2) % 7 // +2 because Sunday is 1-based in `weekday` but we want Monday to be 0-based
-//            startDayDate = calendar.date(byAdding: .day, value: -daysToMonday, to: startDayDate) ?? startDayDate
-//
-//            // Calculate difference in weeks between start day and current date
-//            let weeksElapsed = calendar.dateComponents([.weekOfYear], from: startDayDate, to: currentDate).weekOfYear ?? 0
-//            let roundedWeeksElapsed = max(weeksElapsed, 0) // Ensure weeksElapsed is non-negative
-//            completion(roundedWeeksElapsed)
-//        }
-//    }
-
     // Function to retrieve start day field and calculate weeks elapsed
-    private func calculateWeeksElapsed() async throws -> Int {
+    private func calculateWeeksElapsed() async throws -> Int? {
         // Get current user ID
         guard let userID = try await getCurrentUserID() else {
-            return 1
+            return nil
         }
 
         // Reference to Firestore database
@@ -375,13 +337,12 @@
         // Check if document exists and contains start day field
         guard let userData = userDocSnapshot.data(),
               let startDayTimestamp = userData["StartDateKey"] as? Timestamp else {
-            print("did not find start day key", userID)
-            return 1
-        }
-
-        print("Found start date key", userID)
+                return nil
+            }
+
         // Get start date from Timestamp
-        var startDayDate = startDayTimestamp.dateValue()
+        // Adjust time zones apparently
+        var startDayDate = startDayTimestamp.dateValue().addingTimeInterval(TimeInterval(TimeZone.current.secondsFromGMT()))
 
         // Get current date
         let currentDate = Date()
@@ -390,37 +351,17 @@
         let calendar = Calendar.current
 
         // Move start day to closest Monday
-        let weekday = calendar.component(.weekday, from: startDayDate)
-        let daysToMonday = (7 - weekday + 2) % 7 // +2 because Sunday is 1-based in `weekday` but we want Monday to be 0-based
-        print("daysTOMonday \(daysToMonday)")
-        startDayDate = calendar.date(byAdding: .day, value: -daysToMonday, to: startDayDate) ?? startDayDate
-        print("startDayDate \(startDayDate)")
-
+        // If startDayDate is Monday, keep it as is, otherwise move it to the previous Monday
+        if calendar.component(.weekday, from: startDayDate) != 2 {
+            // Calculate days to Monday
+            let weekday = calendar.component(.weekday, from: startDayDate)
+            let daysToMonday = (weekday - 2) % 7
+            startDayDate = calendar.date(byAdding: .day, value: -daysToMonday, to: startDayDate) ?? startDayDate
+        }
         // Calculate difference in weeks between start day and current date
         let weeksElapsed = calendar.dateComponents([.weekOfYear], from: startDayDate, to: currentDate).weekOfYear ?? 0
-        print("weeksElapsed \(weeksElapsed)")
         let roundedWeeksElapsed = weeksElapsed > 0 ? weeksElapsed : 0 // Ensure weeksElapsed is non-negative
-        print("rounded weeks elapsed \(roundedWeeksElapsed)")
-        return weeksElapsed
-    }
-
-    private func uploadUserData() {
-        let dbe = Firestore.firestore()
-
-        // Data to be uploaded
-        let userData: [String: Any] = [
-            "name": "Rohan Gondor",
-            "role": "admin"
-        ]
-
-        // Upload data to Firestore
-        dbe.collection("users").document("admin").setData(userData) { error in
-            if let error = error {
-                print("Error uploading user data: \(error.localizedDescription)")
-            } else {
-                print("User data uploaded successfully!")
-            }
-        }
+        return weeksElapsed + 1 // as we are using 1 based for selected week.
     }
 }