--- loncom/interface/Attic/lonchart.pm 2001/11/22 17:05:07 1.11
+++ loncom/interface/Attic/lonchart.pm 2002/02/01 16:37:58 1.27
@@ -1,4 +1,31 @@
# The LearningOnline Network with CAPA
+# (Publication Handler
+#
+# $Id: lonchart.pm,v 1.27 2002/02/01 16:37:58 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,19 +33,19 @@
# (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)
-#
-# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer)
-#
-# 1/31 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 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;
@@ -33,7 +60,6 @@ my %hash;
my @cols;
my @rowlabels;
my @students;
-my $r;
# ------------------------------------------------------------- Find out status
@@ -50,9 +76,9 @@ sub ExtractStudentData {
my %TempHash;
my $Version;
my $ProbNo;
- my $PrTotal;
- my $LatestVersion;
-
+ my $ProbSolved;
+ my $ProbTotal;
+ my $LatestVersion;
my $Str=substr($students[$index].
' ',0,14).' ! '.
substr($rowlabels[$index].
@@ -63,21 +89,20 @@ 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;
}
$ResId=~/(\d+)\.(\d+)/;
my $meta=$hash{'src_'.$ResId};
-# $r->print($m.'
');
-# $r->rflush();
my $PartNo = 0;
undef %TempHash;
map {
@@ -92,13 +117,6 @@ sub ExtractStudentData {
}
} split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
-# foreach my $Key (%TempHash) {
-# $r->print($Key.' = '.$TempHash{$Key}.'
');
-# $r->rflush();
-# }
-
-$r->print($PartNo.'
');$r->rflush();
-
my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ).
'___'.$2.'___'.
&Apache::lonnet::declutter( $hash{'src_'.$ResId} );
@@ -106,51 +124,54 @@ $r->print($PartNo.'
');$r->rflush();
$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';}
+ elsif ($Val eq 'ungraded_attempted'){$Code = '#';}
+ else {$Code = ' ';}
$TempHash{"$Part.Code"} = $Code;
}
}
}
-
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 .= ' '.''.$PrTot.' ';
+ my $PrTot = sprintf( "%5d", $ProbTotal );
+ my $PrSvd = sprintf( "%5d", $ProbSolved );
+ $Str .= ' '.''.$PrSvd.' /'.$PrTot.' ';
return $Str ;
}
@@ -202,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
@@ -249,6 +276,7 @@ sub handler {
" +: correct by override\n".
" -: incorrect by override\n".
" .: incorrect attempted\n".
+ " #: ungraded attempted\n".
" : not attempted\n".
" x: excused");
@@ -270,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;
@@ -296,8 +321,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++;