--- loncom/homework/inputtags.pm 2014/06/19 19:37:35 1.324 +++ loncom/homework/inputtags.pm 2014/09/14 15:21:43 1.325 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.324 2014/06/19 19:37:35 raeburn Exp $ +# $Id: inputtags.pm,v 1.325 2014/09/14 15:21:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -997,7 +997,7 @@ sub finalizeawards { } sub decideoutput { - my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_; + my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_; my $message=''; my $button=0; @@ -1573,7 +1573,7 @@ sub grade { } sub get_grade_messages { - my ($id,$prefix,$target,$status,$nocorrect) = @_; + my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_; # nocorrect suppresses "Computer's answer now shown above" my ($message,$latemessage,$trystr,$previousmsg); my $showbutton = 1; @@ -1588,13 +1588,13 @@ sub get_grade_messages { &Apache::lonxml::debug('Getting message'); ($showbutton,my $css_class,$message,$previousmsg) = &decideoutput($award,$awarded,$awardmsg,$solved,$previous, - $target,(($status eq 'CAN_ANSWER') || $nocorrect)); + $target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass); if ($target eq 'tex') { $message='\vskip 2 mm '.$message.' '; } else { - $message="$message"; + $message="$message"; if ($previousmsg) { - $previousmsg="$previousmsg"; + $previousmsg="$previousmsg"; } } } @@ -1629,7 +1629,7 @@ sub get_grade_messages { $trial.="/".$Apache::inputtags::params{'maxtries'}; } } - $trystr = ''.&mt($tries_text.' [_1]',$trial).''; + $trystr = ''.&mt($tries_text.' [_1]',$trial).''; } } @@ -1637,7 +1637,7 @@ sub get_grade_messages { #last submissions was after due date $latemessage=&mt(' The last submission was after the Due Date ');; if ($target eq 'web') { - $latemessage=''.$latemessage.''; + $latemessage=''.$latemessage.''; } } return ($previousmsg,$latemessage,$message,$trystr,$showbutton); @@ -1651,6 +1651,7 @@ sub gradestatus { my $trystr=''; my $button=''; my $previousmsg=''; + my $tdclass=''; my $status = $Apache::inputtags::status['-1']; &Apache::lonxml::debug("gradestatus has :$status:"); @@ -1667,21 +1668,29 @@ sub gradestatus { $showbutton = 0; } + unless (($status eq 'SHOW_ANSWER') || ($status eq 'CANNOT_ANSWER')) { + if ($target ne 'tex') { + $tdclass = 'LC_status_submit_'.$id; + } + } + ($previousmsg,$latemessage,$message,$trystr) = &get_grade_messages($id,"resource.$id",$target,$status, - $showbutton); + $showbutton,$tdclass); if ($status eq 'CANNOT_ANSWER') { $showbutton = 0; } if ( $status eq 'SHOW_ANSWER') { undef($previousmsg); } - if ( $showbutton ) { + if ( $showbutton ) { if ($target ne 'tex') { $button = ''; + type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" + value="'.&mt('Submit Answer').'" /> '. + ''; } } @@ -1696,7 +1705,7 @@ sub gradestatus { $output = ''.$output; if (!$no_previous) { - $output.=''; + $output.=''; } $output.= '
'.$button.''.&previous_tries($id,$target).''.&previous_tries($id,$target).'
'; return $output;