version 1.66, 2002/10/17 14:40:58
|
version 1.69, 2002/11/07 15:12:23
|
Line 157 sub end_numericalresponse {
|
Line 157 sub end_numericalresponse {
|
} |
} |
} |
} |
} elsif ($target eq 'web' || $target eq 'tex') { |
} elsif ($target eq 'web' || $target eq 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
|
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { |
if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { |
Line 199 sub end_numericalresponse {
|
Line 198 sub end_numericalresponse {
|
$result.="}. \\vskip 0 mm "; |
$result.="}. \\vskip 0 mm "; |
} |
} |
} |
} |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); |
my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); |
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); |
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); |
Line 278 sub end_numericalresponse {
|
Line 277 sub end_numericalresponse {
|
my $power = $2; |
my $power = $2; |
$power=~s/^\+//; |
$power=~s/^\+//; |
$power=~s/^(-?)0+(\d+)//; |
$power=~s/^(-?)0+(\d+)//; |
$ans=$number.'$\times 10^{'.$1.$2.'}$'; |
$ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs |
} |
} |
} else { |
} else { |
my $badans = $bubbles_values[$ind]; |
my $badans = $bubbles_values[$ind]; |
Line 297 sub end_numericalresponse {
|
Line 296 sub end_numericalresponse {
|
my $power = $2; |
my $power = $2; |
$power=~s/^\+//; |
$power=~s/^\+//; |
$power=~s/^(-?)0+(\d+)//; |
$power=~s/^(-?)0+(\d+)//; |
$ans=$number.'$\times 10^{'.$1.$2.'}$'; |
$ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs |
} |
} |
} |
} |
$result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; |
$result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; |
Line 308 sub end_numericalresponse {
|
Line 307 sub end_numericalresponse {
|
$result.='\\\\\end{tabular}\vskip 0 mm '; |
$result.='\\\\\end{tabular}\vskip 0 mm '; |
} |
} |
$result.='\end{enumerate}'; |
$result.='\end{enumerate}'; |
$Apache::lonxml::counter++; |
&Apache::lonxml::increment_counter(); |
my %moreenv; |
|
$moreenv{'form.counter'}=$Apache::lonxml::counter; |
|
&Apache::lonnet::appenv(%moreenv); |
|
} |
} |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |