Fixed issues with assignment progress tracking + added subject progress tracking

app/(tabs)/assignments.tsx

@@ -1,4 +1,5 @@
 import { defaultStyles } from '@/constants/defaultStyles';
+import { CheckSubjectCompletion } from '@/lib/progress';
 import { supabase } from '@/lib/supabase';
 import type { Assignment, Task } from '@/lib/types';
 import { Ionicons } from '@expo/vector-icons';
@@ -97,7 +98,7 @@ export default function Assignments() {
     }, [session])
   );
 
-  const DeleteAssignment = async (aId: string) => {
+  const DeleteAssignment = async (aId: string, sId: string) => {
     Alert.alert(
       'Delete Assignment',
       'Are you sure you want to delete this assignment?',
@@ -121,6 +122,13 @@ export default function Assignments() {
             }
 
             Alert.alert('Assignment deleted successfully!');
+
+            try {
+              await CheckSubjectCompletion(sId);
+            } catch {
+              Alert.alert("Failed to update subject status");
+            }
+
             GetAssignments();
           },
         },
@@ -296,7 +304,7 @@ export default function Assignments() {
 
                     <Pressable
                       className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
-                      onPress={() => DeleteAssignment(item.aId)}
+                      onPress={() => DeleteAssignment(item.aId, item.sId)}
                     >
                       <Text className="text-sm font-bold text-status-danger">
                         Delete

app/(tabs)/subjects.tsx

@@ -1,6 +1,6 @@
 import { defaultStyles } from '@/constants/defaultStyles';
 import { supabase } from '@/lib/supabase';
-import type { Subject } from '@/lib/types';
+import type { Assignment, Subject } from '@/lib/types';
 import { Ionicons } from '@expo/vector-icons';
 import { Session } from '@supabase/supabase-js';
 import { router, Stack, useFocusEffect } from 'expo-router';
@@ -15,6 +15,7 @@ import {
 
 export default function Subjects() {
   const [subjects, SetSubjects] = useState<Subject[]>([]);
+  const [assignmentsBySubject, SetAssignmentsBySubject] = useState<Record<string, Assignment[]>>({});
   const [session, SetSession] = useState<Session | null>(null);
 
   const subjectSections = [
@@ -45,17 +46,47 @@ export default function Subjects() {
   }, []);
 
   const GetSubjects = async () => {
-    const { data, error } = await supabase
+    const { data: subjectsData, error: subjectsError } = await supabase
       .from('subjects')
       .select('*')
       .order('lastChanged', { ascending: false });
 
-    if (error) {
+    if (subjectsError) {
       Alert.alert('Subjects could not be fetched, please try again');
       return;
     }
 
-    SetSubjects(data ?? []);
+    const subjectRows = subjectsData ?? [];
+    SetSubjects(subjectsData ?? []);
+
+    if (subjectRows.length === 0) {
+      SetAssignmentsBySubject({});
+      return;
+    }
+    
+    const sIds = subjectRows.map((subject) => subject.sId);
+    
+    const { data: assignmentsData, error: assignmentsError } = await supabase
+      .from('assignments')
+      .select('*')
+      .in('sId', sIds);
+    
+    if (assignmentsError) {
+      Alert.alert('Subject assignments could not be fetched, please try again');
+      SetAssignmentsBySubject({});
+      return;
+    }
+    
+    const groupedAssignments: Record<string, Assignment[]> = {};
+    
+    for (const assignment of assignmentsData ?? []) {
+      if (!groupedAssignments[assignment.sId]) {
+        groupedAssignments[assignment.sId] = [];
+      }
+      groupedAssignments[assignment.sId].push(assignment);
+    }
+    
+    SetAssignmentsBySubject(groupedAssignments);
   };
 
   useFocusEffect(
@@ -169,6 +200,9 @@ export default function Subjects() {
           renderItem={({ item }) => {
             const isOwner = session?.user.id === item.uId;
 
+            const subjectAssignments = assignmentsBySubject[item.sId] ?? [];
+            const progress = subjectAssignments.length === 0 ? 0 : Math.round((subjectAssignments.filter(assignment => assignment.isCompleted).length / subjectAssignments.length) * 100);
+
             return (
               <View className="mb-4 rounded-3xl border border-app-border bg-app-surface p-4 shadow-sm">
                 <Pressable
@@ -219,6 +253,27 @@ export default function Subjects() {
                           {item.isActive ? 'Active' : 'Inactive'}
                         </Text>
                       </View>
+                      <View style={{ marginTop: 10 }}>
+                        <Text style={{ marginBottom: 4 }}>{progress}%</Text>
+                        
+                        <View
+                          style={{
+                            width: "100%",
+                            height: 12,
+                            backgroundColor: "#D9D9D9",
+                            borderRadius: 999,
+                            overflow: "hidden",
+                          }}
+                        >
+                          <View
+                            style={{
+                              width: `${progress}%`,
+                              height: "100%",
+                              backgroundColor: "#4CAF50",
+                            }}
+                          />
+                        </View>
+                      </View>
                     </View>
                   </View>
                 </Pressable>

app/(tabs)/tasks.tsx

@@ -1,4 +1,5 @@
 import { defaultStyles } from '@/constants/defaultStyles';
+import { CheckAssignmentCompletion } from '@/lib/progress';
 import { supabase } from '@/lib/supabase';
 import type { Task } from '@/lib/types';
 import { Ionicons } from '@expo/vector-icons';
@@ -63,7 +64,7 @@ export default function Tasks() {
     }, [session])
   );
 
-  const DeleteTask = async (tId: string) => {
+  const DeleteTask = async (tId: string, aId: string) => {
     Alert.alert(
       'Delete Task',
       'Are you sure you want to delete this task?',
@@ -87,6 +88,13 @@ export default function Tasks() {
             }
 
             Alert.alert('Task deleted successfully!');
+
+            try {
+              await CheckAssignmentCompletion(aId);
+            } catch {
+              Alert.alert("Failed to update assignment completion state");
+            }
+
             GetTasks();
           },
         },
@@ -237,7 +245,7 @@ export default function Tasks() {
 
                     <Pressable
                       className="flex-1 items-center justify-center rounded-2xl border border-app-border bg-app-surface py-3"
-                      onPress={() => DeleteTask(item.tId)}
+                      onPress={() => DeleteTask(item.tId, item.aId)}
                     >
                       <Text className="text-sm font-bold text-status-danger">
                         Delete