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

Update subtask spent based on the time tracking

This commit is contained in:
Frederic Guillot 2015-02-07 21:44:51 -05:00
parent 2d890cbc71
commit c9cc82eec8
4 changed files with 90 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Config.php
View File

@ -38,7 +38,7 @@ class Config extends Base
{
if ($this->request->isPost()) {
$values = $this->request->getValues();
$values = $this->request->getValues() + array('subtask_restriction' => 0, 'subtask_time_tracking' => 0);
if ($this->config->save($values)) {
$this->config->reload();

39
app/Model/Subtask.php
View File

@ -176,9 +176,6 @@ class Subtask extends Base
$subtask_id = $this->persist(self::TABLE, $values);
if ($subtask_id) {
$this->updateTaskTimeTracking($values['task_id']);
$this->container['dispatcher']->dispatch(
self::EVENT_CREATE,
new SubtaskEvent(array('id' => $subtask_id) + $values)
@ -202,10 +199,6 @@ class Subtask extends Base
if ($result) {
if (isset($values['task_id'])) {
$this->updateTaskTimeTracking($values['task_id']);
}
$this->container['dispatcher']->dispatch(
self::EVENT_UPDATE,
new SubtaskEvent($values)
@ -231,6 +224,7 @@ class Subtask extends Base
$values = array(
'id' => $subtask['id'],
'status' => ($subtask['status'] + 1) % 3,
'task_id' => $subtask['task_id'],
);
return $this->update($values);
@ -267,37 +261,6 @@ class Subtask extends Base
->count() === 1;
}
/**
* Update task time tracking based on subtasks time tracking
*
* @access public
* @param integer $task_id Task id
* @return bool
*/
public function updateTaskTimeTracking($task_id)
{
$result = $this->db
->table(self::TABLE)
->eq('task_id', $task_id)
->columns(
'SUM(time_spent) AS total_spent',
'SUM(time_estimated) AS total_estimated'
)
->findOne();
if (empty($result['total_spent']) && empty($result['total_estimated'])) {
return true;
}
return $this->db
->table(Task::TABLE)
->eq('id', $task_id)
->update(array(
'time_spent' => $result['total_spent'],
'time_estimated' => $result['total_estimated'],
));
}
/**
* Remove
*

68
app/Model/SubtaskTimeTracking.php
View File

@ -68,6 +68,8 @@ class SubtaskTimeTracking extends Base
*/
public function logEndTime($subtask_id, $user_id)
{
$this->updateSubtaskTimeSpent($subtask_id, $user_id);
return $this->db
->table(self::TABLE)
->eq('subtask_id', $subtask_id)
@ -77,4 +79,70 @@ class SubtaskTimeTracking extends Base
'end' => time()
));
}
/**
* Update task time tracking based on subtasks time tracking
*
* @access public
* @param integer $task_id Task id
* @return bool
*/
public function updateTaskTimeTracking($task_id)
{
$result = $this->calculateSubtaskTime($task_id);
if (empty($result['total_spent']) && empty($result['total_estimated'])) {
return true;
}
return $this->db
->table(Task::TABLE)
->eq('id', $task_id)
->update(array(
'time_spent' => $result['total_spent'],
'time_estimated' => $result['total_estimated'],
));
}
/**
* Sum time spent and time estimated for all subtasks
*
* @access public
* @param integer $task_id Task id
* @return array
*/
public function calculateSubtaskTime($task_id)
{
return $this->db
->table(Subtask::TABLE)
->eq('task_id', $task_id)
->columns(
'SUM(time_spent) AS total_spent',
'SUM(time_estimated) AS total_estimated'
)
->findOne();
}
/**
* Update subtask time spent based on the punch clock table
*
* @access public
* @param integer $subtask_id
* @param integer $user_id
* @return bool
*/
public function updateSubtaskTimeSpent($subtask_id, $user_id)
{
$start_time = $this->db
->table(self::TABLE)
->eq('subtask_id', $subtask_id)
->eq('user_id', $user_id)
->eq('end', 0)
->findOneColumn('start');
return $start_time &&
$this->db
->getConnection()
->exec('UPDATE '.Subtask::TABLE.' SET time_spent=time_spent+'.round((time() - $start_time) / 3600, 1).' WHERE id='.$subtask_id);
}
}

25
app/Subscriber/SubtaskTimesheetSubscriber.php
View File

@ -11,21 +11,36 @@ class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterfac
public static function getSubscribedEvents()
{
return array(
Subtask::EVENT_UPDATE => array('log', 0),
Subtask::EVENT_CREATE => array('updateTaskTime', 0),
Subtask::EVENT_UPDATE => array(
array('logStartEnd', 10),
array('updateTaskTime', 0),
)
);
}
public function log(SubtaskEvent $event)
public function updateTaskTime(SubtaskEvent $event)
{
if (isset($event['status'])) {
if (isset($event['task_id'])) {
$this->subtaskTimeTracking->updateTaskTimeTracking($event['task_id']);
}
}
public function logStartEnd(SubtaskEvent $event)
{
if ($this->config->get('subtask_time_tracking') == 1 && isset($event['status'])) {
$subtask = $this->subtask->getById($event['id']);
if (empty($subtask['user_id'])) {
return false;
}
if ($subtask['status'] == Subtask::STATUS_INPROGRESS) {
$this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
return $this->subtaskTimeTracking->logStartTime($subtask['id'], $subtask['user_id']);
}
else {
$this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']);
return $this->subtaskTimeTracking->logEndTime($subtask['id'], $subtask['user_id']);
}
}
}