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

Improve subtask toggle

Browse Source
This commit is contained in:
Frederic Guillot
2017-03-19 16:45:32 -04:00
parent 5b7ed28ba1
commit d915c2a96b
19 changed files with 165 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/SubtaskRestrictionController.php
View File

@@ -48,14 +48,12 @@ class SubtaskRestrictionController extends BaseController
$this->subtaskModel->update(array(
'id' => $values['id'],
'status' => $values['status'],
'task_id' => $task['id'],
));
// Set the current subtask to "in progress"
$this->subtaskModel->update(array(
'id' => $subtask['id'],
'status' => SubtaskModel::STATUS_INPROGRESS,
'task_id' => $task['id'],
));
$this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);

50
app/Controller/SubtaskStatusController.php
View File

@@ -19,11 +19,20 @@ class SubtaskStatusController extends BaseController
{
$task = $this->getTask();
$subtask = $this->getSubtask();
$fragment = $this->request->getStringParam('fragment');
$status = $this->subtaskStatusModel->toggleStatus($subtask['id']);
$subtask['status'] = $status;
$this->response->html($this->helper->subtask->renderToggleStatus($task, $subtask));
if ($fragment === 'table') {
$html = $this->renderTable($task);
} elseif ($fragment === 'rows') {
$html = $this->renderRows($task);
} else {
$html = $this->helper->subtask->renderToggleStatus($task, $subtask);
}
$this->response->html($html);
}
/**
@@ -49,4 +58,43 @@ class SubtaskStatusController extends BaseController
'subtask' => $this->subtaskModel->getByIdWithDetails($subtaskId),
)));
}
/**
* Render table
*
* @access protected
* @param array $task
* @return string
*/
protected function renderTable(array $task)
{
return $this->template->render('subtask/table', array(
'task' => $task,
'subtasks' => $this->subtaskModel->getAll($task['id']),
'editable' => true,
));
}
/**
* Render task list rows
*
* @access protected
* @param array $task
* @return string
*/
protected function renderRows(array $task)
{
$userId = $this->request->getIntegerParam('user_id');
if ($userId > 0) {
$task['subtasks'] = $this->subtaskModel->getAllByTaskIdsAndAssignee(array($task['id']), $userId);
} else {
$task['subtasks'] = $this->subtaskModel->getAll($task['id']);
}
return $this->template->render('task_list/task_subtasks', array(
'task' => $task,
'user_id' => $userId,
));
}
}

16
app/Helper/SubtaskHelper.php
View File

@@ -45,20 +45,24 @@ class SubtaskHelper extends Base
* Get the link to toggle subtask status
*
* @access public
* @param array $task
* @param array $subtask
* @param array $task
* @param array $subtask
* @param string $fragment
* @param int $userId
* @return string
*/
public function renderToggleStatus(array $task, array $subtask)
public function renderToggleStatus(array $task, array $subtask, $fragment = '', $userId = 0)
{
if (! $this->helper->user->hasProjectAccess('SubtaskController', 'edit', $task['project_id'])) {
$html = $this->renderTitle($subtask);
} else {
$title = $this->renderTitle($subtask);
$params = array(
'project_id' => $task['project_id'],
'task_id' => $subtask['task_id'],
'subtask_id' => $subtask['id'],
'project_id' => $task['project_id'],
'task_id' => $subtask['task_id'],
'subtask_id' => $subtask['id'],
'user_id' => $userId,
'fragment' => $fragment,
);
if ($subtask['status'] == 0 && $this->hasSubtaskInProgress()) {

5
app/Model/SubtaskModel.php
View File

@@ -218,10 +218,11 @@ class SubtaskModel extends Base
$result = $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
if ($result) {
$this->subtaskTimeTrackingModel->updateTaskTimeTracking($values['task_id']);
$subtask = $this->getById($values['id']);
$this->subtaskTimeTrackingModel->updateTaskTimeTracking($subtask['task_id']);
if ($fireEvent) {
$this->queueManager->push($this->subtaskEventJob->withParams($values['id'], self::EVENT_UPDATE, $values));
$this->queueManager->push($this->subtaskEventJob->withParams($subtask['id'], self::EVENT_UPDATE, $values));
}
}

3
app/Template/dashboard/show.php
View File

@@ -69,7 +69,8 @@
)) ?>
<?= $this->render('task_list/task_subtasks', array(
'task' => $task,
'task' => $task,
'user_id' => $user['id'],
)) ?>
</div>
<?php endforeach ?>

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

@@ -21,7 +21,7 @@
'task' => $task,
'subtask' => $subtask,
)) ?>
<?= $this->subtask->renderToggleStatus($task, $subtask, true) ?>
<?= $this->subtask->renderToggleStatus($task, $subtask, 'table') ?>
<?php else: ?>
<?= $this->subtask->renderTitle($subtask) ?>
<?php endif ?>

2
app/Template/task_list/task_subtasks.php
View File

@@ -3,7 +3,7 @@
<?php foreach ($task['subtasks'] as $subtask): ?>
<div class="task-list-subtask">
<span class="subtask-cell column-50">
<?= $this->subtask->renderToggleStatus($task, $subtask) ?>
<?= $this->subtask->renderToggleStatus($task, $subtask, 'rows', isset($user_id) ? $user_id : 0) ?>
</span>
<span class="subtask-cell column-20 subtask-assignee">
<?php if (! empty($subtask['username'])): ?>