--- db2gantt.cgi	2002/09/13 23:59:38	1.14
+++ db2gantt.cgi	2002/09/16 15:09:19	1.20
@@ -11,14 +11,14 @@
 my $debug = 0;
 
 my $width = 600;	# width of bar
-my $height = 19;	# height of bar
+my $height = 15;	# 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',
@@ -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";
 }
 
@@ -168,6 +179,7 @@
 	my $col = shift @_ || '240,240,240';	# default color (filler)
 	my $alt = shift @_ || undef;
 	my $min_l = shift @_ || 1;
+	my $h = shift @_ || $height;
 
 	my $size = $l / ($len_t / $width);
 	$fix_s += $size - int($size);
@@ -192,7 +204,7 @@
 
 	print STDERR "bar[$col] 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=$col\" width=\"$size\" height=\"$height\"";
+	my $html = "<img src=\"".$q->url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$h\"";
 
 	if ($use_js && $alt) {
 		$html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\"";
@@ -209,7 +221,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;
@@ -221,6 +233,39 @@
 
 $sth->execute() || die "sql: $sql ".$dbh->errstr;
 
+my $dev;	# current device
+my @dev_t;	# all minutes in one hour [1440]
+my @dev_sum_t;
+
+sub sum_bar {
+	my $label = shift @_;
+	my @dev_t = @_;
+	# display device summary
+	my $max_use = 0;
+	for (my $i=0; $i < $len_t; $i++) {
+		$max_use = $dev_t[$i] if (defined $dev_t[$i] && $dev_t[$i] > $max_use);
+	}
+	print "<tr><td align=right><small>$label [$max_use]</small></td><td colspan=2>";
+	my $last_var = 0;
+	my $len = 0;
+	for (my $i=1; $i<= ($to_t-$from_t); $i++) {
+		my $v = $dev_t[$i] || 0;
+		if ($v == $last_var) {
+			$len++;
+		} else {
+			my $h = $last_var / $max_use * $height;
+			my $c = 255 - 255 * $last_var / $max_use;
+			print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1);
+			$len = 0;
+			$last_var = $v;
+		}
+	}
+	my $h = $last_var / $max_use * $height;
+	my $c = 255 - 255 * $last_var / $max_use;
+	print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1) if ($len);
+	print "</td></tr>";
+}
+
 while(my $row = $sth->fetchrow_hashref) {
 	if (!defined $curr_spec || $row->{specification} ne $curr_spec) {
 
@@ -231,6 +276,16 @@
 		}
 
 		print "</td></tr>\n" if ($curr_t != $from_t);
+
+		if ($dev && @dev_t && $dev ne $row->{device}) {
+			sum_bar("summary for $dev",@dev_t);
+			$dev = $row->{device};
+			@dev_t = ();
+		} elsif (! $dev) {
+			$dev = $row->{device};
+		}
+
+		# init vars for next line
 		($fix_s,$fix_d) = (0,0); # init fix vars for bar
 		print "<tr><td>", $row->{specification},"</td><td colspan=2>";
 
@@ -275,11 +330,18 @@
 	my $alt = $row->{start}." - ".$row->{finish}."<br>";
 	$alt =~ s/:\d\d\.\d+//g;
 	$alt =~ s/\s+/&nbsp;/g;
-	$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}."<br>".
+		$row->{type}." <b>".$row->{status}."</b><br>".
+		$row->{user_group_host}." <i>".$row->{sessionid}."</i><br>".
+		$row->{device}."&nbsp;on&nbsp;".$row->{host};
 	print bar($len,$row->{status},$alt);
 
+	# store use of devices for each minute
+	for (my $s=0; $s<$len; $s++) {
+		$dev_t[$curr_t-$from_t+$s]++;
+		$dev_sum_t[$curr_t-$from_t+$s]++;
+	}
+
 	$curr_t += $len;
 
 #	print Dumper($row);
@@ -300,7 +362,9 @@
 $dbh->disconnect;
 
 print "</td></tr>\n";
+sum_bar("summary for $dev",@dev_t);
 hour_grid();
+sum_bar("summary for all devices",@dev_sum_t);
 print "</table>";