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

Improve pull-request

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-11 20:46:14 -05:00
parent 59ee6f9fee
commit 2c512f93ac
22 changed files with 129 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Locale/da_DK/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/de_DE/translations.php
View File

@@ -683,4 +683,7 @@ return array(
'Help on Bitbucket webhooks' => 'Hilfe für Bitbucket webhooks', 'Help on Bitbucket webhooks' => 'Hilfe für Bitbucket webhooks',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/es_ES/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/fi_FI/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/fr_FR/translations.php
View File

@@ -685,4 +685,7 @@ return array(
'Help on Bitbucket webhooks' => 'Aide sur les webhooks Bitbucket', 'Help on Bitbucket webhooks' => 'Aide sur les webhooks Bitbucket',
'Start' => 'Début', 'Start' => 'Début',
'End' => 'Fin', 'End' => 'Fin',
'Task age in days' => 'Age de la tâche en jours',
'Days in this column' => 'Jours dans cette colonne',
'%dd' => '%dj',
); );

3
app/Locale/hu_HU/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/it_IT/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/ja_JP/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/pl_PL/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/pt_BR/translations.php
View File

@@ -683,4 +683,7 @@ return array(
'Help on Bitbucket webhooks' => 'Ajuda sobre os webhooks Bitbucket', 'Help on Bitbucket webhooks' => 'Ajuda sobre os webhooks Bitbucket',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/ru_RU/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/sv_SE/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/th_TH/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

3
app/Locale/zh_CN/translations.php
View File

@@ -683,4 +683,7 @@ return array(
// 'Help on Bitbucket webhooks' => '', // 'Help on Bitbucket webhooks' => '',
// 'Start' => '', // 'Start' => '',
// 'End' => '', // 'End' => '',
// 'Task age in days' => '',
// 'Days in this column' => '',
// '%dd' => '',
); );

4
app/Model/TaskFinder.php
View File

@@ -102,7 +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', 'tasks.date_moved',
'users.username AS assignee_username', 'users.username AS assignee_username',
'users.name AS assignee_name' 'users.name AS assignee_name'
) )
@@ -243,7 +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, 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,10 +30,11 @@ 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) { if ($original_task['column_id'] != $column_id) {
$this->db->table(Task::TABLE)->eq('id', $task_id)->update(array('date_moved' => time(), $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']);
} }

46
app/Schema/Mysql.php
View File

@@ -9,33 +9,35 @@ const VERSION = 45;
function version_45($pdo) function version_45($pdo)
{ {
$pdo->exec('ALTER TABLE tasks ADD COLUMN date_moved INT DEFAULT 0'); $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. /* 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 * 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 * since creation date is always less than task moves
*/ */
$pdo->exec("UPDATE tasks $pdo->exec("UPDATE tasks
SET date_moved = ( SET date_moved = (
SELECT md SELECT md
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
WHERE id = src.task_id WHERE id = src.task_id
) )
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN ( WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id SELECT task_id
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
) )");
");
// If there is no activities for some tasks use the date_creation
$pdo->exec("UPDATE tasks SET date_moved = date_creation WHERE date_moved IS NULL OR date_moved = 0");
} }
function version_44($pdo) function version_44($pdo)
@@ -65,7 +67,7 @@ function version_43($pdo)
function version_42($pdo) function version_42($pdo)
{ {
$pdo->exec('ALTER TABLE columns ADD COLUMN description TEXT'); $pdo->exec('ALTER TABLE columns ADD COLUMN description TEXT');
} }
function version_41($pdo) function version_41($pdo)

36
app/Schema/Postgres.php
View File

@@ -14,33 +14,35 @@ function version_26($pdo)
/* Update tasks.date_moved from project_activities table if tasks.date_moved = null or 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 * 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 * since creation date is always less than task moves
*/ */
$pdo->exec("UPDATE tasks $pdo->exec("UPDATE tasks
SET date_moved = ( SET date_moved = (
SELECT md SELECT md
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
WHERE id = src.task_id WHERE id = src.task_id
) )
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN ( WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id SELECT task_id
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
) )");
");
// If there is no activities for some tasks use the date_creation
$pdo->exec("UPDATE tasks SET date_moved = date_creation WHERE date_moved IS NULL OR date_moved = 0");
} }
function version_25($pdo) function version_25($pdo)
{ {
$pdo->exec("ALTER TABLE users ADD COLUMN disable_login_form BOOLEAN DEFAULT '1'"); $pdo->exec("ALTER TABLE users ADD COLUMN disable_login_form BOOLEAN DEFAULT '0'");
} }
function version_24($pdo) function version_24($pdo)

38
app/Schema/Sqlite.php
View File

@@ -12,30 +12,32 @@ function version_44($pdo)
$pdo->exec('ALTER TABLE tasks ADD COLUMN date_moved INTEGER DEFAULT 0'); $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. /* 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 * 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 * since creation date is always less than task moves
*/ */
$pdo->exec("UPDATE tasks $pdo->exec("UPDATE tasks
SET date_moved = ( SET date_moved = (
SELECT md SELECT md
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
WHERE id = src.task_id WHERE id = src.task_id
) )
WHERE (date_moved IS NULL OR date_moved = 0) AND id IN ( WHERE (date_moved IS NULL OR date_moved = 0) AND id IN (
SELECT task_id SELECT task_id
FROM ( FROM (
SELECT task_id, max(date_creation) md SELECT task_id, max(date_creation) md
FROM project_activities FROM project_activities
WHERE event_name IN ('task.create', 'task.move.column') WHERE event_name IN ('task.create', 'task.move.column')
GROUP BY task_id GROUP BY task_id
) src ) src
) )");
");
// If there is no activities for some tasks use the date_creation
$pdo->exec("UPDATE tasks SET date_moved = date_creation WHERE date_moved IS NULL OR date_moved = 0");
} }
function version_43($pdo) function version_43($pdo)

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

@@ -69,8 +69,8 @@
) ?> ) ?>
</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('Task age in days')?>" class="task-days-age"><?= t('%dd', floor(time()/86400) - floor($task['date_creation']/86400)) ?></span>
<span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= floor(time()/86400) - floor($task['date_moved']/86400)?>d</span> <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= t('%dd', floor(time()/86400) - floor($task['date_moved']/86400)) ?></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>

16
assets/css/app.css
View File

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

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

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