--- loncom/interface/lonstatistics.pm	2002/03/02 01:42:42	1.5
+++ loncom/interface/lonstatistics.pm	2002/03/06 18:42:01	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.5 2002/03/02 01:42:42 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.7 2002/03/06 18:42:01 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,7 +30,7 @@
 # 5/05,7/09,7/25/01,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
 # 11/1, 11/4, 11/16, 12/14, 12/16, 12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002
-# 1/22, 2/1, 2/6, 2/25 Behrouz Minaei
+# 1/22, 2/1, 2/6, 2/25, 3/2, 3/6 Behrouz Minaei
 ###
 
 package Apache::lonstatistics; 
@@ -41,7 +41,6 @@ use Apache::lonnet();
 use Apache::lonhomework;
 use HTML::TokeParser;
 use GDBM_File;
-#use Benchmark;
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
@@ -52,6 +51,9 @@ my %mapsort;
 my %section;
 my %StuBox;
 my %DiscFac;
+my %DisUp;
+my %DisLow;
+my $UpCnt;
 my $CurMap;
 my $CurSec;
 my $CurStu;
@@ -75,24 +77,92 @@ my $lastres;
 my $DiscFlag;
 my $HWN;
 my $P_Order;
-my %Header = (0,"Homework Problems",1,"#Stdnts",2,"Tries",3,"Mod",
+my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
               4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
-              9,"S.D.",10,"Skew.",11,"Map");
-#             11,"Dis.F.",12,"Resourse URL");
+              9,"S.D.",10,"Skew.",
+              11,"D.F.",12,"U.A.",13,"L.A.",14,"U.R.",15,"L.R.");
 
+#------- 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 $Sum=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++;
+	    $Sum += $Dis[$CurDis];
+	    ($Prb,$tmp)=split(/\=/,$List[$nIdx]);
+	    @Dis=split(/\+/,$tmp);
+	} while ( $Prb eq $Temp && $nIdx < $Count );
+	$Proc{$Temp}=$Sum.':'.$nStud;
+	$Proc{$Temp}=($Sum/$nStud).':'.$nStud;
+#        $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} <br>");
+	$Sum=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("<br>$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;
 }
 
 # ------ Create different Student Report 
 sub StudentReport {
+
     my ($sname,$sdom)=@_;
+
     if ( $sname eq 'All Students' ) {
 	$r->print( '<h3><font color=blue>WARNING: 
                     Please select a student</font></h3>' );
 	return;
     }
-    my $shome=&Apache::lonnet::homeserver( $sname,$sdom );          
+    my $shome=&Apache::lonnet::homeserver($sname,$sdom);          
     my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
     my %result = ();
     my $ResId;
@@ -164,8 +234,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 +258,7 @@ sub StudentReport {
 			    $TempHash{"$Part.Wrongs"} = $Wrongs;
 			}
      		    }
-                } 
+                }
 		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
 		    my $part = $TempHash{$n};
 		    if ($PtrTry ne '') {$PtrTry .= ',';}
@@ -212,17 +281,18 @@ sub StudentReport {
 }
 
 sub CreateTable {
+    my $ColNo=0;
+    foreach (keys(%Header)){ 
+	$ColNo++;
+    } 
     my ($Hd, $Hid)=@_;
     if ( $Hd == 1 ) {
-#	$Hid=~/(\d+)\.(\d+)/;
 	$r->print('<br><a href="'.$hash{'src_'.$Hid}.
-                  '" target="_blank">'.$hash{'title_'.$Hid}.'</a>'
-#                  .' ('.&Apache::lonnet::declutter($hash{'map_id_'.$1}).')'
-                 );
+                  '" target="_blank">'.$hash{'title_'.$Hid}.'</a>');
     }
     my $Result = "\n".'<table border=2>';
     $Result .= '<tr><th>P#</th>'."\n";
