--- loncom/interface/Attic/lonchart.pm 2002/02/19 18:58:10 1.30
+++ loncom/interface/Attic/lonchart.pm 2002/03/02 02:03:47 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# (Publication Handler
#
-# $Id: lonchart.pm,v 1.30 2002/02/19 18:58:10 minaeibi Exp $
+# $Id: lonchart.pm,v 1.37 2002/03/02 02:03:47 minaeibi Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,7 +25,6 @@
#
# http://www.lon-capa.org/
#
-#
# Homework Performance Chart
#
# (Navigate Maps Handler
@@ -43,7 +42,7 @@
# 9/8 Gerd Kortemeyer
# 10/1, 10/19, 11/17, 11/22, 11/24, 11/28 12/18 Behrouz Minaei
# YEAR=2002
-# 2/1, 2/6, 2/19 Behrouz Minaei
+# 2/1, 2/6, 2/19, 2/28 Behrouz Minaei
#
###
@@ -64,7 +63,7 @@ my @rowlabels;
my @students;
my @PreCol;
my $r;
-
+
# ------------------------------------------------------------- Find out status
sub ExtractStudentData {
@@ -88,10 +87,10 @@ sub ExtractStudentData {
substr($rowlabels[$index].
' ',0,45).' ! ';
unless ($reply=~/^error\:/) {
- map {
+ foreach (split(/\&/,$reply)) {
my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
$result{$name}=$value;
- } split(/\&/,$reply);
+ }
$ProbNo = 0;
$ProbTotal = 0;
$ProbSolved = 0;
@@ -109,7 +108,7 @@ sub ExtractStudentData {
my $meta=$hash{'src_'.$ResId};
my $PartNo = 0;
undef %TempHash;
- map {
+ foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
if ($_=~/^stores\_(\d+)\_tries$/) {
my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
if ( $TempHash{"$Part"} eq '' ) {
@@ -119,7 +118,7 @@ sub ExtractStudentData {
$PartNo++;
}
}
- } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
+ }
my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ).
'___'.$2.'___'.
@@ -217,13 +216,46 @@ sub tracetable {
}
}
if (defined($hash{'to_'.$rid})) {
- map {
+ foreach (split(/\,/,$hash{'to_'.$rid})){
&tracetable($hash{'goesto_'.$_},$beenhere);
- } split(/\,/,$hash{'to_'.$rid});
+ }
}
}
}
+sub usection {
+ my ($udom,$unam,$courseid,$ActiveFlag)=@_;
+ $courseid=~s/\_/\//g;
+ $courseid=~s/^(\w)/\/$1/;
+ foreach (split(/\&/,&Apache::lonnet::reply('dump:'.
+ $udom.':'.$unam.':roles',
+ &Apache::lonnet::homeserver($unam,$udom)))){
+ my ($key,$value)=split(/\=/,$_);
+ $key=&Apache::lonnet::unescape($key);
+ if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+ my $section=$1;
+ if ($key eq $courseid.'_st') { $section=''; }
+ my ($dummy,$end,$start)=split(/\_/,&Apache::lonnet::unescape($value));
+ if ( $ActiveFlag ne 'Any' ) {
+ my $now=time;
+ my $notactive=0;
+ if ($start) {
+ if ($now<$start) { $notactive=1; }
+ }
+ if ($end) {
+ if ($now>$end) { $notactive=1; }
+ }
+ if ((($ActiveFlag eq 'Expired') && $notactive == 1) ||
+ (($ActiveFlag eq 'Active') && $notactive == 0 ) ) {
+ return $section;
+ }
+ else { return '-1'; }
+ }
+ return $section;
+ }
+ }
+ return '-1';
+}
sub BuildChart {
# ----------------------- Get first and last resource, see if there is anything
@@ -239,32 +271,40 @@ sub BuildChart {
('dump:'.$cdom.':'.$cnum.':classlist',$chome);
my $now=time;
unless ($classlst=~/^error\:/) {
- map {
- my ($name,$value)=split(/\=/,$_);
+ foreach my $KeyPoint(sort split(/\&/,$classlst)) {
+ my ($name,$value)=split(/\=/,$KeyPoint);
my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
my $active=1;
- if (($end) && ($now>$end)) { $active=0; }
+ my $Status=$ENV{'form.status'};
+ $Status = ($Status) ? $Status : 'Active';
+ if ( ( ($end) && $now > $end ) &&
+ ( ($Status eq 'Active') ) ) { $active=0; }
+
+ if ( ($Status eq 'Expired') &&
+ ($end == 0 || $now < $end) ) { $active=0; }
+
if ($active) {
my $thisindex=$#students+1;
$name=&Apache::lonnet::unescape($name);
$students[$thisindex]=$name;
my ($sname,$sdom)=split(/\:/,$name);
$PreCol[$thisindex]=$sname.':';
- my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
+ my $ssec=&usection($sdom,$sname,$cid,$Status);
if ($ssec==-1) {
$rowlabels[$thisindex]=
'Data not available: '.$name;
- } else {
+ }
+ else {
my %reply=&Apache::lonnet::idrget($sdom,$sname);
my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
- ':environment:lastname&generation&firstname&middlename',
- &Apache::lonnet::homeserver($sname,$sdom));
+ ':environment:lastname&generation&firstname&middlename',
+ &Apache::lonnet::homeserver($sname,$sdom));
#$ssec=(int($ssec)) ? int($ssec) : $ssec;
- $rowlabels[$thisindex]=
- sprintf('%3s',$ssec).' '.$reply{$sname}.' ';
- $PreCol[$thisindex] .= $reply.':'.$ssec;
+ my $sec=sprintf('%3s',$ssec);
+ $rowlabels[$thisindex]=$sec.' '.$reply{$sname}.' ';
+ $PreCol[$thisindex] .= $reply.':'.$sec;
my $i=0;
- map {
+ foreach (split(/\&/,$reply)) {
$i++;
if ( $_ ne '') {
$rowlabels[$thisindex].=&Apache::lonnet::unescape($_).' ';
@@ -273,10 +313,10 @@ sub BuildChart {
chop($rowlabels[$thisindex]);
$rowlabels[$thisindex].=', ';
}
- } split(/\&/,$reply);
+ }
}
}
- } sort split(/\&/,$classlst);
+ }
} else {
$r->print('Could not access course data
');
@@ -306,22 +346,36 @@ sub BuildChart {
}
sub CreateForm {
+ my $OpSel1='';
+ my $OpSel2='';
+ my $OpSel3='';
+ my $Status = $ENV{'form.status'};
+ if ( $Status eq 'Any' ) { $OpSel3='selected'; }
+ elsif ($Status eq 'Expired' ) { $OpSel2 = 'selected'; }
+ else { $OpSel1 = 'selected'; }
+
my $Ptr = ''."\n";
$r->print( $Ptr );
}
sub CacheChart {
- my @list = ();
+ my %list = ();
my $count=0;
my $Pos = $ENV{'form.sort'};
@@ -332,11 +386,11 @@ sub CacheChart {
foreach my $key( keys %CachData) {
my @Temp=split(/\:/,$key);
my $Use = $Temp[$Pos];
- $list[$count]=$Use.$key.'*'.$CachData{$key};
+ $list{$Use.$key}=$key;
$count++;
}
- @list = sort (@list);
+ my @order = sort(keys(%list));
$r->print(''.$count.' students
');
&CreateForm();
@@ -344,8 +398,7 @@ sub CacheChart {
$r->print('');
for ( my $n; $n < $count; $n++) {
- my ($dummy, $Line) = split(/\*/,$list[$n]);
- $r->print($Line.'
');
+ $r->print($CachData{$list{$order[$n]}}.'
');
}
$r->print('');
}
@@ -459,10 +512,3 @@ sub handler {
}
1;
__END__
-
-
-
-
-
-
-