version 1.341, 2016/04/04 21:50:32
|
version 1.344, 2016/12/06 20:51:11
|
Line 460 sub start_textline {
|
Line 460 sub start_textline {
|
} |
} |
my $name = 'HWVAL_'.$id; |
my $name = 'HWVAL_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
|
# NOTE: the input id should match the one given by defaut_homework input_id(). |
my $input_tag_id = $itemid.'_'.$input_id; |
my $input_tag_id = $itemid.'_'.$input_id; |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
$name = "none"; |
$name = "none"; |
Line 1059 sub decideoutput {
|
Line 1060 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 1083 sub decideoutput {
|
Line 1084 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 1127 sub decideoutput {
|
Line 1130 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 1329 sub decideoutput {
|
Line 1334 sub decideoutput {
|
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
my $first_access=&Apache::lonnet::get_first_access($interval[1]); |
if (defined($first_access)) { |
if (defined($first_access)) { |
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); |
my $due_date= &Apache::lonnet::EXT("resource.$part.duedate"); |
unless (($due_date) && ($due_date < $first_access + $interval[0])) { |
my ($timelimit) = ($interval[0] =~ /^(\d+)/); |
|
unless (($due_date) && ($due_date < $first_access + $timelimit)) { |
$message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); |
$message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached."); |
} |
} |
} |
} |
Line 1346 sub decideoutput {
|
Line 1352 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') { |