Work in progress on multiple group by options in reports.

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index af674785eb1d4fff921ee3356e129255840eefe3..290e2249bf586201be6c0fdd26661045b19250d4 100644 (file)
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -296,10 +296,15 @@ function handleCheckboxes() {
           </td>
         </tr>
         <tr>
           </td>
         </tr>
         <tr>

-          <td><b>{$i18n.form.reports.group_by}</b></td>
+            <td><b>{$i18n.form.reports.group_by}</b></td>

         </tr>
         <tr valign="top">
         </tr>
         <tr valign="top">

-          <td>{$forms.reportForm.group_by.control} <label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
+          <td>{$forms.reportForm.group_by.control}</td>
+          <td>{$forms.reportForm.group_by2.control}</td>
+          <td>{$forms.reportForm.group_by3.control}</td>
+        </tr>
+        <tr>
+          <td><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>

         </tr>
       </table>
 
         </tr>
       </table>
 

diff --git a/reports.php b/reports.php
index a2825329ecef3a10700597d88fec0720f6706d7d..ae5c9371bc219c8969df62574bb65c164aff9c65 100644 (file)
--- 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'];
 }
 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'];
 }

+$group_by_options_size = sizeof($group_by_options);

 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
 $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','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','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
+  if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
+}

 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
 
 // Add text field for a new favorite report name.