--- loncom/interface/lonstatistics.pm	2002/02/06 16:59:01	1.4
+++ loncom/interface/lonstatistics.pm	2002/05/14 23:17:06	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.4 2002/02/06 16:59:01 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.18 2002/05/14 23:17:06 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,33 +27,37 @@
 #
 # (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/5,7/9,7/25/1,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 Behrouz Minaei
+# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6 Behrouz Minaei
+# 5/12, 5/14 Behrouz Minaei
+#
 ###
 
 package Apache::lonstatistics; 
 
-use strict;
+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;
 
 # -------------------------------------------------------------- Module Globals
 my %hash;
 my %CachData;
 my %GraphDat;
+my %OpResp;
 my %maps;
-my @mapsort;
+my %mapsort;
 my %section;
 my %StuBox;
 my %DiscFac;
+my %DisUp;
+my %DisLow;
+my $UpCnt;
 my $CurMap;
 my $CurSec;
 my $CurStu;
@@ -65,23 +69,348 @@ my $Pos;
 my $r;
 my $OpSel1;
 my $OpSel2;
-my $OpSelDis1;
-my $OpSelDis2;
-my $CurDis=0;
 my $OpSel3;
 my $OpSel4;
 my $GData;
 my $cid;
 my $firstres;
 my $lastres;
