1 files changed, 20 insertions, 6 deletions
diff --git a/app/Helper/CalendarHelper.php b/app/Helper/CalendarHelper.php
index b35c40f7..0942177d 100644
--- a/app/Helper/CalendarHelper.php
+++ b/app/Helper/CalendarHelper.php
@@ -5,8 +5,6 @@ namespace Kanboard\Helper;
 use Kanboard\Core\Base;
 use Kanboard\Core\Filter\QueryBuilder;
 use Kanboard\Filter\TaskDueDateRangeFilter;
-use Kanboard\Formatter\SubtaskTimeTrackingCalendarFormatter;
-use Kanboard\Formatter\TaskCalendarFormatter;
 
 /**
  * Calendar Helper
@@ -17,6 +15,23 @@ use Kanboard\Formatter\TaskCalendarFormatter;
 class CalendarHelper extends Base
 {
     /**
+     * Render calendar component
+     *
+     * @param  string $checkUrl
+     * @param  string $saveUrl
+     * @return string
+     */
+    public function render($checkUrl, $saveUrl)
+    {
+        $params = array(
+            'checkUrl' => $checkUrl,
+            'saveUrl' => $saveUrl,
+        );
+
+        return '<div class="js-calendar" data-params=\''.json_encode($params, JSON_HEX_APOS).'\'></div>';
+    }
+
+    /**
      * Get formatted calendar task due events
      *
      * @access public
@@ -27,7 +42,7 @@ class CalendarHelper extends Base
      */
     public function getTaskDateDueEvents(QueryBuilder $queryBuilder, $start, $end)
     {
-        $formatter = new TaskCalendarFormatter($this->container);
+        $formatter = $this->taskCalendarFormatter;
         $formatter->setFullDay();
         $formatter->setColumns('date_due');
 
@@ -56,7 +71,7 @@ class CalendarHelper extends Base
             'date_due'
         ));
 
-        $formatter = new TaskCalendarFormatter($this->container);
+        $formatter = $this->taskCalendarFormatter;
         $formatter->setColumns($startColumn, 'date_due');
 
         return $queryBuilder->format($formatter);
@@ -73,8 +88,7 @@ class CalendarHelper extends Base
      */
     public function getSubtaskTimeTrackingEvents($user_id, $start, $end)
     {
-        $formatter = new SubtaskTimeTrackingCalendarFormatter($this->container);
-        return $formatter
+        return $this->subtaskTimeTrackingCalendarFormatter
             ->withQuery($this->subtaskTimeTrackingModel->getUserQuery($user_id)
                 ->addCondition($this->getCalendarCondition(
                     $this->dateParser->getTimestampFromIsoFormat($start),