From fa420e23e1677c358748a9e114bf9b00ff706863 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 15 Feb 2020 21:19:02 +0200
Subject: [PATCH] Reports

---
 lib/ui/reports/reports_screen.dart | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index f6dd1f87c..0fe28312d 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -696,6 +696,7 @@ class ReportResult {
 
   List<DataColumn> totalColumns(BuildContext context) {
     final localization = AppLocalization.of(context);
+    columns.sort((String str1, String str2) => str1.compareTo(str2));
 
     return [
       DataColumn(
@@ -730,8 +731,8 @@ class ReportResult {
       for (var j = 0; j < row.length; j++) {
         final cell = row[j];
         final column = columns[j];
-        if (getReportColumnType(column) == ReportColumnType.number) {
-          final String currencyId = (cell as ReportNumberValue).currencyId;
+        if (cell is ReportNumberValue) {
+          final String currencyId = cell.currencyId;
 
           if (!totals.containsKey(currencyId)) {
             totals[currencyId] = {'count': 0};
@@ -744,15 +745,23 @@ class ReportResult {
       }
     }
 
-    totals.forEach((group, values) {
+    totals.forEach((currencyId, values) {
       final cells = <DataCell>[
         DataCell(Text(
-            store.state.staticState.currencyMap[group]?.listDisplayName ?? '')),
-        DataCell(Text('')),
+            store.state.staticState.currencyMap[currencyId]?.listDisplayName ??
+                '')),
+        DataCell(Text(values.toString())),
       ];
 
-      cells.add(DataCell(Text(group ?? '')));
-      cells.add(DataCell(Text(group ?? '')));
+      final List<String> fields = values.keys.toList()
+        ..sort((String str1, String str2) => str1.compareTo(str2));
+      fields.forEach((field) {
+        final amount = values[field];
+        final value = formatNumber(amount, context, currencyId: currencyId);
+        if (field != 'count') {
+          cells.add(DataCell(Text(value)));
+        }
+      });
 
       rows.add(DataRow(cells: cells));
     });