version 1.186, 2008/01/19 14:56:54
|
version 1.191, 2008/05/30 16:19:49
|
Line 454 sub end_customresponse {
|
Line 454 sub end_customresponse {
|
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
&Apache::lonxml::increment_counter(&Apache::response::repetition(), |
"$part.$id"); |
"$part.$id"); |
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
|
$Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse'; |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
} |
} |
Line 485 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 511 sub start_mathresponse {
|
Line 516 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 800 sub answer_part {
|
Line 820 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 821 sub answer_footer {
|
Line 845 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 { |
if (!$need_row_start) { |
if (!$need_row_start) { |
$result .= '</tr>'; |
$result .= '</tr>'; |