From 31a5e6decf63e3e7cd4482bf3b3b6062a313e128 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 2 Dec 2020 08:56:29 +0200
Subject: [PATCH] Task report bug

---
 lib/ui/reports/reports_screen.dart |  2 +-
 lib/ui/reports/task_report.dart    | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index 04a1d1b03..2c250dbd2 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -546,7 +546,7 @@ ReportColumnType getReportColumnType(String column, BuildContext context) {
     return convertCustomFieldType(company.getCustomFieldType(column));
   } else if (['updated_at', 'created_at'].contains(column)) {
     return ReportColumnType.dateTime;
-  } else if (['date', 'due_date', 'valid_until'].contains(column)) {
+  } else if (['date', 'due_date', 'valid_until', 'start_date', 'end_date'].contains(column)) {
     return ReportColumnType.date;
   } else if (column == 'age') {
     return ReportColumnType.age;
diff --git a/lib/ui/reports/task_report.dart b/lib/ui/reports/task_report.dart
index 9315b7a6b..43e21e0f1 100644
--- a/lib/ui/reports/task_report.dart
+++ b/lib/ui/reports/task_report.dart
@@ -8,6 +8,7 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
+import 'package:invoiceninja_flutter/utils/formatting.dart';
 import 'package:memoize/memoize.dart';
 import 'package:invoiceninja_flutter/utils/extensions.dart';
 
@@ -118,16 +119,16 @@ ReportResult taskReport(
           );
           break;
         case TaskReportFields.start_date:
-          value = task.taskTimes.firstOrNull?.startDate;
+          value = convertDateTimeToSqlDate(task.taskTimes.firstOrNull?.startDate);
           break;
         case TaskReportFields.end_date:
-          value = task.taskTimes.firstOrNull?.endDate;
+          value = convertDateTimeToSqlDate(task.taskTimes.firstOrNull?.endDate);
           break;
         case TaskReportFields.description:
           value = task.description;
           break;
         case TaskReportFields.invoice:
-          value = invoice;
+          value = invoice?.listDisplayName ?? '';
           break;
         case TaskReportFields.invoice_amount:
           value = invoice.amount;
@@ -139,7 +140,7 @@ ReportResult taskReport(
           value = invoice.dueDate;
           break;
         case TaskReportFields.client:
-          value = clientMap[task.clientId];
+          value = clientMap[task.clientId]?.displayName ?? '';
           break;
         case TaskReportFields.client_balance:
           value = client.balance;
@@ -166,7 +167,7 @@ ReportResult taskReport(
           value = vendor?.state;
           break;
         case TaskReportFields.vendor_country:
-          value = staticState.countryMap[vendor?.countryId];
+          value = staticState.countryMap[vendor?.countryId].name;
           break;
         case TaskReportFields.custom_value1:
           value = task.customValue1;