--- loncom/interface/Attic/lonchart.pm 2001/02/05 18:58:04 1.3
+++ loncom/interface/Attic/lonchart.pm 2001/11/22 17:05:07 1.11
@@ -14,6 +14,11 @@
# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer)
#
# 1/31 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
package Apache::lonchart;
@@ -28,66 +33,139 @@ my %hash;
my @cols;
my @rowlabels;
my @students;
+my $r;
# ------------------------------------------------------------- Find out status
-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"; }
+sub ExtractStudentData {
+ my ($index,$coid)=@_;
+ my ($sname,$sdom) = split( /\:/, $students[$index] );
+ my $shome=&Apache::lonnet::homeserver( $sname,$sdom );
+ my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$coid,$shome );
+ my %result=();
+ my $ResId;
+ 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 ($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};
+# $r->print($m.'
');
+# $r->rflush();
+ 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'));
+
+# 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} );
+ $Code=' ';
+ $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"};
+ 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';}
+ $TempHash{"$Part.Code"} = $Code;
+ }
+ }
+ }
+
+ for ( my $n = 0; $n < $PartNo; $n++ ) {
+ my $part = $TempHash{$n};
+ if ($TempHash{$part.'.Code'} eq '*') {
+ $ProbNo++;
+ if ($TempHash{$part.'.Tries'}<10) {
+ $TempHash{$part.'.Code'}=$Tries;
+ }
+ }
+ $Str .= $TempHash{$part.'.Code'};
+ }
+ }
+ else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
+ }
}
- return $code;
+ my $PrTot = sprintf( "%5d", $PrTotal );
+ $Str .= ' '.''.$PrTot.' ';
+
+ return $Str ;
}
+
# ------------------------------------------------------------ Build page table
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}})) &&
@@ -124,7 +202,7 @@ sub tracetable {
# ================================================================ Main Handler
sub handler {
- my $r=shift;
+ $r=shift;
if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
# ------------------------------------------- Set document type for header only
@@ -165,9 +243,15 @@ sub handler {
# ---------------------------------------------------------------- Course title
$r->print(''.
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'
');
-
-
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.''.
+ localtime()."
1..9: correct by student in 1..9 tries\n".
+ " *: correct by student in more than 9 tries\n".
+ " +: correct by override\n".
+ " -: incorrect by override\n".
+ " .: incorrect attempted\n".
+ " : not attempted\n".
+ " x: excused
");
+
# ------------------------------- This is going to take a while, produce output
$r->rflush();
@@ -218,16 +302,15 @@ sub handler {
map {
$i++;
if ( $_ ne '') {
- $rowlabels[$thisindex].=&Apache::lonnet::unescape($_).'
-';
+ $rowlabels[$thisindex].=&Apache::lonnet::unescape($_).' ';
}
if ($i == 2) {
chop($rowlabels[$thisindex]);
$rowlabels[$thisindex].=', ';
}
} split(/\&/,$reply);
-
- }
+
+ }
}
} sort split(/\&/,$classlst);
@@ -248,19 +331,7 @@ 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();
}
$r->print('');