version 1.172, 2007/06/20 22:36:52
|
version 1.192, 2008/06/14 16:34:54
|
Line 451 sub end_customresponse {
|
Line 451 sub end_customresponse {
|
} |
} |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::increment_counter(&Apache::response::repetition()); |
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
|
"$part.$id"); |
|
if ($target eq 'analyze') { |
|
$Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse'; |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
} |
} |
pop(@Apache::lonxml::namespace); |
pop(@Apache::lonxml::namespace); |
pop(@Apache::response::custom_answer); |
pop(@Apache::response::custom_answer); |
Line 481 sub start_mathresponse {
|
Line 486 sub start_mathresponse {
|
$safeeval); |
$safeeval); |
$Apache::inputtags::answertxt{$id}=[$answer]; |
$Apache::inputtags::answertxt{$id}=[$answer]; |
} |
} |
|
if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
$result.=&edit_mathresponse_button($id,"HWVAL_$id"); |
|
} |
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('String to display for answer:', |
$result.=&Apache::edit::text_arg('String to display for answer:', |
Line 491 sub start_mathresponse {
|
Line 500 sub start_mathresponse {
|
$token); |
$token); |
$result.=&Apache::edit::text_arg('Argument Array:', |
$result.=&Apache::edit::text_arg('Argument Array:', |
'args',$token); |
'args',$token); |
|
$result.=&Apache::edit::text_arg('Libraries:', |
|
'libraries',$token); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag; |
my $constructtag; |
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
$constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'answerdisplay','cas','args'); |
$safeeval,'answerdisplay','cas','args','libraries'); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
Line 507 sub start_mathresponse {
|
Line 518 sub start_mathresponse {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub edit_mathresponse_button { |
|
my ($id,$field)=@_; |
|
my $button=&mt('Edit Answer'); |
|
return(<<ENDFORMULABUTTON); |
|
<script language="JavaScript"> |
|
function edit_${id}_${field} (textarea) { |
|
thenumber = textarea; |
|
thedata = document.forms['lonhomework'].elements[textarea].value; |
|
newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable"); |
|
} |
|
</script> |
|
<input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" /> |
|
ENDFORMULABUTTON |
|
} |
|
|
sub end_mathresponse { |
sub end_mathresponse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
Line 527 sub end_mathresponse {
|
Line 553 sub end_mathresponse {
|
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval); |
if ($cas eq 'maxima') { |
if ($cas eq 'maxima') { |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)]; |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args); |
$award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args, |
|
&Apache::lonxml::get_param('libraries',$parstack,$safeeval)); |
} |
} |
if (!&Apache::inputtags::valid_award($award)) { |
if (!&Apache::inputtags::valid_award($award)) { |
$error = $award; |
$error = $award; |
Line 569 sub implicit_multiplication {
|
Line 596 sub implicit_multiplication {
|
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
$expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi; |
# Fill in multiplication signs |
# Fill in multiplication signs |
# a b -> a*b;3 b -> 3*b;3 4 -> 3*4 |
# a b -> a*b;3 b -> 3*b;3 4 -> 3*4 |
$expression=~s/(\w)\s+(\w)/$1\*$2/gs; |
$expression=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs; |
# )( -> )*(; ) ( -> )*( |
# )( -> )*(; ) ( -> )*( |
$expression=~s/\)\s*\(/\)\*\(/gs; |
$expression=~s/\)\s*\(/\)\*\(/gs; |
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
# 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A |
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
$expression=~s/(\d)\s*([a-zA-Z\(])/$1\*$2/gs; |
# a ( -> a*( |
# a ( -> a*( |
$expression=~s/(\w)\s+\(/$1\*\(/gs; |
$expression=~s/([A-Za-z0-9])\s+\(/$1\*\(/gs; |
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
# )a -> )*a; )3 -> )*3; ) 3 -> )*3 |
$expression=~s/\)\s*(\w)/\)\*$1/gs; |
$expression=~s/\)\s*([A-Za-z0-9])/\)\*$1/gs; |
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
# 3&8 -> 3e8; 3&-4 -> 3e-4 |
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
$expression=~s/(\d+)\&\(([\+\-]*\d+)\)/$1e$2/gs; |
return $expression; |
return $expression; |
Line 671 sub start_responseparam {
|
Line 698 sub start_responseparam {
|
$Apache::lonnet::packagetab{"$tag&$name&display"}; |
$Apache::lonnet::packagetab{"$tag&$name&display"}; |
$token->[2]->{'default'}= |
$token->[2]->{'default'}= |
$Apache::lonnet::packagetab{"$tag&$name&default"}; |
$Apache::lonnet::packagetab{"$tag&$name&default"}; |
|
$token->[3] = ['name','type','description','default']; |
$constructtag=1; |
$constructtag=1; |
} |
} |
if ($constructtag) { |
if ($constructtag) { |
Line 795 sub answer_part {
|
Line 823 sub answer_part {
|
last; |
last; |
} |
} |
} |
} |
if ($answer ne '') { |
my $fullanswer=$answer; |
$answer = '\verb'.$to_use.$answer.$to_use; |
$answer=''; |
} |
foreach my $element (split(/[\;]/,$fullanswer)) { |
|
if ($element ne '') { |
|
$answer.= '\verb'.$to_use.$element.$to_use.' \newline'; |
|
} |
|
} |
} |
} |
if ($answer ne '') { |
if ($answer ne '') { |
push(@answer_bits,$answer); |
push(@answer_bits,$answer); |
Line 816 sub answer_footer {
|
Line 848 sub answer_footer {
|
my ($type) = @_; |
my ($type) = @_; |
my $result; |
my $result; |
if ($env{'form.answer_output_mode'} eq 'tex') { |
if ($env{'form.answer_output_mode'} eq 'tex') { |
my $columns = scalar(@answer_bits); |
$result = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline '; |
$result = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline '; |
$result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}'; |
$result .= join(' & ',@answer_bits); |
for (my $i=1;$i<=$#answer_bits;$i++) { |
$result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm '; |
$result.='\item '.$answer_bits[$i].'\vspace*{-7mm}'; |
|
} |
|
$result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm '; |
} else { |
} else { |
$result = '</tr></table>'; |
if (!$need_row_start) { |
|
$result .= '</tr>'; |
|
} |
|
$result .= '</table>'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 865 Optional Arguments:
|
Line 902 Optional Arguments:
|
$lines lines of bubbles. |
$lines lines of bubbles. |
$bubbles_per_line - Must be provided if lines is defined.. number of |
$bubbles_per_line - Must be provided if lines is defined.. number of |
bubbles on a line. |
bubbles on a line. |
|
|
=cut |
=cut |
|
|
sub getresponse { |
sub getresponse { |
Line 879 sub getresponse {
|
Line 917 sub getresponse {
|
if (!defined($lines)) { |
if (!defined($lines)) { |
$lines = 1; |
$lines = 1; |
} |
} |
|
|
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21, |
Line 890 sub getresponse {
|
Line 927 sub getresponse {
|
|
|
my $line; |
my $line; |
for ($line = 0; $line < $lines; $line++) { |
for ($line = 0; $line < $lines; $line++) { |
$response = $env{'scantron.'. |
my $theline = $Apache::lonxml::counter+$offset-1+$line; |
($Apache::lonxml::counter+$offset-1+$line). |
$response = $env{"scantron.$theline.answer"}; |
'.answer'}; |
if ((defined($response)) && ($response ne "") && ($response ne " ")) { |
if ($response ne "") { |
|
last; |
last; |
} |
} |
|
|
} |
} |
|
|
|
# save bubbled letter for later |
|
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
|
$response; |
if ($resulttype ne 'letter') { |
if ($resulttype ne 'letter') { |
if ($resulttype eq 'A is 1') { |
if ($resulttype eq 'A is 1') { |
$response = $let_to_num{$response}+1; |
$response = $let_to_num{$response}+1; |
Line 912 sub getresponse {
|
Line 952 sub getresponse {
|
$response = chr(ord($response) + $line * $bubbles_per_line); |
$response = chr(ord($response) + $line * $bubbles_per_line); |
} |
} |
} |
} |
# save submitted response for later |
|
$Apache::lonhomework::results{"resource.$part.$id.scantron"}.= |
|
$response; |
|
|
|
} else { |
} else { |
$response = $env{$formparm}; |
$response = $env{$formparm}; |
Line 1043 sub show_answer {
|
Line 1080 sub show_answer {
|
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$part.solved"}; |
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
return ( ($award =~ /^correct/ |
return ( ($award =~ /^correct/ |
&& lc($Apache::lonhomework::problemstatus) ne 'no') |
&& &Apache::lonhomework::show_problem_status()) |
|| $status eq "SHOW_ANSWER"); |
|| $status eq "SHOW_ANSWER"); |
} |
} |
|
|
Line 1205 sub check_status {
|
Line 1242 sub check_status {
|
return 2; |
return 2; |
} |
} |
|
|
|
=pod |
|
|
|
=item setup_prior_tries_hash($func,$data) |
|
|
|
Foreach each past .submission $func is called with 3 arguments |
|
- the mode to set things up for (currently always 'grade') |
|
- the stored .submission string |
|
- The expansion of $data |
|
|
|
$data is an array ref containing elements that are either |
|
- scalars that are other elements of the history hash to pass to $func |
|
- ref to data to be passed untouched to $func |
|
|
|
=cut |
|
|
sub setup_prior_tries_hash { |
sub setup_prior_tries_hash { |
my ($func,$data) = @_; |
my ($func,$data) = @_; |
my $part = $Apache::inputtags::part; |
my $part = $Apache::inputtags::part; |