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

Reports

This commit is contained in:
Hillel Coren 2020-02-17 12:39:30 +02:00
parent fe19038a25
commit b7ed1936ef
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,12 +523,16 @@ class ReportResult {
}
} else if (getReportColumnType(column) == ReportColumnType.dateTime ||
getReportColumnType(column) == ReportColumnType.date) {
print('## match dateTime: $filter $value');
if (!ReportResult.matchDateTime(
filter: filter,
value: value,
reportsUIState: reportsUIState,
userCompany: userCompany)) {
print('## NO MATCH');
return false;
} else {
print('## MATCH');
}
} else if (getReportColumnType(column) == ReportColumnType.bool) {
if (filter != '$value') {
@ -586,19 +590,27 @@ class ReportResult {
customStartDate: reportsUIState.customStartDate,
customEndDate: reportsUIState.customEndDate,
);
if (reportsUIState.customStartDate.isNotEmpty &&
reportsUIState.customEndDate.isNotEmpty) {
final customStartDate = reportsUIState.customStartDate;
final customEndDate = reportsUIState.customEndDate;
if (dateRange == DateRange.custom) {
if (customStartDate.isNotEmpty && customEndDate.isNotEmpty) {
if (!(startDate.compareTo(value) <= 0 &&
endDate.compareTo(value) >= 0)) {
return false;
}
} else if (customStartDate.isNotEmpty) {
if (!(startDate.compareTo(value) <= 0)) {
return false;
}
} else if (customEndDate.isNotEmpty) {
if (!(endDate.compareTo(value) >= 0)) {
return false;
}
}
} else {
if (!(startDate.compareTo(value) <= 0 && endDate.compareTo(value) >= 0)) {
return false;
}
} else if (reportsUIState.customStartDate.isNotEmpty) {
if (!(startDate.compareTo(value) <= 0)) {
return false;
}
} else if (reportsUIState.customEndDate.isNotEmpty) {
if (!(endDate.compareTo(value) >= 0)) {
return false;
}
}
return true;