version 1.189, 2008/04/05 15:39:17
|
version 1.206, 2008/10/24 16:22:54
|
Line 486 sub start_mathresponse {
|
Line 486 sub start_mathresponse {
|
$safeeval); |
$safeeval); |
$Apache::inputtags::answertxt{$id}=[$answer]; |
$Apache::inputtags::answertxt{$id}=[$answer]; |
} |
} |
|
|
} 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 495 sub start_mathresponse {
|
Line 496 sub start_mathresponse {
|
['maxima'], |
['maxima'], |
$token); |
$token); |
$result.=&Apache::edit::text_arg('Argument Array:', |
$result.=&Apache::edit::text_arg('Argument Array:', |
'args',$token); |
'args',$token). |
|
&Apache::loncommon::help_open_topic('Maxima_Argument_Array'); |
|
$result.=&Apache::edit::text_arg('Libraries:', |
|
'libraries',$token). |
|
&Apache::loncommon::help_open_topic('Maxima_Libraries'); |
$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 512 sub start_mathresponse {
|
Line 517 sub start_mathresponse {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub edit_mathresponse_button { |
|
my ($id,$field)=@_; |
|
my $button=&mt('Edit Answer'); |
|
# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor'); |
|
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; |
|
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> |
|
<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a> |
|
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 532 sub end_mathresponse {
|
Line 554 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 549 sub end_mathresponse {
|
Line 572 sub end_mathresponse {
|
} |
} |
if ($target eq 'web') { |
if ($target eq 'web') { |
&setup_prior_tries_hash(\&format_prior_response_math); |
&setup_prior_tries_hash(\&format_prior_response_math); |
|
my $partid = $Apache::inputtags::part; |
|
my $id = $Apache::inputtags::response[-1]; |
|
if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') |
|
&& (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) { |
|
$result.=&edit_mathresponse_button($id,"HWVAL_$id"); |
|
} |
} |
} |
|
|
pop(@Apache::lonxml::namespace); |
pop(@Apache::lonxml::namespace); |
Line 651 sub start_responseparam {
|
Line 680 sub start_responseparam {
|
} |
} |
} |
} |
if (defined($optionlist)) { |
if (defined($optionlist)) { |
$result.='Use template: <select name="'. |
$result.=&mt('Use template:').' <select name="'. |
&Apache::edit::html_element_name('parameter_package').'">'. |
&Apache::edit::html_element_name('parameter_package').'">'. |
'<option value=""></option>'.$optionlist.'</select><br />'; |
'<option value=""></option>'.$optionlist.'</select><br />'; |
} |
} |
Line 832 sub answer_footer {
|
Line 861 sub answer_footer {
|
$result.='\item '.$answer_bits[$i].'\vspace*{-7mm}'; |
$result.='\item '.$answer_bits[$i].'\vspace*{-7mm}'; |
} |
} |
$result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm '; |
$result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm '; |
&Apache::lonnet::logthis('Result: '.$result); |
|
} else { |
} else { |
if (!$need_row_start) { |
if (!$need_row_start) { |
$result .= '</tr>'; |
$result .= '</tr>'; |
Line 1164 sub submitted {
|
Line 1192 sub submitted {
|
} |
} |
# Submit All button on a .page was pressed |
# Submit All button on a .page was pressed |
if (defined($env{'form.all_submit'})) { return 1; } |
if (defined($env{'form.all_submit'})) { return 1; } |
# otherwise no submission occured |
# otherwise no submission occurred |
return 0; |
return 0; |
} |
} |
|
|