--- loncom/homework/inputtags.pm 2015/10/30 11:21:19 1.339 +++ loncom/homework/inputtags.pm 2016/04/02 04:30:39 1.340 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.339 2015/10/30 11:21:19 raeburn Exp $ +# $Id: inputtags.pm,v 1.340 2016/04/02 04:30:39 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1336,6 +1336,13 @@ sub decideoutput { } $css_class=$possible_class{'no_grade'}; $button=1; + if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { + if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { + $message = 'Answer Submitted'; + } else { + undef($message); + } + } } if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && !$added_computer_text && $target ne 'tex') { @@ -1636,7 +1643,11 @@ sub get_grade_messages { if ($target eq 'tex') { $message='\vskip 2 mm '.$message.' '; } else { - $message="$message"; + if ($message) { + $message="$message"; + } else { + $message=""; + } if ($previousmsg) { $previousmsg="$previousmsg"; } @@ -1740,7 +1751,11 @@ sub gradestatus { } } - my $output= $previousmsg.$latemessage.$message.$trystr; + my $output= $previousmsg.$latemessage.$message; + my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; + unless ($crstype eq 'Placement') { + $output .= $trystr; + } if ($output =~ /^\s*$/) { return $button; } else { @@ -1749,7 +1764,7 @@ sub gradestatus { } else { $output = ''.$output; - if (!$no_previous) { + if ((!$no_previous) && ($crstype ne 'Placement')) { $output.=''; } $output.= '
'.$button.''.&previous_tries($id,$target).'
';