Bug 173005 - Add bar charts, pie charts etc. to reporting. Patch by gerv; 2xr=joel.

3 files changed, 167 insertions, 35 deletions

diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
new file mode 100644
index 000000000..8280fb0bb
--- /dev/null
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -0,0 +1,112 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Gervase Markham <gerv@gerv.net>
+  #%]
+
+[%# INTERFACE:
+  # This template has no interface. However, to use it, you need to fulfill
+  # the interfaces of the templates it contains.
+  #%]
+
+[% PROCESS global/header.html.tmpl 
+  title = "Generate Report"
+  onload = "selectProduct(document.forms['reportform']);"
+%]
+
+[% PROCESS "search/search-report-select.html.tmpl" %]
+
+<p>
+  Produce a pictorial graph of bug counts by choosing one or more fields as 
+  your axes, and then refining your set of bugs using the rest of the form. 
+  If you choose a third axis, it will be represented by multiple tables of data.
+  Note: vertical axis settings will be ignored for pie charts.
+</p>
+
+[% button_name = "Generate Report" %]
+
+<form method="get" action="report.cgi" name="reportform">
+
+<table align="center">
+  <tr>
+    <td valign="middle">
+      <b>Vertical Axis:</b><br>
+      [% PROCESS select name = 'y_axis_field' %]<br>
+      <br>
+        <b>Plot Data Sets:</b><br>
+        <input type="radio" name="cumulate" value="0"
+        [% " checked" IF default.cumulate.0 != "1" %]>
+        Individually<br>
+        <input type="radio" name="cumulate" value="1"
+        [% " checked" IF default.cumulate.0 == "1" %]>
+        Added
+        
+    </td>
+    <td width="150px" height="150px">
+      <table border="1" width="100%" height="100%">
+        <tr>
+          <td align="center" valign="middle">
+            <b>Multiple Images:</b><br>
+            [% PROCESS select name = 'z_axis_field' %]
+          </td>
+        </tr>
+      </table>
+    </td>
+    <td rowspan="2">
+      <b>Format:</b><br>
+      [% chart_formats = [
+        { name => "line", description => "Line Graph" },
+        { name => "bar",  description => "Bar Chart" },
+        { name => "pie",  description => "Pie Chart" } ] %]
+      [% default.chart_format.0 = default.chart_format.0 || "bar" %]
+      
+      [% FOREACH chart_format = chart_formats %]
+        <input type="radio" name="format" 
+               value="[% chart_format.name FILTER html %]" 
+          [% " checked" IF default.chart_format.0 == chart_format.name %]>
+          [% chart_format.description FILTER html %]<br>
+      [% END %]
+    </td>
+  </tr>
+  
+  <tr>
+    <td>
+    </td>
+    <td align="center">
+      <b>Horizontal Axis:</b>
+      [% PROCESS select name = 'x_axis_field' %]
+    </td>
+    <td>
+    </td>
+  </tr>
+</table>  
+
+<hr>
+
+[% PROCESS search/form.html.tmpl %]
+
+<br>
+<input type="submit" value="[% button_name %]">
+<input type="hidden" name="action" value="wrap">
+<hr>
+
+[% PROCESS "search/boolean-charts.html.tmpl" %]
+
+</form>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl
new file mode 100644
index 000000000..75716eac7
--- /dev/null
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -0,0 +1,47 @@
+<!-- 1.0@bugzilla.org -->
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Gervase Markham <gerv@gerv.net>
+  #%]
+
+[%# INTERFACE:
+  # name: string. The name of the select block to output.
+  # default.$name.0: string. The default value for the block, if any.
+  #%]
+
+[% PROCESS "global/field-descs.html.tmpl" %]
+
+[% BLOCK select %]
+  [% fields = ["product", "component", "version", "rep_platform",  
+               "op_sys", "bug_status", "resolution", "bug_severity", 
+               "priority", "target_milestone", "keywords", "assigned_to",
+               "reporter", "qa_contact", "votes" ] %]
+
+  <select name="[% name FILTER html %]">
+    <option value="">&lt;none&gt;</option>
+    
+    [% FOREACH field = fields %]
+      [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %]
+      [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %]
+      [% NEXT IF field == "votes" AND !Param('usevotes') %]      
+      <option value="[% field FILTER html %]" 
+        [% " selected" IF default.$name.0 == field %]>
+        [% field_descs.$field || field FILTER html %]</option>
+    [% END %]
+  </select>
+[% END %]
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 73d542124..a26553602 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -29,12 +29,12 @@
   onload = "selectProduct(document.forms['reportform']);"
 %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "search/search-report-select.html.tmpl" %]
 
 <p>
-  Produce a table of bug counts by choosing one or more fields to plot against
-  each other, and then refining your set of bugs using the rest of the form. If
-  you choose a third axis, it will be represented by multiple tables of data.
+  Produce a table of bug counts by choosing one or more fields as your axes, 
+  and then refining your set of bugs using the rest of the form. 
+  If you choose a third axis, it will be represented by multiple tables of data.
 </p>
 
 [% button_name = "Generate Report" %]
@@ -47,7 +47,7 @@
     </td>
     <td align="center">
       <b>Horizontal Axis:</b>
-      [% PROCESS select sel = { name => 'x_axis_field', noop = 1 } %]
+      [% PROCESS select name = 'x_axis_field' %]
     </td>
     <td>&nbsp;&nbsp;</td>
     <td rowspan="2">
@@ -60,14 +60,14 @@
   <tr>
     <td valign="middle" align="center">
       <b>Vertical Axis:</b><br>
-      [% PROCESS select sel = { name => 'y_axis_field' } %]
+      [% PROCESS select name = 'y_axis_field' %]
     </td>
     <td width="150px" height="150px">
       <table border="1" width="100%" height="100%">
         <tr>
           <td align="center" valign="middle">
             <b>Multiple Tables:</b><br>
-            [% PROCESS select sel = { name => 'z_axis_field', noop = 1 } %]
+            [% PROCESS select name = 'z_axis_field' %]
           </td>
         </tr>
       </table>
@@ -82,7 +82,7 @@
 <br>
 <input type="submit" value="[% button_name %]">
 <input type="hidden" name="format" value="table">
-<input type="hidden" name="action" value="plot">
+<input type="hidden" name="action" value="wrap">
 <hr>
 
 [% PROCESS "search/boolean-charts.html.tmpl" %]
@@ -90,30 +90,3 @@
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
-
-[%############################################################################%]
-[%# Block for SELECT fields                                                  #%]
-[%############################################################################%]
-
-[% BLOCK select %]
-  [% fields = ["product", "component", "version", "rep_platform",  
-               "op_sys", "bug_status", "resolution", "bug_severity", 
-               "priority", "target_milestone", "keywords", "assigned_to",
-               "reporter", "qa_contact", "votes" ] %]
-
-  <select name="[% sel.name %]">
-    [% IF sel.noop %]
-      <option value="">&lt;none&gt;</option>
-    [% END %]
-    
-    [% FOREACH field = fields %]
-      [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %]
-      [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %]
-      [% NEXT IF field == "votes" AND !Param('usevotes') %]
-      
-      <option value="[% field FILTER html %]" 
-        [% " selected" IF default.${sel.name}.0 == field %]>
-        [% field_descs.$field || field FILTER html %]</option>
-    [% END %]
-  </select>
-[% END %]