version 1.222, 2007/04/16 23:15:48
|
version 1.226, 2007/05/29 21:14:45
|
Line 629 sub decideoutput {
|
Line 629 sub decideoutput {
|
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
my ($symb) = &Apache::lonnet::whichuser(); |
my ($symb) = &Apache::lonnet::whichuser(); |
if ((!$env{'course.'. |
if (($symb ne '') |
$env{'request.course.id'}. |
&& |
'.disable_receipt_display'} eq 'yes')&& |
($env{'course.'.$env{'request.course.id'}. |
$symb) { |
'.disable_receipt_display'} ne 'yes')) { |
$message.=(($target eq 'web')?'<br />':' '). |
$message.=(($target eq 'web')?'<br />':' '). |
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). |
&mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part). |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
(($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):''); |
Line 1106 sub get_grade_messages {
|
Line 1106 sub get_grade_messages {
|
} |
} |
|
|
sub gradestatus { |
sub gradestatus { |
my ($id,$target) = @_; |
my ($id,$target,$no_previous) = @_; |
my $showbutton = 1; |
my $showbutton = 1; |
my $message = ''; |
my $message = ''; |
my $latemessage = ''; |
my $latemessage = ''; |
Line 1145 sub gradestatus {
|
Line 1145 sub gradestatus {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $button.' \vskip 0 mm '.$output.' '; |
return $button.' \vskip 0 mm '.$output.' '; |
} else { |
} else { |
return '<table><tr><td>'.$button.'</td>'.$output.'<td>'.&previous_tries($id,$target).'</td></tr></table>'; |
$output = |
|
'<table><tr><td>'.$button.'</td>'.$output; |
|
if (!$no_previous) { |
|
$output.='<td>'.&previous_tries($id,$target).'</td>'; |
|
} |
|
$output.= '</tr></table>'; |
|
return $output; |
} |
} |
} |
} |
} |
} |
Line 1174 sub previous_tries {
|
Line 1180 sub previous_tries {
|
my ($match,$which) = &find_which_previous($i); |
my ($match,$which) = &find_which_previous($i); |
$message=$previousmsg; |
$message=$previousmsg; |
my $previous = $count_lookup{$which}; |
my $previous = $count_lookup{$which}; |
$message =~ s{(</td>)}{ as submission # $previous $1}; |
$message =~ s{(</td>)}{ as submission \# $previous $1}; |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
} elsif ($Apache::lonhomework::history{"$prefix.tries"}) { |
if ( $Apache::lonhomework::history{"$prefix.solved"} =~ |
if (!(lc($Apache::lonhomework::problemstatus) eq 'no' |
/^correct/) { |
&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') |
|
&& $Apache::lonhomework::history{"$prefix.solved"} =~/^correct/ |
|
) { |
|
|
$message =~ s{(<td.*?>)(.*?)(</td>)} |
$message =~ s{(<td.*?>)(.*?)(</td>)} |
{$1 <strong>Correct</strong>. $3}; |
{$1 <strong>Correct</strong>. $3}s; |
} |
} |
my $trystr = "(Try ". |
my $trystr = "(Try ". |
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
$Apache::lonhomework::history{"$prefix.tries"}.')'; |
Line 1190 sub previous_tries {
|
Line 1199 sub previous_tries {
|
|
|
|
|
$output.='<tr class="'.$class.'">'; |
$output.='<tr class="'.$class.'">'; |
$output.='<td align ="center">'.$count.'</td>'; |
$output.='<td align="center">'.$count.'</td>'; |
$output.=$message; |
$output.=$message; |
|
|
foreach my $resid (@Apache::inputtags::response) { |
foreach my $resid (@Apache::inputtags::response) { |
Line 1219 sub previous_tries {
|
Line 1228 sub previous_tries {
|
$output=~s/\\/\\\\/g; |
$output=~s/\\/\\\\/g; |
$output=~s/\'/\\\'/g; |
$output=~s/\'/\\\'/g; |
$output=~s/\s+/ /g; |
$output=~s/\s+/ /g; |
|
$output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>'; |
|
|
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page('Previous Tries', undef, |
&Apache::loncommon::start_page('Previous Tries', undef, |