[Rt-commit] r4591 - in RT-Extension-ActivityReports: .

[alexmv at bestpractical.com]

Author: alexmv
Date: Mon Feb 27 15:33:00 2006
New Revision: 4591

Modified:
   RT-Extension-ActivityReports/   (props changed)
   RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html
   RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html
   RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html
   RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html
   RT-Extension-ActivityReports/html/Reports/Activity/WorkedStatistics.html
   RT-Extension-ActivityReports/html/Reports/Activity/index.html

Log:
 r9347 at zoq-fot-pik:  chmrr | 2006-02-27 15:32:14 -0500
  * Default query to ''
  * Fix pages to work with empty query


Modified: RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ActivityDetail.html	Mon Feb 27 15:33:00 2006
@@ -23,15 +23,13 @@
 
 </&>
 <%args>
-$query => 'id > 0'
+$query => ''
 $start => "2005/01/01"
 $end   => "2006/01/01"
 </%args>
 <%init>
-
-
 my $summary_tickets = RT::Tickets->new($session{'CurrentUser'});
-$summary_tickets->FromSQL($query . " AND ( Updated >= '$start' AND Updated <= '$end')");
+$summary_tickets->FromSQL(join " AND ", map {"($_)"} grep {/\S/} ($query, "Updated >= '$start' AND Updated <= '$end'"));
 my %counts;
 while (my $ticket = $summary_tickets->Next) {
     my $txns = $ticket->Transactions;

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ActivitySummary.html	Mon Feb 27 15:33:00 2006
@@ -29,14 +29,13 @@
 </table>
 </&>
 <%args>
-$query => 'id > 0'
+$query => ''
 $start => "2005/01/01"
 $end   => "2006/01/01"
 </%args>
 <%init>
-
 my $tickets = RT::Tickets->new($session{'CurrentUser'});
-$tickets->FromSQL($query . " AND ( Updated >= '$start' AND Updated <= '$end')");
+$tickets->FromSQL(join " AND ", map {"($_)"} grep {/\S/} ($query, "Updated >= '$start' AND Updated <= '$end'"));
 
 my %queues;
 my %status;

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ResolutionComments.html	Mon Feb 27 15:33:00 2006
@@ -25,7 +25,7 @@
 </&>
 
 <%args>
-$query => 'id > 0'
+$query => ''
 $start => "2005/01/01"
 $end   => "2006/01/01"
 </%args>
@@ -35,7 +35,7 @@
 
 my $summary_tickets = RT::Tickets->new( $session{'CurrentUser'} );
 $summary_tickets->FromSQL(
-    $query . " AND (Status = 'resolved') AND ( Updated >= '$start' AND Updated <= '$end')" );
+    join " AND ", map {"($_)"} grep {/\S/} ($query, "(Status = 'resolved') AND ( Updated >= '$start' AND Updated <= '$end')"));
 
 my @items;
 while ( my $ticket = $summary_tickets->Next ) {

Modified: RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/ResolutionStatistics.html	Mon Feb 27 15:33:00 2006
@@ -38,7 +38,7 @@
 
 </&>
 <%args>
-$query => 'id > 0'
+$query => ''
 $start => "2005/01/01"
 $end   => "2006/01/01"
 </%args>
@@ -63,7 +63,7 @@
 my %queues;
 foreach my $period (keys %queries) {
     my $tix = RT::Tickets->new($session{'CurrentUser'});
-    $tix->FromSQL($query . " AND " .$queries{$period});
+    $tix->FromSQL(join " AND ", map {"($_)"} grep {/\S/} ($query, $queries{$period}));
 
     while (my $ticket = $tix->Next) {
         push @{ $closed{$period}{$ticket->QueueObj->Name}}, $ticket;

Modified: RT-Extension-ActivityReports/html/Reports/Activity/WorkedStatistics.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/WorkedStatistics.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/WorkedStatistics.html	Mon Feb 27 15:33:00 2006
@@ -103,8 +103,6 @@
 $end   => "2006/01/01"
 </%args>
 <%init>
-my $allquery = join " AND ", map {"($_)"} grep {/\S/} ($query, "Updated >= '$start' AND Updated <= '$end'");
-
 my $startDate = RT::Date->new($session{'CurrentUser'});
 $startDate->Set(Format => 'unknown', Value => $start);
 my $endDate   = RT::Date->new($session{'CurrentUser'});
@@ -121,7 +119,7 @@
 }
 
 my $tix = RT::Tickets->new($session{'CurrentUser'});
-$tix->FromSQL($allquery);
+$tix->FromSQL(join " AND ", map {"($_)"} grep {/\S/} ($query, "Updated >= '$start' AND Updated <= '$end'"));
 while (my $ticket = $tix->Next) {
     my $created  = $ticket->CreatedObj;
     my $resolved = $ticket->ResolvedObj;

Modified: RT-Extension-ActivityReports/html/Reports/Activity/index.html
==============================================================================
--- RT-Extension-ActivityReports/html/Reports/Activity/index.html	(original)
+++ RT-Extension-ActivityReports/html/Reports/Activity/index.html	Mon Feb 27 15:33:00 2006
@@ -10,8 +10,6 @@
 $query => undef
 </%args>
 <%init>
-$ARGS{query} = "Status = 'resolved'" unless $ARGS{query} =~ /\S/;
-
 unless ($start) {
     my $then = RT::Date->new($session{'CurrentUser'});
     $then->Set(Format => 'Unix', Value => time - (86400*7));