Diff for /loncom/interface/Attic/lonchart.pm between versions 1.18 and 1.21

version 1.18, 2001/11/28 17:52:00 version 1.21, 2001/11/28 18:29:53
Line 15 Line 15
 # 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
   
 package Apache::lonchart;  package Apache::lonchart;
   
Line 106  sub ExtractStudentData { Line 106  sub ExtractStudentData {
  if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {   if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
     my $Part = $1;      my $Part = $1;
     $Tries = $result{"$Version:$Prob:resource.$Part.tries"};      $Tries = $result{"$Version:$Prob:resource.$Part.tries"};
     #if ($Tries) {$TempHash{"$Part.Tries"}=$Tries;}      $TempHash{"$Part.Tries"}=($Tries) ? $Tries : 0;
     #my $Val = $result{"$Version:$Prob:$Key"};  
     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'){$Code='*';} 
                                 $Code='*';  
                                 $TempHash{$Part.'.Tries'}=$Tries;  
                             }   
     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 = '-';}
Line 120  sub ExtractStudentData { Line 116  sub ExtractStudentData {
     else {$Code = ' ';}      else {$Code = ' ';}
     $TempHash{"$Part.Code"} = $Code;      $TempHash{"$Part.Code"} = $Code;
 #            if ($test=~/*minaeibi*/) {  #            if ($test=~/*minaeibi*/) {
  $r->print($Key."  PartNo =$PartNo "." Tries=$Tries!<br>$Version:$Prob:resource.$Part.tries".' = '.$result{"$Version:$Prob:resource.$Part.tries"}."  $Val "."($Code)".'<br>');  # $r->print($Key."  PartNo =$PartNo "." Tries=$Tries!<br>$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 '*') {                      if ($TempHash{"$part.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'};      $Str .= $TempHash{"$part.Code"};
     $r->print($n.") Part=".$part."  code=$TempHash{$part.'.Code'}<br>");  #    $r->print($n.") Part=".$part."  code=$TempHash{$part.'.Code'}<br>");
  }   }
             }                 }   
     else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}      else {for(my $n=0; $n<$PartNo; $n++) {$Str.=' ';}}

Removed from v.1.18  
changed lines
  Added in v.1.21


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