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

Fix bug: avoid the creation of multiple subtask timer for the same task and user

Browse Source
This commit is contained in:
Frederic Guillot
2015-07-25 17:07:07 -04:00
parent c5481618a7
commit 7f33cf6ef5
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Model/SubtaskTimeTracking.php
View File

@@ -29,7 +29,7 @@ class SubtaskTimeTracking extends Base
public function getTimerQuery($user_id)
{
return sprintf(
"SELECT %s FROM %s WHERE %s='%d' AND %s='0' AND %s=%s",
"SELECT %s FROM %s WHERE %s='%d' AND %s='0' AND %s=%s LIMIT 1",
$this->db->escapeIdentifier('start'),
$this->db->escapeIdentifier(self::TABLE),
$this->db->escapeIdentifier('user_id'),
@@ -226,6 +226,19 @@ class SubtaskTimeTracking extends Base
return $events;
}
/**
* Return true if a timer is started for this use and subtask
*
* @access public
* @param integer $subtask_id
* @param integer $user_id
* @return boolean
*/
public function hasTimer($subtask_id, $user_id)
{
return $this->db->table(self::TABLE)->eq('subtask_id', $subtask_id)->eq('user_id', $user_id)->eq('end', 0)->exists();
}
/**
* Log start time
*
@@ -236,9 +249,11 @@ class SubtaskTimeTracking extends Base
*/
public function logStartTime($subtask_id, $user_id)
{
return $this->db
->table(self::TABLE)
->insert(array('subtask_id' => $subtask_id, 'user_id' => $user_id, 'start' => time(), 'end' => 0));
return
! $this->hasTimer($subtask_id, $user_id) &&
$this->db
->table(self::TABLE)
->insert(array('subtask_id' => $subtask_id, 'user_id' => $user_id, 'start' => time(), 'end' => 0));
}
/**