X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/a84f7509ea5462f08ca01c5435e0217045391a45..6c92bed7b97ace08101baa84c8aa171e5d127c28:/time.php diff --git a/time.php b/time.php index 25cee96c..11f95c49 100644 --- a/time.php +++ b/time.php @@ -66,9 +66,9 @@ if ($user->isPluginEnabled('cf')) { if ($user->isPluginEnabled('mq')){ require_once('plugins/MonthlyQuota.class.php'); $quota = new MonthlyQuota(); - $month_quota = $quota->get($selected_date->mYear, $selected_date->mMonth); + $month_quota_minutes = $quota->get($selected_date->mYear, $selected_date->mMonth); $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date); - $minutes_left = round(60*$month_quota) - ttTimeHelper::toMinutes($month_total); + $minutes_left = $month_quota_minutes - ttTimeHelper::toMinutes($month_total); $smarty->assign('month_total', $month_total); $smarty->assign('over_quota', $minutes_left < 0); @@ -253,7 +253,7 @@ if ($request->isPost()) { $err->add($i18n->getKey('error.empty'), $i18n->getKey('label.duration')); } } else { - if (!ttTimeHelper::isValidDuration($cl_duration)) + if (false === ttTimeHelper::postedDurationToMinutes($cl_duration)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); } if (!ttValidString($cl_note, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.note'));