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

Diff for /loncom/homework/grades.pm between versions 1.688 and 1.690

version 1.688, 2013/05/30 05:04:31 version 1.690, 2013/06/16 16:46:48
Line 5174  sub restore_bubble_lines { Line 5174  sub restore_bubble_lines {
     }      }
 }  }
   
 #  Given the parsed scanline, get the response for   
 #  'answer' number n:  
   
 sub get_response_bubbles {  
     my ($parsed_line, $response)  = @_;  
   
     my $bubble_line = $first_bubble_line{$response-1} +1;  
     my $bubble_lines= $bubble_lines_per_response{$response-1};  
       
     my $selected = "";  
   
     for (my $bline = 0; $bline < $bubble_lines; $bline++) {  
  $selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";  
  $bubble_line++;  
     }  
     return $selected;  
 }  
   
 =pod   =pod 
   
 =item scantron_filenames  =item scantron_filenames
Line 7923  sub scantron_process_students { Line 7905  sub scantron_process_students {
         return '';          return '';
     }        }  
     my $map=$navmap->getResourceByUrl($sequence);      my $map=$navmap->getResourceByUrl($sequence);
     my $randomorder;      my ($randomorder,$randompick);
     if (ref($map)) {      if (ref($map)) {
         $randomorder = $map->randomorder();          $randomorder = $map->randomorder();
           $randompick = $map->randompick();
     }      }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered);      my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered);
Line 8034  SCANTRONFORM Line 8017  SCANTRONFORM
         }          }
   
         my @mapresources = @resources;          my @mapresources = @resources;
         if ($randomorder) {          if ($randomorder || $randompick) {
             @mapresources =               @mapresources = 
                 &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,                  &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,
                              \%symb_to_resource);                               \%symb_to_resource);
Line 8539  sub checkscantron_results { Line 8522  sub checkscantron_results {
         return '';          return '';
     }      }
     my $map=$navmap->getResourceByUrl($sequence);      my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,@master_seq,%symb_to_resource);      my ($randomorder,$randompick,@master_seq,%symb_to_resource);
     if (ref($map)) {       if (ref($map)) { 
         $randomorder=$map->randomorder();          $randomorder=$map->randomorder();
           $randompick=$map->randompick();
     }      }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     foreach my $resource (@resources) {      foreach my $resource (@resources) {
Line 8619  sub checkscantron_results { Line 8603  sub checkscantron_results {
         }          }
   
         my @mapresources = @resources;          my @mapresources = @resources;
         if ($randomorder) {          if ($randomorder || $randompick) {
             @mapresources =              @mapresources =
                 &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,                  &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,
                              \%symb_to_resource);                               \%symb_to_resource);
Removed from v.1.688  
changed lines
  Added in v.1.690

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