Merges an updated upstream from main.

[timetracker.git] / time.php

diff --git a/time.php b/time.php
index f6e4b71..9a34d30 100644 (file)
--- a/time.php
+++ b/time.php
@@ -63,6 +63,17 @@ if ($user->isPluginEnabled('cf')) {
   $smarty->assign('custom_fields', $custom_fields);
 }
 
+if ($user->isPluginEnabled('mq')){
+  require_once('plugins/MonthlyQuota.class.php');
+  $quota = new MonthlyQuota();
+  $monthlyQuota = $quota->get($selected_date->mYear, $selected_date->mMonth);
+  $month_total = ttTimeHelper::getTimeForMonth($user->getActiveUser(), $selected_date);
+  $minutesLeft = ttTimeHelper::toMinutes($monthlyQuota) - ttTimeHelper::toMinutes($month_total);
+  
+  $smarty->assign('month_total', $month_total);
+  $smarty->assign('month_left', ttTimeHelper::fromMinutes($minutesLeft));
+}
+
 // Initialize variables.
 $cl_start = trim($request->getParameter('start'));
 $cl_finish = trim($request->getParameter('finish'));
@@ -256,7 +267,7 @@ if ($request->isPost()) {
 
     // Prohibit creating entries in locked range.
     if ($user->isDateLocked($selected_date))
-      $err->add($i18n->getKey('error.period_locked'));
+      $err->add($i18n->getKey('error.range_locked'));
 
     // Prohibit creating another uncompleted record.
     if ($err->no()) {