X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/058d776c118501eb510967c8b870bc346bc39e71..6c92bed7b97ace08101baa84c8aa171e5d127c28:/mobile/time_edit.php diff --git a/mobile/time_edit.php b/mobile/time_edit.php index 81e5ab8e..81337c9c 100644 --- a/mobile/time_edit.php +++ b/mobile/time_edit.php @@ -175,11 +175,11 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) { $form->addInput(array('type'=>'text','name'=>'start','value'=>$cl_start,'onchange'=>"formDisable('start');")); $form->addInput(array('type'=>'text','name'=>'finish','value'=>$cl_finish,'onchange'=>"formDisable('finish');")); -} -if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) { - // Make the start and finish fields read-only. - $form->getElement('start')->setEnabled(false); - $form->getElement('finish')->setEnabled(false); + if (!$user->canManageTeam() && defined('READONLY_START_FINISH') && isTrue(READONLY_START_FINISH)) { + // Make the start and finish fields read-only. + $form->getElement('start')->setEnabled(false); + $form->getElement('finish')->setEnabled(false); + } } if ((TYPE_DURATION == $user->record_type) || (TYPE_ALL == $user->record_type)) $form->addInput(array('type'=>'text','name'=>'duration','value'=>$cl_duration,'onchange'=>"formDisable('duration');")); @@ -218,6 +218,9 @@ if ($request->isPost()) { if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode) { if (!$cl_project) $err->add($i18n->getKey('error.project')); } + if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode && $user->task_required) { + if (!$cl_task) $err->add($i18n->getKey('error.task')); + } if (!$cl_duration) { if ('0' == $cl_duration) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.duration')); @@ -239,7 +242,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 (!ttValidDate($cl_date)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.date'));