From: Nik Okuntseff Date: Fri, 24 May 2019 21:41:12 +0000 (+0000) Subject: Added capability to see uncompleted indicators to users with view_users right. X-Git-Tag: timetracker_1.19-1~18 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d18d90a3f3050def6c646eef7d5420c2d2091393;p=timetracker.git Added capability to see uncompleted indicators to users with view_users right. --- diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index f6d8b92d..d7278c69 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -649,8 +649,8 @@ class ttTimeHelper { static function getUncompleted($user_id) { $mdb2 = getConnection(); - $sql = "select id, start from tt_log - where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1"; + $sql = "select id, start, date from tt_log". + " where user_id = $user_id and start is not null and time_to_sec(duration) = 0 and status = 1"; $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { if (!$res->numRows()) { diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a51049ae..49305b5c 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {foreach $active_users as $u} - +
 Anuko Time Tracker 1.19.4.5011 | Copyright © Anuko | +  Anuko Time Tracker 1.19.4.5012 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl index c9f67503..401751fc 100644 --- a/WEB-INF/templates/users.tpl +++ b/WEB-INF/templates/users.tpl @@ -104,7 +104,12 @@
{$u.name|escape} + {if $uncompleted_indicators} + + {/if} + {$u.name|escape} + {$u.login|escape} {$u.role_name|escape}