-my $DiscFlag=0;
-my $HWN=0;
+my $DiscFlag;
+my $HWN;
+my $P_Order;
+my %foil_to_concept;
+my @Concepts;
+my %ConceptData;
+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,"D.F.1st",12,"D.F.2nd");
+my %Answer = ();
+
+sub InitAnalysis {
+    my ($rid, $student)=@_;
+    my ($uname,$udom)=split(/\:/,$student);
+    $rid=~/(\d+)\.(\d+)/;
+    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+	     &Apache::lonnet::declutter($hash{'src_'.$rid});
+    my $URI = $hash{'src_'.$rid};
+    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze',
+                                  'grade_username' => $uname,
+                                  'grade_domain' => $udom,
+                                  'grade_courseid' => $cid,
+                                  'grade_symb' => $symb));
+#    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze'));
+
+    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
+    %Answer=();
+    %Answer=&Apache::lonnet::str2hash($Answ);
+
+    my $parts='';
+    foreach my $elm (@{$Answer{"parts"}}) {
+	$parts.="$elm,";
+    }
+    chop($parts);
+    my $conc='';
+    foreach my $elm (@{$Answer{"$parts.concepts"}}) {
+	$conc.="$elm@";
+    }
+    chop($conc);
+
+    @Concepts=split(/\@/,$conc);
+    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
+	foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
+	    $foil_to_concept{$foil} = $concept;
+	}
+    }
+    return $symb;
+}
+
+
+sub Interval {
+    my ($rid,$part,$symb)=@_;
+    my $Int=$ConceptData{"Interval"};
+    my $due = &Apache::lonnet::EXT('resource.$part.duedate',$symb)+1;
+    my $opn = &Apache::lonnet::EXT('resource.$part.opendate',$symb);
+    my $add=int(($due-$opn)/$Int);
+    $ConceptData{"Int.0"}=$opn;
+    for (my $i=1;$i<$Int;$i++) {
+	$ConceptData{"Int.$i"}=$opn+$i*$add;
+    }
+    $ConceptData{"Int.$Int"}=$due;     
+    for (my $i=0;$i<$Int;$i++) {
+	for (my $n=0; $n<=$#Concepts; $n++ ) {
+	    my $tmp=$Concepts[$n];
+	    $ConceptData{"$tmp.$i.true"}=0;
+	    $ConceptData{"$tmp.$i.false"}=0;
+	}
+    }
+}
+
+
+sub ShowOpGraph {
+    my ($InpStr, $Int_No)=@_;
+    my ($rid,$part)=split(/\:/,substr($InpStr,8));
+    $ConceptData{"Interval"}=$Int_No;
+    my $symb=&InitAnalysis($rid,$students[0]);
+    &Interval($rid,$part,$symb);
+    my $URI = $hash{'src_'.$rid};
+    my $Src = $hash{'title_'.$rid};
+    $Src =~ s/\ /"_"/eg;
+    $r->print('<br><b>'.$URI.'</b>');
+    $r->rflush();
+    
+    &Create_PrgWin();
+    &Update_PrgWin("Starting to analyze problem");
+    for (my $index=0;$index<=$#students;$index++) {
+	&Update_PrgWin($index);
+	&OpStatus($rid,$students[$index]);
+    }
+    &Close_PrgWin();
+
+    for (my $k=0; $k<$Int_No; $k++ ) {
+	&DrawGraph($k,$Src);
+    }
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%ConceptData);
+#$Apache::lonxml::debug=0;
+    my $Answ=&Apache::lonnet::ssi($URI);
+    $r->print("<br><b>Here you can see the Problem:</b><br>$Answ");
+}
+
+
+sub DrawGraph {
+    my ($k,$Src)=@_;
+    my $Max=0;
+    my @data1;
+    my @data2;
+    my $Correct=0;
+    my $Wrong=0;
+    # Adjust Data and find the Max 
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	my $tmp=$Concepts[$n];
+	$data1[$n]=$ConceptData{"$tmp.$k.true"};
+	$Correct+=$data1[$n];
+	$data2[$n]=$ConceptData{"$tmp.$k.false"};
+	$Wrong+=$data2[$n];
+	my $Sum=$data1[$n]+$data2[$n];
+	if ( $Max<$Sum ) {$Max=$Sum;}
+    }
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	if ($data1[$n]+$data2[$n]<$Max) {
+	    $data2[$n]+=$Max-($data1[$n]+$data2[$n]);
+	}
+    }
+    my $P_No = $#data1+1;
+#    $r->print('<br><b>From: ['.localtime($ConceptData{'Int.'.($k-1)}).
+#              '] To: ['.localtime($ConceptData{"Int.$k"}).']</b>'); 
+    my $Str = "\n".'<table border=2>'.
+              "\n".'<tr>'.
+              "\n".'<th> # </th>'.
+	      "\n".'<th> Concept </th>'.
+	      "\n".'<th> Correct </th>'.
+	      "\n".'<th> Wrong </th>'.
+	      "\n".'</tr>';
+
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	$Str .= "\n"."<tr>".
+	        "\n"."<td>".($n+1)."</td>".
+                "\n"."<td bgcolor=#FFFFDD> ".$Concepts[$n]." </td>".
+                "\n"."<td bgcolor=#DDFFDD> ".$data1[$n]." </td>".
+                "\n"."<td bgcolor=#FFDDDD> ".$data2[$n]." </td>".
+                "\n"."</tr>";
+    }
+    $Str.='<td></td><td><b>From:['.localtime($ConceptData{'Int.'.($k-1)}).
+          '] To: ['.localtime($ConceptData{"Int.$k"}).
+          "]</b></td><td>$Correct</td><td>$Wrong</td>";
+
+    $Str .= "\n".'</table>';
+
+    $r->print($Str);
+
+    if ( $Max > 1 ) { 
+	$Max += (10 - $Max % 10);
+	$Max = int($Max);
+    } else { $Max = 1; }
+
+    if ( $Max > 1 ) { 
+	$Max += (10 - $Max % 10);
+	$Max = int($Max);
+    } else { $Max = 1; }
+    my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.$k : $Src;
+#    $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2;
+    $GData="$Titr&Concepts&Answers&$Max&$P_No&".
+           (join(',',@data1)).'&'.(join(',',@data2));
+
+    $r->print('<br><IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
+}
+
+
+sub AnalyzeProblem {
+# -------------------------------- Selecting the number of intervals
+    my $OpSel='';
+    my $CurInt = $ENV{'form.interval'};
+    if ($CurInt eq '') {$CurMap = '1';}
+    my $Ptr = '<b>Select number of intervals</b>'."\n".
+       	      '<select name="interval">'."\n";                     	     	     
+    for (my $n=1;$n<=7;$n++) {	          
+	$Ptr .= '<option';
+        if ($CurInt eq $n) {$Ptr .= ' selected';}     
+	$Ptr .= '>'.$n."</option>"."\n";	     
+    }
+    $Ptr .= '</select>'."\n";
+    $r->print( $Ptr );
+
+    $r->print('<br><b> Option Response Problems in this course:</b><br><br>');
+    my $Str = "\n".'<table border=2>'.
+              "\n".'<tr>'.
+              "\n".'<th> # </th>'.
+	      "\n".'<th> Problem Title </th>'.
+	      "\n".'<th> Resouse </th>'.
+	      "\n".'<th> Address </th>'.
+	      "\n".'</tr>';
+
+     my $P_No=1;
+     foreach (sort keys %OpResp) {
+	 my ($rid,$part)=split(/\:/,$OpResp{$_});
+	 my $Temp = '<a href="'.$hash{'src_'.$rid}.
+                    '" target="_blank">'.$hash{'title_'.$rid}.'</a>';
+	 $Str .= "\n"."<tr>".
+	         "\n"."<td> $P_No </td>".
+                 "\n"."<td bgcolor=#DDFFDD> ".$Temp." </td>".
+                 "\n"."<td bgcolor=#EEFFCC> ".$hash{'src_'.$rid}." </td>".
+	         "\n"."<td> ".'<input type="submit" name="sort" value="'.'Analyze_'.$rid.'" />'.'</td>'.
+                 "\n"."</tr>";
+	 $P_No++;
+     }
+     $Str .= "\n".'</table>';
+     $Str .= "\n".'</form>';
+     $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"}++;
+}
 
