[BACK]Return to grades.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.418 and 1.419

version 1.418, 2007/06/22 23:45:19 version 1.419, 2007/07/04 18:37:30
Line 6211  sub process_clicker { Line 6211  sub process_clicker {
     my $pcorrect=&mt("Percentage points for correct solution");      my $pcorrect=&mt("Percentage points for correct solution");
     my $pincorrect=&mt("Percentage points for incorrect solution");      my $pincorrect=&mt("Percentage points for incorrect solution");
     my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',      my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
    ('iclicker' => 'i>clicker'));     ('iclicker' => 'i>clicker',
                                                       'interwrite' => 'interwrite PRS'));
     $symb = &Apache::lonenc::check_encrypt($symb);      $symb = &Apache::lonenc::check_encrypt($symb);
     $result.=<<ENDUPFORM;      $result.=<<ENDUPFORM;
 <script type="text/javascript">  <script type="text/javascript">
Line 6359  ENDHEADER Line 6360  ENDHEADER
     if ($env{'form.upfiletype'} eq 'iclicker') {      if ($env{'form.upfiletype'} eq 'iclicker') {
  ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);   ($errormsg,$number)=&iclicker_eval(\@questiontitles,\%responses);
     }      }
       if ($env{'form.upfiletype'} eq 'interwrite') {
           ($errormsg,$number)=&interwrite_eval(\@questiontitles,\%responses);
       }
     $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.      $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
              '<input type="hidden" name="number" value="'.$number.'" />'.               '<input type="hidden" name="number" value="'.$number.'" />'.
              &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',               &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
Line 6437  sub iclicker_eval { Line 6441  sub iclicker_eval {
     }      }
     return ($errormsg,$number);      return ($errormsg,$number);
 }  }
   
   sub interwrite_eval {
       my ($questiontitles,$responses)=@_;
       my $number=0;
       my $errormsg='';
       foreach my $line (split(/[\n\r]/,$env{'form.upfile'})) {
           my %components=&Apache::loncommon::record_sep($line);
           my @entries=map {$components{$_}} (sort(keys(%components)));
           if ($entries[0] eq 'Question') {
               for (my $i=3;$i<$#entries;$i+=6) {
                   $$questiontitles[$number]=$entries[$i];
                   $number++;
               }
           }
           if ($entries[0]=~/^\#/) {
               my $id=$entries[0];
               my @idresponses;
               $id=~s/^[\#0]+//;
               for (my $i=0;$i<$number;$i++) {
                   my $idx=3+$i*6;
                   push(@idresponses,$entries[$idx]);
               }
               $$responses{$id}=join(',',@idresponses);
           }
       }
       return ($errormsg,$number);
   }
   
 sub assign_clicker_grades {  sub assign_clicker_grades {
     my ($r)=@_;      my ($r)=@_;
Removed from v.1.418  
changed lines
  Added in v.1.419

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