[Bps-public-commit] r11667 - RT-Extension-Reports/html/Reports/Types

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Apr 10 00:18:38 2008
New Revision: 11667

Modified:
   RT-Extension-Reports/html/Reports/Types/ActiveOrInactive
   RT-Extension-Reports/html/Reports/Types/General
   RT-Extension-Reports/html/Reports/Types/TicketsMoved
   RT-Extension-Reports/html/Reports/Types/TimeWorked

Log:
next date instead of next ticket for filter in date loop

Modified: RT-Extension-Reports/html/Reports/Types/ActiveOrInactive
==============================================================================
--- RT-Extension-Reports/html/Reports/Types/ActiveOrInactive	(original)
+++ RT-Extension-Reports/html/Reports/Types/ActiveOrInactive	Thu Apr 10 00:18:38 2008
@@ -140,7 +140,7 @@
             # filter again, now that we have current reports date
             # the reason we call filter twice is for efficiency
             if ( $Filter ) {
-                    next TICKET unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
+                    next unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
             }
 
             if ( $ticket->CreatedObj->Date le $tmp_date->Date ) {
@@ -184,6 +184,8 @@
                 }
             }
             }
+        }
+        continue {
             $tmp_date->AddDay;
         }
     }

Modified: RT-Extension-Reports/html/Reports/Types/General
==============================================================================
--- RT-Extension-Reports/html/Reports/Types/General	(original)
+++ RT-Extension-Reports/html/Reports/Types/General	Thu Apr 10 00:18:38 2008
@@ -111,7 +111,7 @@
     TICKET:
     while ( my $ticket = $tickets->Next ) {
         if ( $Filter ) {
-            next TICKET unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket );
+            next unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket );
         }
 
         my $tmp_date = RT::Date->new( $session{CurrentUser} );
@@ -141,6 +141,8 @@
 
             }
             }
+        }
+        continue {
             $tmp_date->AddDay;
         }
     }

Modified: RT-Extension-Reports/html/Reports/Types/TicketsMoved
==============================================================================
--- RT-Extension-Reports/html/Reports/Types/TicketsMoved	(original)
+++ RT-Extension-Reports/html/Reports/Types/TicketsMoved	Thu Apr 10 00:18:38 2008
@@ -136,7 +136,7 @@
 
         while ( $tmp_date->Unix < $end_date->Unix ) {
             if ( $Filter ) {
-                    next TICKET unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
+                    next unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
             }
 
             my $txns = $ticket->Transactions;
@@ -158,6 +158,8 @@
                 }
                 $data{$tmp_date->Date}{$queue->Name}{Number}++;
             }
+        }
+        continue {
             $tmp_date->AddDay;
         }
     }

Modified: RT-Extension-Reports/html/Reports/Types/TimeWorked
==============================================================================
--- RT-Extension-Reports/html/Reports/Types/TimeWorked	(original)
+++ RT-Extension-Reports/html/Reports/Types/TimeWorked	Thu Apr 10 00:18:38 2008
@@ -127,7 +127,7 @@
 
         while ( $tmp_date->Unix < $end_date->Unix ) {
             if ( $Filter ) {
-                    next TICKET unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
+                    next unless RT::Extension::Reports::Filter::filter_ticket( Filter => $Filter, Ticket => $ticket, Date => $tmp_date, OnlyDate => 1 );
             }
 
             my $txns = $ticket->Transactions;
@@ -162,6 +162,8 @@
 
             $data{$tmp_date->Date}{$ticket->QueueObj->Name}{Number}++;
             $data{$tmp_date->Date}{$ticket->QueueObj->Name}{TimeWorked} += $value;
+        }
+        continue {
 
             $tmp_date->AddDay;
         }