-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");
 
+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;
+    if ($reshash{'version'}) {
+        my $tries=0;
+	&Apache::lonhomework::showhash(%Answer);
+	for (my $version=1;$version<=$reshash{'version'};$version++) {
+	    my $time=$reshash{"$version:timestamp"};
+	   
+	    foreach my $key (sort(split(/\:/,$reshash{$version.':keys'}))) {
+		if (($key=~/\.(\w+)\.(\w+)\.submission$/)) {
+		    my $Id1 = $1; my $Id2 = $2;
+		    #check if this is a repeat submission, if so skip it
+          	    if ($reshash{"$version:resource.$Id1.previous"}) { next; }
+		    #if no solved this wasn't a real submission, ignore it
+		    if (!defined($reshash{"$version:resource.$Id1.solved"})) {
+			&Apache::lonxml::debug("skipping ");
+			next;
+		    }
+		    my $Resp = $reshash{"$version:$key"};
+		    my %submission=&Apache::lonnet::str2hash($Resp);
+		    foreach (keys %submission) {
+			my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"};
+			if ($submission{$_}) {
+			    if ($submission{$_} eq $Ansr) {
+				&Decide("true",$_,$time );
+			    }
+			    else {&Decide("false",$_,$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} <br>");
+	$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("<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;
 }
@@ -94,10 +423,9 @@ sub StudentReport {
                     Please select a student</font></h3>' );
 	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;
     my $Tries;
     my $TotalTries = 0;
@@ -116,13 +444,10 @@ sub StudentReport {
 	      "\n".'<th> Results </th>'.
 	      "\n".'<th> Tries </th>'.
 	      "\n".'</tr>';
-    unless ($reply=~/^error\:/) {
-        map {
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-        } split(/\&/,$reply);;
-        foreach $ResId (@cols) {
-	    if ( !$ResId ) {
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
+        foreach my $CurCol (@cols) {
+	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
 		if ( $Set ) {
 		    $SetNo++;
@@ -137,6 +462,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' ) {
@@ -146,25 +472,25 @@ sub StudentReport {
 	    my $meta=$hash{'src_'.$ResId};
 	    my $PartNo = 0;
 	    undef %TempHash;
-	    map {
-		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;
 			$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} );
             $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"};
@@ -188,7 +514,7 @@ sub StudentReport {
 			    $TempHash{"$Part.Wrongs"} = $Wrongs;
 			}
      		    }
-                } 
+                }
 		for ( my $n = 0; $n < $PartNo; $n++ ) {		  
 		    my $part = $TempHash{$n};
 		    if ($PtrTry ne '') {$PtrTry .= ',';}
@@ -210,18 +536,63 @@ sub StudentReport {
     $r->rflush();
 }
 
+sub CreateTable {
+    my ($Hd, $Hid)=@_;
+    if ($ENV{'form.showcsv'}) {
+	if ( $Hd == 1 ) {
+	    $r->print('<br>"'.$hash{'title_'.$Hid}.'","'.$hash{'src_'.$Hid}.'"');
+	}
+	return;
+    }
+    my $ColNo=0;
+    foreach (keys(%Header)){ 
+	$ColNo++;
+    } 
+    if ( $Hd == 1 ) {
+	$r->print('<br><a href="'.$hash{'src_'.$Hid}.
+                  '" target="_blank">'.$hash{'title_'.$Hid}.'</a>');
+    }
+    my $Result = "\n".'<table border=2>';
+    $Result .= '<tr><th>P#</th>'."\n";
+    for ( my $nIdx=0; $nIdx < $ColNo; $nIdx++ ) { 
+	$Result .= '<th>'.'<input type="submit" name="sort" value="'.
+                   $Header{$nIdx}.'" />'.'</th>'."\n";
+    }
+    $Result .= "\n".'</tr>'."\n";    
+    $r->print( $Result );
+    $r->rflush();
+}
 
+sub CloseTable {
+    if ($ENV{'form.showcsv'}) {
+	return;
+    }    
+    $r->print("\n".'</table>'."\n");
+    $r->rflush();
+}
+ 
 # ------------------------------------------- Prepare Statistics Table
 sub PreStatTable {
     my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$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";
-    $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".
@@ -232,36 +603,38 @@ 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 / #Stdns ]<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>  Max   </b> : Maximunm Number of Tries for solving the problem.<br>'. 
+    '<b>  Avg.   </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>'.
-    '  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>'.
-#    '  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>'.
-#    '  Dis.F. : Discrimination Factor. [ Sum of Partial Credits Awarded / Total Number of Tries in %27 upper and lower students]</b>'.	
+#    '  DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]<br>'. Kashy formula
+    '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'. #Gerd formula
+    '<b>  S.D.  </b> : Standard Deviation of the tries.'.
+    '[ sqrt(sum((Xi - Avg.)^2)) / (#Stdnts-1)'.
+    ' where Xi denotes every student\'s tries ]<br>'.
+    '<b>  Skew.  </b>: Skewness of the students tries.'.
+	' [ (sqrt( sum((Xi - Avg.)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
+    '<b>  Dis.F. </b>: Discrimination Factor: A Standard for '.
+	'evaluating the problem according to a Criterion<br>'.
+	'<b>           [Applied Criterion in %27 Upper Students - '.
+	'Applied the same Criterion in %27 Lower Students]</b><br>'.
+    '<b>           1st Criterion</b> for Sorting the Students: '.
+	'<b>Sum of Partial Credit Awarded / Total Number of Tries</b><br>'.
+    '<b>           2nd Criterion</b> for Sorting the Students: '.
+	'<b>Total number of Correct Answers / Total Number of Tries</b>'.	
             '</pre>';
 
     $r->print($Ptr);
+    
+    $r->print('Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
+    if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
+    $r->print('>');
+
     $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)) {
@@ -274,7 +647,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{$_};}
@@ -285,50 +657,57 @@ 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);
-
-    $r->print("\n".'</table>'."\n");
-    $r->rflush();        
 }
 
 
 # ------------------------------------- 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';
 }
 
 
 # ------ 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 = '';
     my $Code;
     my $Tries;
@@ -341,20 +720,20 @@ sub ExtractStudentData {
     my $TotParCr = 0;
     my $Wrongs;
     my %TempHash;
-    my $Version;
+    my $Version; 
     my $LatestVersion;
     my $SecLimit;
     my $MapLimit;
-    unless ($reply=~/^error\:/) {
-        map {
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-#$r->print($name.'='.$value.'<br>');
-        } split(/\&/,$reply);
-        foreach $ResId (@cols) {
-	    if ( !$ResId ) { next; }
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
+        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 $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; }
@@ -363,31 +742,33 @@ sub ExtractStudentData {
 	    my $PartNo = 0;
 	    $Dis .= ':';
 	    undef %TempHash;
-	    map {
-		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;
 			$TempHash{$PartNo}=$Part;
 			$TempHash{"$Part.Code"} = 'U';  
+			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
 			$PartNo++;
 		    }
+                    #my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		}
-            } split(/\,/,&Apache::lonnet::metadata($meta,'keys'));
-
-            my $Prob = $Map.'___'.$2.'___'.
-                       &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+            }
+            &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+	    my $URI = $hash{'src_'.$ResId};
+            my $Prob = $Map.'___'.$PrbId.'___'.
+                       &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;
@@ -399,7 +780,6 @@ sub ExtractStudentData {
 			    $TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;        
 			    $TotalTries += $TempHash{"$Part.Tries"};
 			    $TotParCr += $TempHash{"$Part.ParCr"};
-#$r->print($Version.'---'.$Prob.'==='.$Time.'<br>');
 			    my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
 			    if ( $Val eq 'correct_by_student' )
                                { $Wrongs = $Tries - 1; $Code = 'C'; } 
@@ -418,11 +798,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}";
+		       {$ProbSolved++;$Yes=1;}		
+
+ #		    my $ptr = "$hash{'title_'.$ResId}";
+		    my $ptr = $TempHash{$part.'.PrOrd'}.'&'.$ResId;
+
 		    if ( $PartNo > 1 ) {                
-			$ptr .= " (part $part)";
-			$Dis .= ':';
+			$ptr .= "*(part $part)";
+			$Dis .= '&';
 		    }
 		    my $Fac = ($TempHash{"$part.Tries"}) ? 
                               ($TempHash{"$part.ParCr"}/$TempHash{"$part.Tries"}) : 0;
@@ -431,36 +814,34 @@ 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 .= "*$ResId:$TempHash{$part.'.Tries'}".
-		            ":$TempHash{$part.'.Wrongs'}".
-                            ":$TempHash{$part.'.Code'}";		    
-#$r->print($sname.' -- '.$ptr.'--- timestamp='.$TempHash{"$part.Time"}.'<br>');
+		    $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
+		    $ptr .= "&$TempHash{$part.'.Tries'}".
+		            "&$TempHash{$part.'.Wrongs'}".
+                            "&$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, "$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.'<br> --- Dis= '.$Dis.'<br>');
+	    $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.'<br>');
@@ -470,53 +851,93 @@ 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}; 
     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;
-	       $HWN++;
-               $mapsort[$HWN]=$rid.$hash{'title_'.$rid}; 
+	       $P_Order++;
+	       $HWN=$P_Order;
+               $mapsort{$HWN} = $rid.':';
+	       $IsMap=1;
+ 
                #$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;
-		     $mapsort[$HWN] .= '&'.$frid;
-                 }
-	      }
+	       $cols[$#cols+1]=($P_Order+1).':'.$frid;
+      
+	       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\_(\w+)\_tries$/) {
+			       $Part=&Apache::lonnet::metadata($meta,$_.'.part');
+			       $P_Order++;
+			       $mapsort{$HWN} .= '&'.$P_Order;
+			       $PartNo++;
+			       #$r->print('<br>'.$PartNo.'---'.$P_Order);
+			   }
+			   foreach my $K(split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+			       if ($K=~/^optionresponse\_($Part)\_(\w+)$/) {
+				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order}="$frid:$Part";
+			       } 
+			   }
+		       }
+		   }
+               }
 	   }
