ihompadmin/tasq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Excluded cancelled tasks in dashboards

Browse Source
This commit is contained in:
Marc Rejohn Castillano 2026-02-28 22:34:43 +08:00
parent 70cdbec5d4
commit d859524a9e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/screens/dashboard/dashboard_screen.dart
View File

@ -210,11 +210,19 @@ final dashboardMetricsProvider = Provider<AsyncValue<DashboardMetrics>>((ref) {
(a, b) => a.inSeconds >= b.inSeconds ? a : b, (a, b) => a.inSeconds >= b.inSeconds ? a : b,
); );
final tasksCreatedToday = tasks.where((task) => isToday(task.createdAt)); // Exclude cancelled tasks from dashboard metrics
final tasksCompletedToday = tasks.where( final tasksCreatedToday = tasks.where(
(task) => task.completedAt != null && isToday(task.completedAt!), (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 taskById = {for (final task in tasks) task.id: task};
final staffOnTask = <String>{}; final staffOnTask = <String>{};

2
lib/screens/tasks/tasks_list_screen.dart
View File

@ -870,6 +870,8 @@ List<Task> _applyTaskFilters(
Map<String, int> _taskStatusCounts(List<Task> tasks) { Map<String, int> _taskStatusCounts(List<Task> tasks) {
final counts = <String, int>{}; final counts = <String, int>{};
for (final task in tasks) { for (final task in tasks) {
// Do not include cancelled tasks in dashboard summaries
if (task.status == 'cancelled') continue;
counts.update(task.status, (value) => value + 1, ifAbsent: () => 1); counts.update(task.status, (value) => value + 1, ifAbsent: () => 1);
} }
return counts; return counts;