Diff for /loncom/interface/lonstatistics.pm between versions 1.6 and 1.10

version 1.6, 2002/03/02 23:22:32 version 1.10, 2002/03/07 00:28:55
Line 30 Line 30
 # 5/05,7/09,7/25/01,8/11,9/13,9/26,10/5,10/9,10/22,10/26 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  # 11/1, 11/4, 11/16, 12/14, 12/16, 12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002  # YEAR=2002
 # 1/22, 2/1, 2/6, 2/25, 3/2 Behrouz Minaei  # 1/22, 2/1, 2/6, 2/25, 3/2, 3/6 Behrouz Minaei
 ###  ###
   
 package Apache::lonstatistics;   package Apache::lonstatistics; 
Line 41  use Apache::lonnet(); Line 41  use Apache::lonnet();
 use Apache::lonhomework;  use Apache::lonhomework;
 use HTML::TokeParser;  use HTML::TokeParser;
 use GDBM_File;  use GDBM_File;
 #use Benchmark;  
   
 # -------------------------------------------------------------- Module Globals  # -------------------------------------------------------------- Module Globals
 my %hash;  my %hash;
Line 52  my %mapsort; Line 51  my %mapsort;
 my %section;  my %section;
 my %StuBox;  my %StuBox;
 my %DiscFac;  my %DiscFac;
   my %DisUp;
   my %DisLow;
   my $UpCnt;
 my $CurMap;  my $CurMap;
 my $CurSec;  my $CurSec;
 my $CurStu;  my $CurStu;
Line 65  my $OpSel1; Line 67  my $OpSel1;
 my $OpSel2;  my $OpSel2;
 my $OpSelDis1;  my $OpSelDis1;
 my $OpSelDis2;  my $OpSelDis2;
 my $CurDis=0;  
 my $OpSel3;  my $OpSel3;
 my $OpSel4;  my $OpSel4;
 my $GData;  my $GData;
