';
+ $Str .= "\n".'';
+ $r->print($Str);
+ $r->rflush();
+}
+
+
+sub Decide {
+ my ($type,$foil,$time)=@_;
+ my $k=0;
+ while ($time>$ConceptData{'Int.'.($k+1)} &&
+ $k<$ConceptData{'Interval'}) {$k++;}
+ $ConceptData{"$foil_to_concept{$foil}.$k.$type"}++;
+}
+
+
+sub OpStatus {
+ my ($rid,$student)=@_;
+ my ($uname,$udom)=split(/\:/,$student);
+ my $code='U';
+ $rid=~/(\d+)\.(\d+)/;
+ my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+ &Apache::lonnet::declutter($hash{'src_'.$rid});
+ my %reshash=&Apache::lonnet::restore($symb,$cid,$udom,$uname);
+ my @True = ();
+ my @False = ();
+ my $flag=0;
+ @shown=();
+ if ($reshash{'version'}) {
+ for (my $version=1;$version<=$reshash{'version'};$version++) {
+ my $time=$reshash{"$version:timestamp"};
+ foreach (sort(split(/\:/,$reshash{$version.':keys'}))) {
+ if (($_=~/\.(\w+)\.(\w+)\.submission$/)) {
+ my $Id1 = $1;
+ my $Id2 = $2;
+ my $Resp = $reshash{$_};
+ my %submission=&Apache::lonnet::str2hash($Resp);
+ foreach (keys %submission) {
+ my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"};
+ #$r->print(" shown: ".join(',',@shown)." size=$#shown");
+ if ($submission{$_}) {
+ #if($#shown==-1){
+ #my @str=split(/\&/,$Resp);
+ #my $garb;
+ #for(my $j=0;$j<=$#str;$j++){
+ # ($shown[$j],$garb)=split(/\=/,$str[$j]);
+ #}
+ ##$r->print(" shown: ".join(',',@shown)." size=$#shown");
+ #}
+ if ($submission{$_} eq $Ansr) {
+ &Decide("true",$_,$time );
+ }
+ else {&Decide("false",$_,$time );}
+ }
+ #else {
+ # if ($#shown==-1 && $flag==0) {
+ # $flag++;
+ # &InitAnalysis($rid,$student);
+ # }
+ # my @erl=split(/\:/,$_);
+ # for (my $i=0;$i<=$#shown; $i++){
+ # my $Ans=$Answer{"$Id1.$Id2.foil.value.$shown[$i]"};
+ # if ($erl[$i] eq $Ans) {
+ # &Decide("true",$shown[$i],$time);
+ # }
+ # else {&Decide("false",$shown[$i],$time);}
+ # }
+ #}
+ }
+ }
+ }
+ }
+ }
+}
+
+
+#------- Processing upperlist and lowerlist according to each problem
+sub ProcessDisc {
+ my @List = @_;
+ @List = sort (@List);
+ my $Count = $#List+1;
+ my $Prb;
+ my @Dis;
+ my $Slvd=0;
+ my $tmp;
+ my $Sum1=0;
+ my $Sum2=0;
+ my $nIdx=0;
+ my $nStud=0;
+ my %Proc;
+ undef %Proc;
+ while ($nIdx<$Count) {
+ ($Prb,$tmp)=split(/\=/,$List[$nIdx]);
+ @Dis=split(/\+/,$tmp);
+ my $Temp = $Prb;
+ do {
+ $nIdx++;
+ $nStud++;
+ $Sum1 += $Dis[0];
+ $Sum2 += $Dis[1];
+ ($Prb,$tmp)=split(/\=/,$List[$nIdx]);
+ @Dis=split(/\+/,$tmp);
+ } while ( $Prb eq $Temp && $nIdx < $Count );
+# $Proc{$Temp}=($Sum1/$nStud).':'.$nStud;
+ $Proc{$Temp}=($Sum1/$nStud).':'.($Sum2/$nStud);
+# $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} ");
+ $Sum1=0;
+ $Sum2=0;
+ $nStud=0;
+ }
+ return %Proc;
+}
+
+
+#------- Creating Discimination factor
+sub Discriminant {
+ my $Count=0;
+ foreach (keys(%DiscFac)){
+ $Count++;
+ }
+ $UpCnt = int(0.27*$Count);
+ my $low=0;
+ my $up=$Count-$UpCnt;
+ my @UpList=();
+ my @LowList=();
+ $Count=0;
+ foreach my $key (sort(keys(%DiscFac))){
+ $Count++;
+ #$r->print(" $Count) $key = $DiscFac{$key}");
+ if ($low < $UpCnt || $Count > $up) {
+ $low++;
+ my $str=$DiscFac{$key};
+ foreach(split(/\:/,$str)){
+ if ($_) {
+ if ($low<$UpCnt){push(@LowList,$_);}
+ else {push(@UpList,$_);}
+ }
+ }
+ }
+ }
+ %DisUp=&ProcessDisc(@UpList);
+ %DisLow=&ProcessDisc(@LowList);
+}
+
sub NumericSort {
$a <=> $b;
}
@@ -92,9 +486,7 @@ sub StudentReport {
Please select a student' );
return;
}
- my $shome=&Apache::lonnet::homeserver( $sname,$sdom );
- my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
- my %result = ();
+ my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
my $ResId;
my $PrOrd;
my $Code;
@@ -115,11 +507,8 @@ sub StudentReport {
"\n".'
Results
'.
"\n".'
Tries
'.
"\n".'';
- unless ($reply=~/^error\:/) {
- foreach (split(/\&/,$reply)){
- my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
- $result{$name}=$value;
- }
+ my ($temp)=keys(%result);
+ unless ($temp=~/^error\:/) {
foreach my $CurCol (@cols) {
if (!$CurCol){
my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -147,7 +536,7 @@ sub StudentReport {
my $PartNo = 0;
undef %TempHash;
foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))){
- if ($_=~/^stores\_(\d+)\_tries$/) {
+ if ($_=~/^stores\_(\w+)\_tries$/) {
my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
if ( $TempHash{"$Part"} eq '' ) {
$TempHash{"$Part"} = $Part;
@@ -164,8 +553,7 @@ sub StudentReport {
$Code='U';
$Tries = 0;
$Wrongs = 0;
- $LatestVersion = $result{"version:$Prob"};
-
+ $LatestVersion = $result{"version:$Prob"};
if ( $LatestVersion ) {
for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
my $vkeys = $result{"$Version:keys:$Prob"};
@@ -189,7 +577,7 @@ sub StudentReport {
$TempHash{"$Part.Wrongs"} = $Wrongs;
}
}
- }
+ }
for ( my $n = 0; $n < $PartNo; $n++ ) {
my $part = $TempHash{$n};
if ($PtrTry ne '') {$PtrTry .= ',';}
@@ -212,17 +600,18 @@ sub StudentReport {
}
sub CreateTable {
+ my $ColNo=0;
+ foreach (keys(%Header)){
+ $ColNo++;
+ }
my ($Hd, $Hid)=@_;
if ( $Hd == 1 ) {
-# $Hid=~/(\d+)\.(\d+)/;
$r->print(' '.$hash{'title_'.$Hid}.''
-# .' ('.&Apache::lonnet::declutter($hash{'map_id_'.$1}).')'
- );
+ '" target="_blank">'.$hash{'title_'.$Hid}.'');
}
my $Result = "\n".'
';
$Result .= '
P#
'."\n";
- for ( my $nIdx=0; $nIdx < 11; $nIdx++ ) {
+ for ( my $nIdx=0; $nIdx < $ColNo; $nIdx++ ) {
$Result .= '
'.''.'
'."\n";
}
@@ -242,8 +631,6 @@ sub PreStatTable {
"_$ENV{'user.domain'}_$cid\_statistics.db";
my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
"_$ENV{'user.domain'}_$cid\_graph.db";
- my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".
- "_$ENV{'user.domain'}_$cid\_DiscFactor.db";
my $OpSel11='';
my $OpSel12='';
my $OpSel13='';
@@ -270,23 +657,29 @@ sub PreStatTable {
$Ptr .= ''."\n";
$Ptr .= '
'.
- ' #Stdnts: Total Number of Students opened the problem. '.
- ' Tries : Total Number of Tries for solving the problem. '.
- ' Mod : Maximunm Number of Tries for solving the problem. '.
- ' Mean : Average Number of the tries. [ Tries / #Stdnts ] '.
- ' #YES : Number of students solved the problem correctly. '.
- ' #yes : Number of students solved the problem by override. '.
- ' %Wrng : Percentage of students tried to solve the problem but'.
+ ' #Stdnts: Total Number of Students opened the problem. '.
+ ' Tries : Total Number of Tries for solving the problem. '.
+ ' Mod : Maximunm Number of Tries for solving the problem. '.
+ ' Mean : Average Number of the tries. [ Tries / #Stdnts ] '.
+ ' #YES : Number of students solved the problem correctly. '.
+ ' #yes : Number of students solved the problem by override. '.
+ ' %Wrng : Percentage of students tried to solve the problem but'.
' still incorrect. [ 100*((#Stdnts-(#YES+#yes))/#Stdnts) ] '.
-# ' DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ] '.
- ' DoDiff : Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ] '.
- ' S.D. : Standard Deviation of the tries.'.
+# ' DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ] '. Kashy formula
+ ' DoDiff : Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ] '. #Gerd formula
+ ' S.D. : Standard Deviation of the tries.'.
'[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
' where Xi denotes every student\'s tries ] '.
- ' Skew. : Skewness of the students tries.'.
- ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ] '.
-
-# ' Dis.F. : Discrimination Factor. [ Sum of Partial Credits Awarded / Total Number of Tries in %27 upper and lower students]'.
+ ' Skew. : Skewness of the students tries.'.
+ ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ] '.
+ ' Dis.F. : Discrimination Factor: A Standard for '.
+ 'evaluating the problem according to a Criterion '.
+ ' [Applied Criterion in %27 Upper Students - '.
+ 'Applied the same Criterion in %27 Lower Students] '.
+ ' 1st Criterion for Sorting the Students: '.
+ 'Sum of Partial Credit Awarded / Total Number of Tries '.
+ ' 2nd Criterion for Sorting the Students: '.
+ 'Total number of Correct Answers / Total Number of Tries'.
'
';
$r->print($Ptr);
@@ -303,7 +696,6 @@ sub PreStatTable {
}
else {
if (tie(%CachData,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
- tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_WRCREAT,0640);
tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
foreach (keys %DiscFac) {delete $CachData{$_};}
foreach (keys %CachData) {delete $CachData{$_};}
@@ -314,11 +706,10 @@ sub PreStatTable {
$r->print("Unable to tie hash to db file");
}
}
- #$r->print('Total instances of the problems : '.($p_count*($#students+1)));
+# $r->print('Total instances of the problems : '.($p_count*($#students+1)));
untie(%CachData);
untie(%GraphDat);
- untie(%DiscFac);
}
@@ -360,13 +751,10 @@ sub usection {
# ------ Dump the Student's DB file and handling the data for statistics table
-
sub ExtractStudentData {
- my ($student,$coid)=@_;
+ my $student=shift;
my ($sname,$sdom) = split( /\:/, $student );
- my $shome=&Apache::lonnet::homeserver( $sname,$sdom );
- my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$coid,$shome );
- my %result = ();
+ my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
my $ResId;
my $PrOrd;
my $Dis = '';
@@ -381,22 +769,20 @@ sub ExtractStudentData {
my $TotParCr = 0;
my $Wrongs;
my %TempHash;
- my $Version;
+ my $Version;
my $LatestVersion;
my $SecLimit;
my $MapLimit;
- unless ($reply=~/^error\:/) {
- foreach (split(/\&/,$reply)) {
- my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
- $result{$name}=$value;
- }
+ my ($temp)=keys(%result);
+ unless ($temp=~/^error\:/) {
foreach my $CurCol(@cols) {
($PrOrd,$ResId)=split(/\:/,$CurCol);
if ( !$CurCol ) { next; }
$ResId=~/(\d+)\.(\d+)/;
my $MapId=$1;
my $PrbId=$2;
- my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$MapId} );
+ my $MapOrg = $hash{'map_id_'.$MapId};
+ my $Map = &Apache::lonnet::declutter($MapOrg);
if ( $CurMap ne 'All Maps' ) {
my ( $ResMap, $NameMap ) = split(/\=/,$CurMap);
if ( $Map ne $ResMap ) { next; }
@@ -405,8 +791,9 @@ sub ExtractStudentData {
my $PartNo = 0;
$Dis .= ':';
undef %TempHash;
- foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
- if ($_=~/^stores\_(\d+)\_tries$/) {
+
+ foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
+ if ($_=~/^stores\_(\w+)\_tries$/) {
my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
if ( $TempHash{"$Part"} eq '' ) {
$TempHash{"$Part"} = $Part;
@@ -415,22 +802,22 @@ sub ExtractStudentData {
$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
$PartNo++;
}
+ #my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
}
}
-
+ &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+ my $URI = $hash{'src_'.$ResId};
my $Prob = $Map.'___'.$PrbId.'___'.
- &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+ &Apache::lonnet::declutter($URI);
$Code='U';
$Tries = 0;
$ParCr = 0;
$Wrongs = 0;
- $LatestVersion = $result{"version:$Prob"};
-
+ $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;
@@ -442,7 +829,6 @@ sub ExtractStudentData {
$TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;
$TotalTries += $TempHash{"$Part.Tries"};
$TotParCr += $TempHash{"$Part.ParCr"};
-#$r->print($Version.'---'.$Prob.'==='.$Time.' ');
my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
if ( $Val eq 'correct_by_student' )
{ $Wrongs = $Tries - 1; $Code = 'C'; }
@@ -461,12 +847,14 @@ sub ExtractStudentData {
my $Yes = 0;
if ( $TempHash{$part.'.Code'} eq 'C' ||
$TempHash{$part.'.Code'} eq 'O' )
- {$ProbSolved++;$Yes=1;}
-# my $ptr = "$hash{'title_'.$ResId}";
- my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
+ {$ProbSolved++;$Yes=1;}
+
+ # my $ptr = "$hash{'title_'.$ResId}";
+ my $ptr = $TempHash{$part.'.PrOrd'}.'&'.$ResId;
+
if ( $PartNo > 1 ) {
$ptr .= "*(part $part)";
- $Dis .= ':';
+ $Dis .= '&';
}
my $Fac = ($TempHash{"$part.Tries"}) ?
($TempHash{"$part.ParCr"}/$TempHash{"$part.Tries"}) : 0;
@@ -475,12 +863,12 @@ sub ExtractStudentData {
$DisF = sprintf( "%.4f", $Fac );
}
else {$DisF = $Fac;}
-# $DisF .= '+'.$TempHash{"$part.Time"};
+# $DisF .= '+'.$TempHash{"$part.Time"};33333333
$TimeTot += $TempHash{"$part.Time"};
- $Dis .= $ptr.'*'.$ResId.'='.$DisF.'+'.$Yes;
- $ptr .= ":$TempHash{$part.'.Tries'}".
- ":$TempHash{$part.'.Wrongs'}".
- ":$TempHash{$part.'.Code'}";
+ $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
+ $ptr .= "&$TempHash{$part.'.Tries'}".
+ "&$TempHash{$part.'.Wrongs'}".
+ "&$TempHash{$part.'.Code'}";
push (@list, $ptr);
$TotalOpend++;
$ProbTot++;
@@ -488,22 +876,21 @@ sub ExtractStudentData {
}
#else {
#for(my $n=0; $n<$PartNo; $n++) {
- # push (@list, "$hash{'title_'.$ResId}*$ResId:0:0:U");
+ # push (@list, "$TempHash{'0'.'.PrOrd'}.':'.$ResId:0:0:U");
# $ProbTot++;
#}
#}
}
if ( $TotalTries ) {
my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
-# my $DisFactor = int(sprintf( "%.4f", $DisFac ) * 100);
my $DisFactor = sprintf( "%.4f", $DisFac );
- my $time;
- if ($ProbSolved){
- $time = int(($TimeTot/$ProbSolved)-10000000);
- }
- $DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.
- $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;
-#$r->print($DisFactor.$sname.' --- Dis= '.$Dis.' ');
+ $DiscFac{$DisFactor}=$Dis;
+ #my $time;
+ #if ($ProbSolved){
+ #$time = int(($TimeTot/$ProbSolved)-10000000);
+ #}
+ #$DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.
+ # $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;
}
}
#$r->print($sname.' PrCr= '.$TotParCr.' Slvd= '.$ProbSolved.' Tries='.$TotalTries.' ');
@@ -513,6 +900,7 @@ sub ExtractStudentData {
# ------------------------------------------------------------ Build page table
sub tracetable {
my ($rid,$beenhere)=@_;
+ my $IsMap=0;
$rid=~/(\d+)\.(\d+)/;
$maps{&Apache::lonnet::declutter($hash{'map_id_'.$1})}='';#$hash{'title_'.$rid};
#$maps{$HWN}=$hash{'title_'.$rid};
@@ -524,7 +912,9 @@ sub tracetable {
$cols[$#cols+1]=0;
$P_Order++;
$HWN=$P_Order;
- $mapsort{$HWN} = $rid.':';
+ $mapsort{$HWN} = $rid.':';
+ $IsMap=1;
+
#$maps{&Apache::lonnet::declutter($hash{'src_'.$rid})}=
# $hash{'title_'.$rid};
}
@@ -539,36 +929,54 @@ sub tracetable {
my $meta=$hash{'src_'.$frid};
my $PartNo = 0;
+ my $Part;
+ # if ($IsMap==0){
if ($meta) {
if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
- if ($_=~/^stores\_(\d+)\_tries$/) {
- &Apache::lonnet::metadata($meta,$_.'.part');
+ if ($_=~/^stores\_(\w+)\_tries$/) {
+ $Part=&Apache::lonnet::metadata($meta,$_.'.part');
$P_Order++;
$mapsort{$HWN} .= '&'.$P_Order;
$PartNo++;
- $r->print(' '.$PartNo.'---'.$P_Order);
+ #$r->print(' '.$PartNo.'---'.$P_Order);
+ }
+ foreach my $K(split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+ if ($K=~/^optionresponse\_($Part)\_(\w+)$/) {
+ #$r->print(' '.$_.'...'.$P_Order.'---'.$Part);
+ $OpResp{$P_Order}=$frid;
+ }
+
}
}
}
}
}
+ # }
} else {
$cols[$#cols+1]=($P_Order+1).':'.$rid;
my $meta=$hash{'src_'.$rid};
my $PartNo = 0;
- if ($meta) {
+ if ($meta) {
if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
- foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
- if ($_=~/^stores\_(\d+)\_tries$/) {
- &Apache::lonnet::metadata($meta,$_.'.part');
+ foreach my $Key(split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
+ if ($Key=~/^stores\_(\w+)\_tries$/) {
+ my $Part=&Apache::lonnet::metadata($meta,$Key.'.part');
$P_Order++;
$mapsort{$HWN} .= '&'.$P_Order;
$PartNo++;
+ foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+ if ($_=~/^optionresponse\_($Part)\_(\w+)$/) {
+ #$r->print(' '.$_.'...'.$P_Order.'---'.$Part);
+ $OpResp{$P_Order}=$rid;
+ }
+
+ }
+
}
}
}
- }
+ }
}
if (defined($hash{'to_'.$rid})) {
foreach (split(/\,/,$hash{'to_'.$rid})){
@@ -589,11 +997,12 @@ sub MySort {
}
}
-sub Build_Statistics {
+sub Create_PrgWin {
+#----------- Create progress
$r->print(<
popwin=open('','popwin','width=400,height=100');
- popwin.document.writeln(''+
+ popwin.document.writeln(''+
'LON-CAPA Statistics'+
'
Computation Progress
'+
'
' );
$GraphDat{$RealIdx}=$DoD.':'.$Wrng;
}
@@ -841,11 +1282,15 @@ sub GetGraphData {
$data .= $inf.',';
$count++;
}
+ if ( $Max > 1 ) {
+ $Max += (10 - $Max % 10);
+ $Max = int($Max);
+ }
+ else { $Max = 1; }
untie(%GraphDat);
my $Course = $ENV{'course.'.$cid.'.description'};
$Course =~ s/\ /"_"/eg;
$GData=$Course.'&'.$Tag.'&'.$Max.'&'.$count.'&'.$data;
-
}
else {
$r->print("Unable to tie hash to db file");
@@ -865,6 +1310,8 @@ sub initial {
undef %CachData;
undef %GraphDat;
undef %DiscFac;
+ undef %OpResp;
+ undef %ConceptData;
undef $CurMap;
undef $CurSec;
undef $CurStu;
@@ -906,25 +1353,27 @@ sub ClassList {
( ($Status eq 'Active') ) ) { $active=0; }
if ( ($Status eq 'Expired') &&
($end == 0 || $now < $end) ) { $active=0; }
+#//new
+# $Status = 'Any';
+#end new
if ($active) {
my $thisindex=$#students+1;
$name=&Apache::lonnet::unescape($name);
$students[$thisindex]=$name;
my ($sname,$sdom)=split(/\:/,$name);
-
#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));
my $ssec=&usection($sdom,$sname,$cid,$Status);
- if ($ssec==-1) {next;}
+# if ($ssec==-1 ) {next;}
+ if ($ssec==-1 || $ssec eq 'adm' ) {next;}
$ssec=($ssec) ? $ssec : '(none)';
#$ssec=(int($ssec)) ? int($ssec) : $ssec;
- #$r->print($sname.'...'.$ssec.' ');
$section{$ssec}=$ssec;
if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
$students[$StudNo]=$name;
- $StuBox{$sname}=$ssec;
+ $StuBox{$sname}=$sdom;
}
$StudNo++;
}
@@ -937,17 +1386,16 @@ sub ClassList {
$r->rflush();
# --------------- Find all assessments and put them into some linear-like order
&tracetable($firstres,'&'.$lastres.'&');
-
# my $c=0;
# foreach (sort keys %mapsort) {
# $r->print(' '.$c.')'.$_.' ... '.$mapsort{$_});
# $c++;
# }
-#foreach(@cols) {
-# $c++;
-# $r->print(' '.$cols[$c]);
-#}
-#$r->print(' Count = '.$c);
+# my $c=1;
+# foreach (sort keys %OpResp) {
+# $r->print(' '.$c.')'.$_.' ... '.$OpResp{$_}.' ... '.$hash{'src_'.$OpResp{$_}});
+# $c++;
+# }
}
@@ -955,64 +1403,75 @@ sub ClassList {
else {
$r->print('
');
+ return;
+ }
+ $r->print('
'.
+ "\n".'
');
+# ---------------------------------------------------------------- Course title
+ $r->print('