X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=39f09c0b4cd12698d0b28b8eb4687fe2ebdacce2;hb=a2c9be17652110a021c2a6ab867ad78ecd1bcc2d;hp=79c011f986f11b90fe4f67132468ff169b17c97c;hpb=3d9beabc77b40f26d2ae76269d03ca1c379f0bd0;p=timetracker.git

diff --git a/reports.php b/reports.php
index 79c011f9..39f09c0b 100644
--- a/reports.php
+++ b/reports.php
@@ -232,7 +232,12 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
 if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
   $group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
 }
-$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
+$group_by_options_size = sizeof($group_by_options);
+$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
+if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) {
+  if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options));
+  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options));
+}
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.
@@ -333,13 +338,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 some more values. TODO: Perhaps it's not a good place to check values, re-evaluate this.
-    // Also make sure other post variations are sane.
+    // 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();