--- loncom/interface/Attic/lonchart.pm	2001/10/22 14:52:14	1.9
+++ loncom/interface/Attic/lonchart.pm	2001/11/17 20:30:47	1.10
@@ -18,6 +18,7 @@
 # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer
 # 10/18/01, 10/19/01 Behrouz Minaei
+# 11/17/01 Behrouz Minaei
 
 package Apache::lonchart;
 
@@ -47,20 +48,31 @@ sub ExtractStudentData {
     my $Wrongs;
     my %TempHash;
     my $Version;
+    my $ProbNo;
+    my $PrTotal;
     my $LatestVersion;            
                 
     my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.
             substr($rowlabels[$index].
             '                                                        ',0,45).' ! ';
-
     unless ($reply=~/^error\:/) {
         map {
             my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
             $result{$name}=$value;
         } split(/\&/,$reply);
+	$ProbNo = 0;
+	$PrTotal = 0;
+	my $IterationNo = 0;
         foreach $ResId (@cols) {
-	    if ( !$ResId ) { $Str .= ' ! '; next; }
+	    if ($IterationNo == 0) {$IterationNo++; next;}
+	    if (!$ResId) { 
+		my $PrNo = sprintf( "%3d", $ProbNo );
+		$Str .= ' '.'<font color="#007700">'.$PrNo.'</font> ';
+		$PrTotal += $ProbNo;
+		$ProbNo=0;
+		next; 
+	    }
             $ResId=~/(\d+)\.(\d+)/;
             my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ).
                        '___'.$2.'___'.
@@ -73,7 +85,6 @@ sub ExtractStudentData {
 	    my $PartNo = 0;
             
             if ( $LatestVersion ) {
-
 		for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
 		    my $vkeys = $result{"$Version:keys:$Prob"};
 		    my @keys = split(/\:/,$vkeys);		  
@@ -101,17 +112,21 @@ sub ExtractStudentData {
 
 		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
 		    my $part = $TempHash{$n};
-                    if (($TempHash{$part.'.Code'} eq '*')&&
-                        ($TempHash{$part.'.Tries'}<10)) {
-                        $TempHash{$part.'.Code'}=$Tries;
+                    if ($TempHash{$part.'.Code'} eq '*') {
+			$ProbNo++;
+                        if ($TempHash{$part.'.Tries'}<10) {
+			    $TempHash{$part.'.Code'}=$Tries;
+			}
                     }
-		    $Str .= $TempHash{$part.'.Code'}; 
+		    $Str .= $TempHash{$part.'.Code'};
 		}
             }   
 	    else { $Str .= ' '; }
         } 
     }
-    return $Str;
+    my $PrTot = sprintf( "%5d", $PrTotal );
+    $Str .= ' '.'<font color="#000077">'.$PrTot.'</font> ';
+    return $Str ;
 }