--- db2gantt.cgi	2002/09/13 13:57:32	1.7
+++ db2gantt.cgi	2002/09/13 16:54:44	1.10
@@ -5,6 +5,7 @@
 use Data::Dumper;
 use Date::Parse;
 use CGI qw/:standard/;
+use CGI::Carp qw(fatalsToBrowser);
 use POSIX qw(strftime);
 
 my $debug = 0;
@@ -25,6 +26,7 @@
 	'Completed/Errors'	=> '255,128,0',
 	'Completed/Failure'	=> '128,0,128',
 	'Mount Request'		=> '128,128,255',
+	'Mount/Errors'		=> '255,64,128',
 	);
 
 my $int_t = (12 * 60 * 60);	# interval to display on one screen
@@ -34,14 +36,21 @@
 
 # time range
 
+$int_t = m_round($int_t);
+
 my ($from_t,$to_t) = (time()-$int_t,time());
 
 $to_t = param('to_t') if (param('to_t'));
 $from_t = param('from_t') if (param('from_t'));
 
 # round to nearest minute
-$to_t = $to_t - ($to_t % 60);
-$from_t = $from_t - ($from_t % 60) + 60;
+sub m_round {
+	my $t = shift @_;
+	return ($t - ($t % 60));
+}
+
+$to_t = m_round($to_t);
+$from_t = m_round($from_t);
 
 my $to=strftime("%Y-%m-%d %H:%M",localtime ($to_t));
 my $from=strftime("%Y-%m-%d %H:%M",localtime ($from_t));
@@ -111,36 +120,62 @@
 print mknav($from_t,($to_t-$int_t),'<small>&lt;&lt;</small>') if ($to_t-$int_t > $from_t);
 print $to,mknav($from_t,($to_t+$int_t),'<small>&gt;&gt;</small>'),"</td></tr>\n";
 
+# draw hour grid
+print "<tr><td align=right><small>hour grid</small></td><td colspan=2>";
+my @c = ("255,255,128","255,192,128");
+my $hr=strftime("%H",localtime ($from_t));
+print color_bar(3600 - $from_t % 3600,$c[0],$hr++ % 24);
+for (my $i=1; $i<int(($to_t-$from_t)/3600); $i++) {
+	print color_bar(3600,$c[1],sprintf("%02d",$hr++ % 24));
+	push @c, shift @c;
+}
+print color_bar($from_t % 3600,$c[1],$hr % 24);
+print "</td></tr>\n";
+
 my $fix_d = 0;	# used to fix graph len
 
 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);
+}
+
+sub color_bar {
+	my $l = shift @_;			# lenght of event utime
+	my $col = shift @_ || '240,240,240';	# default color (filler)
 	my $alt = shift @_ || undef;
 
 	my $size = int($l / ($len_t / $width));
 	if ($size < $min_l) {
+		$fix_d += ($min_l - $size);
+		print STDERR "fix_d: $fix_d\n" if ($debug);
 		$size = $min_l;
-		$fix_d += $min_l;
 	}
 	if ($fix_d && $size > $fix_d+$min_l) {
 		$size -= $fix_d;
 		$fix_d = 0;
+		print STDERR "fix_d: $fix_d\n" if ($debug);
 	}
 
-	print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px<br> alt:$alt\n" if ($debug);
-
-	my $html = "<img src=\"".$q->url(-relative=>1)."?pic=";
+	print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px<br> alt:$alt\n" if ($debug);
 
-	if ($status) {
-		$html .= $cols{$status};
-		$count{$status}++;
-	} else {
-#		$html .= '240,240,240';
-		$html .= '220,220,220';
-	}
+	my $html = "<img src=\"".$q->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) {
@@ -185,10 +220,10 @@
 
 	}
 
-	my $start_t = str2time($row->{start});
-	my $fin_t = str2time($row->{finish});
+	my $start_t = m_round(str2time($row->{start}));
+	my $fin_t = m_round(str2time($row->{finish}));
 
-	if ($start_t > $curr_t) {
+	if ($start_t > $curr_t + 60) {
 		my $t = $start_t - $curr_t;
 		print STDERR "[middle filler $curr_t:$t]" if ($debug);
 		print bar($t);
@@ -251,9 +286,11 @@
 print "<table border=0><tr bgcolor=#e0e0e0><th>status</th><th>#</th><th>color</th></tr>\n";
 foreach my $status (keys %count) {
 #foreach my $status (keys %cols) {
-	print "<tr bgcolor=#e0e0e0><td><small>$status</small></td><td><small>",$count{$status}-1,"</small></td><td>",bar($count{$status},$status),"</td></tr>\n" if ($status ne "");
-	# -1 in line above is a cludge to display correct number on
-	# occurences on graph and without one on legend!
+	print "<tr bgcolor=#e0e0e0><td><small>$status</small></td><td><small>",$count{$status}*1,"</small></td><td>",bar($count{$status},$status),"</td></tr>\n" if ($status ne "");
+	# *1 in line above is a cludge to display correct number on
+	# occurences on graph and without one on legend! If you remove * op
+	# it will first evaluate bar sub (thus increasing number by one) and
+	# then display number (wrongly).
 }
 print "</table>\n<p>Reload <a href=\"",$q->url(-relative=>1),"\">current</a>.</p></body></html>";