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-18 23:04:38 +02:00
parent 610a0c89a0
commit fe2b272774
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -831,7 +831,11 @@ class ReportResult {
List<DataRow> tableRows(BuildContext context, ReportsScreenVM viewModel) { List<DataRow> tableRows(BuildContext context, ReportsScreenVM viewModel) {
final rows = <DataRow>[]; final rows = <DataRow>[];
final store = StoreProvider.of<AppState>(context); final store = StoreProvider.of<AppState>(context);
final reportState = store.state.uiState.reportsUIState; final state = store.state;
final reportState = state.uiState.reportsUIState;
final reportSettings = state.userCompany.settings
?.reportSettings[state.uiState.reportsUIState.report] ??
ReportSettingsEntity();
final groupBy = reportState.group; final groupBy = reportState.group;
if (groupBy.isEmpty) { if (groupBy.isEmpty) {
@ -846,7 +850,21 @@ class ReportResult {
rows.add(DataRow(cells: cells)); rows.add(DataRow(cells: cells));
} }
} else { } else {
viewModel.groupTotals.forEach((group, values) { final groupTotals = viewModel.groupTotals;
final keys = groupTotals.keys.toList();
keys.sort((rowA, rowB) {
final valuesA = groupTotals[rowA];
final valuesB = groupTotals[rowB];
final sort = columns[reportSettings.sortIndex];
if (valuesA.containsKey(sort) && valuesB.containsKey(sort)) {
return reportSettings.sortAscending
? valuesA[sort].compareTo(valuesB[sort])
: valuesB[sort].compareTo(valuesA[sort]);
}
return 0;
});
keys.forEach((group) {
final values = viewModel.groupTotals[group];
final cells = <DataCell>[]; final cells = <DataCell>[];
for (var column in sortedColumns(context)) { for (var column in sortedColumns(context)) {
String value = ''; String value = '';