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

Tasks

This commit is contained in:
Hillel Coren 2020-10-18 18:35:15 +03:00
parent 674b6bc883
commit 9c910ce9c3
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/data/repositories/task_repository.dart
View File

@ -52,11 +52,6 @@ class TaskRepository {
} }
Future<TaskEntity> saveData(Credentials credentials, TaskEntity task) async { Future<TaskEntity> saveData(Credentials credentials, TaskEntity task) async {
// Workaround for API issue
if (task.isNew) {
task = task.rebuild((b) => b..id = null);
}
final data = serializers.serializeWith(TaskEntity.serializer, task); final data = serializers.serializeWith(TaskEntity.serializer, task);
dynamic response; dynamic response;
@ -88,7 +83,7 @@ class TaskRepository {
data: fields, filePath: filePath, fileIndex: 'documents[]'); data: fields, filePath: filePath, fileIndex: 'documents[]');
final TaskItemResponse taskResponse = final TaskItemResponse taskResponse =
serializers.deserializeWith(TaskItemResponse.serializer, response); serializers.deserializeWith(TaskItemResponse.serializer, response);
return taskResponse.data; return taskResponse.data;
} }

4
lib/redux/task/task_selectors.dart
View File

@ -184,9 +184,9 @@ double taskRateSelector(
{CompanyEntity company, ProjectEntity project, ClientEntity client}) { {CompanyEntity company, ProjectEntity project, ClientEntity client}) {
if (project != null && project.taskRate > 0) { if (project != null && project.taskRate > 0) {
return project.taskRate; return project.taskRate;
} else if (client != null && client.settings.defaultTaskRate > 0) { } else if (client != null && (client.settings.defaultTaskRate ?? 0) > 0) {
return client.settings.defaultTaskRate; return client.settings.defaultTaskRate;
} else if (company != null && company.settings.defaultTaskRate > 0) { } else if (company != null && (company.settings.defaultTaskRate ?? 0) > 0) {
return company.settings.defaultTaskRate; return company.settings.defaultTaskRate;
} }

2
lib/ui/task/view/task_view.dart
View File

@ -89,7 +89,7 @@ class _TaskViewState extends State<TaskView> {
List<Widget> _buildView() { List<Widget> _buildView() {
final widgets = <Widget>[ final widgets = <Widget>[
EntityHeader( EntityHeader(
entity: project, entity: task,
statusColor: task.isInvoiced statusColor: task.isInvoiced
? Colors.green ? Colors.green
: task.isRunning : task.isRunning

3
lib/ui/task/view/task_view_vm.dart
View File

@ -60,8 +60,7 @@ class TaskViewVM {
factory TaskViewVM.fromStore(Store<AppState> store) { factory TaskViewVM.fromStore(Store<AppState> store) {
final state = store.state; final state = store.state;
final task = state.taskState.map[state.taskUIState.selectedId] ?? final task = state.taskState.get(state.taskUIState.selectedId);
TaskEntity(id: state.taskUIState.selectedId);
final client = state.clientState.map[task.clientId]; final client = state.clientState.map[task.clientId];
final project = state.projectState.map[task.projectId]; final project = state.projectState.map[task.projectId];