version 1.333.2.3, 2015/10/30 11:33:07
|
version 1.333.2.5, 2019/03/18 20:21:14
|
Line 1048 sub decideoutput {
|
Line 1048 sub decideoutput {
|
# |
# |
|
|
my $computer = ($handgrade || $nocorrect)? '' |
my $computer = ($handgrade || $nocorrect)? '' |
: " ".&mt("Computer's answer now shown above."); |
: &mt("Computer's answer now shown above."); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
|
|
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
Line 1072 sub decideoutput {
|
Line 1072 sub decideoutput {
|
$message = '\textbf{'.$message.'}'; |
$message = '\textbf{'.$message.'}'; |
} else { |
} else { |
$message = "<b>".$message."</b>"; |
$message = "<b>".$message."</b>"; |
$message.= $computer; |
if ($computer) { |
|
$message = "$computer $message"; |
|
} |
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
if ($awarded > 0) { |
if ($awarded > 0) { |
Line 1116 sub decideoutput {
|
Line 1118 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message.= $computer; |
if ($computer) { |
|
$message = "$computer $message"; |
|
} |
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
if ($awarded > 0 |
if ($awarded > 0 |
Line 1328 sub decideoutput {
|
Line 1332 sub decideoutput {
|
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
!$added_computer_text && $target ne 'tex') { |
!$added_computer_text && $target ne 'tex') { |
$message.= $computer; |
if ($computer) { |
|
$message = "$computer $message"; |
|
} |
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
Line 1865 sub previous_tries {
|
Line 1871 sub previous_tries {
|
my $tries_text = &get_tries_text('link'); |
my $tries_text = &get_tries_text('link'); |
my $prefix = $env{'form.request.prefix'}; |
my $prefix = $env{'form.request.prefix'}; |
$prefix =~ tr{.}{_}; |
$prefix =~ tr{.}{_}; |
my $function_name = "LONCAPA_previous_tries_".$prefix. |
my $function_name = 'LONCAPA_previous_tries_'.$prefix; |
$Apache::lonxml::curdepth.'_'.$env{'form.counter'}; |
if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) { |
|
$function_name .= $Apache::lonxml::curdepth; |
|
} else { |
|
$function_name .= &js_escape($id); |
|
} |
|
$function_name .= '_'.$Apache::lonxml::counter; |
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />"; |
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />"; |
return $result; |
return $result; |
} |
} |