--- loncom/interface/Attic/lonchart.pm 2001/09/08 19:16:01 1.6
+++ loncom/interface/Attic/lonchart.pm 2001/12/18 20:06:05 1.24
@@ -11,12 +11,12 @@
# 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
+# 12/18/01 Behrouz Minaei
package Apache::lonchart;
@@ -44,97 +44,98 @@ sub ExtractStudentData {
my $Code;
my $Tries;
my $Wrongs;
+ my %TempHash;
my $Version;
-
+ 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 .= ' '.''.$PrNo.' ';
+ $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} );
$Code=' ';
$Tries = 0;
- $Version = $result{"version:$Prob"};
- if ( $Version ) {
- my $vkeys = $result{"$Version:keys:$Prob"};
- my @keys = split(/:/,$vkeys);
- foreach my $Key (@keys) {
- if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
- my $Part = $1;
- $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
- my $Val = $result{"$Version:$Prob:$Key"};
- 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';}
+ $LatestVersion = $result{"version:$Prob"};
+
+ 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;
+ $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
+ $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 (($Code eq '*')&&($Tries<10)){$Code=$Tries;}
}
+ for ( my $n = 0; $n < $PartNo; $n++ ) {
+ my $part = $TempHash{$n};
+ 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 .= $Code;
+ else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
}
}
- return $Str;
+ my $PrTot = sprintf( "%5d", $PrTotal );
+ $Str .= ' '.''.$PrTot.' ';
+
+ return $Str ;
}
-#sub astatus {
-# my ($rid,$student)=@_;
-# my ($uname,$udom)=split(/\:/,$student);
-# my $code=' ';
-# $rid=~/(\d+)\.(\d+)/;
-# my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
-# &Apache::lonnet::declutter($hash{'src_'.$rid});
-# my $answer=&Apache::lonnet::reply(
-# "restore:$udom:$uname:".
-# $ENV{'request.course.id'}.':'.
-# &Apache::lonnet::escape($symb),
-# &Apache::lonnet::homeserver($uname,$udom));
-# my %returnhash=();
-# map {
-# my ($name,$value)=split(/\=/,$_);
-# $returnhash{&Apache::lonnet::unescape($name)}=
-# &Apache::lonnet::unescape($value);
-# } split(/\&/,$answer);
-# if ($returnhash{'version'}) {
-# my $version;
-# for ($version=1;$version<=$returnhash{'version'};$version++) {
-# map {
-# $returnhash{$_}=$returnhash{$version.':'.$_};
-# } split(/\:/,$returnhash{$version.':keys'});
-# }
-# my $totaltries=0;
-# map {
-# if (($_=~/\.(\w+)\.solved$/) && ($_!~/^\d+\:/)) {
-# my $part=$1;
-# if ($returnhash{$_} eq 'correct_by_student') {
-# unless (($code eq '.') || ($code eq '-')) { $code='*'; }
-# $totaltries+=$returnhash{'resource.'.$part.'.tries'};
-# } elsif ($returnhash{$_} eq 'correct_by_override') {
-# unless (($code eq '.') || ($code eq '-')) { $code='+'; }
-# } elsif ($returnhash{$_} eq 'incorrect_attempted') {
-# $code='.';
-# } elsif ($returnhash{$_} eq 'incorrect_by_override') {
-# $code='-';
-# } elsif ($returnhash{$_} eq 'excused') {
-# unless (($code eq '.') || ($code eq '-')) { $code='x'; }
-# }
-# }
-# } keys %returnhash;
-# if (($code eq '*') && ($totaltries<10)) { $code="$totaltries"; }
-# }
-# return $code;
-#}
# ------------------------------------------------------------ Build page table
@@ -142,9 +143,10 @@ sub tracetable {
my ($rid,$beenhere)=@_;
unless ($beenhere=~/\&$rid\&/) {
$beenhere.=$rid.'&';
+# new ... updating the map according to sequence and page
if (defined($hash{'is_map_'.$rid})) {
- if ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}}
- eq 'sequence') {
+ my $cmap=$hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}};
+ if ( $cmap eq 'sequence' || $cmap eq 'page' ) {
$cols[$#cols+1]=0;
}
if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
@@ -181,6 +183,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'})) {
@@ -228,6 +236,7 @@ sub handler {
" +: correct by override\n".
" -: incorrect by override\n".
" .: incorrect attempted\n".
+ " #: ungraded attempted\n".
" : not attempted\n".
" x: excused");
@@ -249,9 +258,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;
@@ -310,19 +316,6 @@ sub handler {
$r->print('
');
my $index;
for ($index=0;$index<=$#students;$index++) {
-# $r->print(
-# substr($students[$index].
-# ' ',0,14).' ! '.
-# substr($rowlabels[$index].
-# ' ',0,45).' ! ');
- # map {
- # if ($_) {
- # $r->print(&astatus($_,$students[$index]));
- # } else {
- # $r->print(' ! ');
- # }
- # } @cols;
- # $r->print("\n");
$r->print(&ExtractStudentData($index,$cid).'
');
$r->rflush();
}