--- loncom/interface/Attic/lonchart.pm	2001/10/22 14:52:14	1.9
+++ loncom/interface/Attic/lonchart.pm	2001/11/28 18:48:33	1.22
@@ -11,13 +11,11 @@
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
 #
-# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer)
-#
-# 1/31 Gerd Kortemeyer
-#
+# 3/1/1,6/1,17/1,29/1,30/1,31/1 Gerd Kortemeyer)
 # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer
 # 10/18/01, 10/19/01 Behrouz Minaei
+# 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei
 
 package Apache::lonchart;
 
@@ -47,21 +45,46 @@ sub ExtractStudentData {
     my $Wrongs;
     my %TempHash;
     my $Version;
-    my $LatestVersion;            
-                
+    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 $meta=$hash{'src_'.$ResId};
+	    my $PartNo = 0;
+	    undef %TempHash;
+	    map {
+		if ($_=~/^stores\_(\d+)\_tries$/) {
+                    my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
+		    if ( $TempHash{"$Part"} eq '' ) { 
+			$TempHash{"$Part"} = $Part;
+			$TempHash{$PartNo}=$Part;
+			$TempHash{"$Part.Code"} = ' ';  
+			$PartNo++;
+		    }
+		}
+            } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
+
             my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ).
                        '___'.$2.'___'.
                        &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
@@ -69,49 +92,46 @@ sub ExtractStudentData {
             $Tries = 0;
   	    $LatestVersion = $result{"version:$Prob"};
 
-	    undef %TempHash;
-	    my $PartNo = 0;
-            
             if ( $LatestVersion ) {
-
 		for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
 		    my $vkeys = $result{"$Version:keys:$Prob"};
 		    my @keys = split(/\:/,$vkeys);		  
+
 		    foreach my $Key (@keys) {		  
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
-			    if ( $TempHash{"$Part"} eq '' ) { 
-				$TempHash{"$Part"} = $Part;
-				$TempHash{$PartNo}=$Part;
-				$TempHash{"$Part.Code"} = ' ';  
-				$PartNo++;
-			    }
-			    $TempHash{"$Part.Tries"} = $result{"$Version:$Prob:resource.$Part.tries"};
 			    $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
-			    my $Val = $result{"$Version:$Prob:$Key"};
+			    $TempHash{"$Part.Tries"}=($Tries) ? $Tries : 0;
+			    my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
 			    if ($Val eq 'correct_by_student'){$Code='*';} 
 			    elsif ($Val eq 'correct_by_override'){$Code = '+';}                        
 			    elsif ($Val eq 'incorrect_attempted'){$Code = '.';} 
 			    elsif ($Val eq 'incorrect_by_override'){$Code = '-';}
 			    elsif ($Val eq 'excused'){$Code = 'x';}
+			    else {$Code = ' ';}
 			    $TempHash{"$Part.Code"} = $Code;
 			}
       		    }
                 } 
-
 		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.Tries"} eq '')) {
+			    $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
+			}
                     }
-		    $Str .= $TempHash{$part.'.Code'}; 
+		    $Str .= $TempHash{"$part.Code"};
 		}
             }   
-	    else { $Str .= ' '; }
+	    else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
         } 
     }
-    return $Str;
+    my $PrTot = sprintf( "%5d", $PrTotal );
+    $Str .= ' '.'<font color="#000088">'.$PrTot.'</font> ';
+
+    return $Str ;
 }