Excluded cancelled tasks in dashboards

2026-02-28 22:34:43 +08:00
parent 70cdbec5d4
commit d859524a9e
2 changed files with 14 additions and 4 deletions
@@ -210,11 +210,19 @@ final dashboardMetricsProvider = Provider<AsyncValue<DashboardMetrics>>((ref) {
          (a, b) => a.inSeconds >= b.inSeconds ? a : b,
        );

-  final tasksCreatedToday = tasks.where((task) => isToday(task.createdAt));
-  final tasksCompletedToday = tasks.where(
-    (task) => task.completedAt != null && isToday(task.completedAt!),
+  // Exclude cancelled tasks from dashboard metrics
+  final tasksCreatedToday = tasks.where(
+    (task) => isToday(task.createdAt) && task.status != 'cancelled',
+  );
+  final tasksCompletedToday = tasks.where(
+    (task) =>
+        task.completedAt != null &&
+        isToday(task.completedAt!) &&
+        task.status != 'cancelled',
+  );
+  final openTasks = tasks.where(
+    (task) => task.status != 'completed' && task.status != 'cancelled',
  );
-  final openTasks = tasks.where((task) => task.status != 'completed');

  final taskById = {for (final task in tasks) task.id: task};
  final staffOnTask = <String>{};