--- loncom/interface/Attic/lonchart.pm	2001/12/06 21:57:23	1.23
+++ loncom/interface/Attic/lonchart.pm	2002/02/06 16:59:50	1.29
@@ -1,4 +1,31 @@
 # The LearningOnline Network with CAPA
+# (Publication Handler
+#
+# $Id: lonchart.pm,v 1.29 2002/02/06 16:59:50 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
@@ -6,22 +33,26 @@
 # (Page Handler
 #
 # (TeX Content Handler
-#
+# YEAR=2000
 # 05/29/00,05/30 Gerd Kortemeyer)
 # 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)
-#
+# YEAR=2001
 # 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
+# 10/1, 10/19, 11/17, 11/22, 11/24, 11/28 12/18 Behrouz Minaei
+# YEAR=2002
+# 2/1 Behrouz Minaei
+#
+###
 
 package Apache::lonchart;
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
+use Apache::loncommon();
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -46,7 +77,8 @@ sub ExtractStudentData {
     my %TempHash;
     my $Version;
     my $ProbNo;
-    my $PrTotal;
+    my $ProbSolved;
+    my $ProbTotal;
     my $LatestVersion;                     
     my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.
@@ -58,14 +90,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; 
 	    }
@@ -116,21 +149,30 @@ sub ExtractStudentData {
                 } 
 		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.Tries"} eq '')) {
 			    $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
 			}
                     }
+		    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 ;
 }
@@ -182,6 +224,12 @@ sub tracetable {
 # ================================================================ Main Handler
 
 sub handler {
+
+  undef %hash;
+  undef @students;
+  undef @cols;
+  undef @rowlabels;
+
   my $r=shift;
 
   if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
@@ -193,6 +241,7 @@ sub handler {
        } else {
            $r->content_type('text/html');
        }
+       &Apache::loncommon::no_cache($r);
        $r->send_http_header;
        return OK;
    }
@@ -251,9 +300,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;
@@ -277,6 +323,9 @@ sub handler {
 		    my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
                                                      ':environment:lastname&generation&firstname&middlename',
                                                      &Apache::lonnet::homeserver($sname,$sdom));
+
+                    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
+
                     $rowlabels[$thisindex]=
                       sprintf('%3s',$ssec).' '.$reply{$sname}.' ';
                     my $i=0;