Reports

lib/ui/reports/client_report.dart

@@ -83,12 +83,7 @@ ReportResult clientReport(
           ? reportSettings[kReportClient]
           : ReportSettingsEntity();
 
-  if (clientReportSettings.columns.isNotEmpty) {
+  final defaultColumns = [
-    columns = BuiltList(clientReportSettings.columns
-        .map((e) => EnumUtils.fromString(ClientReportFields.values, e))
-        .toList());
-  } else {
-    columns = BuiltList(<ClientReportFields>[
     ClientReportFields.name,
     ClientReportFields.contact_email,
     ClientReportFields.id_number,
@@ -97,7 +92,14 @@ ReportResult clientReport(
     ClientReportFields.balance,
     ClientReportFields.paid_to_date,
     ClientReportFields.country,
-    ]);
+  ];
+
+  if (clientReportSettings.columns.isNotEmpty) {
+    columns = BuiltList(clientReportSettings.columns
+        .map((e) => EnumUtils.fromString(ClientReportFields.values, e))
+        .toList());
+  } else {
+    columns = BuiltList(defaultColumns);
   }
 
   for (var clientId in clientMap.keys) {
@@ -293,8 +295,10 @@ ReportResult clientReport(
 
   return ReportResult(
     allColumns:
-        ClientReportFields.values.map((e) => EnumUtils.parse(e)).toList(),
+        ClientReportFields.values.map((item) => EnumUtils.parse(item)).toList(),
     columns: columns.map((item) => EnumUtils.parse(item)).toList(),
+    defaultColumns:
+        defaultColumns.map((item) => EnumUtils.parse(item)).toList(),
     data: data,
   );
 }

lib/ui/reports/invoice_report.dart

@@ -71,19 +71,21 @@ ReportResult invoiceReport(
           ? reportSettings[kReportInvoice]
           : ReportSettingsEntity();
 
-  if (invoiceReportSettings.columns.isNotEmpty) {
+  final defaultColumns = [
-    columns = BuiltList(invoiceReportSettings.columns
-        .map((e) => EnumUtils.fromString(InvoiceReportFields.values, e))
-        .toList());
-  } else {
-    columns = BuiltList(<InvoiceReportFields>[
     InvoiceReportFields.number,
     InvoiceReportFields.amount,
     InvoiceReportFields.balance,
     InvoiceReportFields.date,
     InvoiceReportFields.due_date,
     InvoiceReportFields.client
-    ]);
+  ];
+
+  if (invoiceReportSettings.columns.isNotEmpty) {
+    columns = BuiltList(invoiceReportSettings.columns
+        .map((e) => EnumUtils.fromString(InvoiceReportFields.values, e))
+        .toList());
+  } else {
+    columns = BuiltList(defaultColumns);
   }
 
   for (var invoiceId in invoiceMap.keys) {
@@ -230,6 +232,8 @@ ReportResult invoiceReport(
     allColumns:
         InvoiceReportFields.values.map((e) => EnumUtils.parse(e)).toList(),
     columns: columns.map((item) => EnumUtils.parse(item)).toList(),
+    defaultColumns:
+        defaultColumns.map((item) => EnumUtils.parse(item)).toList(),
     data: data,
   );
 }

lib/ui/reports/reports_screen.dart

@@ -505,11 +505,13 @@ class ReportResult {
   ReportResult({
     @required this.columns,
     @required this.allColumns,
+    @required this.defaultColumns,
     @required this.data,
   });
 
   final List<String> columns;
   final List<String> allColumns;
+  final List<String> defaultColumns;
   final List<List<ReportElement>> data;
 
   static bool matchField({