X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=quotas.php;h=1f376190ef6add417e57fa945f18afda2dedacb9;hb=ab53f7a7b9b0e0ca43b6950c3389cd3889e74d82;hp=f648f9d2db1b895daac45d578453bc28d8f98b2c;hpb=c304a055bafbb8db6b94dbf538c4c74e88952189;p=timetracker.git diff --git a/quotas.php b/quotas.php index f648f9d2..1f376190 100644 --- a/quotas.php +++ b/quotas.php @@ -1,20 +1,51 @@ isPluginEnabled('mq')) { + header('Location: feature_disabled.php'); + exit(); +} -// fallback values +// Start and end fallback values for the Year dropdown. $yearStart = 2015; $yearEnd = 2030; +// If values are defined in config - use them. if (defined('MONTHLY_QUOTA_YEAR_START')){ $yearStart = (int)MONTHLY_QUOTA_YEAR_START; } @@ -22,67 +53,81 @@ if (defined('MONTHLY_QUOTA_YEAR_END')){ $yearEnd = (int)MONTHLY_QUOTA_YEAR_END; } -// create values for dropdown +// Create values for the Year dropdown. $years = array(); -for ($i=$yearStart; $i <= $yearEnd; $i++) { - array_push($years, array('id'=>$i, 'name'=>$i)); +for ($i = $yearStart; $i <= $yearEnd; $i++) { + array_push($years, array('id'=>$i,'name'=>$i)); } -// get selected year from url parameters -$selectedYear = $request->getParameter("year"); +// Get selected year from url parameter. +$selectedYear = $request->getParameter('year'); if (!$selectedYear or !ttValidInteger($selectedYear)){ - $selectedYear = date("Y"); + $selectedYear = date('Y'); } else { - $selectedYear = intval($selectedYear); + $selectedYear = (int) $selectedYear; } -// months are zero indexed +// Months are zero indexed. $months = $i18n->monthNames; $quota = new MonthlyQuota(); if ($request->isPost()){ - $res = false; - // if user pressed save fpr monthly quotas - if ($_POST["quotas"]){ - $postedYear = $request->getParameter("years"); - $selectedYear = intval($postedYear); - for ($i=0; $i < count($months); $i++){ - $res = $quota->update($postedYear, $i+1, $request->getParameter($months[$i])); - } - } - // if user saved required working hours for a day - if ($_POST["dailyHours"]){ - $hours = $request->getParameter("dailyWorkingHours"); - $teamDetails = ttTeamHelper::getTeamDetails($quota->usersTeamId); - $res = ttTeamHelper::update($quota->usersTeamId, array('name'=>$teamDetails['team_name'], - 'workday_hours'=>$hours)); + // Validate user input. + if (false === ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours'))) + $err->add($i18n->get('error.field'), $i18n->get('form.quota.workday_hours')); + + for ($i = 0; $i < count($months); $i++){ + $val = $request->getParameter($months[$i]); + if (false === ttTimeHelper::postedDurationToMinutes($val, 44640/*24*60*31*/)) + $err->add($i18n->get('error.field'), $months[$i]); } - if ($res) { - header('Location: profile_edit.php'); - exit(); - } else { - $err->add($i18n->getKey('error.db')); + // Finished validating user input. + + if ($err->no()) { + + // Handle workday hours. + $workday_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter('workdayHours')); + if ($workday_minutes != $user->getWorkdayMinutes()) { + if (!$user->updateGroup(array('workday_minutes'=>$workday_minutes))) + $err->add($i18n->get('error.db')); + } + + // Handle monthly quotas for a selected year. + $selectedYear = (int) $request->getParameter('year'); + for ($i = 0; $i < count($months); $i++){ + $quota_in_minutes = ttTimeHelper::postedDurationToMinutes($request->getParameter($months[$i]), 44640/*24*60*31*/); + if (!$quota->update($selectedYear, $i+1, $quota_in_minutes)) + $err->add($i18n->get('error.db')); + } + + if ($err->no()) { + // Redisplay the form. + header('Location: quotas.php?year='.$selectedYear); + exit(); + } } } -// returns months where January is month 1, not 0 +// Get monthly quotas for the entire year. $monthsData = $quota->get($selectedYear); +$workdayHours = ttTimeHelper::toAbsDuration($user->getWorkdayMinutes(), true); -$form = new Form('monthlyQuotaForm'); - -$form->addInput(array('type'=>'combobox', 'name'=>'years', 'data'=>$years, 'datakeys'=>array('id', 'name'), 'value'=>$selectedYear, 'onchange'=>'yearChange(this.value);')); +$form = new Form('monthlyQuotasForm'); +$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 = ""; if (array_key_exists($i+1, $monthsData)){ $value = $monthsData[$i+1]; + $value = ttTimeHelper::toAbsDuration($value, true); } $name = $months[$i]; - $form->addInput(array('type'=>'text', 'name'=>$name, 'maxlength'=>3, 'value'=> $value, 'style'=>'width:50px')); + $form->addInput(array('type'=>'text','name'=>$name,'maxlength'=>6,'value'=> $value,'style'=>'width:70px')); } -$form->addInput(array('type'=>'text', 'name'=>'dailyWorkingHours', 'value'=>$quota->getDailyWorkingHours(), 'style'=>'width:50px')); + $smarty->assign('months', $months); $smarty->assign('forms', array($form->getName()=>$form->toArray())); -$smarty->assign('title', $i18n->getKey('title.monthly_quotas')); +$smarty->assign('title', $i18n->get('title.monthly_quotas')); $smarty->assign('content_page_name', 'quotas.tpl'); $smarty->display('index.tpl');