summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBlueTeck <tili2@gmx.de>2015-03-29 12:48:24 +0200
committerBlueTeck <tili2@gmx.de>2015-03-29 12:48:24 +0200
commit58b0159e87f778819b6045ae5a099fa06b4f1a72 (patch)
treeb0f1811c2ed869710baed246177f9f0a89548411 /app
parent5536f6c6ce591ba05a169d2e33b6fb240378d8a4 (diff)
add activity stream to task #693
Diffstat (limited to 'app')
-rw-r--r--app/Controller/Task.php16
-rw-r--r--app/Model/ProjectActivity.php46
-rw-r--r--app/Template/task/events.php25
-rw-r--r--app/Template/task/sidebar.php3
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 c5fbbd38..46d71fc7 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): ?>