AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid code duplication in pull-request #746

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-30 21:58:16 -04:00
parent 6d80f0b466
commit 8d9b87bb6e
7 changed files with 69 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controller/Task.php
View File

@@ -92,14 +92,15 @@ class Task extends Base
public function activites() public function activites()
{ {
$task = $this->getTask(); $task = $this->getTask();
$this->response->html($this->taskLayout('task/events', array(
$this->response->html($this->taskLayout('task/activity', array(
'title' => $task['title'], 'title' => $task['title'],
'task' => $task, 'task' => $task,
'ajax' => $this->request->isAjax(), 'ajax' => $this->request->isAjax(),
'events' => $this->projectActivity->getTasks([$task['id']]), 'events' => $this->projectActivity->getTask($task['id']),
))); )));
} }
/** /**
* Display a form to create a new task * Display a form to create a new task
* *

117
app/Model/ProjectActivity.php
View File

@@ -50,52 +50,6 @@ class ProjectActivity extends Base
return $this->db->table(self::TABLE)->insert($values); 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 * Get all events for the given project
* *
@@ -127,23 +81,68 @@ class ProjectActivity extends Base
return array(); return array();
} }
$query = $this->db->table(self::TABLE) $query = $this
->columns( ->db
self::TABLE.'.*', ->table(self::TABLE)
User::TABLE.'.username AS author_username', ->columns(
User::TABLE.'.name AS author_name', self::TABLE.'.*',
User::TABLE.'.email' User::TABLE.'.username AS author_username',
) User::TABLE.'.name AS author_name',
->in('project_id', $project_ids) User::TABLE.'.email'
->join(User::TABLE, 'id', 'creator_id') )
->desc(self::TABLE.'.id') ->in('project_id', $project_ids)
->limit($limit); ->join(User::TABLE, 'id', 'creator_id')
->desc(self::TABLE.'.id')
->limit($limit);
if (!is_null($start)){ return $this->getEvents($query, $start, $end);
}
/**
* Get all events for the given task
*
* @access public
* @param integer $task_id Task id
* @param integer $limit Maximum events number
* @param integer $start Timestamp of earliest activity
* @param integer $end Timestamp of latest activity
* @return array
*/
public function getTask($task_id, $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',
User::TABLE.'.email'
)
->eq('task_id', $task_id)
->join(User::TABLE, 'id', 'creator_id')
->desc(self::TABLE.'.id')
->limit($limit);
return $this->getEvents($query, $start, $end);
}
/**
* Common function to return events
*
* @access public
* @param \PicoDb\Table $query PicoDb Query
* @param integer $start Timestamp of earliest activity
* @param integer $end Timestamp of latest activity
* @return array
*/
private function getEvents(\PicoDb\Table $query, $start, $end)
{
if (! is_null($start)){
$query->gte('date_creation', $start); $query->gte('date_creation', $start);
} }
if (!is_null($end)){ if (! is_null($end)){
$query->lte('date_creation', $end); $query->lte('date_creation', $end);
} }

2
app/Template/app/dashboard.php
View File

@@ -53,7 +53,7 @@
</div> </div>
<div id="dashboard-activities"> <div id="dashboard-activities">
<h2><?= t('Activity stream') ?></h2> <h2><?= t('Activity stream') ?></h2>
<?= $this->render('project/events', array('events' => $events)) ?> <?= $this->render('event/events', array('events' => $events)) ?>
</div> </div>
</div> </div>
</section> </section>

0
app/Template/project/events.php → app/Template/event/events.php
View File

2
app/Template/project/activity.php
View File

@@ -23,6 +23,6 @@
</ul> </ul>
</div> </div>
<section> <section>
<?= $this->render('project/events', array('events' => $events)) ?> <?= $this->render('event/events', array('events' => $events)) ?>
</section> </section>
</section> </section>

5
app/Template/task/activity.php Normal file
View File

@@ -0,0 +1,5 @@
<div class="page-header">
<h2><?= t('Activity stream') ?></h2>
</div>
<?= $this->render('event/events', array('events' => $events)) ?>

25
app/Template/task/events.php
View File

@@ -1,25 +0,0 @@
<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 ?>