Skip to content

Commit e79b4b8

Browse files
fix: hide waiting tasks by default
1 parent 1b649ea commit e79b4b8

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

lib/app/modules/home/controllers/home_controller.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,7 @@ class HomeController extends GetxController {
231231

232232
void _profileSet() {
233233
pendingFilter.value = Query(storage.tabs.tab()).getPendingFilter();
234-
if (!Query(storage.tabs.tab()).getWaitingFilter()) {
235-
waitingFilter.value = Query(storage.tabs.tab()).getWaitingFilter();
236-
} else {
237-
Query(storage.tabs.tab()).toggleWaitingFilter();
238-
waitingFilter.value = Query(storage.tabs.tab()).getWaitingFilter();
239-
}
234+
waitingFilter.value = Query(storage.tabs.tab()).getWaitingFilter();
240235
projectFilter.value = Query(storage.tabs.tab()).projectFilter();
241236
tagUnion.value = Query(storage.tabs.tab()).tagUnion();
242237
selectedSort.value = Query(storage.tabs.tab()).getSelectedSort();
@@ -268,7 +263,11 @@ class HomeController extends GetxController {
268263
.where((task) => task.status == 'pending')
269264
.toList();
270265
} else {
271-
queriedTasks.value = storage.data.pendingData();
266+
var currentTime = DateTime.now();
267+
queriedTasks.value = storage.data.pendingData().where((task) =>
268+
task.status != 'waiting' &&
269+
!(task.wait != null && task.wait!.isAfter(currentTime))
270+
).toList();
272271
}
273272

274273
if (hideBlocked.value) {
@@ -281,9 +280,10 @@ class HomeController extends GetxController {
281280
// Rest of the method stays the same...
282281
if (waitingFilter.value) {
283282
var currentTime = DateTime.now();
284-
queriedTasks.value = queriedTasks
285-
.where((task) => task.wait != null && task.wait!.isAfter(currentTime))
286-
.toList();
283+
queriedTasks.value = storage.data.pendingData().where((task) =>
284+
task.status == 'waiting' ||
285+
(task.wait != null && task.wait!.isAfter(currentTime))
286+
).toList();
287287
}
288288

289289
if (projectFilter.value.isNotEmpty) {

lib/app/modules/home/views/tasks_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class TasksBuilder extends StatelessWidget {
181181
? storageWidget.taskItemKey
182182
: ValueKey(task.uuid);
183183

184-
return pendingFilter
184+
return (pendingFilter || waitingFilter)
185185
? Slidable(
186186
key: itemKey,
187187
startActionPane: ActionPane(

lib/app/utils/taskfunctions/query.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Query {
3939
if (!_pendingFilter.existsSync()) {
4040
_pendingFilter
4141
..createSync(recursive: true)
42-
..writeAsStringSync('true');
42+
..writeAsStringSync('false');
4343
}
4444
return json.decode(_pendingFilter.readAsStringSync());
4545
}
@@ -54,7 +54,7 @@ class Query {
5454
if (!_waitingFilter.existsSync()) {
5555
_waitingFilter
5656
..createSync(recursive: true)
57-
..writeAsStringSync('true');
57+
..writeAsStringSync('false');
5858
}
5959
return json.decode(_waitingFilter.readAsStringSync());
6060
}

0 commit comments

Comments
 (0)