--- loncom/homework/inputtags.pm 2007/04/16 22:50:41 1.221
+++ loncom/homework/inputtags.pm 2007/05/21 22:57:17 1.224
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.221 2007/04/16 22:50:41 albertel Exp $
+# $Id: inputtags.pm,v 1.224 2007/05/21 22:57:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -629,14 +629,17 @@ sub decideoutput {
}
$added_computer_text=1;
my ($symb) = &Apache::lonnet::whichuser();
- if ((!$env{'course.'.
- $env{'request.course.id'}.
- '.disable_receipt_display'} eq 'yes')&&
- $symb) {
+ if (($symb ne '')
+ &&
+ ($env{'course.'.$env{'request.course.id'}.
+ '.disable_receipt_display'} ne 'yes')) {
$message.=(($target eq 'web')?'
':' ').
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
}
+ &Apache::lonnet::logthis(" er \n$symb\n$message\n".$env{'course.'.
+ $env{'request.course.id'}.
+ '.disable_receipt_display'});
}
$button=0;
$previousmsg='';
@@ -1106,7 +1109,7 @@ sub get_grade_messages {
}
sub gradestatus {
- my ($id,$target) = @_;
+ my ($id,$target,$no_previous) = @_;
my $showbutton = 1;
my $message = '';
my $latemessage = '';
@@ -1145,7 +1148,13 @@ sub gradestatus {
if ($target eq 'tex') {
return $button.' \vskip 0 mm '.$output.' ';
} else {
- return '
'.$button.' | '.$output.''.&previous_tries($id,$target).' |
';
+ $output =
+ ''.$button.' | '.$output;
+ if (!$no_previous) {
+ $output.=''.&previous_tries($id,$target).' | ';
+ }
+ $output.= '
';
+ return $output;
}
}
}
@@ -1190,7 +1199,7 @@ sub previous_tries {
$output.='';
- $output.=''.$count.' | ';
+ $output.=''.$count.' | ';
$output.=$message;
foreach my $resid (@Apache::inputtags::response) {
@@ -1211,7 +1220,7 @@ sub previous_tries {
}
return if ($output eq '');
my $headers =
- '
'.''.&mt('Submission #').' | '.&mt(' ').
+ ' |
'.''.&mt('Submission #').' | '.&mt('Try').
' | '.
&mt('Submitted Answer').' | ';
$output ='';