Improve ICal export

3 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index eccff6a3..03d93840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ New features:
 
 Improvements:
 
+* Improve ICal export
 * Added argument owner_id and identifier to project API calls
 * Rewrite integration tests to run with Docker containers
 * Use the same task form layout everywhere
diff --git a/app/Formatter/TaskICalFormatter.php b/app/Formatter/TaskICalFormatter.php
index 890674c7..ad2a4449 100644
--- a/app/Formatter/TaskICalFormatter.php
+++ b/app/Formatter/TaskICalFormatter.php
@@ -6,6 +6,7 @@ use DateTime;
 use Eluceo\iCal\Component\Calendar;
 use Eluceo\iCal\Component\Event;
 use Eluceo\iCal\Property\Event\Attendees;
+use Eluceo\iCal\Property\Event\Organizer;
 use Kanboard\Core\Filter\FormatterInterface;
 
 /**
@@ -117,16 +118,24 @@ class TaskICalFormatter extends BaseTaskCalendarFormatter implements FormatterIn
         $vEvent->setModified($dateModif);
         $vEvent->setUseTimezone(true);
         $vEvent->setSummary(t('#%d', $task['id']).' '.$task['title']);
+        $vEvent->setDescription($task['description']);
+        $vEvent->setDescriptionHTML($this->helper->text->markdown($task['description']));
         $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
 
         if (! empty($task['owner_id'])) {
-            $vEvent->setOrganizer($task['assignee_name'] ?: $task['assignee_username'], $task['assignee_email']);
+            $attendees = new Attendees;
+            $attendees->add(
+                'MAILTO:'.($task['assignee_email'] ?: $task['assignee_username'].'@kanboard.local'),
+                array('CN' => $task['assignee_name'] ?: $task['assignee_username'])
+            );
+            $vEvent->setAttendees($attendees);
         }
 
         if (! empty($task['creator_id'])) {
-            $attendees = new Attendees;
-            $attendees->add('MAILTO:'.($task['creator_email'] ?: $task['creator_username'].'@kanboard.local'));
-            $vEvent->setAttendees($attendees);
+            $vEvent->setOrganizer(new Organizer(
+                'MAILTO:' . $task['creator_email'] ?: $task['creator_username'].'@kanboard.local',
+                array('CN' => $task['creator_name'] ?: $task['creator_username'])
+            ));
         }
 
         return $vEvent;
diff --git a/app/Model/TaskFinderModel.php b/app/Model/TaskFinderModel.php
index 0e99c407..af39b924 100644
--- a/app/Model/TaskFinderModel.php
+++ b/app/Model/TaskFinderModel.php
@@ -367,6 +367,7 @@ class TaskFinderModel extends Base
                 'ua.name AS assignee_name',
                 'ua.username AS assignee_username',
                 'uc.email AS creator_email',
+                'uc.name AS creator_name',
                 'uc.username AS creator_username'
             );
     }