RTx-Statistics in 2.1 / 3.8, RT#10046

6 files changed, 16 insertions, 46 deletions

diff --git a/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html b/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
index abf8aa74a..1b7a6592c 100755
--- a/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
+++ b/rt/share/html/RTx/Statistics/CallsMultiQueue/index.html
@@ -99,11 +99,6 @@ The line chart below shows the same information in a graphical form.
 </table>
 <& /Elements/TitleBoxEnd&>
 
-<hr>
-
-<BR />
-<BR />
-
 <!--    <td>Show:</td>
     <td COLSPAN=2><SELECT NAME="status">
 % for (qw(resolved new deleted stalled rejected open)) {
diff --git a/rt/share/html/RTx/Statistics/CallsQueueDay/index.html b/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
index 06fc484d1..5a4fe52f0 100755
--- a/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
+++ b/rt/share/html/RTx/Statistics/CallsQueueDay/index.html
@@ -81,11 +81,6 @@ for a spreadsheet, use this <a href="<%$RT::WebPath%>/RTx/Statistics/CallsQueueD
 </table>
 </&>
 
-<hr>
-
-<BR />
-<BR />
-
 <%perl>
 # Create the graph URL
 my $url= 'Elements/Chart?x_labels=';
diff --git a/rt/share/html/RTx/Statistics/DayOfWeek/index.html b/rt/share/html/RTx/Statistics/DayOfWeek/index.html
index 2e82b9c24..6353abbdb 100755
--- a/rt/share/html/RTx/Statistics/DayOfWeek/index.html
+++ b/rt/share/html/RTx/Statistics/DayOfWeek/index.html
@@ -46,11 +46,6 @@ selected queue for each day. It also hows how many of those created tickets were
 </table>
 </&>
 
-<hr>
-
-<BR />
-<BR />
-
 <%perl>
 my $url = 'Elements/Chart?&x_labels=';
 for (0..$#days) {
diff --git a/rt/share/html/RTx/Statistics/OpenStalled/index.html b/rt/share/html/RTx/Statistics/OpenStalled/index.html
index d0cd9f158..4a1badb7e 100755
--- a/rt/share/html/RTx/Statistics/OpenStalled/index.html
+++ b/rt/share/html/RTx/Statistics/OpenStalled/index.html
@@ -65,11 +65,6 @@ viewed once (Open) and how many have had their status changed to stalled.</p>
 </table>
 <& /Elements/TitleBoxEnd&>
 
-<hr>
-
-<BR />
-<BR />
-
 % use Data::Dumper;
 % Statistics::DebugLog("Dump of data array is " . Dumper(@data) . "\n");
 %  my $url = 'Elements/Chart?x_labels=';
diff --git a/rt/share/html/RTx/Statistics/Resolution/index.html b/rt/share/html/RTx/Statistics/Resolution/index.html
index d9885b093..838d27392 100644
--- a/rt/share/html/RTx/Statistics/Resolution/index.html
+++ b/rt/share/html/RTx/Statistics/Resolution/index.html
@@ -72,11 +72,6 @@ resolve.</p>
 </table>
 </&>
 
-<hr>
-
-<BR />
-<BR />
-
 <%perl>
 # Create the graph URL
 
diff --git a/rt/share/html/RTx/Statistics/TimeToResolve/index.html b/rt/share/html/RTx/Statistics/TimeToResolve/index.html
index 2124b538d..ad3e23ace 100755
--- a/rt/share/html/RTx/Statistics/TimeToResolve/index.html
+++ b/rt/share/html/RTx/Statistics/TimeToResolve/index.html
@@ -5,19 +5,9 @@
 <p>This page displays the same information as the Time to Resolve chart, but in a scattergraph format and only for the previous 7 calendar
 days. It only displays data for tickets which have been resolved. Each division on the Days axis is one day and the granularity of this chart
 is 30 minutes.</p>
-<form method="POST">
 
-<table>
-  <tr>
-  <td>Show Queue:</td>
-  <td COLSPAN=3><& /Elements/SelectQueue, Name=>"queue", Default=>$queue ,ShowNullOption=>0, 
-            CheckQueueRight=>'SeeQueue' &></td>
-  </tr>
-</table>
-<INPUT TYPE="submit" VALUE="Update Page"</INPUT>
-</form>
+<form method="POST">
 
-<BR>
 % my $url = 'Elements/Chart?x_labels=';
 % my $i;
 % $url .= join ",", (map {(int($_/2) == $_/2 && (++$i)%2) ? $_/2 : ""} grep {$counts[$_]} 0..($#counts-1)), "longer";
@@ -25,14 +15,19 @@ is 30 minutes.</p>
 % $url .= "marker_size=1&";
 % $url .= "data1=".(join ",", map { $_ || () } @counts)."&";
 % chop $url;
-<IMG SRC="<% $url %>">
+<& /RTx/Statistics/Elements/GraphBox, GraphURL => $url &>
 
-<BR>
+<& /RTx/Statistics/Elements/ControlsAsTable/ControlBox, 
+        Title => "Change Queue",
+        ShowSingleQueue => 1, Queue=>$Queue,
+&>
+
+</form>
 
 %Statistics::DebugInit($m);
 
 <%ARGS>
-$queue => undef
+$Queue => undef
 </%ARGS>
 
 <%INIT>
@@ -51,16 +46,16 @@ for my $key (keys %ARGS) {
 }
 
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
-if (!defined $queue) {
-  $QueueObj->Load($Statistics::TimeToResolveGraphQueue);
-  $queue = $QueueObj->Id();
-} else {
-  $QueueObj->Load($queue);
-}
+#if (!defined $queue) {
+#  $QueueObj->Load($Statistics::TimeToResolveGraphQueue);
+#  $queue = $QueueObj->Id();
+#} else {
+  $QueueObj->Load($Queue);
+#}
 
 
 my $tix = new RT::Tickets($session{'CurrentUser'});
-$tix->LimitQueue (VALUE => $queue) if $queue;
+$tix->LimitQueue (VALUE => $Queue) if $Queue;
 $tix->LimitStatus(VALUE => "resolved");
 $tix->UnLimit;
 if ($tix->Count) {