+	 #  }
        } else {
-          if ($hash{'src_'.$rid}) {
-             if ($hash{'src_'.$rid}=~
-                                 /\.(problem|exam|quiz|assess|survey|form)$/) {
-	         $cols[$#cols+1]=$rid;
-		 $mapsort[$HWN] .= '&'.$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 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('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order}="$rid:$Part";;
+			       } 
+		   
+			   }
+
+		       }
+		   }
+	       }
+	   }       
        }
        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; }
     }
@@ -526,37 +947,57 @@ sub MySort {
     }
 }
 
-sub Build_Statistics {
+sub Create_PrgWin {
+#----------- Create progress
     $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="#88DDFF">'+
       '<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();
-# ---------------------------- Gathering the Data of students' tries
-    my $index;
-    for ($index=0;$index<=$#students;$index++) {
+}
+
+
+sub Update_PrgWin {
 #----------- update progress
-        $r->print('<script>popwin.document.popremain.remaining.value="'.
-                  'Computing '.($index+1).'/'.($#students+1).': '.
-                  $students[$index].'";</script>');
-        $r->rflush();
+    my $index = shift;
+    $r->print('<script>popwin.document.popremain.remaining.value="'.
+              'Computing '.($index+1).'/'.($#students+1).': '.
+              $students[$index].'";</script>');
+    $r->rflush();
+}
 
-        &ExtractStudentData($students[$index],$cid);
-    }
+sub Close_PrgWin {
 #--------------------- close Progress Line
     $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
+}
+
+sub Build_Statistics {
+    &Create_PrgWin();
+# ---------------------------- Gathering the Data of students' tries
+    for (my $index=0;$index<=$#students;$index++) {
+	&Update_PrgWin($index);
+        &ExtractStudentData($students[$index]);
+    }
+
 # -------------------- sorting the Data
-    @list = sort(@list);
+    $r->print('<script>popwin.document.popremain.remaining.value="'.
+              'Calculating Discrimination Factors...";</script>');
+
+    @list = sort (@list);
+
+
+    &Discriminant();
+
     $OpSel2='';
     $OpSel1='selected';
  		   
@@ -567,178 +1008,227 @@ 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);
-
-        $Temp = '<a href="'.$hash{'src_'.$ResId}.'" target="_blank">'.$Temp.'</a>';
-    
-	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;
+    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">'.$hash{'title_'.$ResId}.$Dummy.'</a>';
+
+	    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;
  
-
-        $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;
-	    $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 $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;
+	    }
 
+#--------------------- Compute the Discrimination Factors
+	    my ($Up1,$Up2)=split(/\:/,$DisUp{$lpr[$i]});
+	    my ($Lw1,$Lw2)=split(/\:/,$DisLow{$lpr[$i]});
+	    my $Dis1 = $Up1 - $Lw1;
+	    my $Dis2 = $Up2 - $Lw2;
+	    my $_D1 = sprintf("%.2f", $Dis1);
+	    my $_D2 = sprintf("%.2f", $Dis2);
+
+#-----------------  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 );
+	    my $join = $lpr[$i].'&'.$Temp.'&'.$StdNo.'&'.
+                       $TotalTries.'&'.$MxTries.'&'.$Avg.'&'.
+                       $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'.
+		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.
+                       $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();
     }
+    &Close_PrgWin();
 }
 
