X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=time.php;h=768a809da1ce0127dc013457da5bc5d44aaf30ef;hb=a07b6f8bccda226991ced6fe25f1c9c508e423e5;hp=4042d7c5dfa83d612b12c69429abc006587753a7;hpb=5acb933e804db8f3ff7c71e66ef99ea95520547e;p=timetracker.git diff --git a/time.php b/time.php index 4042d7c5..768a809d 100644 --- a/time.php +++ b/time.php @@ -66,12 +66,13 @@ if ($user->isPluginEnabled('cf')) { if ($user->isPluginEnabled('mq')){ require_once('plugins/MonthlyQuota.class.php'); $quota = new MonthlyQuota(); - $monthlyQuota = $quota->get($selected_date->mYear, $selected_date->mMonth); + $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth); $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date); - $minutesLeft = ttTimeHelper::toMinutes($monthlyQuota) - ttTimeHelper::toMinutes($month_total); + $minutes_left = ttTimeHelper::toMinutes($month_quota) - ttTimeHelper::toMinutes($month_total); $smarty->assign('month_total', $month_total); - $smarty->assign('month_left', ttTimeHelper::fromMinutes($minutesLeft)); + $smarty->assign('over_quota', $minutes_left < 0); + $smarty->assign('quota_remaining', ttTimeHelper::toAbsDuration($minutes_left)); } // Initialize variables. @@ -231,10 +232,8 @@ if ($request->isPost()) { if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_task) $err->add($i18n->getKey('error.task')); } - if (!$cl_duration) { - if ('0' == $cl_duration) - $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); - elseif ($cl_start || $cl_finish) { + if (strlen($cl_duration) == 0) { + if ($cl_start || $cl_finish) { if (!ttTimeHelper::isValidTime($cl_start)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start')); if ($cl_finish) {