Diff for /loncom/interface/Attic/lonchart.pm between versions 1.14 and 1.25

version 1.14, 2001/11/27 21:16:11 version 1.25, 2001/12/18 22:22:13
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 15 Line 42
 # 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/18/01, 10/19/01 Behrouz Minaei
 # 11/17/01, 11/22/01, 11/24/01 Behrouz Minaei  # 11/17/01, 11/22/01, 11/24/01, 11/28/01 Behrouz Minaei
   # 12/18/01 Behrouz Minaei
   
 package Apache::lonchart;  package Apache::lonchart;
   
Line 30  my %hash; Line 58  my %hash;
 my @cols;  my @cols;
 my @rowlabels;  my @rowlabels;
 my @students;  my @students;
 my $r;  
   
 # ------------------------------------------------------------- Find out status  # ------------------------------------------------------------- Find out status
   
Line 48  sub ExtractStudentData { Line 75  sub ExtractStudentData {
     my $Version;      my $Version;
     my $ProbNo;      my $ProbNo;
     my $PrTotal;      my $PrTotal;
     my $LatestVersion;                  my $LatestVersion;                     
   
     my $test = $ENV{'request.course.fn'};  
     my $comp = '/home/httpd/perl/tmp/minaeibi_msu_12679c3ed543a25msul1';   
                  
     my $Str=substr($students[$index].      my $Str=substr($students[$index].
             '                                                        ',0,14).' ! '.              '                                                        ',0,14).' ! '.
             substr($rowlabels[$index].              substr($rowlabels[$index].
Line 105  sub ExtractStudentData { Line 128  sub ExtractStudentData {
     foreach my $Key (@keys) {        foreach my $Key (@keys) {  
  if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {   if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
     my $Part = $1;      my $Part = $1;
     $TempHash{"$Part.Tries"} = $result{"$Version:$Prob:resource.$Part.tries"};  
     $Tries = $result{"$Version:$Prob:resource.$Part.tries"};      $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
     my $Val = $result{"$Version:$Prob:$Key"};      $TempHash{"$Part.Tries"}=($Tries) ? $Tries : 0;
       my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
     if ($Val eq 'correct_by_student'){$Code='*';}       if ($Val eq 'correct_by_student'){$Code='*';} 
     elsif ($Val eq 'correct_by_override'){$Code = '+';}                              elsif ($Val eq 'correct_by_override'){$Code = '+';}                        
     elsif ($Val eq 'incorrect_attempted'){$Code = '.';}       elsif ($Val eq 'incorrect_attempted'){$Code = '.';} 
     elsif ($Val eq 'incorrect_by_override'){$Code = '-';}      elsif ($Val eq 'incorrect_by_override'){$Code = '-';}
     elsif ($Val eq 'excused'){$Code = 'x';}      elsif ($Val eq 'excused'){$Code = 'x';}
       elsif ($Val eq 'ungraded_attempted'){$Code = '#';}
     else {$Code = ' ';}      else {$Code = ' ';}
     $TempHash{"$Part.Code"} = $Code;      $TempHash{"$Part.Code"} = $Code;
             if ($test eq $comp) {  
  $r->print("$Version:$Prob:resource.$Part.tries".' = '.$result{"$Version:$Prob:resource.$Part.tries"}."  $Val "."($Code)".'<br>');  
     }  
  }   }
          }           }
                 }                   } 
   
  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.'.Code'}=$Tries;                              ($TempHash{"$part.Tries"} eq '')) {
       $TempHash{"$part.Code"}=$TempHash{"$part.Tries"};
  }   }
                     }                      }
     $Str .= $TempHash{$part.'.Code'};      elsif ( $Code eq '+' ) {$ProbNo++;}
       $Str .= $TempHash{"$part.Code"};
  }   }
             }                 }   
     else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}      else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}
Line 189  sub tracetable { Line 212  sub tracetable {
 # ================================================================ Main Handler  # ================================================================ Main Handler
   
 sub handler {  sub handler {
   $r=shift;  
     undef %hash;
     undef @students;
     undef @cols;
     undef @rowlabels;
   
     my $r=shift;
   
   if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 # ------------------------------------------- Set document type for header only  # ------------------------------------------- Set document type for header only
Line 236  sub handler { Line 265  sub handler {
                     "   +: correct by override\n".                      "   +: correct by override\n".
                             "   -: incorrect by override\n".                              "   -: incorrect by override\n".
                     "   .: incorrect attempted\n".                      "   .: incorrect attempted\n".
                       "   #: ungraded attempted\n".
                             "    : not attempted\n".                              "    : not attempted\n".
                     "   x: excused</pre><p>");                      "   x: excused</pre><p>");
       
Line 257  sub handler { Line 287  sub handler {
   
 # ---------------------------------------------- Read class list and row labels  # ---------------------------------------------- Read class list and row labels
   
     undef @rowlabels;  
     undef @students;  
   
     my $classlst=&Apache::lonnet::reply      my $classlst=&Apache::lonnet::reply
                                  ('dump:'.$cdom.':'.$cnum.':classlist',$chome);                                   ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
     my $now=time;      my $now=time;

Removed from v.1.14  
changed lines
  Added in v.1.25


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