--- db2gantt.cgi	2002/09/13 23:59:38	1.14
+++ db2gantt.cgi	2002/09/15 19:17:37	1.17
@@ -8,7 +8,7 @@
 use CGI::Carp qw(fatalsToBrowser);
 use POSIX qw(strftime);
 
-my $debug = 0;
+my $debug = 1;
 
 my $width = 600;	# width of bar
 my $height = 19;	# height of bar
@@ -17,8 +17,8 @@
 # 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',
@@ -127,13 +127,24 @@
 	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));
-	my $min_l=1;
-	print color_bar(3600 - $from_t % 3600,$c[0],sprintf("%02d",$hr++ % 24));
+	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<int(($to_t-$from_t)/3600); $i++) {
-		print color_bar(3600,$c[1],sprintf("%02d",$hr++ % 24));
+		hour_bar(3600,$c[1],$hr++);
 		push @c, shift @c;
 	}
-	print color_bar($from_t % 3600,$c[1],sprintf("%02d",$hr % 24));
+	hour_bar($from_t % 3600,$c[1],$hr);
 	print "</td></tr>\n";
 }
 
@@ -209,8 +220,8 @@
 	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;
 
@@ -278,6 +289,7 @@
 	$alt .= $row->{type}." <b>".$row->{status}."</b><br>".
 	$row->{user_group_host}." <i>".$row->{sessionid}."</i><br>".
 	$row->{device}."&nbsp;on&nbsp;".$row->{host};
+$alt .= "-- ".$row->{specification};
 	print bar($len,$row->{status},$alt);
 
 	$curr_t += $len;