--- loncom/interface/lonstatistics.pm	2002/02/04 16:08:26	1.1
+++ loncom/interface/lonstatistics.pm	2002/03/02 23:22:32	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.1 2002/02/04 16:08:26 albertel Exp $
+# $Id: lonstatistics.pm,v 1.6 2002/03/02 23:22:32 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,30 +27,28 @@
 #
 # (Navigate problems for statistical reports
 # YEAR=2001
-# 5/05/01, 7/09/01, 7/25/01, 8/11/01,9/13/01, 9/26/01 Behrouz Minaei
-# 10/5/01, 10/9/01, 10/22/01, 10/26/01 Behrouz Minaei
-# 11/1/01, 11/4/01, 11/16/01 Behrouz Minaei
-# 12/14/01, 12/16/01, 12/18/01,12/20/01,12/31/01 Behrouz Minaei
+# 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/02,2/1/02
+# 1/22, 2/1, 2/6, 2/25, 3/2 Behrouz Minaei
 ###
 
-package Apache::lonstatistics;
+package Apache::lonstatistics; 
 
 use strict;
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::lonhomework;
-use Apache::loncommon();
 use HTML::TokeParser;
 use GDBM_File;
-use Benchmark;
+#use Benchmark;
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
 my %CachData;
 my %GraphDat;
 my %maps;
+my %mapsort;
 my %section;
 my %StuBox;
 my %DiscFac;
@@ -74,351 +72,18 @@ my $GData;
 my $cid;
 my $firstres;
 my $lastres;
-my $DiscFlag=0;
-
-my %Header = (0,"Problem Title",1,"#Stdnts",2,"Tries",3,"Mod",
-              4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"S.D.",
-              9,"Skew.",10,"DoDiff",11,"Map");
-#             9,"Skew.",10,"DoDiff",11,"Dis.F.",12,"Resourse URL");
-
-my %class = ();
-
-my @LS;
-my @LF;
-
-sub GetBin {
-    my ($Index1,$Index2,$String,$C)=@_;
-    my @step = 5;
-    my @L=($C eq 'S') ? @LS : @LF;
-    my $Count=$#L+1;
-    $r->print("<br>zone   $C ------ $String ");
-    for(my $n=0;$n<$Count;$n++){  
-	my @t=split(/\:/,$L[$n]);
-        $r->print("<br>$t[$Index1] $t[$Index2]");
-    }
-}
-
-sub GetUniqe {
-    my ($Index,$String,$C)=@_;
-    my @step = 5;
-    my @L=($C eq 'S') ? @LS : @LF;
-    my $Count=$#L+1;
-    my @List=();
-    for(my $n=0;$n<$Count;$n++){  
-	my @t=split(/\:/,$L[$n]);
-	push(@List,$t[$Index]);
-        #$r->print("<br>$t[$Index]");
-    }
-    @List = sort NumSort(@List);
-
-    $r->print("<br>zone   $C ------ $String ");
-    my $nIdx=0;
-    my $nPrb=0;
-    my %Proc;
-    undef %Proc;
-    while ( $nIdx < $Count ) {
-	my $Focus=$List[$nIdx];
-	my $Temp = $Focus;
-	do {
-	    $nIdx++;
-	    $nPrb++;
-	    $Focus=$List[$nIdx];
-	    #$Proc{$name}=$Focus;
-	} while ( $Focus == $Temp && $nIdx < $Count );
-        $r->print("<br>$Temp --> $nPrb");
-	$nPrb=0;
-    }
-    return %Proc;
-}
-
-sub GetUniq {
-    my ($Index,$String)=@_;
-    my @step = 5;
-    my $Count=0;
-    my @List=();
-    my @temp=();
-    foreach (keys(%DiscFac)){  
-	$Count++;
-	my @temp1=split(/\:/,$_);
-        @temp=($temp1[$Index],@temp1);
-	push(@List,join(':',@temp));
-    }
-    @List = sort NumericSort(@List);
-
-    $r->print("<br><br>zone ($Index) ------ $String ----- / $temp[3]");
-    my $nIdx=0;
-    my $nPrb=0;
-    my %Proc;
-    undef %Proc;
-    while ( $nIdx < $Count ) {
-	my ($Focus,$Dummy,$name)=split(/\:/,$List[$nIdx]);
-	my $Temp = $Focus;
-	$Proc{$name}=$Focus;
-	do {
-	    $nIdx++;
-	    $nPrb++;
-	    ($Focus,$Dummy,$name)=split(/\:/,$List[$nIdx]);
-	    $Proc{$name}=$Focus;
-	} while ( $Focus == $Temp && $nIdx < $Count );
-        $r->print("<br>$Temp --> $nPrb");
-	$nPrb=0;
-    }
-    return %Proc;
-}
+my $DiscFlag;
+my $HWN;
+my $P_Order;
+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");
 
 sub NumericSort {          
     $a <=> $b;
 }
 
