X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/997481e8d75cb192c12b1c38f71021fd27105777..eb39786a6d545fab4e795ce42f3cc5504ec69551:/reports.php diff --git a/reports.php b/reports.php index fcefd047..a2825329 100644 --- a/reports.php +++ b/reports.php @@ -35,6 +35,7 @@ import('Period'); import('ttProjectHelper'); import('ttFavReportHelper'); import('ttClientHelper'); +import('ttReportHelper'); // Access check. if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) { @@ -214,6 +215,9 @@ $form->addInput(array('type'=>'checkbox','name'=>'chcost')); // If we have a custom field - add a checkbox for it. if ($custom_fields && $custom_fields->fields[0]) $form->addInput(array('type'=>'checkbox','name'=>'chcf_1')); +if ($user->isPluginEnabled('wu')) + $form->addInput(array('type'=>'checkbox','name'=>'chunits')); + // Add group by control. $group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no'); $group_by_options['date'] = $i18n->get('form.reports.group_by_date'); @@ -260,6 +264,7 @@ if ($request->isGet() && !$bean->isSaved()) { $form->setValueByElement('chfinish', '1'); $form->setValueByElement('chnote', '1'); $form->setValueByElement('chcf_1', '0'); + $form->setValueByElement('chunits', '0'); $form->setValueByElement('chtotalsonly', '0'); } @@ -328,10 +333,11 @@ if ($request->isPost()) { if ($start_date->compare($end_date) > 0) $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date')); } - - $bean->saveBean(); + // Check remaining values. + if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys')); if ($err->no()) { + $bean->saveBean(); // Now we can go ahead and create a report. header('Location: report.php'); exit();