--- loncom/homework/grades.pm 2013/08/15 12:38:30 1.701 +++ loncom/homework/grades.pm 2013/09/27 12:57:49 1.707 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.701 2013/08/15 12:38:30 bisitz Exp $ +# $Id: grades.pm,v 1.707 2013/09/27 12:57:49 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1976,7 +1976,7 @@ sub submission { $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode)); } - # kwclr is the only variable that is guaranteed to be non blank + # kwclr is the only variable that is guaranteed not to be blank # if this subroutine has been called once. my %keyhash = (); # if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') { @@ -2139,146 +2139,146 @@ KEYWORDS $result.=$sub_result; } $request->print($result."\n"); - + # print student answer/submission # Options are (1) Handgraded submission only # (2) Last submission, includes submission that is not handgraded # (for multi-response type part) # (3) Last submission plus the parts info # (4) The whole record for this student - if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) { - my ($string,$timestamp)= &get_last_submission(\%record); + + my ($string,$timestamp)= &get_last_submission(\%record); - my $lastsubonly; + my $lastsubonly; - if ($$timestamp eq '') { - $lastsubonly.='
'. &keywords_highlight($oessay). '
' + .&mt('Unable to accept last correction, an error occurred: [_1]', + $errmsg) + .'
'); } else { &scantron_put_line($scanlines,$scan_data,$which,$line,$skip); &scantron_putfile($scanlines,$scan_data); @@ -6576,7 +6581,7 @@ sub scantron_warning_screen { return ('-'.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).' +'.&mt("Please double check the information below before clicking on '[_1]'",&mt($button_text)).'
'.&mt('Sequence to be Graded:').' | '.$title.' | '.&mt('Bubblesheet').' | '. - ''.$studentdata.' | '. + ''.$studentdata.' | '. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::start_data_table_row(). ''.&mt('Stored submissions').' | '. - ''.$studentrecord.' | '."\n". + ''.$studentrecord.' | '."\n". &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table().''); } else { @@ -8888,7 +8893,7 @@ sub checkscantron_results { my $count=&get_todo_count($scanlines,$scan_data); my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,$count); - my ($username,$domain,$started,%ordered); + my ($username,$domain,$started); &scantron_get_maxbubble(\$nav_error,\%scantron_config); # Need the bubble lines array to parse. if ($nav_error) { $r->print(&navmap_errormsg());