--- loncom/interface/Attic/lonchart.pm	2001/11/27 21:16:11	1.14
+++ loncom/interface/Attic/lonchart.pm	2001/12/20 20:47:53	1.26
@@ -1,4 +1,31 @@
 # The LearningOnline Network with CAPA
+# (Publication Handler
+#
+# $Id: lonchart.pm,v 1.26 2001/12/20 20:47:53 minaeibi Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+#
 # Homework Performance Chart
 #
 # (Navigate Maps Handler
@@ -15,7 +42,10 @@
 # 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 Behrouz Minaei
+# 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei
+# 12/18/01 Behrouz Minaei
+#
+###
 
 package Apache::lonchart;
 
@@ -30,7 +60,6 @@ my %hash;
 my @cols;
 my @rowlabels;
 my @students;
-my $r;
 
 # ------------------------------------------------------------- Find out status
 
@@ -47,12 +76,9 @@ sub ExtractStudentData {
     my %TempHash;
     my $Version;
     my $ProbNo;
-    my $PrTotal;
-    my $LatestVersion;            
-
-    my $test = $ENV{'request.course.fn'};
-    my $comp = '/home/httpd/perl/tmp/minaeibi_msu_12679c3ed543a25msul1'; 
-               
+    my $ProbSolved;
+    my $ProbTotal;
+    my $LatestVersion;                     
     my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.
             substr($rowlabels[$index].
@@ -63,14 +89,15 @@ sub ExtractStudentData {
             $result{$name}=$value;
         } split(/\&/,$reply);
 	$ProbNo = 0;
-	$PrTotal = 0;
+	$ProbTotal = 0;
+        $ProbSolved = 0;
 	my $IterationNo = 0;
         foreach $ResId (@cols) {
 	    if ($IterationNo == 0) {$IterationNo++; next;}
 	    if (!$ResId) { 
 		my $PrNo = sprintf( "%3d", $ProbNo );
 		$Str .= ' '.'<font color="#007700">'.$PrNo.'</font> ';
-		$PrTotal += $ProbNo;
+		$ProbSolved += $ProbNo;
 		$ProbNo=0;
 		next; 
 	    }
@@ -105,39 +132,46 @@ sub ExtractStudentData {
 		    foreach my $Key (@keys) {		  
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
-			    $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';}
+			    elsif ($Val eq 'ungraded_attempted'){$Code = '#';}
 			    else {$Code = ' ';}
 			    $TempHash{"$Part.Code"} = $Code;
-            if ($test eq $comp) {
-		$r->print("$Version:$Prob:resource.$Part.tries".' = '.$result{"$Version:$Prob:resource.$Part.tries"}."  $Val "."($Code)".'<br>');
-	    }
 			}
       		    }
                 } 
-
 		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
 		    my $part = $TempHash{$n};
-                    if ($TempHash{$part.'.Code'} eq '*') {
+		    my $Code = $TempHash{"$part.Code"};
+                    if ( $Code eq '*') {
 			$ProbNo++;
-                        if ($TempHash{$part.'.Tries'}<10) {
-			    $TempHash{$part.'.Code'}=$Tries;
+                        if (($TempHash{"$part.Tries"}<10) ||
+                            ($TempHash{"$part.Tries"} eq '')) {
+			    $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
 			}
                     }
-		    $Str .= $TempHash{$part.'.Code'};
+		    elsif ( $Code eq '+' ) {$ProbNo++;}
+		    $Str .= $TempHash{"$part.Code"};
+		    if ( $Code ne 'x' ) {$ProbTotal++;}
 		}
             }   
-	    else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
+	    else {
+		for(my $n=0; $n<$PartNo; $n++) {
+		    $Str.=' ';
+		    $ProbTotal++;
+		}
+	    }
         } 
     }
-    my $PrTot = sprintf( "%5d", $PrTotal );
-    $Str .= ' '.'<font color="#000088">'.$PrTot.'</font> ';
+    my $PrTot = sprintf( "%5d", $ProbTotal );
+    my $PrSvd = sprintf( "%5d", $ProbSolved );
+    $Str .= ' '.'<font color="#000088">'.$PrSvd.'  /'.$PrTot.'</font> ';
 
     return $Str ;
 }
@@ -189,7 +223,13 @@ sub tracetable {
 # ================================================================ Main Handler
 
 sub handler {
-  $r=shift;
+
+  undef %hash;
+  undef @students;
+  undef @cols;
+  undef @rowlabels;
+
+  my $r=shift;
 
   if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 # ------------------------------------------- Set document type for header only
@@ -236,6 +276,7 @@ sub handler {
 	                    "   +: correct by override\n".
                             "   -: incorrect by override\n".
 	                    "   .: incorrect attempted\n".
+	                    "   #: ungraded attempted\n".
                             "    : not attempted\n".
 	                    "   x: excused</pre><p>");
   
@@ -257,9 +298,6 @@ sub handler {
 
 # ---------------------------------------------- Read class list and row labels
 
-    undef @rowlabels;
-    undef @students;
-
     my $classlst=&Apache::lonnet::reply
                                  ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
     my $now=time;