version 1.338, 2015/10/30 03:49:47
|
version 1.343, 2016/05/30 02:45:32
|
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; |
my $input_tag_id = 'HWVAL_'.$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 1059 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 1083 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 1129 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 1333 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."); |
} |
} |
} |
} |
} |
} |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { |
|
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
|
$message = 'Answer Submitted'; |
|
} else { |
|
undef($message); |
|
} |
|
} |
} |
} |
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 1636 sub get_grade_messages {
|
Line 1650 sub get_grade_messages {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
if ($message) { |
|
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
|
} else { |
|
$message="<td class=\"$tdclass\"></td>"; |
|
} |
if ($previousmsg) { |
if ($previousmsg) { |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
} |
} |
Line 1673 sub get_grade_messages {
|
Line 1691 sub get_grade_messages {
|
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
|
|
unless (($env{'request.state'} ne "construct") && |
|
($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') && |
|
(!$env{'request.role.adv'})) { |
|
$trystr = '<span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span>'; |
|
} |
|
$trystr = '<td class="'.$tdclass.'">'.$trystr.'</td>'; |
} |
} |
} |
} |
|
|
Line 1749 sub gradestatus {
|
Line 1773 sub gradestatus {
|
} else { |
} else { |
$output = |
$output = |
'<table><tr><td>'.$button.'</td>'.$output; |
'<table><tr><td>'.$button.'</td>'.$output; |
if (!$no_previous) { |
if ((!$no_previous) && |
|
(($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || |
|
($env{'request.role.adv'}))) { |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
} |
} |
$output.= '</tr></table>'; |
$output.= '</tr></table>'; |