RTx-Statistics in 2.1 / 3.8, RT#10046

2 files changed, 134 insertions, 22 deletions

diff --git a/rt/share/html/RTx/Statistics/Elements/CollectionAsTable/Header b/rt/share/html/RTx/Statistics/Elements/CollectionAsTable/Header
new file mode 100644
index 000000000..cecb02eee
--- /dev/null
+++ b/rt/share/html/RTx/Statistics/Elements/CollectionAsTable/Header
@@ -0,0 +1,126 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
+%# 
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
+%# 
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%# 
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%# General Public License for more details.
+%# 
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
+%# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%# 
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# END BPS TAGGED BLOCK }}}
+<%ARGS>
+@Format => undef
+$FormatString => undef
+$AllowSorting => undef
+$Order=>undef
+$BaseURL => undef
+$Query => undef
+$Rows => undef
+$Page => undef
+$maxitems => undef
+</%ARGS>
+<TR class="collection-as-table">
+<%perl>
+
+my %generic_query_args = ( Query => $Query, Rows => $Rows, Page => $Page, Format => $FormatString );
+
+my $item = 0;
+foreach my $col (@Format) {
+    $item++;
+    if ( $col->{title} eq 'NEWLINE' ) {
+        while ( $item < $maxitems ) {
+            $m->out(qq{<th class="collection-as-table">&nbsp;</th>\n});
+            $item++;
+        }
+
+        $item = 0;
+        $m->out(qq{</TR>\n<TR class="collection-as-table">});
+    }
+    else {
+        $m->out('<TH class="collection-as-table" ');
+	$m->out( 'align="' . $col->{align} . '"' ) if ( $col->{align} );
+	$m->out( 'style="' . $col->{style} . '"' ) if ( $col->{style} );
+ 	$m->out('>');
+        my $title = $col->{title};
+        $title =~ s/^__(.*)__$/$1/o;
+        $title = (
+            $m->comp(
+                '/RTx/Statistics/Elements/StatColumnMap',
+                Name => $title,
+                Attr => 'title'
+              )
+              || $title
+        );
+        if (
+               $AllowSorting
+            && $col->{'attribute'}
+            && $m->comp(
+                '/RTx/Statistics/Elements/StatColumnMap',
+                Name => $col->{'attribute'},
+                Attr => 'attribute'
+            )
+          )
+        {
+
+            $m->out(
+                '<a href="' . $BaseURL
+                  . $m->comp(
+                    '/Elements/QueryString',
+                    %generic_query_args,
+                    OrderBy => (
+                        $m->comp(
+                            '/RTx/Statistics/Elements/StatColumnMap',
+                            Name => $col->{'attribute'},
+                            Attr => 'attribute'
+                          )
+                          || $col->{'attribute'}
+                    ),
+                    Order => ( $ARGS{'Order'} eq 'ASC' ? 'DESC' : 'ASC' )
+                  )
+                  . '">'
+                  . loc($title) . '</a>'
+            );
+        }
+        else {
+            $m->out( loc($title) );
+        }
+        $m->out('</TH>');
+    }
+}
+</%perl>
+</TR>
diff --git a/rt/share/html/RTx/Statistics/Elements/GraphBox b/rt/share/html/RTx/Statistics/Elements/GraphBox
index 3dc06973e..d4855264e 100644
--- a/rt/share/html/RTx/Statistics/Elements/GraphBox
+++ b/rt/share/html/RTx/Statistics/Elements/GraphBox
@@ -1,27 +1,13 @@
-<div style="float:left; padding-right:30px;">
-<table class="box" bgcolor="#336699" style="border-style:none solid solid solid;border-width:1px;border-color:#2E2E8C;" cellpadding="0" cellspacing="0">
-  <tbody><tr>
-    <th style="color: rgb(51, 102, 153);" class="titlebox">
-      <span class="titleboxclose">
-        <a href="#" onclick="hideshow('stats_chart')">X</a></span>&nbsp;
+<TABLE><TR><TD>
 
-      <span class="titleboxtitle">
-        <b><a href="<% $GraphURL %>">Download Chart as Image</a></b>
-      </span>
-    </th>
-    <th style="color: rgb(51, 102, 153);" class="titleboxright">
-      <span class="titleboxright">&nbsp;</span>
-    </th>
-  </tr>
+<&/Widgets/TitleBoxStart, 
+	title      => 'Download Chart as Image',
+	title_href => $GraphURL
+&>
+<img src="<% $GraphURL %>" ALT="Result Graph" >
+<&/Widgets/TitleBoxEnd&>
 
-  <tr id="element-stats_chart">
-    <td colspan="3" class="" bgcolor="#dddddd">
-       <img src="<% $GraphURL %>" ALT="Result Graph" >
-     </td>
-  </tr>
-  </tbody>
-</table>
-</div>
+</TD>
 <%args>
 $GraphURL => undef
 </%args>