--- loncom/homework/inputtags.pm 2016/04/02 04:30:39 1.340 +++ loncom/homework/inputtags.pm 2019/03/18 20:18:27 1.345 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.340 2016/04/02 04:30:39 raeburn Exp $ +# $Id: inputtags.pm,v 1.345 2019/03/18 20:18:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -460,6 +460,7 @@ sub start_textline { } my $name = 'HWVAL_'.$id; my $itemid = 'HWVAL_'.$partid.'_'.$id; + # NOTE: the input id should match the one given by defaut_homework input_id(). my $input_tag_id = $itemid.'_'.$input_id; if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { $name = "none"; @@ -1059,7 +1060,7 @@ sub decideoutput { # my $computer = ($handgrade || $nocorrect)? '' - : " ".&mt("Computer's answer now shown above."); + : &mt("Computer's answer now shown above."); &Apache::lonxml::debug("handgrade has :$handgrade:"); if ($previous) { $previousmsg=&mt('You have entered that answer before'); } @@ -1083,7 +1084,9 @@ sub decideoutput { $message = '\textbf{'.$message.'}'; } else { $message = "".$message.""; - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } } $added_computer_text=1; if ($awarded > 0) { @@ -1127,7 +1130,9 @@ sub decideoutput { $message = '\textbf{'.&mt('You are correct.').'}'; } else { $message = "".&mt('You are correct.').""; - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } } $added_computer_text=1; if ($awarded > 0 @@ -1329,7 +1334,8 @@ sub decideoutput { my $first_access=&Apache::lonnet::get_first_access($interval[1]); if (defined($first_access)) { my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); - unless (($due_date) && ($due_date < $first_access + $interval[0])) { + my ($timelimit) = ($interval[0] =~ /^(\d+)/); + unless (($due_date) && ($due_date < $first_access + $timelimit)) { $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); } } @@ -1346,7 +1352,9 @@ sub decideoutput { } if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && !$added_computer_text && $target ne 'tex') { - $message.= $computer; + if ($computer) { + $message = "$computer $message"; + } $added_computer_text=1; } if ($Apache::lonhomework::type eq 'practice') { @@ -1684,7 +1692,13 @@ sub get_grade_messages { $trial.="/".$Apache::inputtags::params{'maxtries'}; } } - $trystr = '
'.$button.' | '.$output; - if ((!$no_previous) && ($crstype ne 'Placement')) { + if ((!$no_previous) && + (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || + ($env{'request.role.adv'}))) { $output.=''.&previous_tries($id,$target).' | '; } $output.= '