if (!$selectedYear or !ttValidInteger($selectedYear)){
$selectedYear = date('Y');
} else {
- $selectedYear = intval($selectedYear);
+ $selectedYear = (int) $selectedYear;
}
// Months are zero indexed.
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.
if ($err->no()) {
- $res = false;
- if ($_POST['btn_hours']){
-
- // User changed workday hours for team.
- $hours = (int)$request->getParameter('workdayHours');
- $res = ttTeamHelper::update($user->team_id, array('name'=>$user->team,'workday_hours'=>$hours));
+ // Handle workday hours.
+ $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'));
}
- if ($_POST['btn_submit']){
- // User pressed the Save button under monthly quotas table.
- $postedYear = $request->getParameter('year');
- $selectedYear = intval($postedYear);
- for ($i = 0; $i < count($months); $i++){
- $res = $quota->update($postedYear, $i+1, $request->getParameter($months[$i]));
- }
+
+ // Handle monthly quotas for a selected 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'));
}
- if ($res) {
- // header('Location: profile_edit.php');
- header('Location: quotas.php'); // For debugging.
+
+ if ($err->no()) {
+ // Redisplay the form.
+ header('Location: quotas.php?year='.$selectedYear);
exit();
- } else {
- $err->add($i18n->getKey('error.db'));
}
}
}
// 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 = "";