-    for ( my $nIdx=0; $nIdx < 11; $nIdx++ ) { 
+    for ( my $nIdx=0; $nIdx < $ColNo; $nIdx++ ) { 
 	$Result .= '<th>'.'<input type="submit" name="sort" value="'.
                    $Header{$nIdx}.'" />'.'</th>'."\n";
     }
@@ -244,9 +314,22 @@ sub PreStatTable {
                   "_$ENV{'user.domain'}_$cid\_graph.db";
     my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".
 		     "_$ENV{'user.domain'}_$cid\_DiscFactor.db";
-    $r->print('<br><input type="submit" name="sort" value="Recalculate Statistics" />');
+    my $OpSel11='';
+    my $OpSel12='';
+    my $OpSel13='';
+    my $Status = $ENV{'form.status'};
+    if ( $Status eq 'Any' ) { $OpSel13='selected'; }
+    elsif ($Status eq 'Expired' ) { $OpSel12 = 'selected'; }
+    else { $OpSel11 = 'selected'; }
 
     my $Ptr = '';
+    $Ptr .= '<br><b> Student Status: &nbsp; </b>'."\n".
+            '<select name="status">'. 
+            '<option '.$OpSel11.' >Active</option>'."\n".
+            '<option '.$OpSel12.' >Expired</option>'."\n".
+	    '<option '.$OpSel13.' >Any</option> </select> '."\n";
+    $Ptr .= '&nbsp;&nbsp;&nbsp;';
+    $Ptr .= '<input type=submit name=sort value="Recalculate Statistics"/>'."\n";
 
     $Ptr .= '<br><b> Sorting Type: &nbsp; </b>'."\n".
             '<select name="order"> <option '.$OpSel1.' >Ascending</option>'."\n".
@@ -257,23 +340,35 @@ sub PreStatTable {
     $Ptr .= '<input type="submit" name="sort" value="%Wrong Graph" />'."\n";
 
     $Ptr .= '<pre>'.
-    '  #Stdnts: Total Number of Students opened the problem.<br>'. 
-    '  Tries  : Total Number of Tries for solving the problem.<br>'. 
-    '  Mod    : Maximunm Number of Tries for solving the problem.<br>'. 
-    '  Mean   : Average Number of the tries. [ Tries / #Stdnts ]<br>'.
-    '  #YES   : Number of students solved the problem correctly.<br>'. 
-    '  #yes   : Number of students solved the problem by override.<br>'.
-    '  %Wrng  : Percentage of students tried to solve the problem but'.
+    '<b>  #Stdnts</b>: Total Number of Students opened the problem.<br>'. 
+    '<b>  Tries  </b>: Total Number of Tries for solving the problem.<br>'. 
+    '<b>  Mod   </b> : Maximunm Number of Tries for solving the problem.<br>'. 
+    '<b>  Mean   </b>: Average Number of the tries. [ Tries / #Stdnts ]<br>'.
+    '<b>  #YES   </b>: Number of students solved the problem correctly.<br>'. 
+    '<b>  #yes   </b>: Number of students solved the problem by override.<br>'.
+    '<b>  %Wrng  </b>: Percentage of students tried to solve the problem but'.
     ' still incorrect. [ 100*((#Stdnts-(#YES+#yes))/#Stdnts) ]<br>'.
 #    '  DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]<br>'.
-    '  DoDiff : Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'.
-    '  S.D.   : Standard Deviation of the tries.'.
+    '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'.
+    '<b>  S.D.  </b> : Standard Deviation of the tries.'.
     '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
     ' where Xi denotes every student\'s tries ]<br>'.
-    '  Skew.  : Skewness of the students tries.'.
+    '<b>  Skew.  </b>: Skewness of the students tries.'.
     ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
 
-#    '  Dis.F. : Discrimination Factor. [ Sum of Partial Credits Awarded / Total Number of Tries in %27 upper and lower students]</b>'.	
+    '<b>  Dis.F. </b>: Discrimination Factor. [ Sum of Partial Credits'.
+    ' Awarded / Total Number of Tries in %27 upper and lower students]<br>'.	
+    '<b>  U.A.   </b>: Upper %27 Award<br>'.	
+    '<b>  L.A.   </b>: Lower %27 Award<br>'.	
+    '<b>  U.R.   </b>: Upper %27 Records<br>'.	
+    '<b>  L.R.   </b>: Lower %27 Records'.	
+
+#    "<br>The <b>Upper 27%</b> has <b>$UpCnt</b> records.".
+#    "&nbsp;&nbsp;The <b>Lower 27%</b> has <b>$UpCnt</b> records <br>".
+#    "The Criterion of sorting the students: ". 
+#    "<b>( Sum of Partial Credits Awarded / ".
+#    "Total Number of Tries )</b>".
+
             '</pre>';
 
     $r->print($Ptr);
@@ -281,6 +376,7 @@ sub PreStatTable {
 
     if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) {
 	if (tie(%CachData,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
+	    tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_READER,0640);
 	    tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
 	    &Cache_Statistics();
         }
@@ -312,24 +408,37 @@ sub PreStatTable {
 # ------------------------------------- Find the section of student in a course
 
 sub usection {
-    my ($udom,$unam,$courseid)=@_;
+    my ($udom,$unam,$courseid,$ActiveFlag)=@_;
     $courseid=~s/\_/\//g;
     $courseid=~s/^(\w)/\/$1/;
-    map {
+    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));
-            $section=($section) ? $section : '(none)';
-#            $section=(int($section)) ? int($section) : $section;
-#            $r->print($unam.'...'.$section.'<br>');
+	    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;
         }
-    } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles',
-                        &Apache::lonnet::homeserver($unam,$udom)));
-    return '';
+    }
+    return '-1';
 }
 
 
