[Rt-commit] rt branch, 4.2/date-time-improvements-in-charts, updated. rt-3.8.10-119-g177b6bb

[Ruslan Zakirov]

The branch, 4.2/date-time-improvements-in-charts has been updated
       via  177b6bbe9eb6712bf77c9a10bbe2e1719f6600f5 (commit)
       via  2020bdfaceca505bcc6e018a1a72fc5f3943e118 (commit)
       via  95c61d2aab452c21778bbe63ecfef75872d303dc (commit)
      from  fe8533332222b5ee35943c1bc234ebb84de7274a (commit)

Summary of changes:
 t/charts/basics.t |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 deletions(-)
 create mode 100644 t/charts/basics.t

- Log -----------------------------------------------------------------
commit 95c61d2aab452c21778bbe63ecfef75872d303dc
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Aug 9 01:13:53 2011 +0400

    elementary tests for charts, for real

diff --git a/t/charts/basics.t b/t/charts/basics.t
new file mode 100644
index 0000000..21c723d
--- /dev/null
+++ b/t/charts/basics.t
@@ -0,0 +1,103 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+
+use RT::Test tests => 13;
+use RT::Ticket;
+
+my $q = RT::Test->load_or_create_queue( Name => 'Default' );
+ok $q && $q->id, 'loaded or created queue';
+my $queue = $q->Name;
+
+my (%test) = (0, ());
+
+my @tickets = add_tix_from_data(
+    { Subject => 'n', Status => 'new' },
+    { Subject => 'o', Status => 'open' },
+    { Subject => 'o', Status => 'open' },
+    { Subject => 's', Status => 'stalled' },
+    { Subject => 's', Status => 'stalled' },
+    { Subject => 's', Status => 'stalled' },
+    { Subject => 'r', Status => 'resolved' },
+    { Subject => 'r', Status => 'resolved' },
+    { Subject => 'r', Status => 'resolved' },
+    { Subject => 'r', Status => 'resolved' },
+);
+
+use_ok 'RT::Report::Tickets';
+
+{
+    my $report = RT::Report::Tickets->new( RT->SystemUser );
+    my %columns = $report->SetupGroupings(
+        Query    => 'Queue = '. $q->id,
+        GroupBy  => ['Status'],
+        Function => ['COUNT'],
+    );
+
+    my $expected = {
+        'thead' => [ {
+                'cells' => [
+                    { 'value' => 'Status', 'type' => 'head' },
+                    { 'rowspan' => 1, 'value' => 'Tickets', 'type' => 'head' },
+                ],
+        } ],
+       'tfoot' => [ {
+            'cells' => [
+                { 'colspan' => 1, 'value' => 'Total', 'type' => 'label' },
+                { 'value' => 10, 'type' => 'value' },
+            ],
+            'even' => 1
+        } ],
+       'tbody' => [
+            {
+                'cells' => [
+                    { 'value' => 'new', 'type' => 'label' },
+                    { 'query' => 'Status = \'new\'', 'value' => '1', 'type' => 'value' },
+                ],
+                'even' => 1
+            },
+            {
+                'cells' => [
+                    { 'value' => 'open', 'type' => 'label' },
+                    { 'query' => 'Status = \'open\'', 'value' => '2', 'type' => 'value' }
+                ],
+                'even' => 0
+            },
+            {
+                'cells' => [
+                    { 'value' => 'resolved', 'type' => 'label' },
+                    { 'query' => 'Status = \'resolved\'', 'value' => '4', 'type' => 'value' }
+                ],
+                'even' => 1
+            },
+            {
+                'cells' => [
+                    { 'value' => 'stalled', 'type' => 'label' },
+                    { 'query' => 'Status = \'stalled\'', 'value' => '3', 'type' => 'value' }
+                ],
+                'even' => 0
+            }
+        ]
+    };
+
+    my %table = $report->FormatTable( %columns );
+    is_deeply( \%table, $expected, "basic table" );
+}
+
+
+sub add_tix_from_data {
+    my @data = @_;
+    my @res = ();
+    while (@data) {
+        my $t = RT::Ticket->new($RT::SystemUser);
+        my ( $id, undef $msg ) = $t->Create(
+            Queue => $q->id,
+            %{ shift(@data) },
+        );
+        ok( $id, "ticket created" ) or diag("error: $msg");
+        push @res, $t;
+    }
+    return @res;
+}
+

commit 2020bdfaceca505bcc6e018a1a72fc5f3943e118
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Aug 9 01:41:05 2011 +0400

    Revert "elementary tests for new charts"
    
    This reverts commit fe8533332222b5ee35943c1bc234ebb84de7274a.
    
    Wrong commit message

diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index 62ad4d8..c7868ca 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -432,7 +432,7 @@ sub SetupGroupings {
         @_
     );
 
-    $self->FromSQL( $args{'Query'} ) if $args{'Query'};
+    $self->FromSQL( $args{'Query'} );
 
     %GROUPINGS = @GROUPINGS unless keys %GROUPINGS;
 

commit 177b6bbe9eb6712bf77c9a10bbe2e1719f6600f5
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Aug 9 01:43:23 2011 +0400

    don't call FromSQL if Query is not passed
    
    let caller do UnLimit or custom limits

diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index c7868ca..62ad4d8 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -432,7 +432,7 @@ sub SetupGroupings {
         @_
     );
 
-    $self->FromSQL( $args{'Query'} );
+    $self->FromSQL( $args{'Query'} ) if $args{'Query'};
 
     %GROUPINGS = @GROUPINGS unless keys %GROUPINGS;
 

-----------------------------------------------------------------------