committing to close bug 6682 "Chart all bug states". patches

contributed by mhamby@logicon.com

diff --git a/collectstats.pl b/collectstats.pl
index a1b9885a76244cd7a15fde609c0c2f99556e21ba..4789440dd0db1a7392fba95ba10ccf8134a67cbe 100755 (executable)
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -25,7 +25,8 @@
 
 use diagnostics;
 use strict;
-use vars @::legal_product;
+use vars @::legal_product,
+       @::legal_bug_status;
 
 require "globals.pl";
 
@@ -64,7 +65,7 @@ sub collect_stats {
     if (open DATA, ">>$file") {
         push my @row, &today;
 
-        foreach my $status ('NEW', 'ASSIGNED', 'REOPENED') {
+        foreach my $status (@::legal_bug_status) {
            if( $product eq "-All-" ) {
                 SendSQL("select count(bug_status) from bugs where bug_status='$status'");
            } else {
@@ -80,10 +81,14 @@ sub collect_stats {
 #
 # do not edit me! this file is generated.
 # 
-# fields: date|new|assigned|reopened
 # product: $product
 # created: $when
 FIN
+          print DATA "# field: DATE";
+            foreach my $status (@::legal_bug_status) {
+              print DATA "|$status";
+          }
+          print DATA "\n";
        }
 
         print DATA (join '|', @row) . "\n";

diff --git a/reports.cgi b/reports.cgi
index be21d0d6c3192ad4f36eb8aef7c6854a63afeea2..daf640cb8d3e8075b71da8f0d44e500db1b68007 100755 (executable)
--- a/reports.cgi
+++ b/reports.cgi
@@ -434,6 +434,7 @@ FIN
        
        my @dates;
        my @open; my @assigned; my @reopened;
+        my @resolved; my @verified; my @closed;
 
         my $prodname = $::FORM{'product'};
 
@@ -457,13 +458,17 @@ FIN
                {
                chomp;
                next if ($_ =~ /^#/ or ! $_);
-               my ($date, $open, $assigned, $reopened) = split /\|/, $_;
+               my ($date, $open, $assigned, $reopened,
+                       $resolved, $verified, $closed) = split /\|/, $_;
                my ($yy, $mm, $dd) = $date =~ /^\d{2}(\d{2})(\d{2})(\d{2})$/;
 
                push @dates, "$mm/$dd/$yy";
                push @open, $open;
                push @assigned, $assigned;
                push @reopened, $reopened;
+                push @resolved, $resolved;
+                push @verified, $verified;
+                push @closed, $closed;
                }
        
        close FILE;
@@ -474,7 +479,7 @@ FIN
                }
        
        my $img = Chart::Lines->new (800, 600);
-       my @labels = qw (New Assigned Reopened);
+        my @labels = qw (New Assigned Reopened Resolved Verified Closed);
        my @when;
        my $i = 0;
        my @data;
@@ -483,6 +488,9 @@ FIN
        push @data, \@open;
        push @data, \@assigned;
        push @data, \@reopened;
+        push @data, \@resolved;
+        push @data, \@verified;
+        push @data, \@closed;
 
     my $MAXTICKS = 20;      # Try not to show any more x ticks than this.
     my $skip = 1;
@@ -492,11 +500,13 @@ FIN
 
        my %settings =
                (
-               "title" => "Bug Charts for $::FORM{'product'}",
+                 "title" => "Status Counts for $::FORM{'product'}",
                "x_label" => "Dates",
-               "y_label" => "Bug Count",
+               "y_label" => "Bug Counts",
                "legend_labels" => \@labels,
-        "skip_x_ticks" => $skip,
+                "skip_x_ticks" => $skip,
+                "y_grid_lines" => "true",
+                "grey_background" => "false"
                );
        
        $img->set (%settings);