Merge pull-request #746

4 files changed, 90 insertions, 0 deletions

diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 64017582..9bd6e711 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -85,6 +85,22 @@ class Task extends Base
     }
 
     /**
+     * Display task activities
+     *
+     * @access public
+     */
+    public function activites()
+    {
+        $task = $this->getTask();
+        $this->response->html($this->taskLayout('task/events', array(   
+            'title' => $task['title'],
+            'task' => $task,
+            'ajax' => $this->request->isAjax(),
+            'events' => $this->projectActivity->getTasks([$task['id']]),
+        )));
+    }
+    
+    /**
      * Display a form to create a new task
      *
      * @access public
diff --git a/app/Model/ProjectActivity.php b/app/Model/ProjectActivity.php
index ae593da8..05081a47 100644
--- a/app/Model/ProjectActivity.php
+++ b/app/Model/ProjectActivity.php
@@ -50,6 +50,52 @@ class ProjectActivity extends Base
         return $this->db->table(self::TABLE)->insert($values);
     }
 
+     /**
+     * Get all events for the given task
+     *
+     * @access public
+     * @param  integer[]   $task_ids         Task ids
+     * @param  integer     $limit           Maximum events number
+     * @param  integer     $start           Timestamp of earliest activity
+     * @param  integer     $end             Timestamp of latest activity
+     * @return array
+     */
+    public function getTasks(array $task_ids, $limit = 50, $start = null, $end = null)
+    {
+        $query = $this->db->table(self::TABLE)
+                           ->columns(
+                                self::TABLE.'.*',
+                                User::TABLE.'.username AS author_username',
+                                User::TABLE.'.name AS author_name'
+                           )
+                           ->in('task_id', $task_ids)
+                           ->join(User::TABLE, 'id', 'creator_id')
+                           ->desc(self::TABLE.'.id')
+                           ->limit($limit);
+
+        if(!is_null($start)){
+            $query->gte('date_creation', $start);
+        }
+
+        if(!is_null($end)){
+            $query->lte('date_creation', $end);
+        }
+
+        $events = $query->findAll();
+
+        foreach ($events as &$event) {
+
+            $event += $this->decode($event['data']);
+            unset($event['data']);
+
+            $event['author'] = $event['author_name'] ?: $event['author_username'];
+            $event['event_title'] = $this->getTitle($event);
+            $event['event_content'] = $this->getContent($event);
+        }
+
+        return $events;
+    }
+    
     /**
      * Get all events for the given project
      *
diff --git a/app/Template/task/events.php b/app/Template/task/events.php
new file mode 100644
index 00000000..188f46fe
--- /dev/null
+++ b/app/Template/task/events.php
@@ -0,0 +1,25 @@
+<div class="page-header">
+    <h2><?= t('Activity stream') ?></h2>
+</div>
+
+<?php if (empty($events)): ?>
+    <p class="alert"><?= t('No activity.') ?></p>
+<?php else: ?>
+
+    <?php foreach ($events as $event): ?>
+        <div class="activity-event">
+            <p class="activity-datetime">
+                <?php if ($this->contains($event['event_name'], 'subtask')): ?>
+                    <i class="fa fa-tasks"></i>
+                <?php elseif ($this->contains($event['event_name'], 'task')): ?>
+                    <i class="fa fa-newspaper-o"></i>
+                <?php elseif ($this->contains($event['event_name'], 'comment')): ?>
+                    <i class="fa fa-comments-o"></i>
+                <?php endif ?>
+                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
+            </p>
+            <div class="activity-content"><?= $event['event_content'] ?></div>
+        </div>
+    <?php endforeach ?>
+
+<?php endif ?>
\ No newline at end of file
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index cb3b3c69..e911d5cd 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -5,6 +5,9 @@
             <?= $this->a(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <li>
+            <?= $this->a(t('Activity stream'), 'task', 'activites', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+        <li>
             <?= $this->a(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
         </li>
         <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?>