projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified ttUser::getUsers a bit.
[timetracker.git]
/
time.php
diff --git
a/time.php
b/time.php
index
013f15c
..
7252f47
100644
(file)
--- a/
time.php
+++ b/
time.php
@@
-85,11
+85,17
@@
if ($user->isPluginEnabled('cf')) {
if ($user->isPluginEnabled('mq')){
require_once('plugins/MonthlyQuota.class.php');
$quota = new MonthlyQuota();
if ($user->isPluginEnabled('mq')){
require_once('plugins/MonthlyQuota.class.php');
$quota = new MonthlyQuota();
- $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth);
+ $month_quota_minutes = $quota->getUserQuota($selected_date->mYear, $selected_date->mMonth);
+ $quota_minutes_from_1st = $quota->getUserQuotaFrom1st($selected_date);
$month_total = ttTimeHelper::getTimeForMonth($selected_date);
$month_total = ttTimeHelper::getTimeForMonth($selected_date);
- $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total);
+ $month_total_minutes = ttTimeHelper::toMinutes($month_total);
+ $balance_left = $quota_minutes_from_1st - $month_total_minutes;
+ $minutes_left = $month_quota_minutes - $month_total_minutes;
$smarty->assign('month_total', $month_total);
$smarty->assign('month_total', $month_total);
+ $smarty->assign('month_quota', ttTimeHelper::toAbsDuration($month_quota_minutes));
+ $smarty->assign('over_balance', $balance_left < 0);
+ $smarty->assign('balance_remaining', ttTimeHelper::toAbsDuration($balance_left));
$smarty->assign('over_quota', $minutes_left < 0);
$smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
}
$smarty->assign('over_quota', $minutes_left < 0);
$smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left));
}