From ec2ceb2d05f1971c2535a0ccf5da3087dd02ce1e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 3 Feb 2021 23:13:47 +0200
Subject: [PATCH] Report changes

---
 lib/redux/task/task_selectors.dart     |  2 +-
 lib/ui/expense/view/expense_view.dart  |  2 +-
 lib/ui/reports/profit_loss_report.dart | 26 ++++++++++++++++++++++----
 lib/ui/reports/reports_screen_vm.dart  |  1 +
 lib/ui/task/view/task_view.dart        |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
index 737d6a6d2..c961bd79b 100644
--- a/lib/redux/task/task_selectors.dart
+++ b/lib/redux/task/task_selectors.dart
@@ -29,7 +29,7 @@ InvoiceItemEntity convertTaskToInvoiceItem(
       final start =
           formatDate(time.startDate.toIso8601String(), context, showTime: true);
       final end = formatDate(time.endDate.toIso8601String(), context,
-          showTime: true, showDate: false, showSeconds: false);
+          showTime: true, showDate: false, showSeconds: true);
       notes += '\n$start - $end';
     });
     notes += '\n</span>';
diff --git a/lib/ui/expense/view/expense_view.dart b/lib/ui/expense/view/expense_view.dart
index 4c7826cc0..c1cab53f2 100644
--- a/lib/ui/expense/view/expense_view.dart
+++ b/lib/ui/expense/view/expense_view.dart
@@ -91,7 +91,7 @@ class _ExpenseViewState extends State<ExpenseView>
               action1: EntityAction.clone,
               action2: expense.isInvoiced
                   ? EntityAction.archive
-                  : EntityAction.newInvoice,
+                  : EntityAction.invoiceExpense,
             )
           ],
         );
diff --git a/lib/ui/reports/profit_loss_report.dart b/lib/ui/reports/profit_loss_report.dart
index 30074ef70..30242096f 100644
--- a/lib/ui/reports/profit_loss_report.dart
+++ b/lib/ui/reports/profit_loss_report.dart
@@ -23,21 +23,32 @@ enum ProfitAndLossReportFields {
   vendor_country,
   type,
   amount,
-  date
+  date,
+  category,
 }
 
-var memoizedProfitAndLossReport = memo8((
+var memoizedProfitAndLossReport = memo9((
   UserCompanyEntity userCompany,
   ReportsUIState reportsUIState,
   BuiltMap<String, ClientEntity> clientMap,
   BuiltMap<String, PaymentEntity> paymentMap,
   BuiltMap<String, ExpenseEntity> expenseMap,
+  BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
   BuiltMap<String, VendorEntity> vendorMap,
   BuiltMap<String, UserEntity> userMap,
   StaticState staticState,
 ) =>
-    profitAndLossReport(userCompany, reportsUIState, clientMap, paymentMap,
-        expenseMap, vendorMap, userMap, staticState));
+    profitAndLossReport(
+      userCompany,
+      reportsUIState,
+      clientMap,
+      paymentMap,
+      expenseMap,
+      expenseCategoryMap,
+      vendorMap,
+      userMap,
+      staticState,
+    ));
 
 ReportResult profitAndLossReport(
   UserCompanyEntity userCompany,
@@ -45,6 +56,7 @@ ReportResult profitAndLossReport(
   BuiltMap<String, ClientEntity> clientMap,
   BuiltMap<String, PaymentEntity> paymentMap,
   BuiltMap<String, ExpenseEntity> expenseMap,
+  BuiltMap<String, ExpenseCategoryEntity> expenseCategoryMap,
   BuiltMap<String, VendorEntity> vendorMap,
   BuiltMap<String, UserEntity> userMap,
   StaticState staticState,
@@ -132,6 +144,9 @@ ReportResult profitAndLossReport(
         case ProfitAndLossReportFields.date:
           value = payment?.date;
           break;
+        case ProfitAndLossReportFields.category:
+          value = '';
+          break;
       }
 
       if (!ReportResult.matchField(
@@ -217,6 +232,9 @@ ReportResult profitAndLossReport(
         case ProfitAndLossReportFields.date:
           value = expense.date;
           break;
+        case ProfitAndLossReportFields.category:
+          value = expenseCategoryMap[expense.categoryId]?.name ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(
diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart
index 3e745aba7..ea42db3a3 100644
--- a/lib/ui/reports/reports_screen_vm.dart
+++ b/lib/ui/reports/reports_screen_vm.dart
@@ -226,6 +226,7 @@ class ReportsScreenVM {
           state.clientState.map,
           state.paymentState.map,
           state.expenseState.map,
+          state.expenseCategoryState.map,
           state.vendorState.map,
           state.userState.map,
           state.staticState,
diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart
index f891336c1..bb177fc73 100644
--- a/lib/ui/task/view/task_view.dart
+++ b/lib/ui/task/view/task_view.dart
@@ -95,7 +95,7 @@ class _TaskViewState extends State<TaskView>
                       : EntityAction.resume,
               action2: task.isInvoiced
                   ? EntityAction.archive
-                  : EntityAction.newInvoice,
+                  : EntityAction.invoiceTask,
               action1Enabled: !task.isInvoiced,
             ),
           ],