Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add tasks statuses to filter

This commit is contained in:
Hillel Coren 2022-08-02 09:11:58 +03:00
parent edd02b7a40
commit 49eb49f4c8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/data/models/task_model.dart
View File

@ -771,6 +771,8 @@ abstract class TaskEntity extends Object
return true; return true;
} else if (status.id == kTaskStatusLogged && isStopped && !isInvoiced) { } else if (status.id == kTaskStatusLogged && isStopped && !isInvoiced) {
return true; return true;
} else if (status.id == statusId) {
return true;
} }
} }

6
lib/ui/task/task_screen.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
// Package imports: // Package imports:
import 'package:flutter_redux/flutter_redux.dart'; import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/task_status/task_status_selectors.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
// Project imports: // Project imports:
@ -51,6 +52,11 @@ class TaskScreen extends StatelessWidget {
TaskStatusEntity().rebuild((b) => b TaskStatusEntity().rebuild((b) => b
..id = kTaskStatusInvoiced ..id = kTaskStatusInvoiced
..name = localization.invoiced), ..name = localization.invoiced),
for (var statusId in memoizedSortedActiveTaskStatusIds(
state.taskStatusState.list, state.taskStatusState.map))
TaskStatusEntity().rebuild((b) => b
..id = statusId
..name = state.taskStatusState.map[statusId].name),
]; ];
return ListScaffold( return ListScaffold(