feat: filter by task type assignments screen

backend/package.json

@@ -12,7 +12,6 @@
     "build": "nest build",
     "format": "prettier -w \"src/**/*.ts\"",
     "format:check": "prettier -c \"src/**/*.ts\"",
-    "start": "nest start",
     "dev": "dotenv -e .env nest start -- --watch",
     "start:debug": "nest start -- --debug --watch",
     "pm2:start": "dotenv -e .env pm2 -- start dist/src/main.js",

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 {

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;

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

frontend/lib/fetch/assignment.dart

@@ -19,7 +19,8 @@ Future<List<Assignment>> fetchAssignments({required int groupId}) async {
   }
 }
 
-void updateAssignmentState(int assignmentId, bool newAssignmentState) async {
+Future<void> updateAssignmentState(
+    int assignmentId, bool newAssignmentState) async {
   var assignmentState = newAssignmentState ? "pending" : 'completed';
   var apiBaseUrl = getApiBaseUrl();
   final response = await authenticatedClient.post(

frontend/lib/main.dart

@@ -62,6 +62,14 @@ class _AppState extends State<App> {
         theme: ThemeData(
           useMaterial3: true,
           brightness: Brightness.light,
+          checkboxTheme: CheckboxThemeData(
+            fillColor: WidgetStateProperty.resolveWith((states) {
+              if (states.contains(WidgetState.selected)) {
+                return Colors.blueAccent;
+              }
+              return Colors.white;
+            }),
+          ),
         ),
         darkTheme: ThemeData(brightness: Brightness.dark),
         themeMode: ThemeMode.system);

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";
+  }
 }

frontend/lib/widgets/task_type_switch.dart

@@ -0,0 +1,101 @@
+import 'package:flatshare/const.dart';
+import 'package:flatshare/models/task.dart';
+import 'package:flutter/material.dart';
+
+class TaskTypeSwitch extends StatefulWidget {
+  const TaskTypeSwitch(
+      {super.key,
+      required this.selectedTaskType,
+      required this.onTaskTypeSelect});
+
+  final TaskType selectedTaskType;
+  final Function(TaskType) onTaskTypeSelect;
+
+  @override
+  State<StatefulWidget> createState() => TaskTypeSwitchState();
+}
+
+class TaskTypeSwitchState extends State<TaskTypeSwitch> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 2.0),
+      child: Container(
+        decoration: BoxDecoration(
+            borderRadius: const BorderRadius.all(Radius.circular(10)),
+            color: Colors.grey[300]),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 4),
+          child: Row(
+            children: [
+              Expanded(
+                  child: ElevatedButton(
+                      style: ButtonStyle(
+                          foregroundColor: WidgetStateProperty.all(
+                              widget.selectedTaskType == TaskType.recurring
+                                  ? Colors.white
+                                  : Colors.black),
+                          backgroundColor: WidgetStateProperty.all<Color>(
+                              widget.selectedTaskType == TaskType.recurring
+                                  ? Colors.blueAccent
+                                  : Colors.grey.shade300),
+                          textStyle: WidgetStateProperty.all<TextStyle>(
+                            TextStyle(
+                              fontWeight:
+                                  widget.selectedTaskType == TaskType.recurring
+                                      ? FontWeight.bold
+                                      : FontWeight.normal,
+                            ),
+                          ),
+                          shape: WidgetStateProperty.all(
+                            RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                          ),
+                          elevation: WidgetStateProperty.all(generalElevation)),
+                      onPressed: () {
+                        widget.onTaskTypeSelect(TaskType.recurring);
+                      },
+                      child: const Text("Recurring Tasks"))),
+              const SizedBox(width: 4),
+              Expanded(
+                  child: ElevatedButton(
+                      style: ButtonStyle(
+                          backgroundColor: WidgetStateProperty.all(
+                              widget.selectedTaskType == TaskType.oneOff
+                                  ? Colors.blueAccent
+                                  : Colors.grey.shade300),
+                          foregroundColor: WidgetStateProperty.all(
+                              widget.selectedTaskType == TaskType.oneOff
+                                  ? Colors.white
+                                  : Colors.black),
+                          textStyle: WidgetStateProperty.all<TextStyle>(
+                            TextStyle(
+                              fontWeight:
+                                  widget.selectedTaskType == TaskType.oneOff
+                                      ? FontWeight.bold
+                                      : FontWeight.normal,
+                            ),
+                          ),
+                          shape:
+                              WidgetStateProperty.all<RoundedRectangleBorder>(
+                            RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                          )),
+                      onPressed: () {
+                        widget.onTaskTypeSelect(TaskType.oneOff);
+                      },
+                      child: const Text("One-Time Tasks"))),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

frontend/lib/widgets/tasks/tasks_overview_widget.dart

@@ -2,6 +2,7 @@ import 'package:flatshare/const.dart';
 import 'package:flatshare/models/task.dart';
 import 'package:flatshare/providers/task.dart';
 import 'package:flatshare/providers/task_group.dart';
+import 'package:flatshare/widgets/task_type_switch.dart';
 import 'package:flatshare/widgets/tasks/task_group_list.dart';
 import 'package:flatshare/widgets/tasks/task_list.dart';
 import 'package:flutter/material.dart';
@@ -15,7 +16,7 @@ class TasksOverviewWidget extends StatefulWidget {
 }
 
 class TasksOverviewWidgetState extends State<TasksOverviewWidget> {
-  TaskType filterBy = TaskType.recurring;
+  TaskType filterByTaskType = TaskType.recurring;
 
   @override
   void initState() {
@@ -35,86 +36,17 @@ class TasksOverviewWidgetState extends State<TasksOverviewWidget> {
     return Padding(
       padding: const EdgeInsets.all(generalRootPadding),
       child: Column(children: [
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 2.0),
-          child: Container(
-            decoration: BoxDecoration(
-                borderRadius: const BorderRadius.all(Radius.circular(10)),
-                color: Colors.grey[300]),
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 4),
-              child: Row(
-                children: [
-                  Expanded(
-                      child: ElevatedButton(
-                          style: ButtonStyle(
-                              foregroundColor: WidgetStateProperty.all(
-                                  filterBy == TaskType.recurring
-                                      ? Colors.white
-                                      : Colors.black),
-                              backgroundColor: WidgetStateProperty.all<Color>(
-                                  filterBy == TaskType.recurring
-                                      ? Colors.blueAccent
-                                      : Colors.grey.shade300),
-                              textStyle: WidgetStateProperty.all<TextStyle>(
-                                TextStyle(
-                                  fontWeight: filterBy == TaskType.recurring
-                                      ? FontWeight.bold
-                                      : FontWeight.normal,
-                                ),
-                              ),
-                              shape: WidgetStateProperty.all(
-                                RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(10),
-                                ),
-                              ),
-                              elevation:
-                                  WidgetStateProperty.all(generalElevation)),
-                          onPressed: () {
-                            setState(() {
-                              filterBy = TaskType.recurring;
-                            });
-                          },
-                          child: const Text("Recurring Tasks"))),
-                  const SizedBox(width: 4),
-                  Expanded(
-                      child: ElevatedButton(
-                          style: ButtonStyle(
-                              backgroundColor: WidgetStateProperty.all(
-                                  filterBy == TaskType.oneOff
-                                      ? Colors.blueAccent
-                                      : Colors.grey.shade300),
-                              foregroundColor: WidgetStateProperty.all(
-                                  filterBy == TaskType.oneOff
-                                      ? Colors.white
-                                      : Colors.black),
-                              textStyle: WidgetStateProperty.all<TextStyle>(
-                                TextStyle(
-                                  fontWeight: filterBy == TaskType.oneOff
-                                      ? FontWeight.bold
-                                      : FontWeight.normal,
-                                ),
-                              ),
-                              shape: WidgetStateProperty.all<
-                                  RoundedRectangleBorder>(
-                                RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(10),
-                                ),
-                              )),
-                          onPressed: () {
-                            setState(() {
-                              filterBy = TaskType.oneOff;
-                            });
-                          },
-                          child: const Text("One-Time Tasks"))),
-                ],
-              ),
-            ),
-          ),
+        TaskTypeSwitch(
+          selectedTaskType: filterByTaskType,
+          onTaskTypeSelect: (taskType) {
+            setState(() {
+              filterByTaskType = taskType;
+            });
+          },
         ),
         const SizedBox(height: 20),
         Expanded(
-            child: filterBy == TaskType.recurring
+            child: filterByTaskType == TaskType.recurring
                 ? TaskGroupList(taskGroups: taskGroups)
                 : TaskList(
                     tasks: oneTimeTasks,