From 31b355fc8f20d8e76a62804782d45db04ed2228c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 16 Feb 2020 12:54:46 +0200
Subject: [PATCH] Charts

---
 lib/ui/reports/reports_screen_vm.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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