-
-#------- Classification  
-sub Classify {
-    my $Count=0;
-    my @List=();
-#    foreach(keys %class){
-#        $r->print("<br>$_ --> $class{$_}");
-#    }
-	   # $DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.
-            #          $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;
-    @LS=();
-    @LF=();
-    my $cf=0;
-    my $cs=0;
-    foreach (keys(%DiscFac)){  
-	my @l=split(/\:/,$_);	
-	if ($class{$l[1]}){
-	    if( $class{$l[1]} == 4 ) {
-		$cs++;
-		push(@LS,('S:'.$l[6].':'.$l[0].':'.$l[5].':'.$l[4].':'.$l[3].':'.$class{$l[1]}));
-	    }	    
-	    elsif ( $class{$l[1]} < 3 ) {
-		$cf++;
-		push(@LF,('F:'.$l[6].':'.$l[0].':'.$l[5].':'.$l[4].':'.$l[3].':'.$class{$l[1]}));
-	    }
-	}
-    }
-    
-    $r->print("<br>zone successful");
-    for(my $n=0;$n<$cs;$n++){
-	$r->print('<br>'.$LS[$n]);
-    }
-
-    $r->print("<br>zone failed");
-    for(my $n=0;$n<$cf;$n++){
-	$r->print('<br>'.$LF[$n]);
-    }
- 
-#    my %Disc = &GetUniqe(@List,5,"Discrimination Factor");    
-#    my %Opnd = &GetUniq(@List,3,"Total Opened");
-#    my %Trys = &GetUniq(@Lsit4,"Total Tries");
-#    my %Slvd = &GetUniq(5,"Problems Solved");
-
-   # my (@L, $Index,$String)=@_;
-    my %Time = &GetUniqe(1,"Time",'S');
-    &GetUniqe(1,"Time",'F');
-    &GetUniqe(2,"Discrimination Factor",'S');    
-    &GetUniqe(2,"Discrimination Factor",'F');
-    &GetUniqe(3,"Solved",'S');
-    &GetUniqe(3,"Solved",'F');
-    &GetUniqe(4,"Tries",'S');
-    &GetUniqe(4,"Tries",'F');    
-
-    &GetBin(1,2, "  Time ... Discriminat",'S');
-    &GetBin(1,2, "  Time ... Discriminat",'F');
-    &GetBin(1,3, "  Time ... Solved",'S');
-    &GetBin(1,3, "  Time ... Solved",'F');
-    &GetBin(1,4, "  Time ... Tries",'S');
-    &GetBin(1,4, "  Time ... Tries",'F');
-    &GetBin(2,3, "  Discriminant ... Solved",'S');
-    &GetBin(2,3, "  Discriminant ... Solved",'F');
-    &GetBin(2,4, "  Discriminant ... Tries",'S');
-    &GetBin(2,4, "  Discriminant ... Tries",'F');
-    &GetBin(3,4, "  Solved ... Tries",'S');
-    &GetBin(3,4, "  solved ... Tries",'F');
-#    foreach (keys(%Disc)) {
-#        $r->print("<br>: $Disc{$_} --> $Slvd{$_}");
- #   } 
- #   $r->print("<br>..........Discriminant ...  Time................");
- ##   foreach (keys(%Disc)) {
- #       $r->print("<br>$Disc{$_} --> $Time{$_}");
-  #  } 
-  #  $r->print("<br>..........Time ...  Solved.......................");
-  #  foreach (keys(%Disc)) {
-  #      $r->print("<br>$Disc{$_} --> $Slvd{$_}");
-  #  }  
-}
-
-#------- 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 --> ($nPrb) $Proc{$Temp} <br>");
-	$Sum=0;
-	$nStud=0;
-    }
-    return %Proc;
-}
-
-#------- Creating Discimination factor table  
-sub DiscriminationTable {
-    my $Count=0;
-    foreach (keys(%DiscFac)){ 
-	$Count++;
-    }
-    my $UpCnt = int(0.27*$Count);
-    $r->print("<br><br>".
-              "Current map: <b>\"$CurMap\"</b> &nbsp;&nbsp;&nbsp; ".
-              "Current Section: <b>\"$CurSec\" </b>&nbsp;&nbsp;&nbsp;".
-              "Number of valid students: <b>$Count</b>".
-              "<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>".
-              " <br><br>");
-    $r->rflush();
-    my $low=0;
-    my $up=$Count-$UpCnt;
-    my @UpList=();
-    my @LowList=();
-    $Count=0;
-    foreach my $key (sort(keys(%DiscFac))){ 
-	$Count++;    
-#        $r->print("$Count) $key <br>");
-
-	if ($low < $UpCnt || $Count > $up) {
-	    $low++;
-	    my $str=$DiscFac{$key};
-#            $r->print("$Count) $str <br>");
-	    foreach(split(/\:/,$str)){
-		if ($_) {
-		    if ($low<$UpCnt){push(@LowList,$_);}
-		    else {push(@UpList,$_);}
-		}
-	    }
-	}
-    }
-
-    my %Up=&ProcessDisc(@UpList);
-    my %Low=&ProcessDisc(@LowList);
-
-    my @list = ();
-    my $Useful;
-    my $UnUseful;
-    $p_count = 0;
-
-    foreach my $key( keys %CachData) { 
-	my @Temp=split(/\:/,$CachData{$key});
-	($UnUseful,$Useful)=split(/\>/,$Temp[0]);   
-	$list[$p_count]=$Useful.'&'.$CachData{$key};
-        $p_count++;
-    }
-
-    @list = sort MySort (@list);
-
-    my $Result = "\n".'<table border=2>';
-    $Result .= "\n".'<tr><th>P#</th>'; 
-    $Result .= "\n".'<th>'.$Header{0}.'</th>';
-    $Result .= "\n".'<th>'.'Discrimination Factor'.'</th>';
-    $Result .= "\n".'<th>'.'%Upper Award'.'</th>';
-    $Result .= "\n".'<th>'.'%Lower Award'.'</th>';
-    $Result .= "\n".'<th>'.'Upper Records'.'</th>';
-    $Result .= "\n".'<th>'.'Lower Records'.'</th>';
-    $Result .= "\n".'<th>'.'%Degree of Difficulty'.'</th>';
-    $Result .= "\n".'</tr>';    
-    $r->print( $Result );
-
-    for ( my $nIdx = 0; $nIdx < $p_count; $nIdx++ ) {
-	my( $Pre, $Post ) = split(/\&/,$list[$nIdx]); 
-	my ($Temp,$MxTries,$StdNo,$TotalTries,$YES,$Override,
-            $Wrng,$Avg,$SD,$Sk,$DoD,$res,$Prob)=split(/\:/,$Post);
-	my ($UpDis,$UpNo)=split(/\:/,$Up{$Prob});
-	my ($LwDis,$LwNo)=split(/\:/,$Low{$Prob});
-	$UpNo = ($UpNo) ? $UpNo : 0;
-	$LwNo = ($LwNo) ? $LwNo : 0;
-	my $U_Dis = sprintf("%.4f", $UpDis)*100;
-	my $L_Dis = sprintf("%.4f", $LwDis)*100;
-	my $DisFac = $UpDis - $LwDis;
-	my $_Dis = sprintf("%.4f", $DisFac)*100;
-        $r->print( "\n".'<tr>'.
-                   "\n".'<td>'.($nIdx+1).'</td>'.
-                   "\n".'<td>'.$Temp.'</td>'.
-                   "\n".'<td>'.$_Dis.'</td>'.
-                   "\n".'<td>'.$U_Dis.'</td>'.
-                   "\n".'<td>'.$L_Dis.'</td>'.
-                   "\n".'<td>'.$UpNo.'</td>'.
-                   "\n".'<td>'.$LwNo.'</td>'.
-                   "\n".'<td>'.($DoD).'</td>'.
-                   "\n".'</tr>' );
-    } 
-    $r->print("\n".'</table>');
-    $r->rflush();
-}
-
-sub CreateDiscFac {
-
-    my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
-                  "_$ENV{'user.domain'}_$cid\_statistics.db";
-    my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".
-		     "_$ENV{'user.domain'}_$cid\_DiscFactor.db";
-
-    my $ptr='';
-#    $ptr .= '<br><b> Discrimination Criterion: &nbsp; </b>'."\n".
-#            '<select name="DisType"> <option '.$OpSelDis1.'>  Total Numebr of Correct Answers </option>'."\n".
-#	    '<option '.$OpSelDis2.'></option>Sum of Partial Awarded Credits / Total Number of Tries  </select> '."\n";		          
-    $ptr .= '<br><input type="submit" name="sort" '.
-            'value="Recalculate Discrimintion Factor" />';
-    $r->print($ptr);
-
-    if ((-e "$CacheDB")&&
-         ($ENV{'form.sort'} ne 'Recalculate Discrimintion Factor')) {
-	if (tie(%CachData,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
-            tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_READER,0640);
-            #&DiscriminationTable();
-	    &Classify(); 
-        } 
-        else {$r->print("Unable to tie hash to db file");}
-    }
-    else {
-	if (tie(%CachData,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
-	    tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_WRCREAT,0640);
-	    foreach (keys %CachData) {delete $CachData{$_};}
-	    foreach (keys %DiscFac) {delete $DiscFac{$_};}
-	    $DiscFlag=1;
-	    &Build_Statistics();
-	    $DiscFlag=0;
-            &DiscriminationTable(); 
-	}
-        else {$r->print("Unable to tie hash to db file");}
-    }
-    untie(%CachData);
-    untie(%DiscFac);
-}	    
-
-
 # ------ Create different Student Report 
 sub StudentReport {
     my ($sname,$sdom)=@_;
@@ -431,6 +96,7 @@ sub StudentReport {
     my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
     my %result = ();
     my $ResId;
+    my $PrOrd;
     my $Code;
     my $Tries;
     my $TotalTries = 0;
@@ -450,12 +116,12 @@ sub StudentReport {
 	      "\n".'<th> Tries </th>'.
 	      "\n".'</tr>';
     unless ($reply=~/^error\:/) {
-        map {
+        foreach (split(/\&/,$reply)){
             my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
             $result{$name}=$value;
-        } split(/\&/,$reply);;
-        foreach $ResId (@cols) {
-	    if ( !$ResId ) {
+        }
+        foreach my $CurCol (@cols) {
+	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
 		if ( $Set ) {
 		    $SetNo++;
@@ -470,6 +136,7 @@ sub StudentReport {
 		$PtrCod='';
 		next; 
 	    }
+	    ($PrOrd,$ResId)=split(/\:/,$CurCol);
             $ResId=~/(\d+)\.(\d+)/;
             my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$1} );
             if ( $CurMap ne 'All Maps' ) {
@@ -479,17 +146,18 @@ sub StudentReport {
 	    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 '' ) { 
 			$TempHash{"$Part"} = $Part;
 			$TempHash{$PartNo}=$Part;
 			$TempHash{"$Part.Code"} = '-';  
+			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;  
 			$PartNo++;
 		    }
 		}
-            } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
+            }
 
             my $Prob = $Map.'___'.$2.'___'.
                        &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
@@ -543,9 +211,31 @@ sub StudentReport {
     $r->rflush();
 }
 
+sub CreateTable {
+    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}).')'
+                 );
+    }
+    my $Result = "\n".'<table border=2>';
+    $Result .= '<tr><th>P#</th>'."\n";
+    for ( my $nIdx=0; $nIdx < 11; $nIdx++ ) { 
+	$Result .= '<th>'.'<input type="submit" name="sort" value="'.
+                   $Header{$nIdx}.'" />'.'</th>'."\n";
+    }
+    $Result .= "\n".'</tr>'."\n";    
+    $r->print( $Result );
+    $r->rflush();
+}
 
