--- loncom/homework/grades.pm 2010/12/18 23:09:57 1.640 +++ loncom/homework/grades.pm 2011/01/23 01:04:21 1.643 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.640 2010/12/18 23:09:57 raeburn Exp $ +# $Id: grades.pm,v 1.643 2011/01/23 01:04:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2414,12 +2414,11 @@ sub get_last_submission { ($lasthash{$key} eq 'randomizetry')) { my ($ign,@parts) = split(/\./,$key); pop(@parts); + my $id = join('.',@parts); if ($lasthash{$key} eq 'randomizetry') { - my $id = join(',',@parts); $randombytry{$ign.'.'.$id} = $lasthash{$key}; } else { unless ($showsurv) { - my $id = join(',',@parts); $typeparts{$ign.'.'.$id} = $lasthash{$key}; } } @@ -6200,15 +6199,15 @@ sub scantron_do_warning { if ( $env{'form.selectpage'} eq '' || $env{'form.scantron_selectfile'} eq '' || $env{'form.scantron_format'} eq '' ) { - $r->print("

".&mt('You have forgetten to specify some information. Please go Back and try again.')."

"); + $r->print("

".&mt('You have forgotten to specify some information. Please go Back and try again.')."

"); if ( $env{'form.selectpage'} eq '') { $r->print('

'.&mt('You have not selected a Sequence to grade').'

'); } if ( $env{'form.scantron_selectfile'} eq '') { - $r->print('

'.&mt('You have not selected a file that contains the student\'s response data.').'

'); + $r->print('

'.&mt("You have not selected a file that contains the student's response data.").'

'); } if ( $env{'form.scantron_format'} eq '') { - $r->print('

'.&mt('You have not selected a the format of the student\'s response data.').'

'); + $r->print('

'.&mt("You have not selected the format of the student's response data.").'

'); } } else { my $warning=&scantron_warning_screen('Grading: Validate Records'); @@ -8974,7 +8973,7 @@ ENDHEADER "\n".&mt("Username").":  ". "\n".&mt("Domain").": ". &Apache::loncommon::select_dom_form($env{'course.'.$env{'request.course.id'}.'.domain'},'udom'.$id).' '. - &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id); + &Apache::loncommon::selectstudent_link('clickeranalysis','uname'.$id,'udom'.$id,0,$id); $unknown_count++; } }