Improve pull-request

app/Locale/da_DK/translations.php

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

app/Locale/de_DE/translations.php

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

app/Locale/es_ES/translations.php

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

app/Locale/fi_FI/translations.php

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

app/Locale/fr_FR/translations.php

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

app/Locale/hu_HU/translations.php

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

app/Locale/it_IT/translations.php

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

app/Locale/ja_JP/translations.php

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

app/Locale/pl_PL/translations.php

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

app/Locale/pt_BR/translations.php

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

app/Locale/ru_RU/translations.php

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

app/Locale/sv_SE/translations.php

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

app/Locale/th_TH/translations.php

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

app/Locale/zh_CN/translations.php

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

app/Model/TaskPosition.php

@@ -30,10 +30,11 @@ class TaskPosition extends Base
         $result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id);
 
         if ($result) {
+            
             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) {
                 $this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
             }

app/Schema/Mysql.php

@@ -34,8 +34,10 @@ function version_45($pdo)
                         WHERE event_name IN ('task.create', 'task.move.column')
                         GROUP BY task_id
                     ) 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)

app/Schema/Postgres.php

@@ -34,13 +34,15 @@ function version_26($pdo)
                         WHERE event_name IN ('task.create', 'task.move.column')
                         GROUP BY task_id
                     ) 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)
 {
-    $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)

app/Schema/Sqlite.php

@@ -34,8 +34,10 @@ function version_44($pdo)
                         WHERE event_name IN ('task.create', 'task.move.column')
                         GROUP BY task_id
                     ) 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)

app/Template/board/task.php

@@ -69,8 +69,8 @@
         ) ?>
     </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']): ?>
         <span class="task-score"><?= $this->e($task['score']) ?></span>

assets/css/app.css

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

assets/css/src/task.css

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