-
 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 ) {
+	my @Temp=split(/\&/,$CachData{$key});
+	if ( $Pos == 0 ) {
 	    ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]);
 	}
 	else {
 	    $Useful = $Temp[$Pos];
 	}   
-	$list[$p_count]=$Useful.'&'.$CachData{$key};
+	$list[$p_count]=$Useful.'@'.$CachData{$key};
         $p_count++;
     }
 
     @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  bgcolor="#FFFFFF">'.$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>'.
-               "\n".'</tr>' );
-	$GraphDat{$nIdx}=$DoD.':'.$Wrng;
-    } 
+    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]); 
+		#$r->print('<br>'.$Pre.'---'.$Post);
+		&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,$_D1,$_D2,$Prob)=split(/\&/,$Str);	
+    if ($ENV{'form.showcsv'}) {
+        my ($ResId,$Dummy)=split(/\*/,$Prob);
+        my $Ptr =  "\n".'<br>'.
+               "\n".'"'.($RealIdx+1).'",'.
+               "\n".'"'.$hash{'title_'.$ResId}.$Dummy.'",'.
+               "\n".'"'.$hash{'src_'.$ResId}.'",'.
+               "\n".'"'.$StdNo.'",'.
+               "\n".'"'.$TotalTries.'",'.
+               "\n".'"'.$MxTries.'",'.
+               "\n".'"'.$Avg.'",'.
+               "\n".'"'.$YES.'",'.
+               "\n".'"'.$Override.'",'.
+               "\n".'"'.$Wrng.'",'.
+               "\n".'"'.$DoD.'",'.
+               "\n".'"'.$SD.'",'.
+               "\n".'"'.$Sk.'",'.
+               "\n".'"'.$_D1.'",'.
+	       "\n".'"'.$_D2.'"';
+        $r->print("\n".$Ptr);
+    }
+    else{
+        my $Ptr =  "\n".'<tr>'.
+               "\n".'<td>'.($RealIdx+1).'</td>'.
+          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
+               "\n".'<td>'.$Temp.'</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>'.
+               "\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 bgcolor="#FFDDFF"> '.$_D1.'</td>'.
+	       "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>';
+        $r->print("\n".$Ptr.'</tr>' );
+    }
+    $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
 
 # ------------------------------------------- Prepare data for Graphical chart
 
 sub GetGraphData {
-    my $Tag = shift;
+    my $ylab = shift;
     my $Col;
     my $data='';
     my $count = 0;
@@ -749,12 +1239,12 @@ sub GetGraphData {
     foreach (keys %GraphDat) {delete $GraphDat{$_};}
     if (-e "$GraphDB") {
 	if (tie(%GraphDat,'GDBM_File',"$GraphDB",&GDBM_READER,0640)) {
-	    if ( $Tag eq 'DoDiff Graph' ) {
-		$Tag = 'Degree-of-Difficulty';
+	    if ( $ylab eq 'DoDiff Graph' ) {
+		$ylab = 'Degree-of-Difficulty';
 		$Col = 0;
 	    }
 	    else {
-		$Tag = 'Wrong-Percentage';
+		$ylab = 'Wrong-Percentage';
 		$Col = 1;
 	    }
 	    foreach (sort NumericSort keys %GraphDat) { 
@@ -764,11 +1254,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;
-
+	    $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.$Max.'&'.$count.'&'.$data;
 	}
 	else {
 	    $r->print("Unable to tie hash to db file");
@@ -788,12 +1282,17 @@ sub initial {
   undef %CachData;
   undef %GraphDat;
   undef %DiscFac;
+  undef %OpResp;
+  undef %ConceptData;
   undef $CurMap;
   undef $CurSec;
   undef $CurStu;
   undef $p_count;
   undef $Pos;
   undef $GData;
+  $DiscFlag=0; 
+  $P_Order=100000;
+  $HWN=$P_Order;
 }
 
 
@@ -808,27 +1307,44 @@ sub ClassList {
     $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
     $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
     if (($firstres) && ($lastres)) {
-# ----------------------------------------------------------------- Render page
-	my $classlst=&Apache::lonnet::reply
-                 ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
+	#my %result = &Apache::lonnet::dump('classlist',$sdom,$sname);
+	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;}
+		    if ($ssec==-1 || $ssec eq 'adm' ) {next;}
+		    $ssec=($ssec) ? $ssec : '(none)';
+		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
+		    $section{$ssec}=$ssec;
+		    if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
+			$students[$StudNo]=$name;
+			$StuBox{$sname}=$sdom;
+		    }
+		    $StudNo++;
+	        }
 	    }
 	}
 	else {
@@ -838,13 +1354,16 @@ sub ClassList {
         $r->rflush();
 # --------------- Find all assessments and put them into some linear-like order
 	&tracetable($firstres,'&'.$lastres.'&');
-
-#my $c=0;
-#foreach(@mapsort) {
-#    $c++;
-#    $r->print('<br>'.$mapsort[$c]);
-#}
-#$r->print('<br> Count = '.$c);
+#    my $c=0;
+#    foreach (sort keys %mapsort) {
+#	$r->print('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
+#	$c++;
+#    }
+#	my $c=1;
+#	foreach (sort keys %OpResp) {
+#	    $r->print('<br>'.$c.')'.$_.' ... '.$OpResp{$_}.' ... '.$hash{'src_'.$OpResp{$_}});
+#	    $c++;
+#	}
 
     }
 
@@ -852,64 +1371,75 @@ sub ClassList {
     else {
 	$r->print('<h3>Undefined course sequence</h3>');
     }
-    &MapSecOptions();
+}
+
+
+sub Title {
+    $r->print('<html><head><title>LON-CAPA Statistics</title></head>');
+    $r->print('<body bgcolor="#FFFFFF">'.
+              '<script>window.focus(); window.width=500;window.height=500;</script>'.
+              '<img align=right src=/adm/lonIcons/lonlogos.gif>');
+# ---------------------------------------------------------------- Course title
+    $r->print('<h1> Course : "'.
+              $ENV{'course.'.$ENV{'request.course.id'}.
+              '.description'}.'"</h1><h2>'.localtime().'</h2>');
+# ------------------------------- This is going to take a while, produce output
+    $r->rflush();	
+}
+
+sub CreateForm {
+    $r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
+    my $content = $ENV{'form.sort'};
+    if (!($ENV{'form.showcsv'}) && ($content eq '' || $content eq 'Return to Menu')) {
+	my $Ptr = '<h3>';
+	$Ptr .= '<input type=submit name=sort value="Problem Stats"/>';
+	$Ptr .= '<br><br>';
+	$Ptr .= '<input type=submit name=sort value="Problem Analysis"/>';
+	$Ptr .= '<br><br>';
+	$Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
+	$Ptr .= '</h3>';
+	$r->print( $Ptr );
+    }
+    else {
+	if ( $content eq 'Student Assessment' || 
+	     $content eq 'Create Student Report' ) {
+	    &MapSecOptions();
+	    &StudentOptions();
+	    &StudentReport($CurStu,$StuBox{"$CurStu"});
+	}
+	elsif ( $content eq 'Problem Analysis' ) {
+	    &AnalyzeProblem();
+	}
+	else {
+	    &MapSecOptions();
+	    &PreStatTable();
+	}
+    }
 }
 
 
 sub Menu {
+    &initial();
+    #$Apache::lonxml::debug=1;
+    #&Apache::lonhomework::showhash(%ENV);
+    #$Apache::lonxml::debug=0;
+    &Title();
+    &ClassList();
     my $InpStr = $ENV{'form.sort'};
-    if ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
+    if ($InpStr=~/^Analyze\_/) {
+	&ShowOpGraph($InpStr,$ENV{'form.interval'});
+    }
+    elsif ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
 	&GetGraphData($InpStr);
     	$r->print('<IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
     }
     else {
-	$r->print('<html><head><title>LON-CAPA Statistics</title></head>');
-
-
-        $r->print('<body bgcolor="#FFFFFF">'.
-                  '<script>window.focus(); window.width=500;window.height=500; </script>'.
-                  '<img align=right src=/adm/lonIcons/lonlogos.gif>');
-# ---------------------------------------------------------------- Course title
-        $r->print('<h1> Course : "'.
-                  $ENV{'course.'.$ENV{'request.course.id'}.
-                  '.description'}.'"</h1><h2>'.localtime().'</h2>');
-# ------------------------------- This is going to take a while, produce output
-        $r->rflush();	
-
-	$r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
-
-	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 .= '<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 );
-      	}
-	else {
-	    &initial();
-	    &ClassList();
-	    if ( $content eq 'Discrimination' || #'Problem Evaluation' ||
-                 $content eq 'Recalculate Discrimintion Factor' ) {
-		&CreateDiscFac();
-	    }
-	    elsif ( $content eq 'Student Assessment' || 
-                    $content eq 'Create Student Report' ) {
-		&StudentOptions();
-		&StudentReport($CurStu,$StuBox{"$CurStu"});
-	    }
-	    else {
-		&PreStatTable();
-	    }
-	}
-	$r->print("\n".'</form>'.
-                  "\n".'</body>'.
-                  "\n".'</html>');
-	$r->rflush();
+	&CreateForm();
+	$r->print("\n".'</form>');
     }
+    $r->print("\n".'</body>'.
+	      "\n".'</html>');
+    $r->rflush();
 }
 
 sub StudentOptions {
@@ -935,23 +1465,23 @@ sub StudentOptions {
     $r->rflush();	
 }
 
-sub GetStatus {
 
-    $OpSelDis1='';
-    $OpSelDis2='';
+sub GetStatus {
     $OpSel1='';
     $OpSel2='';
     $OpSel3='';
     $OpSel4='';
 
-#    if ( $ENV{'form.DisType'} eq 'Total Number of Correct Answers' ) { 
-#	$OpSelDis1='selected'; 
-#	$CurDis=0;
-#    }
-#    else { $OpSel2 = 'selected'; $CurDis = 1;}
-
     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';
@@ -967,8 +1497,8 @@ sub GetStatus {
 
 sub MapSecOptions {
 # ----------------------------------- Loading the Maps Combobox
-    my $Ptr = '<br>';
-    $Ptr .= '<br><input type="submit" name="sort" value="Return to Menu" />';
+    my $Ptr = '';
+    $Ptr .= '<input type="submit" name="sort" value="Return to Menu" />';
     $Ptr .= '<br><b> Select &nbsp; Map &nbsp; &nbsp; </b>'."\n".
        	    '<select name="maps">'."\n". 
 	    '<option '.$OpSel3.'>All Maps</option>';                     	     	     
@@ -1057,6 +1587,3 @@ sub handler {
 }
 1;
 __END__
-
-
-