-
-
+sub CloseTable {
+    $r->print("\n".'</table>'."\n");
+    $r->rflush();
+}
+ 
 # ------------------------------------------- Prepare Statistics Table
 sub PreStatTable {
     my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
@@ -554,9 +244,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".
@@ -570,29 +273,24 @@ sub PreStatTable {
     '  #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 / #Stdns ]<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 still incorrect. [ 100*((#Stdnts-(#YES+#yes))/#Stdnts) ]<br>'.
-    '  S.D.   : Standard Deviation of the tries.[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1) where Xi is every student\'s tries ]<br>'.
-    '  Skew.  : Skewness of the students tries. [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
+    '  %Wrng  : 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.'.
+    '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
+    ' where Xi denotes every student\'s tries ]<br>'.
+    '  Skew.  : 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>'.	
             '</pre>';
 
     $r->print($Ptr);
     $r->rflush();	
-		      
-    my $Result = "\n".'<table border=2>';
-    $Result .= '<tr><th>P#</th>'."\n";
-    for ( my $nIdx=0; $nIdx < 12; $nIdx++ ) { 
-	$Result .= '<th>'.'<input type="submit" name="sort" value="'.
-                   $Header{$nIdx}.'" />'.'</th>'."\n";
-    }
-    $Result .= "\n".'</tr>'."\n";    
-    $r->print( $Result );
-    $r->rflush();
 
     if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) {
 	if (tie(%CachData,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
@@ -620,34 +318,44 @@ sub PreStatTable {
 
     untie(%CachData);
     untie(%GraphDat);
-    untie(%DiscFac);
-
-    $r->print("\n".'</table>'."\n");
-    $r->rflush();        
+    untie(%DiscFac);       
 }
 
 
 # ------------------------------------- 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';
 }
 
 
@@ -660,6 +368,7 @@ sub ExtractStudentData {
     my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$coid,$shome );
     my %result = ();
     my $ResId;
+    my $PrOrd;
     my $Dis = '';
     my $Code;
     my $Tries;
@@ -677,15 +386,17 @@ sub ExtractStudentData {
     my $SecLimit;
     my $MapLimit;
     unless ($reply=~/^error\:/) {
-        map {
+        foreach (split(/\&/,$reply)) {
             my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
             $result{$name}=$value;
-#$r->print($name.'='.$value.'<br>');
-        } split(/\&/,$reply);
-        foreach $ResId (@cols) {
-	    if ( !$ResId ) { next; }
+        }
+        foreach my $CurCol(@cols) {
+	    ($PrOrd,$ResId)=split(/\:/,$CurCol);
+	    if ( !$CurCol ) { next; }
             $ResId=~/(\d+)\.(\d+)/;
-            my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$1} );
+	    my $MapId=$1;
+	    my $PrbId=$2;
+            my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$MapId} );
             if ( $CurMap ne 'All Maps' ) {
 		my ( $ResMap, $NameMap ) = split(/\=/,$CurMap);
 		if ( $Map ne $ResMap ) { next; }
@@ -694,19 +405,20 @@ sub ExtractStudentData {
 	    my $PartNo = 0;
 	    $Dis .= ':';
 	    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 '' ) { 
 			$TempHash{"$Part"} = $Part;
 			$TempHash{$PartNo}=$Part;
 			$TempHash{"$Part.Code"} = 'U';  
+			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
 			$PartNo++;
 		    }
 		}
-            } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
+            }
 
-            my $Prob = $Map.'___'.$2.'___'.
+            my $Prob = $Map.'___'.$PrbId.'___'.
                        &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
             $Code='U';
             $Tries = 0;
@@ -750,9 +462,10 @@ sub ExtractStudentData {
                     if ( $TempHash{$part.'.Code'} eq 'C' ||
                          $TempHash{$part.'.Code'} eq 'O'  ) 
 		       {$ProbSolved++;$Yes=1;}		    
-		    my $ptr = "$hash{'title_'.$ResId}";
+#		    my $ptr = "$hash{'title_'.$ResId}";
+		    my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
 		    if ( $PartNo > 1 ) {                
-			$ptr .= " (part $part)";
+			$ptr .= "*(part $part)";
 			$Dis .= ':';
 		    }
 		    my $Fac = ($TempHash{"$part.Tries"}) ? 
@@ -765,21 +478,20 @@ sub ExtractStudentData {
 #		    $DisF .= '+'.$TempHash{"$part.Time"};
 		    $TimeTot += $TempHash{"$part.Time"};
 		    $Dis .= $ptr.'*'.$ResId.'='.$DisF.'+'.$Yes;
-		    $ptr .= "*$ResId:$TempHash{$part.'.Tries'}".
+		    $ptr .= ":$TempHash{$part.'.Tries'}".
 		            ":$TempHash{$part.'.Wrongs'}".
-                            ":$TempHash{$part.'.Code'}";		    
-#$r->print($sname.' -- '.$ptr.'--- timestamp='.$TempHash{"$part.Time"}.'<br>');
+                            ":$TempHash{$part.'.Code'}";
 		    push (@list, $ptr);
 		    $TotalOpend++;
 		    $ProbTot++;
 		}
             }
-	    else { 
-		for(my $n=0; $n<$PartNo; $n++) {
-		    push (@list, "$hash{'title_'.$ResId}*$ResId:0:0:U");
-		    $ProbTot++; 
-		}
-	    }
+	    #else { 
+		#for(my $n=0; $n<$PartNo; $n++) {
+		#    push (@list, "$hash{'title_'.$ResId}*$ResId:0:0:U");
+		#    $ProbTot++; 
+		#}
+	    #}
         }
 	if ( $TotalTries ) {
 	    my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
@@ -787,7 +499,7 @@ sub ExtractStudentData {
 	    my $DisFactor = sprintf( "%.4f", $DisFac );
 	    my $time;
 	    if ($ProbSolved){
-		$time = int(($TimeTot/$ProbSolved)/10000000);
+		$time = int(($TimeTot/$ProbSolved)-10000000);
 	    }
 	    $DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.
                       $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;
@@ -803,47 +515,71 @@ sub tracetable {
     my ($rid,$beenhere)=@_;
     $rid=~/(\d+)\.(\d+)/;
     $maps{&Apache::lonnet::declutter($hash{'map_id_'.$1})}='';#$hash{'title_'.$rid}; 
+    #$maps{$HWN}=$hash{'title_'.$rid}; 
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&'; 
        if (defined($hash{'is_map_'.$rid})) {
 	   my $cmap=$hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}};
            if ( $cmap eq 'sequence' || $cmap eq 'page' ) { 
                $cols[$#cols+1]=0;
+	       $P_Order++;
+	       $HWN=$P_Order;
+               $mapsort{$HWN} = $rid.':'; 
                #$maps{&Apache::lonnet::declutter($hash{'src_'.$rid})}= 
                #      $hash{'title_'.$rid}; 
            }
            if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
                (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
-              my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
+	       my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 
-                &tracetable($hash{'map_start_'.$hash{'src_'.$rid}},
-                '&'.$frid.'&');
+               &tracetable($hash{'map_start_'.$hash{'src_'.$rid}},
+			   '&'.$frid.'&');
 
-              if ($hash{'src_'.$frid}) {
-                 if ($hash{'src_'.$frid}=~
-                                 /\.(problem|exam|quiz|assess|survey|form)$/) {
-		     $cols[$#cols+1]=$frid;
-                 }
-	      }
+	       $cols[$#cols+1]=($P_Order+1).':'.$frid;
+      
+	       my $meta=$hash{'src_'.$frid};
+	       my $PartNo = 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');
+			       $P_Order++;
+			       $mapsort{$HWN} .= '&'.$P_Order;
+			       $PartNo++;
+			       $r->print('<br>'.$PartNo.'---'.$P_Order);
+			   }
+		       }
+		   }
+               }
 	   }
        } else {
-          if ($hash{'src_'.$rid}) {
-             if ($hash{'src_'.$rid}=~
-                                 /\.(problem|exam|quiz|assess|survey|form)$/) {
-	         $cols[$#cols+1]=$rid;
-             }
-          }
+	   $cols[$#cols+1]=($P_Order+1).':'.$rid;
+	   my $meta=$hash{'src_'.$rid};
+	   my $PartNo = 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');
+			   $P_Order++;
+			   $mapsort{$HWN} .= '&'.$P_Order;
+			   $PartNo++;
+		       }
+		   }
+	       }
+	   }
        }
        if (defined($hash{'to_'.$rid})) {
-          map {
+          foreach (split(/\,/,$hash{'to_'.$rid})){
               &tracetable($hash{'goesto_'.$_},$beenhere);
-          } split(/\,/,$hash{'to_'.$rid});
+          }
        }
     }
 }
 
 sub MySort {          
-    if ( $Pos > 0 && $Pos < 11 ) {
+    if ( $Pos > 0 ) {
 	if ($ENV{'form.order'} eq 'Descending') {$b <=> $a;}
 	else { $a <=> $b; }
     }
@@ -855,16 +591,16 @@ sub MySort {
 
 sub Build_Statistics {
     $r->print(<<ENDPOP);
-<script>
+    <script>
     popwin=open('','popwin','width=400,height=100');
-    popwin.document.writeln('<html><body bgcolor="#8cee8c">'+
+    popwin.document.writeln('<html><body bgcolor="#88CC88">'+
       '<title>LON-CAPA Statistics</title>'+
       '<h4>Computation Progress</h4>'+
       '<form name=popremain>'+
       '<input type=text size=35 name=remaining value=Starting></form>'+
       '</body></html>');
     popwin.document.close();
-</script>
+    </script>
 ENDPOP
 
     $r->rflush();
@@ -883,7 +619,8 @@ ENDPOP
     $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
 # -------------------- sorting the Data
-    @list = sort(@list);
+    @list = sort (@list);
+
     $OpSel2='';
     $OpSel1='selected';
  		   
@@ -894,140 +631,129 @@ ENDPOP
     my $ResId;
     my $NoElements = $#list + 1;
 #-------------------------------- loop for data representation
-    while ( $nIdx < $NoElements ) {
-        my %storestats=();
-	my ($Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
-	my $Temp = $Prob;
-	my $MxTries = 0;
-	my $TotalTries = 0;
-	my $YES = 0;
-	my $Incorrect = 0;
-	my $Override = 0;
-	my $StdNo = 0;
-	my @StdLst; 
-	do {
-	    $nIdx++;
-	    $StdNo++;
-	    $StdLst[ $StdNo ] = $Tries;
-	    $TotalTries += $Tries;
-	    if ( $MxTries < $Tries ) { $MxTries = $Tries; } 
-	    if ( $Code eq 'C' ){ $YES++; }
-	    elsif( $Code eq 'I' ) { $Incorrect++; }
-	    elsif( $Code eq 'O' ) { $Override++; }
-	    elsif( $Code eq 'U' ) { $StdNo--; }
-	    ($Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
-	} while ( $Prob eq $Temp && $nIdx < $NoElements );	
-
-	$p_count++;
-
-	($Temp,$ResId)=split(/\*/,$Temp);
+    foreach (sort keys %mapsort) {
+	my ($Hid,$pr)=split(/\:/,$mapsort{$_});
+	my @lpr=split(/\&/,$pr);
+	&CreateTable(1,$Hid);
+	for (my $i=1; $i<=$#lpr; $i++) {
+	    my %storestats=();
+	    my ($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+	    my $Temp = $Prob;
+	    my $MxTries = 0;
+	    my $TotalTries = 0;
+	    my $YES = 0;
+	    my $Incorrect = 0;
+	    my $Override = 0;
+	    my $StdNo = 0;
+	    my @StdLst;
+	    while ( $PrOrd == $lpr[$i] ) 
+	    {
+		$nIdx++;
+		$StdNo++;
+		$StdLst[ $StdNo ] = $Tries;
+		$TotalTries += $Tries;
+		if ( $MxTries < $Tries ) { $MxTries = $Tries; } 
+		if ( $Code eq 'C' ){ $YES++; }
+		elsif( $Code eq 'I' ) { $Incorrect++; }
+		elsif( $Code eq 'O' ) { $Override++; }
+		elsif( $Code eq 'U' ) { $StdNo--; }
+		($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+	    }	
+
+	    $p_count++;
+	    my $Dummy;
+	    ($ResId,$Dummy)=split(/\*/,$Temp);
 
-        $Temp = '<a href="'.$hash{'src_'.$ResId}.'" target="_blank">'.$Temp.'</a>';
+	    $Temp = '<a href="'.$hash{'src_'.$ResId}.
+                '" target="_blank">'.$hash{'title_'.$ResId}.$Dummy.'</a>';
     
-	my $res = &Apache::lonnet::declutter($hash{'src_'.$ResId});
-        my $urlres=$res;
+	    my $res = &Apache::lonnet::declutter($hash{'src_'.$ResId});
+	    my $urlres=$res;
 
-        $ResId=~/(\d+)\.(\d+)/;
-        my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$1} );
-        $urlres=$Map;
+	    $ResId=~/(\d+)\.(\d+)/;
+	    my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$1} );
+	    $urlres=$Map;
  
-
-        $res = '<a href="'.$hash{'src_'.$ResId}.'">'.$res.'</a>';
-
-        #$Map = '<a href="'.$Map.'">'.$res.'</a>';
+	    $res = '<a href="'.$hash{'src_'.$ResId}.'">'.$res.'</a>';
+	    #$Map = '<a href="'.$Map.'">'.$res.'</a>';
 
 #------------------------ Compute the Average of Tries about one problem
-	my $Average = ($StdNo) ? $TotalTries/$StdNo : 0;
+	    my $Average = ($StdNo) ? $TotalTries/$StdNo : 0;
 
-        $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___timestamp'}=time;       
-        $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___stdno'}=$StdNo;
-        $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___avetries'}=$Average;
+	    $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___timestamp'}=time;       
+	    $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___stdno'}=$StdNo;
+	    $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___avetries'}=$Average;
    
 #-------------------------------- Compute percentage of Wrong tries
-	my $Wrong = ( $StdNo ) ? 100 * ( $Incorrect / $StdNo ) : 0;
+	    my $Wrong = ( $StdNo ) ? 100 * ( $Incorrect / $StdNo ) : 0;
 
 #-------------------------------- Compute Standard Deviation
-	my $StdDev = 0; 
-	if ( $StdNo > 1 ) {
-	    for ( my $n = 0; $n < $StdNo; $n++ ) {
-                my $Dif = $StdLst[ $n ]-$Average;
-		$StdDev += $Dif*$Dif;
-	    } 
-	    $StdDev /= ( $StdNo - 1 );
-	    $StdDev = sqrt( $StdDev );
-	}
+	    my $StdDev = 0; 
+	    if ( $StdNo > 1 ) {
+		for ( my $n = 0; $n < $StdNo; $n++ ) {
+		    my $Dif = $StdLst[ $n ]-$Average;
+		    $StdDev += $Dif*$Dif;
+		} 
+		$StdDev /= ( $StdNo - 1 );
+		$StdDev = sqrt( $StdDev );
+	    }
 
 #-------------------------------- Compute Degree of Difficulty
-	my $DoDiff = 0;
-	if( $TotalTries > 0 ) {
-	    $DoDiff = 1 - ( ( $YES + $Override ) / $TotalTries );
+	    my $DoDiff = 0;
+	    if( $TotalTries > 0 ) {
+		$DoDiff = 1 - ( ( $YES + $Override ) / $TotalTries );
 #	    $DoDiff =  ($TotalTries)/($YES + $Override+ 0.1);	    
-	}
+	    }
        
-        $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___difficulty'}=$DoDiff;
+	    $storestats{$ENV{'request.course.id'}.'___'.$urlres.'___difficulty'}=$DoDiff;
 
 #-------------------------------- Compute the Skewness
-	my $Skewness = 0;
-        my $Sum = 0; 
-	if ( $StdNo > 0 && $StdDev > 0 ) {
-	    for ( my $n = 0; $n < $StdNo; $n++ ) {
-                my $Dif = $StdLst[ $n ]-$Average;
-		$Skewness += $Dif*$Dif*$Dif;
-	    } 
-	    $Skewness /= $StdNo;
+	    my $Skewness = 0;
+	    my $Sum = 0; 
+	    if ( $StdNo > 0 && $StdDev > 0 ) {
+		for ( my $n = 0; $n < $StdNo; $n++ ) {
+		    my $Dif = $StdLst[ $n ]-$Average;
+		    $Skewness += $Dif*$Dif*$Dif;
+		} 
+		$Skewness /= $StdNo;
 	    $Skewness /= $StdDev*$StdDev*$StdDev;
-	}
+	    }
 #-----------------  Some restition in presenting the float numbers
-	my $Avg = sprintf( "%.2f", $Average );
-	my $Wrng = sprintf( "%.1f", $Wrong );
-	my $SD = sprintf( "%.1f", $StdDev );
-	my $DoD = sprintf( "%.2f", $DoDiff );
-	my $Sk = sprintf( "%.1f", $Skewness );
-    
-	$CachData{($p_count-1)}=$Temp.':'.$StdNo.':'.$TotalTries.':'.
-                                $MxTries.':'.$Avg.':'.$YES.':'.
-                                $Override.':'.$Wrng.':'.$SD.':'.
-                                $Sk.':'.$DoD.':'.$Map.':'.$Prob;
-
-        $urlres=~/^(\w+)\/(\w+)/;
-        if ($StdNo) { 
-           &Apache::lonnet::put('resevaldata',\%storestats,$1,$2); 
-        }
-
+	    my $Avg = sprintf( "%.2f", $Average );
+	    my $Wrng = sprintf( "%.1f", $Wrong );
+	    my $SD = sprintf( "%.1f", $StdDev );
+	    my $DoD = sprintf( "%.2f", $DoDiff );
+	    my $Sk = sprintf( "%.1f", $Skewness );
+	    my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.
+                       $TotalTries.':'.$MxTries.':'.$Avg.':'.
+                       $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.
+		       $SD.':'.$Sk.':'.$Prob;
+	    $CachData{($p_count-1)}=$join;
+
+	    $urlres=~/^(\w+)\/(\w+)/;
+	    if ($StdNo) { 
+		&Apache::lonnet::put('resevaldata',\%storestats,$1,$2); 
+	    }
 #-------------------------------- Row of statistical table
-        if ( $DiscFlag == 0 ) {
-	    $r->print( "\n".'<tr>'.
-               "\n".'<td>'.$p_count.'</td>'.
-               "\n".'<td>'.$Temp.'</td>'.
-               "\n".'<td>'.$StdNo.'</td>'.
-               "\n".'<td>'.$TotalTries.'</td>'.
-               "\n".'<td>'.$MxTries.'</td>'.
-               "\n".'<td>'.$Avg.'</td>'.
-               "\n".'<td>'.$YES.'</td>'.
-               "\n".'<td>'.$Override.'</td>'.
-               "\n".'<td>'.$Wrng.'</td>'.
-               "\n".'<td>'.$SD.'</td>'.
-               "\n".'<td>'.$Sk.'</td>'.
-               "\n".'<td>'.$DoD.'</td>'.
-               "\n".'<td>'.$Map.'</td>'.
-                       "\n".'</tr>' );
-	    $GraphDat{$nIdx}=$DoD.':'.$Wrng;
-	} 
+	    if ( $DiscFlag == 0 ) {
+		&TableRow($join,$i,($p_count-1));
+	    } 
+	}
+	&CloseTable();
     }
 }
 
-
 sub Cache_Statistics {
     my @list = ();
     my $Useful;
     my $UnUseful;
     my %myHeader = reverse( %Header );
     $Pos = $myHeader{$ENV{'form.sort'}};
+    if ($Pos > 0) {$Pos++;}
     $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 {
@@ -1039,27 +765,51 @@ sub Cache_Statistics {
 
     @list = sort MySort (@list);
 
-    for ( my $nIdx = 0; $nIdx < $p_count; $nIdx++ ) {
-	my( $Pre, $Post ) = split(/\&/,$list[$nIdx]); 
-	my ($Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
-            $Override,$Wrng,$SD,$Sk,$DoD,$res,$Prob)=split(/\:/,$Post);	
-	$r->print( "\n".'<tr>'.
-               "\n".'<td>'.($nIdx+1).'</td>'.
-               "\n".'<td>'.$Temp.'</td>'.
-               "\n".'<td>'.$StdNo.'</td>'.
-               "\n".'<td>'.$TotalTries.'</td>'.
-               "\n".'<td>'.$MxTries.'</td>'.
-               "\n".'<td>'.$Avg.'</td>'.
-               "\n".'<td>'.$YES.'</td>'.
-               "\n".'<td>'.$Override.'</td>'.
-               "\n".'<td>'.$Wrng.'</td>'.
-               "\n".'<td>'.$SD.'</td>'.
-               "\n".'<td>'.$Sk.'</td>'.
-               "\n".'<td>'.$DoD.'</td>'.
-               "\n".'<td>'.$res.'</td>'.
+    my $nIdx=0;
+
+    if ( $Pos == 0 ) {
+	foreach (sort keys %mapsort) {
+	    my ($Hid,$pr)=split(/\:/,$mapsort{$_});
+	    &CreateTable(1,$Hid);
+	    my @lpr=split(/\&/,$pr);
+	    for (my $i=1; $i<=$#lpr; $i++) {
+		my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+		&TableRow($Post,$i,$nIdx);
+		$nIdx++;
+	    }
+	    &CloseTable();
+	}
+    }
+    else {
+	&CreateTable(0);
+	for ( my $nIdx = 0; $nIdx < $p_count; $nIdx++ ) {
+	    my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+	    &TableRow($Post,$nIdx,$nIdx);
+	} 
+	&CloseTable();
+    }
+}
+
+sub TableRow {
+    my ($Str,$Idx,$RealIdx)=@_;
+    my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
+       $Override,$Wrng,$DoD,$SD,$Sk,$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="#DDFFFF">'.$Avg.'</td>'.
+               "\n".'<td bgcolor="#DDFFFF"> '.$YES.'</td>'.
+               "\n".'<td bgcolor="#DDFFFF"> '.$Override.'</td>'.
+               "\n".'<td bgcolor="#FFDDDD"> '.$Wrng.'</td>'.
+               "\n".'<td bgcolor="#FFDDDD">'.$DoD.'</td>'.
+               "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.
+               "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
+#               "\n".'<td>'.$res.'</td>'.
                "\n".'</tr>' );
-	$GraphDat{$nIdx}=$DoD.':'.$Wrng;
-    } 
+    $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
 
 # ------------------------------------------- Prepare data for Graphical chart
@@ -1121,6 +871,9 @@ sub initial {
   undef $p_count;
   undef $Pos;
   undef $GData;
+  $DiscFlag=0; 
+  $P_Order=100000;
+  $HWN=$P_Order;
 }
 
 
@@ -1139,32 +892,63 @@ 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}=$ssec;
+		    }
+		    $StudNo++;
+	        }
 	    }
 	}
 	else {
 	    $r->print('<h1>Could not access course data</h1>');
-	}
+	} 
         $r->print("Total number of students : ".($#students+1));
         $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('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
+#	$c++;
+#    }
+#foreach(@cols) {
+#    $c++;
+#    $r->print('<br>'.$cols[$c]);
+#}
+#$r->print('<br> Count = '.$c);
+
     }
 
 # ------------------------------------------------------------- End render page 
@@ -1271,6 +1055,14 @@ sub GetStatus {
 
     if ( $ENV{'form.order'} eq 'Descending' ) { $OpSel2='selected'; }
     else { $OpSel1 = 'selected'; }
+
+    my %myHeader = reverse( %Header );
+    $Pos = $myHeader{$ENV{'form.sort'}};
+    if ($Pos == 0) {
+	$OpSel1 = 'selected';
+	$ENV{'form.order'}='Ascendig';
+    }
+
     $CurMap = $ENV{'form.maps'};
     if ( $CurMap eq '' ) { 
 	$CurMap = 'All Maps';
@@ -1329,7 +1121,6 @@ sub handler {
 	    else {
 		$r->content_type('text/html');
 	    }
-	    &Apache::loncommon::no_cache($r);
 	    $r->send_http_header;
 	    return OK;
 	}