Diff for /loncom/interface/Attic/lonchart.pm between versions 1.24 and 1.27

version 1.24, 2001/12/18 20:06:05 version 1.27, 2002/02/01 16:37:58
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
   # (Publication Handler
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # Homework Performance Chart  # Homework Performance Chart
 #  #
 # (Navigate Maps Handler  # (Navigate Maps Handler
Line 6 Line 33
 # (Page Handler  # (Page Handler
 #  #
 # (TeX Content Handler  # (TeX Content Handler
 #  # YEAR=2000
 # 05/29/00,05/30 Gerd Kortemeyer)  # 05/29/00,05/30 Gerd Kortemeyer)
 # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,  # 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
 # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)  # 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
 #  # YEAR=2001
 # 3/1/1,6/1,17/1,29/1,30/1,31/1 Gerd Kortemeyer)  # 3/1/1,6/1,17/1,29/1,30/1,31/1 Gerd Kortemeyer)
 # 7/10/01 Behrouz Minaei  # 7/10/01 Behrouz Minaei
 # 9/8 Gerd Kortemeyer  # 9/8 Gerd Kortemeyer
 # 10/18/01, 10/19/01 Behrouz Minaei  # 10/1, 10/19, 11/17, 11/22, 11/24, 11/28 12/18 Behrouz Minaei
 # 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei  # YEAR=2002
 # 12/18/01 Behrouz Minaei  # 2/1 Behrouz Minaei
   #
   ###
   
 package Apache::lonchart;  package Apache::lonchart;
   
Line 47  sub ExtractStudentData { Line 76  sub ExtractStudentData {
     my %TempHash;      my %TempHash;
     my $Version;      my $Version;
     my $ProbNo;      my $ProbNo;
     my $PrTotal;      my $ProbSolved;
       my $ProbTotal;
     my $LatestVersion;                           my $LatestVersion;                     
     my $Str=substr($students[$index].      my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.              '                                                        ',0,14).' ! '.
Line 59  sub ExtractStudentData { Line 89  sub ExtractStudentData {
             $result{$name}=$value;              $result{$name}=$value;
         } split(/\&/,$reply);          } split(/\&/,$reply);
  $ProbNo = 0;   $ProbNo = 0;
  $PrTotal = 0;   $ProbTotal = 0;
           $ProbSolved = 0;
  my $IterationNo = 0;   my $IterationNo = 0;
         foreach $ResId (@cols) {          foreach $ResId (@cols) {
     if ($IterationNo == 0) {$IterationNo++; next;}      if ($IterationNo == 0) {$IterationNo++; next;}
     if (!$ResId) {       if (!$ResId) { 
  my $PrNo = sprintf( "%3d", $ProbNo );   my $PrNo = sprintf( "%3d", $ProbNo );
  $Str .= ' '.'<font color="#007700">'.$PrNo.'</font> ';   $Str .= ' '.'<font color="#007700">'.$PrNo.'</font> ';
  $PrTotal += $ProbNo;   $ProbSolved += $ProbNo;
  $ProbNo=0;   $ProbNo=0;
  next;    next; 
     }      }
Line 117  sub ExtractStudentData { Line 148  sub ExtractStudentData {
                 }                   } 
  for ( my $n = 0; $n < $PartNo; $n++ ) {     for ( my $n = 0; $n < $PartNo; $n++ ) {  
     my $part = $TempHash{$n};      my $part = $TempHash{$n};
                     if ($TempHash{"$part.Code"} eq '*') {      my $Code = $TempHash{"$part.Code"};
                       if ( $Code eq '*') {
  $ProbNo++;   $ProbNo++;
                         if (($TempHash{"$part.Tries"}<10) ||                          if (($TempHash{"$part.Tries"}<10) ||
                             ($TempHash{"$part.Tries"} eq '')) {                              ($TempHash{"$part.Tries"} eq '')) {
     $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};      $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
  }   }
                     }                      }
       elsif ( $Code eq '+' ) {$ProbNo++;}
     $Str .= $TempHash{"$part.Code"};      $Str .= $TempHash{"$part.Code"};
       if ( $Code ne 'x' ) {$ProbTotal++;}
  }   }
             }                 }   
     else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}      else {
    for(my $n=0; $n<$PartNo; $n++) {
       $Str.=' ';
       $ProbTotal++;
    }
       }
         }           } 
     }      }
     my $PrTot = sprintf( "%5d", $PrTotal );      my $PrTot = sprintf( "%5d", $ProbTotal );
     $Str .= ' '.'<font color="#000088">'.$PrTot.'</font> ';      my $PrSvd = sprintf( "%5d", $ProbSolved );
       $Str .= ' '.'<font color="#000088">'.$PrSvd.'  /'.$PrTot.'</font> ';
   
     return $Str ;      return $Str ;
 }  }
Line 281  sub handler { Line 321  sub handler {
     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',
                                                      &Apache::lonnet::homeserver($sname,$sdom));                                                       &Apache::lonnet::homeserver($sname,$sdom));
   
                       $ssec=(int($ssec)) ? int($ssec) : $ssec;
   
                     $rowlabels[$thisindex]=                      $rowlabels[$thisindex]=
                       sprintf('%3s',$ssec).' '.$reply{$sname}.' ';                        sprintf('%3s ',$ssec).' '.$reply{$sname}.' ';
                     my $i=0;                      my $i=0;
                     map {                      map {
                       $i++;                        $i++;

Removed from v.1.24  
changed lines
  Added in v.1.27


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