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

Improve subtask toggle status and timer

Browse Source
This commit is contained in:
Frederic Guillot
2016-02-05 18:30:16 -05:00
parent 9c15658089
commit 4e07ad6555
12 changed files with 92 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/BoardPopover.php
View File

@@ -95,7 +95,6 @@ class BoardPopover extends Base
$this->response->html($this->template->render('file/screenshot', array(
'task' => $task,
'redirect' => 'board',
)));
}

1
app/Controller/Subtask.php
View File

@@ -23,7 +23,6 @@ class Subtask extends Base
'project' => $this->getProject(),
'subtasks' => $this->subtask->getAll($task['id']),
'editable' => true,
'redirect' => 'subtask',
)));
}

47
app/Controller/SubtaskStatus.php
View File

@@ -21,8 +21,51 @@ class SubtaskStatus extends Base
$subtask = $this->getSubtask();
$status = $this->subtask->toggleStatus($subtask['id']);
$subtask['status'] = $status;
$this->response->html($this->helper->subtask->toggleStatus($subtask, $task['project_id']));
if ($this->request->getIntegerParam('refresh-table') === 0) {
$subtask['status'] = $status;
$html = $this->helper->subtask->toggleStatus($subtask, $task['project_id']);
} else {
$html = $this->renderTable($task);
}
$this->response->html($html);
}
/**
* Start/stop timer for subtasks
*
* @access public
*/
public function timer()
{
$task = $this->getTask();
$subtask_id = $this->request->getIntegerParam('subtask_id');
$timer = $this->request->getStringParam('timer');
if ($timer === 'start') {
$this->subtaskTimeTracking->logStartTime($subtask_id, $this->userSession->getId());
} elseif ($timer === 'stop') {
$this->subtaskTimeTracking->logEndTime($subtask_id, $this->userSession->getId());
$this->subtaskTimeTracking->updateTaskTimeTracking($task['id']);
}
$this->response->html($this->renderTable($task));
}
/**
* Render table
*
* @access private
* @param array $task
* @return string
*/
private function renderTable(array $task)
{
return $this->template->render('subtask/table', array(
'task' => $task,
'subtasks' => $this->subtask->getAll($task['id']),
'editable' => true,
));
}
}

34
app/Controller/Timer.php
View File

@@ -1,34 +0,0 @@
<?php
namespace Kanboard\Controller;
/**
* Time Tracking controller
*
* @package controller
* @author Frederic Guillot
*/
class Timer extends Base
{
/**
* Start/stop timer for subtasks
*
* @access public
*/
public function subtask()
{
$project_id = $this->request->getIntegerParam('project_id');
$task_id = $this->request->getIntegerParam('task_id');
$subtask_id = $this->request->getIntegerParam('subtask_id');
$timer = $this->request->getStringParam('timer');
if ($timer === 'start') {
$this->subtaskTimeTracking->logStartTime($subtask_id, $this->userSession->getId());
} elseif ($timer === 'stop') {
$this->subtaskTimeTracking->logEndTime($subtask_id, $this->userSession->getId());
$this->subtaskTimeTracking->updateTaskTimeTracking($task_id);
}
$this->response->redirect($this->helper->url->to('task', 'show', array('project_id' => $project_id, 'task_id' => $task_id)).'#subtasks');
}
}

8
app/Helper/Subtask.php
View File

@@ -29,21 +29,23 @@ class Subtask extends \Kanboard\Core\Base
* @access public
* @param array $subtask
* @param integer $project_id
* @param boolean $refresh_table
* @return string
*/
public function toggleStatus(array $subtask, $project_id)
public function toggleStatus(array $subtask, $project_id, $refresh_table = false)
{
if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) {
return $this->getTitle($subtask);
}
$params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']);
$params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table);
if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) {
return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover');
}
return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, 'ajax-replace');
$class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : '');
return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, $class);
}
public function selectTitle(array $values, array $errors = array(), array $attributes = array())

1
app/ServiceProvider/AuthenticationProvider.php
View File

@@ -97,7 +97,6 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->add('TaskExternalLink', array('show'), Role::PROJECT_VIEWER);
$acl->add('Taskmodification', '*', Role::PROJECT_MEMBER);
$acl->add('Taskstatus', '*', Role::PROJECT_MEMBER);
$acl->add('Timer', '*', Role::PROJECT_MEMBER);
$acl->add('UserHelper', array('mention'), Role::PROJECT_MEMBER);
return $acl;

6
app/Template/subtask/table.php
View File

@@ -16,7 +16,7 @@
<tr>
<td>
<?php if ($editable): ?>
<?= $this->subtask->toggleStatus($subtask, $task['project_id']) ?>
<?= $this->subtask->toggleStatus($subtask, $task['project_id'], true) ?>
<?php else: ?>
<?= $this->subtask->getTitle($subtask) ?>
<?php endif ?>
@@ -41,11 +41,11 @@
<li>
<?php if ($subtask['is_timer_started']): ?>
<i class="fa fa-pause"></i>
<?= $this->url->link(t('Stop timer'), 'timer', 'subtask', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?>
<?= $this->url->link(t('Stop timer'), 'SubtaskStatus', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
(<?= $this->dt->age($subtask['timer_start_date']) ?>)
<?php else: ?>
<i class="fa fa-play-circle-o"></i>
<?= $this->url->link(t('Start timer'), 'timer', 'subtask', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?>
<?= $this->url->link(t('Start timer'), 'SubtaskStatus', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
<?php endif ?>
</li>
<?php endif ?>