feat: show only my assignments for assignments screen

invertedEcho · Nov 8, 2024 · 422a65f · 422a65f
1 parent 07d40d8
commit 422a65f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 7 deletions.
diff --git a/backend/src/assignment/assignment.controller.ts b/backend/src/assignment/assignment.controller.ts
@@ -4,7 +4,7 @@ import {
   dbGetAssignmentsFromCurrentInterval,
 } from 'src/db/functions/assignment';
 import { AssignmentState } from 'src/db/schema';
-import { AssignmentResponse } from 'src/types';
+import { AssignmentResponse } from './types';
 
 @Controller('assignments')
 export class AssignmentController {

diff --git a/backend/src/types.ts → backend/src/assignment/types.ts b/backend/src/types.ts → backend/src/assignment/types.ts
@@ -1,5 +1,3 @@
-// TODO: this has to go somewhere else
-
 export type AssignmentResponse = {
   id: number;
   title: string;

diff --git a/backend/src/db/functions/assignment.ts b/backend/src/db/functions/assignment.ts
@@ -8,7 +8,6 @@ import {
   or,
   sql,
 } from 'drizzle-orm';
-import { AssignmentResponse } from 'src/types';
 import { db } from '..';
 import {
   AssignmentState,
@@ -22,6 +21,7 @@ import {
 } from '../schema';
 import { z } from 'zod';
 import { defaultPostgresIntervalSchema } from 'src/utils/interval';
+import { AssignmentResponse } from 'src/assignment/types';
 
 // FIXME: This function doesn't only return the assignments from the current interval, but just all assignments newer than `NOW()` minus
 // the interval, so let there be a weekly recurring taskgroup, let it be wednesday , it would also return all assignments that are newer

diff --git a/frontend/lib/main.dart b/frontend/lib/main.dart
@@ -62,6 +62,14 @@ class _AppState extends State<App> {
         theme: ThemeData(
           useMaterial3: true,
           brightness: Brightness.light,
+          checkboxTheme: CheckboxThemeData(
+            fillColor: MaterialStateProperty.resolveWith((states) {
+              if (states.contains(MaterialState.selected)) {
+                return Colors.blueAccent;
+              }
+              return Colors.white;
+            }),
+          ),
         ),
         darkTheme: ThemeData(brightness: Brightness.dark),
         themeMode: ThemeMode.system);

diff --git a/frontend/lib/models/assignment.dart b/frontend/lib/models/assignment.dart
@@ -42,4 +42,9 @@ class Assignment {
       taskGroupTitle: json['taskGroupTitle'] as String?,
     );
   }
+
+  @override
+  String toString() {
+    return "Assignment: $title ID: $id TaskGroupTitle: $taskGroupTitle";
+  }
 }
diff --git a/frontend/lib/widgets/assignments/assignments_widget.dart b/frontend/lib/widgets/assignments/assignments_widget.dart
@@ -20,12 +20,15 @@ class AssignmentsWidget extends StatefulWidget {
 class AssignmentsWidgetState extends State<AssignmentsWidget> {
   late Future<List<Assignment>> _assignmentsFuture;
   TaskType filterByTaskType = TaskType.recurring;
+  bool showOnlyCurrentUserAssignments = true;
+  int? currentUserId;
 
   // TODO: we should not do async operations in this method, as it could cause unneccessary rebuilds
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
     final userProvider = Provider.of<UserProvider>(context, listen: false);
+    currentUserId = userProvider.user?.userId;
     UserGroup? userGroup = userProvider.userGroup;
     final groupId = userGroup?.id;
 
@@ -68,8 +71,26 @@ class AssignmentsWidgetState extends State<AssignmentsWidget> {
               });
             },
           ),
+          ListTile(
+              title: const Text("Show only my assignments"),
+              onTap: () {
+                setState(() {
+                  showOnlyCurrentUserAssignments =
+                      !showOnlyCurrentUserAssignments;
+                });
+              },
+              trailing: SizedBox(
+                  height: 24,
+                  width: 24,
+                  child: Checkbox(
+                      value: showOnlyCurrentUserAssignments,
+                      onChanged: (newValue) {
+                        setState(() {
+                          showOnlyCurrentUserAssignments = newValue ?? false;
+                        });
+                      }))),
           const SizedBox(
-            height: 20,
+            height: 10,
           ),
           Expanded(
               child: FutureBuilder<List<Assignment>>(
@@ -86,13 +107,20 @@ class AssignmentsWidgetState extends State<AssignmentsWidget> {
                       Map<String, List<Assignment>> groupedAssignments = {};
 
                       if (filterByTaskType == TaskType.recurring) {
+                        // print(snapshot.data);
                         final filteredAssignments = snapshot.data!.where(
-                            (assignment) => assignment.taskGroupTitle != null);
+                            (assignment) =>
+                                assignment.taskGroupTitle != null &&
+                                (!showOnlyCurrentUserAssignments ||
+                                    assignment.assigneeId == currentUserId));
                         groupedAssignments = groupBy(filteredAssignments,
                             (assignment) => assignment.taskGroupTitle!);
                       } else if (filterByTaskType == TaskType.oneOff) {
                         final filteredAssignments = snapshot.data!.where(
-                            (assignment) => assignment.taskGroupTitle == null);
+                            (assignment) =>
+                                assignment.taskGroupTitle == null &&
+                                (!showOnlyCurrentUserAssignments ||
+                                    assignment.assigneeId == currentUserId));
                         groupedAssignments = groupBy(filteredAssignments,
                             (assignment) => assignment.assigneeName);
                       }