X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=quotas.php;h=d3e7912e7e28177ed0316808d4345141a65d7c4a;hb=466bac15266780623565e359e418411ed516915e;hp=375d8a781c3e2fb2f567e8cb7fc8290eb08cd9b8;hpb=4b203ad8b61fde986390ebc7d44727089d0595b4;p=timetracker.git

diff --git a/quotas.php b/quotas.php
index 375d8a78..d3e7912e 100644
--- a/quotas.php
+++ b/quotas.php
@@ -61,7 +61,7 @@ $selectedYear = $request->getParameter('year');
 if (!$selectedYear or !ttValidInteger($selectedYear)){
   $selectedYear = date('Y');
 } else {
-  $selectedYear = intval($selectedYear);
+  $selectedYear = (int) $selectedYear;
 }
 
 // Months are zero indexed.
@@ -71,9 +71,12 @@ $quota = new MonthlyQuota();
 
 if ($request->isPost()){
   // Validate user input.
+  if (!ttTimeHelper::isValidDuration($request->getParameter('workdayHours')))
+    $err->add($i18n->getKey('error.field'), $i18n->getKey('form.quota.workday_hours'));
+
   for ($i = 0; $i < count($months); $i++){
     $val = $request->getParameter($months[$i]);
-    if (!ttTimeHelper::isValidQuota($val))
+    if (!$quota->isValidQuota($val))
       $err->add($i18n->getKey('error.field'), $months[$i]);
   }
   // Finished validating user input.
@@ -81,14 +84,14 @@ if ($request->isPost()){
   if ($err->no()) {
 
     // Handle workday hours.
-    $hours = (int)$request->getParameter('workdayHours');
+    $hours = $quota->quotaToFloat($request->getParameter('workdayHours'));
     if ($hours != $user->workday_hours) {
       if (!ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_hours'=>$hours)))
         $err->add($i18n->getKey('error.db'));
     }
 
     // Handle monthly quotas for a selected year.
-    $selectedYear = intval($request->getParameter('year'));
+    $selectedYear = (int) $request->getParameter('year');
     for ($i = 0; $i < count($months); $i++){
       if (!$quota->update($selectedYear, $i+1, $request->getParameter($months[$i])))
         $err->add($i18n->getKey('error.db'));
@@ -104,9 +107,10 @@ if ($request->isPost()){
 
 // Get monthly quotas for the entire year.
 $monthsData = $quota->get($selectedYear);
+$workdayHours = ttTimeHelper::toAbsDuration($user->workday_hours * 60, true);
 
 $form = new Form('monthlyQuotasForm');
-$form->addInput(array('type'=>'text', 'name'=>'workdayHours', 'value'=>$user->workday_hours, 'style'=>'width:50px'));
+$form->addInput(array('type'=>'text', 'name'=>'workdayHours', 'value'=>$workdayHours, 'style'=>'width:60px'));
 $form->addInput(array('type'=>'combobox','name'=>'year','data'=>$years,'datakeys'=>array('id','name'),'value'=>$selectedYear,'onchange'=>'yearChange(this.value);'));
 for ($i=0; $i < count($months); $i++) { 
   $value = "";