[LON-CAPA-cvs] cvs: loncom /homework response.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 06 Dec 2005 09:29:35 -0000
albertel Tue Dec 6 04:29:35 2005 EDT
Modified files:
/loncom/homework response.pm
Log:
- tex mode answer printing puts the wole answer bit in a single line now
- printing in exam mode puts the counter value in the answer mode print
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.131 loncom/homework/response.pm:1.132
--- loncom/homework/response.pm:1.131 Tue Nov 29 13:42:54 2005
+++ loncom/homework/response.pm Tue Dec 6 04:29:34 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.131 2005/11/29 18:42:54 albertel Exp $
+# $Id: response.pm,v 1.132 2005/12/06 09:29:34 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -592,15 +592,22 @@
}
}
+{
+ my @answer_bits;
+
sub answer_header {
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- $result = ' \vskip 0 mm \begin{tabular}{|c|}\hline Answer for Part: \verb|'.
- $Apache::inputtags::part.'| \\\\ \hline ';
+ undef(@answer_bits);
} else {
- $result = '<table border="1"><tr><td>Answer for Part:'.
- $Apache::inputtags::part. '</td>'."\n";
+ $result = '<table border="1"><tr>';
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result .= '<td>'.$Apache::lonxml::counter. ')</td>';
+ } else {
+ $result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>';
+ }
+ $result .= "\n";
}
return $result;
}
@@ -617,7 +624,9 @@
last;
}
}
- $result = '\verb'.$to_use.$answer.$to_use.'\\\\ \hline ';
+ if ($answer ne '') {
+ push(@answer_bits,'\verb'.$to_use.$answer.$to_use);
+ }
} else {
$result = '<td>'.$answer.'</td>';
}
@@ -628,13 +637,26 @@
my ($type) = @_;
my $result;
if ($env{'form.answer_output_mode'} eq 'tex') {
- $result = ' \end{tabular} \vskip 0 mm ';
+ my $columns = scalar(@answer_bits)+1;
+ $result = ' \vskip 0 mm \begin{tabular}{|'.'c|'x$columns.'}\hline ';
+ if ($Apache::lonhomework::type eq 'exam') {
+ $result .= $Apache::lonxml::counter.') ';
+ } else {
+ $result .= ' Answer for Part: \verb|'.
+ $Apache::inputtags::part.'| ';
+ }
+ foreach my $bit (@answer_bits) {
+ $result.=' & '.$bit;
+ }
+ $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
} else {
$result = '</tr></table>';
}
return $result;
}
+}
+
sub showallfoils {
if (defined($env{'form.showallfoils'})) {
my ($symb)=&Apache::lonxml::whichuser();