X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=work_units.php;h=e4d198d5cd0b727c12a41eaec21ea5903f94af46;hb=HEAD;hp=3340ec15106fe2454ec044a70fb257bbb41c585a;hpb=99041558bf625b082fc5058a93e1bd2634c2c9d2;p=timetracker.git diff --git a/work_units.php b/work_units.php index 3340ec15..e4d198d5 100644 --- a/work_units.php +++ b/work_units.php @@ -39,31 +39,36 @@ if (!$user->isPluginEnabled('wu')) { header('Location: feature_disabled.php'); exit(); } +// End of access checks. -$config = new ttConfigHelper($user->config); +$config = new ttConfigHelper($user->getConfig()); if ($request->isPost()) { $cl_minutes_in_unit = $request->getParameter('minutes_in_unit'); $cl_1st_unit_threshold = $request->getParameter('1st_unit_threshold'); + $cl_totals_only = $request->getParameter('totals_only'); } else { - $cl_minutes_in_unit = $config->getIntValue('minutes_in_unit'); - $cl_1st_unit_threshold = $config->getIntValue('1st_unit_threshold'); + $cl_minutes_in_unit = $user->getConfigInt('minutes_in_unit', 15); + $cl_1st_unit_threshold = $user->getConfigInt('1st_unit_threshold', 0); + $cl_totals_only = $user->getConfigOption('unit_totals_only'); } $form = new Form('workUnitsForm'); $form->addInput(array('type'=>'text', 'name'=>'minutes_in_unit', 'value'=>$cl_minutes_in_unit, 'style'=>'width:40px')); $form->addInput(array('type'=>'text', 'name'=>'1st_unit_threshold', 'value'=>$cl_1st_unit_threshold, 'style'=>'width:40px')); +$form->addInput(array('type'=>'checkbox','name'=>'totals_only','value'=>$cl_totals_only)); $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save'))); if ($request->isPost()){ // Validate user input. - if (!ttValidInteger($cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.minutes_in_unit')); + if (!ttValidInteger($cl_minutes_in_unit) || $cl_minutes_in_unit == 0) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.minutes_in_unit')); if (!ttValidInteger($cl_1st_unit_threshold, true) ||($cl_minutes_in_unit && $cl_1st_unit_threshold > $cl_minutes_in_unit)) $err->add($i18n->get('error.field'), $i18n->get('form.work_units.1st_unit_threshold')); // Finished validating user input. if ($err->no()) { $config->setIntValue('minutes_in_unit', $cl_minutes_in_unit); $config->setIntValue('1st_unit_threshold', $cl_1st_unit_threshold); + $config->setDefinedValue('unit_totals_only', $cl_totals_only); if (!$user->updateGroup(array('config' => $config->getConfig()))) { $err->add($i18n->get('error.db')); }