Line 77  my $HWN; Line 78  my $HWN;
 my $P_Order;  my $P_Order;
 my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",  my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
               4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",                4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
               9,"S.D.",10,"Skew.",11,"Map");                9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");
 #             11,"Dis.F.",12,"Resourse URL");  
   
   #------- 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 {            sub NumericSort {          
     $a <=> $b;      $a <=> $b;
 }  }
   
 # ------ Create different Student Report   # ------ Create different Student Report 
 sub StudentReport {  sub StudentReport {
   
     my ($sname,$sdom)=@_;      my ($sname,$sdom)=@_;
   
     if ( $sname eq 'All Students' ) {      if ( $sname eq 'All Students' ) {
  $r->print( '<h3><font color=blue>WARNING:    $r->print( '<h3><font color=blue>WARNING: 
                     Please select a student</font></h3>' );                      Please select a student</font></h3>' );
  return;   return;
     }      }
     my $shome=&Apache::lonnet::homeserver( $sname,$sdom );                my $shome=&Apache::lonnet::homeserver($sname,$sdom);          
     my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );      my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
     my %result = ();      my %result = ();
     my $ResId;      my $ResId;
Line 164  sub StudentReport { Line 235  sub StudentReport {
             $Code='U';              $Code='U';
             $Tries = 0;              $Tries = 0;
             $Wrongs = 0;              $Wrongs = 0;
      $LatestVersion = $result{"version:$Prob"};              $LatestVersion = $result{"version:$Prob"};
   
     if ( $LatestVersion ) {      if ( $LatestVersion ) {
  for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {   for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
     my $vkeys = $result{"$Version:keys:$Prob"};      my $vkeys = $result{"$Version:keys:$Prob"};
Line 189  sub StudentReport { Line 259  sub StudentReport {
     $TempHash{"$Part.Wrongs"} = $Wrongs;      $TempHash{"$Part.Wrongs"} = $Wrongs;
  }   }
          }           }
                 }                   }
  for ( my $n = 0; $n < $PartNo; $n++ ) {     for ( my $n = 0; $n < $PartNo; $n++ ) {  
     my $part = $TempHash{$n};      my $part = $TempHash{$n};
     if ($PtrTry ne '') {$PtrTry .= ',';}      if ($PtrTry ne '') {$PtrTry .= ',';}
Line 212  sub StudentReport { Line 282  sub StudentReport {
 }  }
   
 sub CreateTable {  sub CreateTable {
       my $ColNo=0;
       foreach (keys(%Header)){ 
    $ColNo++;
       } 
     my ($Hd, $Hid)=@_;      my ($Hd, $Hid)=@_;
     if ( $Hd == 1 ) {      if ( $Hd == 1 ) {
 # $Hid=~/(\d+)\.(\d+)/;  
  $r->print('<br><a href="'.$hash{'src_'.$Hid}.   $r->print('<br><a href="'.$hash{'src_'.$Hid}.
                   '" target="_blank">'.$hash{'title_'.$Hid}.'</a>'                    '" target="_blank">'.$hash{'title_'.$Hid}.'</a>');
 #                  .' ('.&Apache::lonnet::declutter($hash{'map_id_'.$1}).')'  
                  );  
     }      }
     my $Result = "\n".'<table border=2>';      my $Result = "\n".'<table border=2>';
     $Result .= '<tr><th>P#</th>'."\n";      $Result .= '<tr><th>P#</th>'."\n";
     for ( my $nIdx=0; $nIdx < 11; $nIdx++ ) {       for ( my $nIdx=0; $nIdx < $ColNo; $nIdx++ ) { 
  $Result .= '<th>'.'<input type="submit" name="sort" value="'.   $Result .= '<th>'.'<input type="submit" name="sort" value="'.
                    $Header{$nIdx}.'" />'.'</th>'."\n";                     $Header{$nIdx}.'" />'.'</th>'."\n";
     }      }
Line 242  sub PreStatTable { Line 313  sub PreStatTable {
                   "_$ENV{'user.domain'}_$cid\_statistics.db";                    "_$ENV{'user.domain'}_$cid\_statistics.db";
     my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".      my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$cid\_graph.db";                    "_$ENV{'user.domain'}_$cid\_graph.db";
     my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".  
      "_$ENV{'user.domain'}_$cid\_DiscFactor.db";  
     my $OpSel11='';      my $OpSel11='';
     my $OpSel12='';      my $OpSel12='';
     my $OpSel13='';      my $OpSel13='';
Line 270  sub PreStatTable { Line 339  sub PreStatTable {
     $Ptr .= '<input type="submit" name="sort" value="%Wrong Graph" />'."\n";      $Ptr .= '<input type="submit" name="sort" value="%Wrong Graph" />'."\n";
   
     $Ptr .= '<pre>'.      $Ptr .= '<pre>'.
     '  #Stdnts: Total Number of Students opened the problem.<br>'.       '<b>  #Stdnts</b>: Total Number of Students opened the problem.<br>'. 
     '  Tries  : Total Number of Tries for solving the problem.<br>'.       '<b>  Tries  </b>: Total Number of Tries for solving the problem.<br>'. 
     '  Mod    : Maximunm Number of Tries for solving the problem.<br>'.       '<b>  Mod   </b> : Maximunm Number of Tries for solving the problem.<br>'. 
     '  Mean   : Average Number of the tries. [ Tries / #Stdnts ]<br>'.      '<b>  Mean   </b>: Average Number of the tries. [ Tries / #Stdnts ]<br>'.
     '  #YES   : Number of students solved the problem correctly.<br>'.       '<b>  #YES   </b>: Number of students solved the problem correctly.<br>'. 
     '  #yes   : Number of students solved the problem by override.<br>'.      '<b>  #yes   </b>: Number of students solved the problem by override.<br>'.
     '  %Wrng  : Percentage of students tried to solve the problem but'.      '<b>  %Wrng  </b>: Percentage of students tried to solve the problem but'.
     ' still incorrect. [ 100*((#Stdnts-(#YES+#yes))/#Stdnts) ]<br>'.      ' 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. [ Tries/(#YES+#yes+0.1) ]<br>'. Kashy formula
     '  DoDiff : Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'.      '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'. #Gerd formula
     '  S.D.   : Standard Deviation of the tries.'.      '<b>  S.D.  </b> : Standard Deviation of the tries.'.
     '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.      '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
     ' where Xi denotes every student\'s tries ]<br>'.      ' where Xi denotes every student\'s tries ]<br>'.
     '  Skew.  : Skewness of the students tries.'.      '<b>  Skew.  </b>: Skewness of the students tries.'.
     ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.   ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
       '<b>  Dis.F. </b>: Discrimination Factor: A Standard for '.
 #    '  Dis.F. : Discrimination Factor. [ Sum of Partial Credits Awarded / Total Number of Tries in %27 upper and lower students]</b>'.   '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 </b>Criterion for Sorting the Students: '.
    'Sum of Partial Credit Awarded / Total Number of Tries<br>'.
       '<b>           2nd </b>Criterion for Sorting the Students: '.
    'Total number of Correct Answers / Total Number of Tries'.
             '</pre>';              '</pre>';
   
     $r->print($Ptr);      $r->print($Ptr);
Line 303  sub PreStatTable { Line 378  sub PreStatTable {
     }      }
     else {      else {
  if (tie(%CachData,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {   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);      tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
     foreach (keys %DiscFac) {delete $CachData{$_};}      foreach (keys %DiscFac) {delete $CachData{$_};}
     foreach (keys %CachData) {delete $CachData{$_};}      foreach (keys %CachData) {delete $CachData{$_};}
Line 318  sub PreStatTable { Line 392  sub PreStatTable {
   
     untie(%CachData);      untie(%CachData);
     untie(%GraphDat);      untie(%GraphDat);
     untie(%DiscFac);         
 }  }
   
   
Line 442  sub ExtractStudentData { Line 515  sub ExtractStudentData {
     $TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;              $TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;        
     $TotalTries += $TempHash{"$Part.Tries"};      $TotalTries += $TempHash{"$Part.Tries"};
     $TotParCr += $TempHash{"$Part.ParCr"};      $TotParCr += $TempHash{"$Part.ParCr"};
 #$r->print($Version.'---'.$Prob.'==='.$Time.'<br>');  
     my $Val = $result{"$Version:$Prob:resource.$Part.solved"};      my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
     if ( $Val eq 'correct_by_student' )      if ( $Val eq 'correct_by_student' )
                                { $Wrongs = $Tries - 1; $Code = 'C'; }                                  { $Wrongs = $Tries - 1; $Code = 'C'; } 
Line 461  sub ExtractStudentData { Line 533  sub ExtractStudentData {
     my $Yes = 0;      my $Yes = 0;
                     if ( $TempHash{$part.'.Code'} eq 'C' ||                      if ( $TempHash{$part.'.Code'} eq 'C' ||
                          $TempHash{$part.'.Code'} eq 'O'  )                            $TempHash{$part.'.Code'} eq 'O'  ) 
        {$ProbSolved++;$Yes=1;}             {$ProbSolved++;$Yes=1;}
 #    my $ptr = "$hash{'title_'.$ResId}";  
    #    my $ptr = "$hash{'title_'.$ResId}";
     my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;      my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
   
     if ( $PartNo > 1 ) {                      if ( $PartNo > 1 ) {                
  $ptr .= "*(part $part)";   $ptr .= "*(part $part)";
  $Dis .= ':';   $Dis .= ':';
Line 477  sub ExtractStudentData { Line 551  sub ExtractStudentData {
     else {$DisF = $Fac;}      else {$DisF = $Fac;}
 #    $DisF .= '+'.$TempHash{"$part.Time"};  #    $DisF .= '+'.$TempHash{"$part.Time"};
     $TimeTot += $TempHash{"$part.Time"};      $TimeTot += $TempHash{"$part.Time"};
     $Dis .= $ptr.'*'.$ResId.'='.$DisF.'+'.$Yes;      $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
     $ptr .= ":$TempHash{$part.'.Tries'}".      $ptr .= ":$TempHash{$part.'.Tries'}".
             ":$TempHash{$part.'.Wrongs'}".              ":$TempHash{$part.'.Wrongs'}".
                             ":$TempHash{$part.'.Code'}";                              ":$TempHash{$part.'.Code'}";
Line 495  sub ExtractStudentData { Line 569  sub ExtractStudentData {
         }          }
  if ( $TotalTries ) {   if ( $TotalTries ) {
     my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;      my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
 #    my $DisFactor = int(sprintf( "%.4f", $DisFac ) * 100);  
     my $DisFactor = sprintf( "%.4f", $DisFac );      my $DisFactor = sprintf( "%.4f", $DisFac );
     my $time;      $DiscFac{$DisFactor}=$Dis;
     if ($ProbSolved){      #my $time;
  $time = int(($TimeTot/$ProbSolved)-10000000);      #if ($ProbSolved){
     }   #$time = int(($TimeTot/$ProbSolved)-10000000);
     $DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.      #}
                       $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;      #$DiscFac{($DisFactor.':'.$sname.':'.$ProbTot.':'.$TotalOpend.':'.
 #$r->print($DisFactor.$sname.'<br> --- Dis= '.$Dis.'<br>');              #          $TotalTries.':'.$ProbSolved.':'.$time)}=$Dis;
  }   }
     }      }
     #$r->print($sname.' PrCr= '.$TotParCr.' Slvd= '.$ProbSolved.' Tries='.$TotalTries.'<br>');      #$r->print($sname.' PrCr= '.$TotParCr.' Slvd= '.$ProbSolved.' Tries='.$TotalTries.'<br>');
Line 593  sub Build_Statistics { Line 666  sub Build_Statistics {
     $r->print(<<ENDPOP);      $r->print(<<ENDPOP);
     <script>      <script>
     popwin=open('','popwin','width=400,height=100');      popwin=open('','popwin','width=400,height=100');
     popwin.document.writeln('<html><body bgcolor="#88CC88">'+      popwin.document.writeln('<html><body bgcolor="#88DDFF">'+
       '<title>LON-CAPA Statistics</title>'+        '<title>LON-CAPA Statistics</title>'+
       '<h4>Computation Progress</h4>'+        '<h4>Computation Progress</h4>'+
       '<form name=popremain>'+        '<form name=popremain>'+
Line 615  ENDPOP Line 688  ENDPOP
   
         &ExtractStudentData($students[$index],$cid);          &ExtractStudentData($students[$index],$cid);
     }      }
 #--------------------- close Progress Line  
     $r->print('<script>popwin.close()</script>');  
     $r->rflush();   
 # -------------------- sorting the Data  # -------------------- sorting the Data
       $r->print('<script>popwin.document.popremain.remaining.value="'.
                 'Calculating Discrimination Factors...";</script>');
   
     @list = sort (@list);      @list = sort (@list);
   
   
       &Discriminant();
   
     $OpSel2='';      $OpSel2='';
     $OpSel1='selected';      $OpSel1='selected';
           
Line 718  ENDPOP Line 795  ENDPOP
  $Skewness /= $StdNo;   $Skewness /= $StdNo;
     $Skewness /= $StdDev*$StdDev*$StdDev;      $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  #-----------------  Some restition in presenting the float numbers
     my $Avg = sprintf( "%.2f", $Average );      my $Avg = sprintf( "%.2f", $Average );
     my $Wrng = sprintf( "%.1f", $Wrong );      my $Wrng = sprintf( "%.1f", $Wrong );
Line 727  ENDPOP Line 813  ENDPOP
     my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.      my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.
                        $TotalTries.':'.$MxTries.':'.$Avg.':'.                         $TotalTries.':'.$MxTries.':'.$Avg.':'.
                        $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.                         $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.
        $SD.':'.$Sk.':'.$Prob;         $SD.':'.$Sk.':'.$_D1.':'.$_D2.':'.$Prob;
     $CachData{($p_count-1)}=$join;      $CachData{($p_count-1)}=$join;
   
     $urlres=~/^(\w+)\/(\w+)/;      $urlres=~/^(\w+)\/(\w+)/;
Line 741  ENDPOP Line 827  ENDPOP
  }   }
  &CloseTable();   &CloseTable();
     }      }
   #--------------------- close Progress Line
       $r->print('<script>popwin.close()</script>');
       $r->rflush(); 
 }  }
   
 sub Cache_Statistics {  sub Cache_Statistics {
Line 793  sub Cache_Statistics { Line 882  sub Cache_Statistics {
 sub TableRow {  sub TableRow {
     my ($Str,$Idx,$RealIdx)=@_;      my ($Str,$Idx,$RealIdx)=@_;
     my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,      my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
        $Override,$Wrng,$DoD,$SD,$Sk,$Prob)=split(/\:/,$Str);         $Override,$Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\:/,$Str);
     $r->print( "\n".'<tr>'.      $r->print( "\n".'<tr>'.
                "\n".'<td>'.($RealIdx+1).'</td>'.                 "\n".'<td>'.($RealIdx+1).'</td>'.
                "\n".'<td bgcolor="#FFFFFF">'.$Temp.'</td>'.                 "\n".'<td>'.$Temp.'</td>'.
                "\n".'<td bgcolor="#EEFFDD"> '.$StdNo.'</td>'.                 "\n".'<td bgcolor="#EEFFCC"> '.$StdNo.'</td>'.
                "\n".'<td bgcolor="#EEFFDD">'.$TotalTries.'</td>'.                 "\n".'<td bgcolor="#EEFFCC">'.$TotalTries.'</td>'.
                "\n".'<td bgcolor="#EEFFDD">'.$MxTries.'</td>'.                 "\n".'<td bgcolor="#EEFFCC">'.$MxTries.'</td>'.
                "\n".'<td bgcolor="#DDFFFF">'.$Avg.'</td>'.                 "\n".'<td bgcolor="#DDFFFF">'.$Avg.'</td>'.
                "\n".'<td bgcolor="#DDFFFF"> '.$YES.'</td>'.                 "\n".'<td bgcolor="#DDFFFF"> '.$YES.'</td>'.
                "\n".'<td bgcolor="#DDFFFF"> '.$Override.'</td>'.                 "\n".'<td bgcolor="#DDFFFF"> '.$Override.'</td>'.
Line 807  sub TableRow { Line 896  sub TableRow {
                "\n".'<td bgcolor="#FFDDDD">'.$DoD.'</td>'.                 "\n".'<td bgcolor="#FFDDDD">'.$DoD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.                 "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.                 "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
 #               "\n".'<td>'.$res.'</td>'.                 "\n".'<td bgcolor="#FFDDFF"> '.$_D1.'</td>'.
                  "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>'.
                "\n".'</tr>' );                 "\n".'</tr>' );
     $GraphDat{$RealIdx}=$DoD.':'.$Wrng;      $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }  }
Line 911  sub ClassList { Line 1001  sub ClassList {
     $name=&Apache::lonnet::unescape($name);      $name=&Apache::lonnet::unescape($name);
     $students[$thisindex]=$name;      $students[$thisindex]=$name;
     my ($sname,$sdom)=split(/\:/,$name);      my ($sname,$sdom)=split(/\:/,$name);
   
     #my %reply=&Apache::lonnet::idrget($sdom,$sname);      #my %reply=&Apache::lonnet::idrget($sdom,$sname);
     #my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.      #my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
     #         ':environment:lastname&generation&firstname&middlename',      #         ':environment:lastname&generation&firstname&middlename',
Line 920  sub ClassList { Line 1009  sub ClassList {
     if ($ssec==-1) {next;}      if ($ssec==-1) {next;}
     $ssec=($ssec) ? $ssec : '(none)';      $ssec=($ssec) ? $ssec : '(none)';
     #$ssec=(int($ssec)) ? int($ssec) : $ssec;      #$ssec=(int($ssec)) ? int($ssec) : $ssec;
     #$r->print($sname.'...'.$ssec.'<br>');  
     $section{$ssec}=$ssec;      $section{$ssec}=$ssec;
     if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {      if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
  $students[$StudNo]=$name;   $students[$StudNo]=$name;
  $StuBox{$sname}=$ssec;   $StuBox{$sname}=$sdom;
     }      }
     $StudNo++;      $StudNo++;
         }          }
Line 937  sub ClassList { Line 1025  sub ClassList {
         $r->rflush();          $r->rflush();
 # --------------- Find all assessments and put them into some linear-like order  # --------------- Find all assessments and put them into some linear-like order
  &tracetable($firstres,'&'.$lastres.'&');   &tracetable($firstres,'&'.$lastres.'&');
   
 #    my $c=0;  #    my $c=0;
 #    foreach (sort keys %mapsort) {  #    foreach (sort keys %mapsort) {
 # $r->print('<br>'.$c.')'.$_.' ... '.$mapsort{$_});  # $r->print('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
 # $c++;  # $c++;
 #    }  #    }
 #foreach(@cols) {  
 #    $c++;  
 #    $r->print('<br>'.$cols[$c]);  
 #}  
 #$r->print('<br> Count = '.$c);  
   
     }      }
   
 # ------------------------------------------------------------- End render page   # ------------------------------------------------------------- End render page 
Line 984  sub Menu { Line 1065  sub Menu {
  my $content = $ENV{'form.sort'};   my $content = $ENV{'form.sort'};
  if ($content eq '' || $content eq 'Return to Menu') {   if ($content eq '' || $content eq 'Return to Menu') {
     my $Ptr = '<h3>';      my $Ptr = '<h3>';
     $Ptr .= '<input type=submit name=sort value="Problem Evaluation"/>';#General Statistics"/>';      $Ptr .= '<input type=submit name=sort value="Problem Evaluation"/>';
     $Ptr .= '<br><br>';      $Ptr .= '<br><br>';
     $Ptr .= '<input type=submit name=sort value="Student Assessment"/>';      $Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
     $Ptr .= '<br><br>';  
 #    $Ptr .= '<input type=submit name=sort value=Discrimination>';#"Problem Evaluation"/>';  
     $Ptr .= '</h3>';      $Ptr .= '</h3>';
     $r->print( $Ptr );      $r->print( $Ptr );
       }        }
  else {   else {
     &initial();      &initial();
     &ClassList();      &ClassList();
     if ( $content eq 'Discrimination' || #'Problem Evaluation' ||      if ( $content eq 'Student Assessment' || 
                  $content eq 'Recalculate Discrimintion Factor' ) {  
  &CreateDiscFac();  
     }  
     elsif ( $content eq 'Student Assessment' ||   
                     $content eq 'Create Student Report' ) {                      $content eq 'Create Student Report' ) {
  &StudentOptions();   &StudentOptions();
  &StudentReport($CurStu,$StuBox{"$CurStu"});   &StudentReport($CurStu,$StuBox{"$CurStu"});
Line 1039  sub StudentOptions { Line 1114  sub StudentOptions {
 }  }
   
 sub GetStatus {  sub GetStatus {
   
     $OpSelDis1='';  
     $OpSelDis2='';  
     $OpSel1='';      $OpSel1='';
     $OpSel2='';      $OpSel2='';
     $OpSel3='';      $OpSel3='';
     $OpSel4='';      $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'; }      if ( $ENV{'form.order'} eq 'Descending' ) { $OpSel2='selected'; }
     else { $OpSel1 = 'selected'; }      else { $OpSel1 = 'selected'; }
   

Removed from v.1.6  
changed lines
  Added in v.1.10


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>