@@ -435,9 +544,11 @@ sub ExtractStudentData {
 		    my $Yes = 0;
                     if ( $TempHash{$part.'.Code'} eq 'C' ||
                          $TempHash{$part.'.Code'} eq 'O'  ) 
-		       {$ProbSolved++;$Yes=1;}		    
-#		    my $ptr = "$hash{'title_'.$ResId}";
+		       {$ProbSolved++;$Yes=1;}		
+
+ #		    my $ptr = "$hash{'title_'.$ResId}";
 		    my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
+
 		    if ( $PartNo > 1 ) {                
 			$ptr .= "*(part $part)";
 			$Dis .= ':';
@@ -451,7 +562,9 @@ sub ExtractStudentData {
 		    else {$DisF = $Fac;}
 #		    $DisF .= '+'.$TempHash{"$part.Time"};
 		    $TimeTot += $TempHash{"$part.Time"};
-		    $Dis .= $ptr.'*'.$ResId.'='.$DisF.'+'.$Yes;
+		    $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
+
+            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
 		    $ptr .= ":$TempHash{$part.'.Tries'}".
 		            ":$TempHash{$part.'.Wrongs'}".
                             ":$TempHash{$part.'.Code'}";
@@ -469,15 +582,15 @@ sub ExtractStudentData {
         }
 	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.'<br> --- Dis= '.$Dis.'<br>');
+	    $DiscFac{$DisFactor}=$Dis;
+            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
+	    #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.'<br>');
@@ -553,7 +666,7 @@ sub tracetable {
 }
 
 sub MySort {          
-    if ( $Pos > 0 && $Pos < 11 ) {
+    if ( $Pos > 0 ) {
 	if ($ENV{'form.order'} eq 'Descending') {$b <=> $a;}
 	else { $a <=> $b; }
     }
@@ -567,7 +680,7 @@ sub Build_Statistics {
     $r->print(<<ENDPOP);
     <script>
     popwin=open('','popwin','width=400,height=100');
-    popwin.document.writeln('<html><body bgcolor="#7777EE">'+
+    popwin.document.writeln('<html><body bgcolor="#88DDFF">'+
       '<title>LON-CAPA Statistics</title>'+
       '<h4>Computation Progress</h4>'+
       '<form name=popremain>'+
@@ -589,12 +702,16 @@ ENDPOP
 
         &ExtractStudentData($students[$index],$cid);
     }
-#--------------------- close Progress Line
-    $r->print('<script>popwin.close()</script>');
-    $r->rflush(); 
+
 # -------------------- sorting the Data
+    $r->print('<script>popwin.document.popremain.remaining.value="'.
+              'Calculating Discrimination Factors...";</script>');
+
     @list = sort (@list);
 
+
+    &Discriminant();
+
     $OpSel2='';
     $OpSel1='selected';
  		   
@@ -692,6 +809,17 @@ ENDPOP
 		$Skewness /= $StdNo;
 	    $Skewness /= $StdDev*$StdDev*$StdDev;
 	    }
+
+#--------------------- Compute the Discrimination Factors
+	    my ($UpD,$UpNo)=split(/\:/,$DisUp{$lpr[$i]});
+	    my ($LwD,$LwNo)=split(/\:/,$DisLow{$lpr[$i]});
+	    $UpNo = ($UpNo) ? $UpNo : 0;
+	    $LwNo = ($LwNo) ? $LwNo : 0;
+	    my $U_D = sprintf("%.2f", $UpD);
+	    my $L_D = sprintf("%.2f", $LwD);
+	    my $DisFac = $UpD - $LwD;
+	    my $_Dis = sprintf("%.2f", $DisFac);
+
 #-----------------  Some restition in presenting the float numbers
 	    my $Avg = sprintf( "%.2f", $Average );
 	    my $Wrng = sprintf( "%.1f", $Wrong );
@@ -701,7 +829,8 @@ ENDPOP
 	    my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.
                        $TotalTries.':'.$MxTries.':'.$Avg.':'.
                        $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.
-		       $SD.':'.$Sk.':'.$Map.':'.$Prob;
+		       $SD.':'.$Sk.':'.$_Dis.':'.$U_D.':'.
+                       $L_D.':'.$UpNo.':'.$LwNo.':'.$Prob;
 	    $CachData{($p_count-1)}=$join;
 
 	    $urlres=~/^(\w+)\/(\w+)/;
@@ -715,6 +844,9 @@ ENDPOP
 	}
 	&CloseTable();
     }
+#--------------------- close Progress Line
+    $r->print('<script>popwin.close()</script>');
+    $r->rflush(); 
 }
 
 sub Cache_Statistics {
@@ -727,7 +859,7 @@ sub Cache_Statistics {
     $p_count = 0;
     foreach my $key( keys %CachData) { 
 	my @Temp=split(/\:/,$CachData{$key});
-	if ( $Pos == 0 || $Pos == 11 ) {
+	if ( $Pos == 0 ) {
 	    ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]);
 	}
 	else {
@@ -767,13 +899,14 @@ sub Cache_Statistics {
 sub TableRow {
     my ($Str,$Idx,$RealIdx)=@_;
     my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
-       $Override,$Wrng,$DoD,$SD,$Sk,$res,$Prob)=split(/\:/,$Str);	
+       $Override,$Wrng,$DoD,$SD,$Sk,$_Dis,$U_D,$L_D,$UpNo,$LwNo,
+       $Prob)=split(/\:/,$Str);	
     $r->print( "\n".'<tr>'.
                "\n".'<td>'.($RealIdx+1).'</td>'.
                "\n".'<td bgcolor="#FFFFFF">'.$Temp.'</td>'.
-               "\n".'<td bgcolor="#EEFFDD"> '.$StdNo.'</td>'.
-               "\n".'<td bgcolor="#EEFFDD">'.$TotalTries.'</td>'.
-               "\n".'<td bgcolor="#EEFFDD">'.$MxTries.'</td>'.
+               "\n".'<td bgcolor="#EEFFCC"> '.$StdNo.'</td>'.
+               "\n".'<td bgcolor="#EEFFCC">'.$TotalTries.'</td>'.
+               "\n".'<td bgcolor="#EEFFCC">'.$MxTries.'</td>'.
                "\n".'<td bgcolor="#DDFFFF">'.$Avg.'</td>'.
                "\n".'<td bgcolor="#DDFFFF"> '.$YES.'</td>'.
                "\n".'<td bgcolor="#DDFFFF"> '.$Override.'</td>'.
@@ -781,7 +914,11 @@ sub TableRow {
                "\n".'<td bgcolor="#FFDDDD">'.$DoD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
-#               "\n".'<td>'.$res.'</td>'.
+               "\n".'<td bgcolor="#FFDDCC"> '.$_Dis.'</td>'.
+               "\n".'<td bgcolor="#FFFFDD"> '.$U_D.'</td>'.
+               "\n".'<td bgcolor="#FFFFDD"> '.$L_D.'</td>'.
+               "\n".'<td bgcolor="#FFFFDD"> '.$UpNo.'</td>'.
+               "\n".'<td bgcolor="#FFFFDD"> '.$LwNo.'</td>'.
                "\n".'</tr>' );
     $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
@@ -866,23 +1003,42 @@ sub ClassList {
 	my $classlst=&Apache::lonnet::reply
                  ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
 	my $StudNo = 0;
+	my $now=time;
 	unless ($classlst=~/^error\:/) {
 	    foreach (sort split(/\&/,$classlst)) {
 		my ($name,$value)=split(/\=/,$_);
 		my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
 		$name=&Apache::lonnet::unescape($name);
 		my ($sname,$sdom)=split(/\:/,$name);
-		my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid);
-                if ($ssec==-1) {next;}
-		$ssec=($ssec) ? $ssec : '(none)';
-		#$ssec=(int($ssec)) ? int($ssec) : $ssec;
-		#$r->print($sname.'...'.$ssec.'<br>');
-		$section{$ssec}=$ssec;
-		if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
-		    $students[$StudNo]=$name;
-		    $StuBox{$sname}=$ssec;
-		}
-		$StudNo++;
+		my $active=1;
+		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);
+
+		    #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;}
+		    $ssec=($ssec) ? $ssec : '(none)';
+		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
+		    #$r->print($sname.'...'.$ssec.'<br>');
+		    $section{$ssec}=$ssec;
+		    if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
+			$students[$StudNo]=$name;
+			$StuBox{$sname}=$sdom;
+		    }
+		    $StudNo++;
+	        }
 	    }
 	}
 	else {
@@ -939,11 +1095,9 @@ sub Menu {
 	my $content = $ENV{'form.sort'};
 	if ($content eq '' || $content eq 'Return to Menu') {
 	    my $Ptr = '<h3>';
-	    $Ptr .= '<input type=submit name=sort value="Problem Evaluation"/>';#General Statistics"/>';
+	    $Ptr .= '<input type=submit name=sort value="Problem Evaluation"/>';
 	    $Ptr .= '<br><br>';
 	    $Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
-	    $Ptr .= '<br><br>';
-#	    $Ptr .= '<input type=submit name=sort value=Discrimination>';#"Problem Evaluation"/>';
 	    $Ptr .= '</h3>';
 	    $r->print( $Ptr );
       	}
@@ -995,8 +1149,8 @@ sub StudentOptions {
 
 sub GetStatus {
 
-    $OpSelDis1='';
-    $OpSelDis2='';
+#    $OpSelDis1='';
+#    $OpSelDis2='';
     $OpSel1='';
     $OpSel2='';
     $OpSel3='';