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

Merge pull-request #615

Browse Source
This commit is contained in:
Frederic Guillot
2015-02-14 17:18:13 -05:00
parent 35382583db 0c60489b08
commit 8c8692cd4d
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

25
app/functions.php
View File

@@ -66,3 +66,28 @@ function dt($format, $timestamp)
function p($value, $t1, $t2) { function p($value, $t1, $t2) {
return $value > 1 ? $t2 : $t1; return $value > 1 ? $t2 : $t1;
} }
/**
* Get the age of an item in quasi human readable format.
* It's in this format: <1h , NNh, NNd
*
* @access public
* @param int $time
* Unix timestamp of the artifact for which age will be calculated
* @param int $currenttime
* Comepare with timestamp. Default current unix timestamp
* @return string
*/
function getAgeShort($time, $currenttime = NULL) {
if (! $currenttime) {
$currenttime = time ();
}
$diff = $currenttime - $time;
if ($diff < 3600)
return "<1h";
elseif ($diff < 86400) {
return intval ( ($diff / 3600) ) . "h";
}
return intval ( ((floor ( $currenttime ) - floor ( $time )) / 86400) ) . "d";
}