--- db2gantt.cgi 2002/09/13 14:34:02 1.9 +++ db2gantt.cgi 2002/09/15 19:29:38 1.19 @@ -5,19 +5,20 @@ use Data::Dumper; use Date::Parse; use CGI qw/:standard/; +use CGI::Carp qw(fatalsToBrowser); use POSIX qw(strftime); my $debug = 0; my $width = 600; # width of bar -my $height = 12; # height of bar +my $height = 19; # height of bar my $use_js = 1; # use JavaScript pop-up # status colors my %cols = ( 'In Progress' => '0,255,0', - 'In Progress/Failure' => '255,64,255', - 'In Progress/Errors' => '255,64,0', + 'In Progress/Failures' => '192,64,192', + 'In Progress/Errors' => '255,128,128', 'Queuing' => '255,255,0', 'Aborted' => '255,0,0', 'Failed' => '255,0,0', @@ -74,10 +75,12 @@ } print "Content-type: text/html +Cache-Control: max-age=60, must-revalidate -OmniBack Gantt: $from - $to"; +OmniBack Gantt: $from - $to +"; if ($use_js) { print ' @@ -111,7 +114,7 @@ return "url(-relative=>1)."?from_t=${f}&to_t=${t}\">$ch"; } -print ""; +print "
"; print "\n"; -my $fix_d = 0; # used to fix graph len +# draw hour grid +sub hour_grid { + print "\n"; +} + +hour_grid(); + +my $fix_d = 0; # used to fix graph len (in pixels) +my $fix_s = 0; # used to collect round errors of size sub bar { - my $l = shift @_; # lenght of event utime - my $status = shift @_ || undef; # what to draw + my $l = shift @_; + my $status = shift @_; + my $alt = shift @_; + + my $col; + + if ($status) { + if ($cols{$status}) { + $col .= $cols{$status}; + } else { + $col .= "0,0,0"; # unknown status, black + } + $count{$status}++; + } else { +# $col .= '240,240,240'; + $col .= '220,220,220'; + } + return color_bar($l,$col,$alt,$min_l); +} + +sub color_bar { + my $l = shift @_; # lenght of event utime + my $col = shift @_ || '240,240,240'; # default color (filler) my $alt = shift @_ || undef; + my $min_l = shift @_ || 1; - my $size = int($l / ($len_t / $width)); - if ($size < $min_l) { + my $size = $l / ($len_t / $width); + $fix_s += $size - int($size); + $size=int($size); + # add rounding error to size + if ($fix_s > 1) { + my $i = $fix_s ; $i = int($i); + $fix_s -= $i; + $size += $i; + } + + if ($alt && $size < $min_l) { $fix_d += ($min_l - $size); print STDERR "fix_d: $fix_d\n" if ($debug); $size = $min_l; @@ -138,23 +201,10 @@ print STDERR "fix_d: $fix_d\n" if ($debug); } - print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug); - - my $html = "url(-relative=>1)."?pic="; + print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug); - if ($status) { - if ($cols{$status}) { - $html .= $cols{$status}; - } else { - $html .= "0,0,0"; # unknown status, black - } - $count{$status}++; - } else { -# $html .= '240,240,240'; - $html .= '220,220,220'; - } + my $html = "url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$height\""; - $html .= "\" width=\"$size\" height=\"$height\""; if ($use_js && $alt) { $html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\""; } elsif ($alt) { @@ -170,7 +220,7 @@ from gantt where (start < '$from' and finish > '$from') or (start > '$from' and start < '$to') - order by device,specification + order by device,specification,start "; my $sth = $dbh->prepare($sql) || die "sql: $sql ".$dbh->errstr; @@ -192,6 +242,7 @@ } print "\n" if ($curr_t != $from_t); + ($fix_s,$fix_d) = (0,0); # init fix vars for bar print "\n
Specification"; print mknav(($from_t-$int_t),$to_t,'<<'),$from; print mknav(($from_t+$int_t),$to_t,'>>') if ($from_t+$int_t < $to_t); @@ -119,15 +122,75 @@ print mknav($from_t,($to_t-$int_t),'<<') if ($to_t-$int_t > $from_t); print $to,mknav($from_t,($to_t+$int_t),'>>'),"
hour grid"; + my @c = ("255,255,128","255,192,128"); + my $hr=strftime("%H",localtime ($from_t)); + sub hour_bar { + my ($t,$c,$hr) = @_; + my $clock_hr = $hr % 24; + my $alt = sprintf("%02d:00",$clock_hr); + if ($clock_hr == 0) { + my $pix_hr = int(1 / $width); + print color_bar($pix_hr,"0,0,0",strftime("%Y-%m-%d", localtime($from_t + $hr*3600))); + print color_bar($t-$pix_hr,$c,$alt); + } else { + print color_bar($t,$c,$alt); + } + } + hour_bar(3600 - $from_t % 3600,$c[0],$hr++); + for (my $i=1; $i
", $row->{specification},""; $curr_t = $from_t; # init timeline @@ -199,14 +250,18 @@ } - my $start_t = m_round(str2time($row->{start})); - my $fin_t = m_round(str2time($row->{finish})); + my $start_t = str2time($row->{start}); + my $fin_t = str2time($row->{finish}); - if ($start_t > $curr_t + 60) { + # Can I squeeze here 1 pixel of time (many seconds) ? + if ($start_t > $curr_t + ($len_t / $width)) { my $t = $start_t - $curr_t; print STDERR "[middle filler $curr_t:$t]" if ($debug); print bar($t); $curr_t = $start_t; + } else { + # prepend too few seconds to next event + $start_t = $curr_t; } my $len = $fin_t - $start_t; @@ -231,9 +286,10 @@ my $alt = $row->{start}." - ".$row->{finish}."
"; $alt =~ s/:\d\d\.\d+//g; $alt =~ s/\s+/ /g; - $alt .= $row->{type}." ".$row->{status}."
". - $row->{user_group_host}." ".$row->{sessionid}."
". - $row->{device}." on ".$row->{host}; + $alt .= $row->{specification}."
". + $row->{type}." ".$row->{status}."
". + $row->{user_group_host}." ".$row->{sessionid}."
". + $row->{device}." on ".$row->{host}; print bar($len,$row->{status},$alt); $curr_t += $len; @@ -255,7 +311,9 @@ undef $sth; $dbh->disconnect; -print "
"; +print "\n"; +hour_grid(); +print ""; # label and usage @@ -271,5 +329,5 @@ # it will first evaluate bar sub (thus increasing number by one) and # then display number (wrongly). } -print "\n

Reload url(-relative=>1),"\">current.

"; +print "\n

Reload url(-relative=>1),"\">current or see help.

";