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

Task age and time spent in one column.

Browse Source 
Details: https://github.com/fguillot/kanboard/issues/608
This commit is contained in:
ashbike
2015-02-11 16:52:07 +05:30
parent efbf679385
commit 59ee6f9fee
9 changed files with 147 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/TaskCreation.php
View File

@@ -62,6 +62,7 @@ class TaskCreation extends Base
$values['swimlane_id'] = empty($values['swimlane_id']) ? 0 : $values['swimlane_id']; $values['swimlane_id'] = empty($values['swimlane_id']) ? 0 : $values['swimlane_id'];
$values['date_creation'] = time(); $values['date_creation'] = time();
$values['date_modification'] = $values['date_creation']; $values['date_modification'] = $values['date_creation'];
$values['date_moved'] = $values['date_creation'];
$values['position'] = $this->taskFinder->countByColumnAndSwimlaneId($values['project_id'], $values['column_id'], $values['swimlane_id']) + 1; $values['position'] = $this->taskFinder->countByColumnAndSwimlaneId($values['project_id'], $values['column_id'], $values['swimlane_id']) + 1;
} }

2
app/Model/TaskFinder.php
View File

@@ -102,6 +102,7 @@ class TaskFinder extends Base
'tasks.is_active', 'tasks.is_active',
'tasks.score', 'tasks.score',
'tasks.category_id', 'tasks.category_id',
'tasks.date_moved',
'users.username AS assignee_username', 'users.username AS assignee_username',
'users.name AS assignee_name' 'users.name AS assignee_name'
) )
@@ -242,6 +243,7 @@ class TaskFinder extends Base
tasks.score, tasks.score,
tasks.category_id, tasks.category_id,
tasks.swimlane_id, tasks.swimlane_id,
tasks.date_moved,
project_has_categories.name AS category_name, project_has_categories.name AS category_name,
projects.name AS project_name, projects.name AS project_name,
columns.title AS column_title, columns.title AS column_title,

5
app/Model/TaskPosition.php
View File

@@ -30,7 +30,10 @@ class TaskPosition extends Base
$result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id); $result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id);
if ($result) { if ($result) {
if ($original_task['column_id'] != $column_id) {
$this->db->table(Task::TABLE)->eq('id', $task_id)->update(array('date_moved' => time(),
));
}
if ($original_task['swimlane_id'] != $swimlane_id) { if ($original_task['swimlane_id'] != $swimlane_id) {
$this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']); $this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
} }

33
app/Schema/Mysql.php
View File

@@ -5,7 +5,38 @@ namespace Schema;
use PDO; use PDO;
use Core\Security; use Core\Security;
const VERSION = 44; const VERSION = 45;
function version_45($pdo)
{
$pdo->exec('ALTER TABLE tasks ADD COLUMN date_moved INT DEFAULT 0');
/* Update tasks.date_moved from project_activities table if tasks.date_moved = null or 0.
* We take max project_activities.date_creation where event_name in task.create','task.move.column
* since creation date is always less than task moves
*/
$pdo->exec("UPDATE tasks
SET date_moved = (
SELECT md
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
WHERE id = src.task_id
)
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
)
");
}
function version_44($pdo) function version_44($pdo)
{ {

33
app/Schema/Postgres.php
View File

@@ -5,7 +5,38 @@ namespace Schema;
use PDO; use PDO;
use Core\Security; use Core\Security;
const VERSION = 25; const VERSION = 26;
function version_26($pdo)
{
$pdo->exec('ALTER TABLE tasks ADD COLUMN date_moved INT DEFAULT 0');
/* Update tasks.date_moved from project_activities table if tasks.date_moved = null or 0.
* We take max project_activities.date_creation where event_name in task.create','task.move.column
* since creation date is always less than task moves
*/
$pdo->exec("UPDATE tasks
SET date_moved = (
SELECT md
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
WHERE id = src.task_id
)
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
)
");
}
function version_25($pdo) function version_25($pdo)
{ {

33
app/Schema/Sqlite.php
View File

@@ -5,7 +5,38 @@ namespace Schema;
use Core\Security; use Core\Security;
use PDO; use PDO;
const VERSION = 43; const VERSION = 44;
function version_44($pdo)
{
$pdo->exec('ALTER TABLE tasks ADD COLUMN date_moved INTEGER DEFAULT 0');
/* Update tasks.date_moved from project_activities table if tasks.date_moved = null or 0.
* We take max project_activities.date_creation where event_name in task.create','task.move.column
* since creation date is always less than task moves
*/
$pdo->exec("UPDATE tasks
SET date_moved = (
SELECT md
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
WHERE id = src.task_id
)
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id
FROM (
SELECT task_id, max(date_creation) md
FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id
) src
)
");
}
function version_43($pdo) function version_43($pdo)
{ {

5
app/Template/board/task.php
View File

@@ -68,7 +68,10 @@
t('Change assignee') t('Change assignee')
) ?> ) ?>
</span> </span>
<span title="<?= t('Task age in days')?>" class="task-days-age"><?= floor(time()/86400) - floor($task['date_creation']/86400)?>d</span>
<span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= floor(time()/86400) - floor($task['date_moved']/86400)?>d</span>
<?php if ($task['score']): ?> <?php if ($task['score']): ?>
<span class="task-score"><?= $this->e($task['score']) ?></span> <span class="task-score"><?= $this->e($task['score']) ?></span>
<?php endif ?> <?php endif ?>

20
assets/css/app.css
View File

@@ -1631,6 +1631,26 @@ a.task-board-nobody {
margin-bottom: 25px; margin-bottom: 25px;
padding: 3px; padding: 3px;
} }
.task-days-age {
font-size: 0.8em;
border: #888 1px solid;
border-radius:2px;
padding:1px 4px 1px 2px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.task-days-incolumn {
font-size: 0.8em;
border: #888 1px solid;
border-left: none;
margin-left: -5px;
border-radius:2px;
padding:1px 2px 1px 4px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
/* comments */ /* comments */
.comment { .comment {
margin-bottom: 20px; margin-bottom: 20px;

20
assets/css/src/task.css
View File

@@ -205,3 +205,23 @@ a.task-board-nobody {
margin-bottom: 25px; margin-bottom: 25px;
padding: 3px; padding: 3px;
} }
.task-days-age {
font-size: 0.8em;
border: #888 1px solid;
border-radius:2px;
padding:1px 4px 1px 2px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.task-days-incolumn {
font-size: 0.8em;
border: #888 1px solid;
border-left: none;
margin-left: -5px;
border-radius:2px;
padding:1px 2px 1px 4px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}