From c33aa0b118b7fdd6af15f6fdba5a621db3d4b74b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 3 Jan 2022 12:56:50 +0200
Subject: [PATCH] Add user to the reports

---
 lib/ui/reports/credit_report.dart  | 9 +++++++++
 lib/ui/reports/expense_report.dart | 8 ++++++++
 lib/ui/reports/invoice_report.dart | 9 +++++++++
 lib/ui/reports/quote_report.dart   | 9 +++++++++
 lib/ui/reports/task_report.dart    | 8 ++++++++
 5 files changed, 43 insertions(+)

diff --git a/lib/ui/reports/credit_report.dart b/lib/ui/reports/credit_report.dart
index 0a92005c4..ae27edd7c 100644
--- a/lib/ui/reports/credit_report.dart
+++ b/lib/ui/reports/credit_report.dart
@@ -60,6 +60,8 @@ enum CreditReportFields {
   tax_name3,
   currency,
   is_viewed,
+  assigned_to,
+  created_by,
 }
 
 var memoizedCreditReport = memo6((
@@ -270,6 +272,13 @@ ReportResult creditReport(
           break;
         case CreditReportFields.is_viewed:
           value = credit.isViewed;
+          break;
+        case CreditReportFields.assigned_to:
+          value = userMap[credit.assignedUserId]?.listDisplayName ?? '';
+          break;
+        case CreditReportFields.created_by:
+          value = userMap[credit.createdUserId]?.listDisplayName ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(
diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart
index efaa62ab4..b5d3572de 100644
--- a/lib/ui/reports/expense_report.dart
+++ b/lib/ui/reports/expense_report.dart
@@ -36,6 +36,8 @@ enum ExpenseReportFields {
   expense3,
   expense4,
   category,
+  assigned_to,
+  created_by,
 }
 
 var memoizedExpenseReport = memo9((
@@ -193,6 +195,12 @@ ReportResult expenseReport(
         case ExpenseReportFields.category:
           value = expenseCategoryMap[expense.categoryId]?.name ?? '';
           break;
+        case ExpenseReportFields.assigned_to:
+          value = userMap[expense.assignedUserId]?.listDisplayName ?? '';
+          break;
+        case ExpenseReportFields.created_by:
+          value = userMap[expense.createdUserId]?.listDisplayName ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(
diff --git a/lib/ui/reports/invoice_report.dart b/lib/ui/reports/invoice_report.dart
index 552044c34..eb42b0d69 100644
--- a/lib/ui/reports/invoice_report.dart
+++ b/lib/ui/reports/invoice_report.dart
@@ -67,6 +67,8 @@ enum InvoiceReportFields {
   tax_name3,
   currency,
   is_viewed,
+  assigned_to,
+  created_by,
 }
 
 var memoizedInvoiceReport = memo6((
@@ -299,6 +301,13 @@ ReportResult invoiceReport(
           break;
         case InvoiceReportFields.is_viewed:
           value = invoice.isViewed;
+          break;
+        case InvoiceReportFields.assigned_to:
+          value = userMap[invoice.assignedUserId]?.listDisplayName ?? '';
+          break;
+        case InvoiceReportFields.created_by:
+          value = userMap[invoice.createdUserId]?.listDisplayName ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(
diff --git a/lib/ui/reports/quote_report.dart b/lib/ui/reports/quote_report.dart
index 63fd85dfb..8c18fd301 100644
--- a/lib/ui/reports/quote_report.dart
+++ b/lib/ui/reports/quote_report.dart
@@ -57,6 +57,8 @@ enum QuoteReportFields {
   tax_name3,
   currency,
   is_viewed,
+  assigned_to,
+  created_by,
 }
 
 var memoizedQuoteReport = memo7((
@@ -264,6 +266,13 @@ ReportResult quoteReport(
           break;
         case QuoteReportFields.is_viewed:
           value = quote.isViewed;
+          break;
+        case QuoteReportFields.assigned_to:
+          value = userMap[quote.assignedUserId]?.listDisplayName ?? '';
+          break;
+        case QuoteReportFields.created_by:
+          value = userMap[quote.createdUserId]?.listDisplayName ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(
diff --git a/lib/ui/reports/task_report.dart b/lib/ui/reports/task_report.dart
index cdcd889b7..3ad9a59b2 100644
--- a/lib/ui/reports/task_report.dart
+++ b/lib/ui/reports/task_report.dart
@@ -36,6 +36,8 @@ enum TaskReportFields {
   task3,
   task4,
   status,
+  assigned_to,
+  created_by,
 }
 
 var memoizedTaskReport = memo10((
@@ -200,6 +202,12 @@ ReportResult taskReport(
         case TaskReportFields.status:
           value = taskStatusMap[task.statusId]?.name ?? '';
           break;
+        case TaskReportFields.assigned_to:
+          value = userMap[task.assignedUserId]?.listDisplayName ?? '';
+          break;
+        case TaskReportFields.created_by:
+          value = userMap[task.createdUserId]?.listDisplayName ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(