Reports

lib/redux/app/app_state.dart

@@ -448,7 +448,7 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
     //return 'isAuthenticated: ${authState.isAuthenticated}';
     //return 'MultiSelect: ${productListState.isInMultiselect()} SelectedIds: ${productListState.selectedIds}';
     //return 'History: $historyList';
-    return 'Report State: ${uiState.reportsUIState}, Settings: ${userCompany.settings}';
+    //return 'Report State: ${uiState.reportsUIState}, Settings: ${userCompany.settings}';
     //return 'UserCompany Settngs: ${userCompany.settings}, User Settings: ${user.userCompany.settings}';
     return 'Layout: ${prefState.appLayout}, Route: ${uiState.currentRoute} Prev: ${uiState.previousRoute}';
   }

lib/redux/reports/reports_middleware.dart

@@ -19,14 +19,13 @@ List<Middleware<AppState>> createStoreReportsMiddleware() {
 Middleware<AppState> _viewReports() {
   return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as ViewReports;
-    final uiState = store.state.uiState;
 
     if (!action.force &&
         hasChanges(store: store, context: action.context, action: action)) {
       return;
     }
 
-    final route = ReportsScreen.route;
+    const route = ReportsScreen.route;
 
     next(action);
 

lib/ui/reports/client_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/credit_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/document_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/expense_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/invoice_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/payment_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/product_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/ui/reports/reports_screen.dart

@@ -17,7 +17,6 @@ import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
-import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart';
@@ -527,7 +526,7 @@ ReportColumnType getReportColumnType(String column, BuildContext context) {
     return ReportColumnType.dateTime;
   } else if (['date', 'due_date'].contains(column)) {
     return ReportColumnType.date;
-  } else if (['balance', 'paid_to_date', 'amount', 'quantity', 'price', 'cost']
+  } else if (['balance', 'paid_to_date', 'amount', 'quantity', 'pridce', 'cost']
       .contains(column)) {
     return ReportColumnType.number;
   } else if (['is_active'].contains(column)) {
@@ -668,11 +667,12 @@ class ReportResult {
   }
 
   List<String> sortedColumns(BuildContext context) {
-    final store = StoreProvider.of<AppState>(context);
-    final group = store.state.uiState.reportsUIState.group;
     final data = columns.toList();
 
     /*
+    final store = StoreProvider.of<AppState>(context);
+    final group = store.state.uiState.reportsUIState.group;
+
     if (group.isNotEmpty) {
       data.remove(group);
       data.insert(0, group);

lib/ui/reports/reports_screen_vm.dart

@@ -1,5 +1,3 @@
-//import 'dart:html';
-import 'dart:collection';
 import 'dart:io' as file;
 import 'package:flutter_share/flutter_share.dart';
 import 'package:built_collection/built_collection.dart';
@@ -284,8 +282,8 @@ class ReportsScreenVM {
               '${state.uiState.reportsUIState.report}_report_$date.csv';
 
           if (kIsWeb) {
-            final encodedFileContents = Uri.encodeComponent(csvData);
             /*
+            final encodedFileContents = Uri.encodeComponent(csvData);
             AnchorElement(
                 href: 'data:text/plain;charset=utf-8,$encodedFileContents')
               ..setAttribute('download', filename)

lib/ui/reports/task_report.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/utils/enums.dart';
 import 'package:invoiceninja_flutter/constants.dart';

lib/utils/enums.dart

@@ -1,11 +1,15 @@
 class EnumUtils {
   static String parse(dynamic enumItem) {
-    if (enumItem == null) return null;
+    if (enumItem == null) {
+      return null;
+    }
     return enumItem.toString().split('.')[1];
   }
 
   static T fromString<T>(List<T> enumValues, String value) {
-    if (value == null || enumValues == null) return null;
+    if (value == null || enumValues == null) {
+      return null;
+    }
 
     return enumValues.singleWhere(
         (enumItem) =>