More work in progress on multiple group by.

diff --git a/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 290e2249bf586201be6c0fdd26661045b19250d4..9c8221ade6db9595146a6269de1ed3bc20679949 100644 (file)
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -133,17 +133,20 @@ function selectAssignedUsers(project_id) {
   }
 }
 
   }
 }
 

-// handleCheckboxes - unmarks and disables the "Totals only" checkbox when
+// handleCheckboxes - unmarks and hides the "Totals only" checkbox when

 // "no grouping" is selected in the associated dropdown.
 // "no grouping" is selected in the associated dropdown.

-// In future we need to improve this function and hide not relevant elements completely.

 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");
 function handleCheckboxes() {
   var totalsOnlyCheckbox = document.getElementById("chtotalsonly");

+  var totalsOnlyLabel = document.getElementById("totals_only_label");

   if ("no_grouping" == document.getElementById("group_by").value) {
     // Unmark and disable the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;
   if ("no_grouping" == document.getElementById("group_by").value) {
     // Unmark and disable the "Totals only" checkbox.
     totalsOnlyCheckbox.checked = false;

-    totalsOnlyCheckbox.disabled = true;
-  } else
-    totalsOnlyCheckbox.disabled = false;
+    totalsOnlyCheckbox.style.visibility = "hidden";
+    totalsOnlyLabel.style.visibility = "hidden";
+  } else {
+    totalsOnlyCheckbox.style.visibility = "visible";
+    totalsOnlyLabel.style.visibility = "visible";
+  }

 }
 </script>
 
 }
 </script>
 


@@ -304,7 +307,7 @@ function handleCheckboxes() {
           <td>{$forms.reportForm.group_by3.control}</td>
         </tr>
         <tr>
           <td>{$forms.reportForm.group_by3.control}</td>
         </tr>
         <tr>

-          <td><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></td>
+            <td><span id="totals_only_label"><label>{$forms.reportForm.chtotalsonly.control} {$i18n.label.totals_only}</label></span></td>

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

diff --git a/reports.php b/reports.php
index ae5c9371bc219c8969df62574bb65c164aff9c65..dae0c180bd9c852a6ca6029621e5dba6164b80b2 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -235,8 +235,8 @@ if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['ty
 $group_by_options_size = sizeof($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)) {
 $group_by_options_size = sizeof($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));
+  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'));
 
 }
 $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));