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

Reports

This commit is contained in:
Hillel Coren 2021-02-03 21:59:43 +02:00
parent 7ef0d432ab
commit d3e0e7c531
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ui/reports/profit_loss_report.dart
View File

@ -88,7 +88,7 @@ ReportResult profitAndLossReport(
switch (column) { switch (column) {
case ProfitAndLossReportFields.type: case ProfitAndLossReportFields.type:
value = EntityType.payment.toString(); value = EntityType.payment;
break; break;
case ProfitAndLossReportFields.client: case ProfitAndLossReportFields.client:
value = client?.displayName; value = client?.displayName;
@ -143,7 +143,9 @@ ReportResult profitAndLossReport(
skip = true; skip = true;
} }
if (value.runtimeType == bool) { if (value.runtimeType == EntityType) {
row.add(payment.getReportEntityType());
} else if (value.runtimeType == bool) {
row.add(payment.getReportBool(value: value)); row.add(payment.getReportBool(value: value));
} else if (value.runtimeType == double || value.runtimeType == int) { } else if (value.runtimeType == double || value.runtimeType == int) {
row.add(payment.getReportDouble( row.add(payment.getReportDouble(
@ -171,7 +173,7 @@ ReportResult profitAndLossReport(
switch (column) { switch (column) {
case ProfitAndLossReportFields.type: case ProfitAndLossReportFields.type:
value = EntityType.expense.toString(); value = EntityType.expense;
break; break;
case ProfitAndLossReportFields.client: case ProfitAndLossReportFields.client:
value = client?.displayName; value = client?.displayName;
@ -226,7 +228,9 @@ ReportResult profitAndLossReport(
skip = true; skip = true;
} }
if (value.runtimeType == bool) { if (value.runtimeType == EntityType) {
row.add(expense.getReportEntityType());
} else if (value.runtimeType == bool) {
row.add(expense.getReportBool(value: value)); row.add(expense.getReportBool(value: value));
} else if (value.runtimeType == double || value.runtimeType == int) { } else if (value.runtimeType == double || value.runtimeType == int) {
row.add(expense.getReportDouble( row.add(expense.getReportDouble(

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

@ -646,7 +646,7 @@ class ReportResult {
return false; return false;
} }
} else if (value.runtimeType == EntityType) { } else if (value.runtimeType == EntityType) {
return filter == localization.lookup('$value'); return filter.toLowerCase() == '$value'.toLowerCase();
} else if (isValidDate(value)) { } else if (isValidDate(value)) {
if (!ReportResult.matchDateTime( if (!ReportResult.matchDateTime(
filter: filter, filter: filter,