This commit is contained in:
Hillel Coren 2020-02-16 12:54:46 +02:00
parent 13fa127255
commit 31b355fc8f
1 changed files with 10 additions and 10 deletions

View File

@ -178,14 +178,14 @@ Map<String, Map<String, double>> calculateReportTotals({
ReportResult reportResult, ReportResult reportResult,
ReportsUIState reportUIState, ReportsUIState reportUIState,
}) { }) {
if (reportUIState.group.isEmpty) {
return null;
}
final Map<String, Map<String, double>> totals = {}; final Map<String, Map<String, double>> totals = {};
final data = reportResult.data; final data = reportResult.data;
final columns = reportResult.columns; final columns = reportResult.columns;
if (reportUIState.group.isEmpty) {
return totals;
}
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
final row = data[i]; final row = data[i];
for (var j = 0; j < row.length; j++) { for (var j = 0; j < row.length; j++) {
@ -193,7 +193,7 @@ Map<String, Map<String, double>> calculateReportTotals({
final column = columns[j]; final column = columns[j];
final columnIndex = columns.indexOf(reportUIState.group); final columnIndex = columns.indexOf(reportUIState.group);
String group = row[columnIndex].value; dynamic group = row[columnIndex].value;
if (getReportColumnType(reportUIState.group) == if (getReportColumnType(reportUIState.group) ==
ReportColumnType.dateTime) { ReportColumnType.dateTime) {
@ -206,16 +206,16 @@ Map<String, Map<String, double>> calculateReportTotals({
} }
if (!totals.containsKey(group)) { if (!totals.containsKey(group)) {
totals[group] = {'count': 0}; totals['$group'] = {'count': 0};
} }
if (column == reportUIState.group) { if (column == reportUIState.group) {
totals[group]['count'] += 1; totals['$group']['count'] += 1;
} }
if (cell is ReportNumberValue) { if (cell is ReportNumberValue) {
if (!totals[group].containsKey(column)) { if (!totals['$group'].containsKey(column)) {
totals[group][column] = 0; totals['$group'][column] = 0;
} }
totals[group][column] += cell.value; totals['$group'][column] += cell.value;
} }
} }
} }