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

Diff for /loncom/homework/grades.pm between versions 1.539 and 1.541

version 1.539, 2008/12/21 22:01:35 version 1.541, 2008/12/22 14:55:28
Line 1656  sub gradeBox { Line 1656  sub gradeBox {
  $wgt.')" /></td>'."\n";   $wgt.')" /></td>'."\n";
     $line.='<td>/'.$wgt.' '.$wgtmsg.      $line.='<td>/'.$wgt.' '.$wgtmsg.
  ($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').   ($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
  ' </td><td>'."\n";   ' </td><td><b>'.&mt('Grade Status').':</b>'."\n";
     $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.      $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
  'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";   'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
     if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {      if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
Line 1669  sub gradeBox { Line 1669  sub gradeBox {
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";      $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
   
   
    #&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .=       $result .= 
  &mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);      '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
   
           
     $result.='</tr></table>'."\n";      $result.='</tr></table>'."\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
Line 3230  sub viewgrades { Line 3230  sub viewgrades {
  $line.='<input type="hidden" name="weight_'.   $line.='<input type="hidden" name="weight_'.
     $partid.'" value="'.$weight{$partid}.'" />'."\n";      $partid.'" value="'.$weight{$partid}.'" />'."\n";
   
     #&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).  
  $result.=   $result.=
     &Apache::loncommon::start_data_table_row()."\n".      &Apache::loncommon::start_data_table_row()."\n".
     '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.      '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
Line 7243  sub scantron_get_maxbubble { Line 7242  sub scantron_get_maxbubble {
     foreach my $resource (@resources) {      foreach my $resource (@resources) {
         my $symb = $resource->symb();          my $symb = $resource->symb();
   
         my (@parts,@allparts,@possible_parts);          my @parts;
   
         # Need to retrieve part IDs and response IDs because essayresponse,  
         # reactionresponse and organicresponse items are not included in   
         # $analysis{'parts'} from lonnet::ssi.    
         if (ref($resource->parts()) eq 'ARRAY') {  
             foreach my $part (@{$resource->parts()}) {  
                 if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) {  
                     my @resp_ids = $resource->responseIds($part);  
                     foreach my $id (@resp_ids) {  
                         my $part_id = $part.'.'.$id;  
                         push(@possible_parts,$part_id);  
                     }  
                 }  
             }  
         }  
   
         my $result=&ssi_with_retries($resource->src(), $ssi_retries,          my $result=&ssi_with_retries($resource->src(), $ssi_retries,
                                         ('symb' => $symb,                                          ('symb' => $symb,
Line 7279  sub scantron_get_maxbubble { Line 7263  sub scantron_get_maxbubble {
                 }                  }
             }              }
         }          }
         # Add part_ids for any essayresponse, reactionresponse or   
         # organicresponse items.   
         foreach my $part_id (@possible_parts) {  
             if (grep(/^\Q$part_id\E$/,@parts)) {  
                 push(@allparts,$part_id);  
             } else {  
                 if (($analysis{$part_id.'.type'} eq 'essayresponse') ||  
                     ($analysis{$part_id.'.type'} eq 'reactionresponse') ||  
                     ($analysis{$part_id.'.type'} eq 'organicresponse')) {  
                     push(@allparts,$part_id);  
                 }  
             }  
         }  
   
  foreach my $part_id (@allparts) {   foreach my $part_id (@parts) {
             my $lines;              my $lines;
   
     # TODO - make this a persistent hash not an array.      # TODO - make this a persistent hash not an array.
Removed from v.1.539  
changed lines
  Added in v.1.541

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