[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.689

version 1.688, 2013/05/30 05:04:31 version 1.689, 2013/06/01 00:22:42
Line 7923  sub scantron_process_students { Line 7923  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 8035  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 8540  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 8621  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.689

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