--- loncom/interface/Attic/lonchart.pm 2001/12/18 22:22:13 1.25 +++ loncom/interface/Attic/lonchart.pm 2002/02/04 13:52:09 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonchart.pm,v 1.25 2001/12/18 22:22:13 minaeibi Exp $ +# $Id: lonchart.pm,v 1.28 2002/02/04 13:52:09 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,23 +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 -# 12/18/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; @@ -74,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).' ! '. @@ -86,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 .= ' '.''.$PrNo.' '; - $PrTotal += $ProbNo; + $ProbSolved += $ProbNo; $ProbNo=0; next; } @@ -154,13 +159,20 @@ sub ExtractStudentData { } 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 .= ' '.''.$PrTot.' '; + my $PrTot = sprintf( "%5d", $ProbTotal ); + my $PrSvd = sprintf( "%5d", $ProbSolved ); + $Str .= ' '.''.$PrSvd.' /'.$PrTot.' '; return $Str ; } @@ -229,6 +241,7 @@ sub handler { } else { $r->content_type('text/html'); } + &Apache::loncommon::no_cache($r); $r->send_http_header; return OK; } @@ -310,8 +323,11 @@ 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}.' '; + sprintf('%3s ',$ssec).' '.$reply{$sname}.' '; my $i=0; map { $i++;