X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FChart;h=2a28d62c4a41137c759f223b7fe798b1078dfd6a;hp=59e9fc6fcd4847b87a9fb69cd0705f408d025697;hb=919e930aa9279b3c5cd12b593889cd6de79d67bf;hpb=b4b0c7e72d7eaee2fbfc7022022c9698323203dd diff --git a/rt/share/html/Search/Chart b/rt/share/html/Search/Chart index 59e9fc6fc..2a28d62c4 100644 --- a/rt/share/html/Search/Chart +++ b/rt/share/html/Search/Chart @@ -1,40 +1,40 @@ %# BEGIN BPS TAGGED BLOCK {{{ -%# +%# %# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -%# -%# +%# +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +%# +%# %# (Except where explicitly superseded by other copyright notices) -%# -%# +%# +%# %# LICENSE: -%# +%# %# This work is made available to you under the terms of Version 2 of %# the GNU General Public License. A copy of that license should have %# been provided with this software, but in any event can be snarfed %# from www.gnu.org. -%# +%# %# This work is distributed in the hope that it will be useful, but %# WITHOUT ANY WARRANTY; without even the implied warranty of %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %# General Public License for more details. -%# +%# %# You should have received a copy of the GNU General Public License %# along with this program; if not, write to the Free Software %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA %# 02110-1301 or visit their web page on the internet at %# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -%# -%# +%# +%# %# CONTRIBUTION SUBMISSION POLICY: -%# +%# %# (The following paragraph is not intended to limit the rights granted %# to you to modify and distribute this software under the terms of %# the GNU General Public License and is only of importance to you if %# you choose to contribute your changes and enhancements to the %# community by submitting them to Best Practical Solutions, LLC.) -%# +%# %# By intentionally submitting any modifications, corrections or %# derivatives to this work, or any other work intended for use with %# Request Tracker, to Best Practical Solutions, LLC, you confirm that @@ -43,13 +43,12 @@ %# royalty-free, perpetual, license to use, copy, create derivative %# works based on those contributions, and sublicense and distribute %# those contributions and any derivatives thereof. -%# +%# %# END BPS TAGGED BLOCK }}} <%args> $Query => "id > 0" $PrimaryGroupBy => 'Queue' -$SecondaryGroupBy => undef -$ChartStyle => 'bars' +$ChartStyle => 'bar' <%init> my $chart_class; @@ -66,52 +65,12 @@ if ($ChartStyle eq 'pie') { use RT::Report::Tickets; my $tix = RT::Report::Tickets->new( $session{'CurrentUser'} ); +my %AllowedGroupings = reverse $tix->Groupings( Query => $Query ); +$PrimaryGroupBy = 'Queue' unless exists $AllowedGroupings{$PrimaryGroupBy}; my ($count_name, $value_name) = $tix->SetupGroupings( Query => $Query, GroupBy => $PrimaryGroupBy, ); -my $chart = $chart_class->new( 600 => 400 ); - -my $font = RT->Config->Get('ChartFont') || ['verdana', 'arial', gdMediumBoldFont]; -$chart->set_title_font( $font, 12 ) if $chart->can('set_title_font'); -$chart->set_legend_font( $font, 12 ) if $chart->can('set_legend_font'); -$chart->set_x_label_font( $font, 10 ) if $chart->can('set_x_label_font'); -$chart->set_y_label_font( $font, 10 ) if $chart->can('set_y_label_font'); -$chart->set_label_font( $font, 10 ) if $chart->can('set_label_font'); -$chart->set_x_axis_font( $font, 9 ) if $chart->can('set_x_axis_font'); -$chart->set_y_axis_font( $font, 9 ) if $chart->can('set_y_axis_font'); -$chart->set_values_font( $font, 9 ) if $chart->can('set_values_font'); -$chart->set_value_font( $font, 9 ) if $chart->can('set_value_font'); - -# Pie charts don't like having no input, so we show a special image -# that indicates an error message. Because this is used in an -# context, it can't be a simple error message. Without this check, -# the chart will just be a non-loading image. -if ($tix->Count == 0) { - my $plot = GD::Image->new(600 => 400); - $plot->colorAllocate(255, 255, 255); # background - my $black = $plot->colorAllocate(0, 0, 0); - - require GD::Text::Wrap; - my $error = GD::Text::Wrap->new($plot, - color => $black, - text => loc("No tickets found."), - ); - $error->set_font( $font, 12 ); - $error->draw(0, 0); - - $m->comp( 'SELF:Plot', plot => $plot, %ARGS ); -} - -if ($chart_class eq "GD::Graph::bars") { - $chart->set( - x_label => $tix->Label( $PrimaryGroupBy ), - x_labels_vertical => 1, - y_label => loc('Tickets'), - show_values => 1 - ); -} - my %class = ( Queue => 'RT::Queue', Owner => 'RT::User', @@ -121,15 +80,17 @@ my %class = ( my $class = $class{ $PrimaryGroupBy }; my %data; +my $max_value = 0; +my $max_key_length = 0; while ( my $entry = $tix->Next ) { my $key; if ( $class ) { my $q = $class->new( $session{'CurrentUser'} ); - $q->Load( $entry->__Value( $value_name ) ); + $q->Load( $entry->LabelValue( $value_name ) ); $key = $q->Name; } else { - $key = $entry->__Value($value_name); + $key = $entry->LabelValue($value_name); } $key ||= '(no value)'; @@ -140,26 +101,87 @@ while ( my $entry = $tix->Next ) { $key = loc($key); } $data{ $key } = $value; -} - -# XXX: Convert 1970-01-01 date to the 'Not Set' -# this code should be generalized!!! -if ( $PrimaryGroupBy =~ /(Daily|Monthly|Annually)$/ ) { - my $re; - $re = qr{1970-01-01} if $PrimaryGroupBy =~ /Daily$/; - $re = qr{1970-01} if $PrimaryGroupBy =~ /Monthly$/; - $re = qr{1970} if $PrimaryGroupBy =~ /Annually$/; - foreach my $k (keys %data) { - my $tmp = $k; - $tmp =~ s/^$re/loc('Not Set')/e or next; - $data{$tmp} = delete $data{$k}; - } + $max_value = $value if $max_value < $value; + $max_key_length = length $key if $max_key_length < length $key; } unless (keys %data) { $data{''} = 0; } + +my $chart = $chart_class->new( 600 => 400 ); +$chart->set( pie_height => 60 ) if $chart_class eq 'GD::Graph::pie'; +my %font_config = RT->Config->Get('ChartFont'); +my $font = $font_config{ $session{CurrentUser}->UserObj->Lang || '' } + || $font_config{'others'}; +$chart->set_title_font( $font, 16 ) if $chart->can('set_title_font'); +$chart->set_legend_font( $font, 16 ) if $chart->can('set_legend_font'); +$chart->set_x_label_font( $font, 14 ) if $chart->can('set_x_label_font'); +$chart->set_y_label_font( $font, 14 ) if $chart->can('set_y_label_font'); +$chart->set_label_font( $font, 14 ) if $chart->can('set_label_font'); +$chart->set_x_axis_font( $font, 12 ) if $chart->can('set_x_axis_font'); +$chart->set_y_axis_font( $font, 12 ) if $chart->can('set_y_axis_font'); +$chart->set_values_font( $font, 12 ) if $chart->can('set_values_font'); +$chart->set_value_font( $font, 12 ) if $chart->can('set_value_font'); + +# Pie charts don't like having no input, so we show a special image +# that indicates an error message. Because this is used in an +# context, it can't be a simple error message. Without this check, +# the chart will just be a non-loading image. +if ($tix->Count == 0) { + my $plot = GD::Image->new(600 => 400); + $plot->colorAllocate(255, 255, 255); # background + my $black = $plot->colorAllocate(0, 0, 0); + + require GD::Text::Wrap; + my $error = GD::Text::Wrap->new($plot, + color => $black, + text => loc("No tickets found."), + ); + $error->set_font( $font, 16 ); + $error->draw(0, 0); + + $m->comp( 'SELF:Plot', plot => $plot, %ARGS ); +} + +if ($chart_class eq "GD::Graph::bars") { + my $count = keys %data; + $chart->set( + x_label => $tix->Label( $PrimaryGroupBy ), + y_label => loc('Tickets'), + show_values => 1, + x_label_position => 0.6, + y_label_position => 0.6, + values_space => -1, +# use a top margin enough to display values over the top line if needed + t_margin => 18, +# the following line to make sure there's enough space for values to show + y_max_value => 5*(int($max_value/5) + 2), +# if there're too many bars or at least one key is too long, use vertical + x_labels_vertical => ( $count * $max_key_length > 60 ) ? 1 : 0, + $count > 30 ? ( bar_spacing => 1 ) : ( $count > 20 ? ( bar_spacing => 2 ) : + ( $count > 10 ? ( bar_spacing => 3 ) : ( bar_spacing => 5 ) ) + ), + ); +} + +# refine values' colors, with both Color::Scheme's help and my own tweak +$chart->{dclrs} = [ + '66cc66', 'ff6666', 'ffcc66', '663399', + '3333cc', '339933', '993333', '996633', + '33cc33', 'cc3333', 'cc9933', '6633cc', +]; + +{ + no warnings 'redefine'; + *GD::Graph::pick_data_clr = sub { + my $self = shift; + my $color_hex = $self->{dclrs}[ $_[0] % @{ $self->{dclrs} } - 1 ]; + return map { hex } ( $color_hex =~ /(..)(..)(..)/ ); + }; +} + my $plot = $chart->plot( [ [sort keys %data], [map $data{$_}, sort keys %data] ] ) or die $chart->error; $m->comp( 'SELF:Plot', plot => $plot, %ARGS ); @@ -170,7 +192,6 @@ $plot => undef <%INIT> my @types = ('png', 'gif'); - for my $type (@types) { $plot->can($type) or next;