--- loncom/interface/Attic/lonchart.pm 2001/01/31 23:21:06 1.1
+++ loncom/interface/Attic/lonchart.pm 2002/02/04 13:52:09 1.28
@@ -1,4 +1,31 @@
# The LearningOnline Network with CAPA
+# (Publication Handler
+#
+# $Id: lonchart.pm,v 1.28 2002/02/04 13:52:09 albertel 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,20 +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/1, 10/19, 11/17, 11/22, 11/24, 11/28 12/18 Behrouz Minaei
+# YEAR=2002
+# 2/1 Behrouz Minaei
#
-# 3/1/1,6/1,17/1,29/1,30/1 Gerd Kortemeyer)
-#
-# 1/31 Gerd Kortemeyer
+###
package Apache::lonchart;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet();
+use Apache::loncommon();
use HTML::TokeParser;
use GDBM_File;
@@ -31,62 +64,130 @@ my @students;
# ------------------------------------------------------------- Find out status
-sub astatus {
- my $rid=shift;
- 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:$ENV{'user.domain'}:$ENV{'user.name'}:".
- $ENV{'request.course.id'}.':'.
- &Apache::lonnet::escape($symb),
- "$ENV{'user.home'}");
- 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 $ProbSolved;
+ my $ProbTotal;
+ 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;
+ $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> ';
+ $ProbSolved += $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;
+ $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;
+ }
+ }
+ }
+ for ( my $n = 0; $n < $PartNo; $n++ ) {
+ my $part = $TempHash{$n};
+ 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.=' ';
+ $ProbTotal++;
+ }
+ }
+ }
}
- return $code;
+ my $PrTot = sprintf( "%5d", $ProbTotal );
+ my $PrSvd = sprintf( "%5d", $ProbSolved );
+ $Str .= ' '.'<font color="#000088">'.$PrSvd.' /'.$PrTot.'</font> ';
+
+ 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}})) &&
@@ -123,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'})) {
@@ -134,6 +241,7 @@ sub handler {
} else {
$r->content_type('text/html');
}
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
return OK;
}
@@ -164,9 +272,16 @@ sub handler {
# ---------------------------------------------------------------- Course title
$r->print('<h1>'.
- $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'</h1>');
-
-
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'}.'</h1><h3>'.
+ localtime()."</h3><p><pre>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".
+ " #: ungraded attempted\n".
+ " : not attempted\n".
+ " x: excused</pre><p>");
+
# ------------------------------- This is going to take a while, produce output
$r->rflush();
@@ -185,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;
@@ -208,14 +320,26 @@ sub handler {
'Data not available: '.$name;
} else {
my %reply=&Apache::lonnet::idrget($sdom,$sname);
- my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
- ':environment:firstname&middlename&lastname&generation',
- &Apache::lonnet::homeserver($sname,$sdom));
+ 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]=
- $ssec.' '.$reply{$sname}.' ';
+ sprintf('%3s ',$ssec).' '.$reply{$sname}.' ';
+ my $i=0;
map {
- $rowlabels[$thisindex].=&Apache::lonnet::unescape($_).' ';
+ $i++;
+ if ( $_ ne '') {
+ $rowlabels[$thisindex].=&Apache::lonnet::unescape($_).' ';
+ }
+ if ($i == 2) {
+ chop($rowlabels[$thisindex]);
+ $rowlabels[$thisindex].=', ';
+ }
} split(/\&/,$reply);
+
}
}
} sort split(/\&/,$classlst);
@@ -237,19 +361,7 @@ sub handler {
$r->print('<p><pre>');
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).'<br>');
$r->rflush();
}
$r->print('</pre>');