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

Task report bug

This commit is contained in:
Hillel Coren 2020-12-02 08:56:29 +02:00
parent ec3715dd88
commit 31a5e6decf
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/reports/reports_screen.dart
View File

@ -546,7 +546,7 @@ ReportColumnType getReportColumnType(String column, BuildContext context) {
return convertCustomFieldType(company.getCustomFieldType(column)); return convertCustomFieldType(company.getCustomFieldType(column));
} else if (['updated_at', 'created_at'].contains(column)) { } else if (['updated_at', 'created_at'].contains(column)) {
return ReportColumnType.dateTime; return ReportColumnType.dateTime;
} else if (['date', 'due_date', 'valid_until'].contains(column)) { } else if (['date', 'due_date', 'valid_until', 'start_date', 'end_date'].contains(column)) {
return ReportColumnType.date; return ReportColumnType.date;
} else if (column == 'age') { } else if (column == 'age') {
return ReportColumnType.age; return ReportColumnType.age;

11
lib/ui/reports/task_report.dart
View File

@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/redux/reports/reports_state.dart'; import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
import 'package:invoiceninja_flutter/redux/static/static_state.dart'; import 'package:invoiceninja_flutter/redux/static/static_state.dart';
import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart'; import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
import 'package:invoiceninja_flutter/utils/formatting.dart';
import 'package:memoize/memoize.dart'; import 'package:memoize/memoize.dart';
import 'package:invoiceninja_flutter/utils/extensions.dart'; import 'package:invoiceninja_flutter/utils/extensions.dart';
@ -118,16 +119,16 @@ ReportResult taskReport(
); );
break; break;
case TaskReportFields.start_date: case TaskReportFields.start_date:
value = task.taskTimes.firstOrNull?.startDate; value = convertDateTimeToSqlDate(task.taskTimes.firstOrNull?.startDate);
break; break;
case TaskReportFields.end_date: case TaskReportFields.end_date:
value = task.taskTimes.firstOrNull?.endDate; value = convertDateTimeToSqlDate(task.taskTimes.firstOrNull?.endDate);
break; break;
case TaskReportFields.description: case TaskReportFields.description:
value = task.description; value = task.description;
break; break;
case TaskReportFields.invoice: case TaskReportFields.invoice:
value = invoice; value = invoice?.listDisplayName ?? '';
break; break;
case TaskReportFields.invoice_amount: case TaskReportFields.invoice_amount:
value = invoice.amount; value = invoice.amount;
@ -139,7 +140,7 @@ ReportResult taskReport(
value = invoice.dueDate; value = invoice.dueDate;
break; break;
case TaskReportFields.client: case TaskReportFields.client:
value = clientMap[task.clientId]; value = clientMap[task.clientId]?.displayName ?? '';
break; break;
case TaskReportFields.client_balance: case TaskReportFields.client_balance:
value = client.balance; value = client.balance;
@ -166,7 +167,7 @@ ReportResult taskReport(
value = vendor?.state; value = vendor?.state;
break; break;
case TaskReportFields.vendor_country: case TaskReportFields.vendor_country:
value = staticState.countryMap[vendor?.countryId]; value = staticState.countryMap[vendor?.countryId].name;
break; break;
case TaskReportFields.custom_value1: case TaskReportFields.custom_value1:
value = task.customValue1; value = task.customValue1;