[Rt-commit] r18868 - rt/3.999/branches/datetime/share/html/Tools/Reports

sartak at bestpractical.com sartak at bestpractical.com
Thu Mar 19 17:18:06 EDT 2009


Author: sartak
Date: Thu Mar 19 17:18:06 2009
New Revision: 18868

Modified:
   rt/3.999/branches/datetime/share/html/Tools/Reports/CreatedByDates.html
   rt/3.999/branches/datetime/share/html/Tools/Reports/ResolvedByDates.html

Log:
CreatedByDates/ResolvedByDates fixes and DTification

Modified: rt/3.999/branches/datetime/share/html/Tools/Reports/CreatedByDates.html
==============================================================================
--- rt/3.999/branches/datetime/share/html/Tools/Reports/CreatedByDates.html	(original)
+++ rt/3.999/branches/datetime/share/html/Tools/Reports/CreatedByDates.html	Thu Mar 19 17:18:06 2009
@@ -63,11 +63,11 @@
 <&| /_elements/wrapper, title => $title &>
 <& /Tools/Reports/Elements/Tabs, current_tab => 'Tools/Reports/CreatedByDates.html', title => $title &>
 <form method="post" action="CreatedByDates.html">
-% if ($queue|| $created_before ||$created_after) {
+% if ($queue || $before->is_set || $after->is_set) {
 % # if we have a queue, do the search
 % if ($queue) { $query .= " AND queue = '$queue'"}
-% if ($created_before) { $query .= " AND Created < '".$before->iso."'"; }
-% if ($created_after) { $query .= " AND Created > '".$after->iso."'"}
+% if ($before->is_set) { $query .= " AND Created < '".$before->iso."'"; }
+% if ($after->is_set) { $query .= " AND Created > '".$after->iso."'"}
 % my $groupby = 'Status';
 <& /Search/Elements/Chart, query => $query, primary_group_by => $groupby &>
 % }

Modified: rt/3.999/branches/datetime/share/html/Tools/Reports/ResolvedByDates.html
==============================================================================
--- rt/3.999/branches/datetime/share/html/Tools/Reports/ResolvedByDates.html	(original)
+++ rt/3.999/branches/datetime/share/html/Tools/Reports/ResolvedByDates.html	Thu Mar 19 17:18:06 2009
@@ -53,32 +53,22 @@
 <%init>
 my $title = _("Resolved tickets in period, grouped by owner");
 my $q = RT::Model::Queue->new( current_user => Jifty->web->current_user );
-my $before = RT::Date->new();
-my $after = RT::Date->new();
 my $query = '';
 
-
-if ($resolved_after) {
-    $after->set(format => 'unknown', value => $resolved_after);
-    $resolved_after = $after->as_string;
-}
-if ($resolved_before) {
-    $before->set(format => 'unknown', value => $resolved_before);
-    $resolved_before = $before->as_string;
-}
-
+my $after = RT::DateTime->new_from_string($resolved_after);
+my $before = RT::DateTime->new_from_string($resolved_before);
 
 $q->load_by_cols(name => $queue);
 </%init>
 <&| /_elements/wrapper, title => $title &>
 <& /Tools/Reports/Elements/Tabs, current_tab => 'Tools/Reports/ResolvedByDates.html', title => $title &>
 <form method="post" action="ResolvedByDates.html">
-% if ($queue|| $resolved_before ||$resolved_after) {
+% if ($queue || $before->is_set || $after->is_set) {
 % # if we have a queue, do the search
 % $query = "Status = 'resolved'";
 % if ($queue) { $query .= " AND queue = '$queue'"}
-% if ($resolved_before) { $query .= " AND resolved < '".$before->iso."'"; }
-% if ($resolved_after) { $query .= " AND resolved > '".$after->iso."'"}
+% if ($before->is_set) { $query .= " AND resolved < '".$before->iso."'"; }
+% if ($after->is_set) { $query .= " AND resolved > '".$after->iso."'"}
 % my $groupby = 'Owner';
 <& /Search/Elements/Chart, query => $query, primary_group_by => $groupby &>
 % }
@@ -87,9 +77,9 @@
 
 <br /><&|/l&>Queue</&>: <& /Elements/SelectQueue, name => 'queue', named_values => 1, default => $q->id &>
 <br /><&|/l&>Tickets resolved after</&>: 
-<& /Elements/SelectDate, name => 'resolved_after', default => ($resolved_after) ? $after->iso : ''&>
+<& /Elements/SelectDate, name => 'resolved_after', default => $after &>
 <br /><&|/l&>Tickets resolved before</&>: 
-<& /Elements/SelectDate, name => 'resolved_before', default => ($resolved_before) ? $before->iso : ''&>
+<& /Elements/SelectDate, name => 'resolved_before', default => $before &>
 
 <& /Elements/Submit&>
 </form>


More information about the Rt-commit mailing list