--- loncom/homework/radiobuttonresponse.pm 2007/08/06 20:52:54 1.125
+++ loncom/homework/radiobuttonresponse.pm 2008/09/05 12:50:45 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.125 2007/08/06 20:52:54 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.135 2008/09/05 12:50:45 onken Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -18,8 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with LON-CAPA; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with LON-CAPA; if not, write to the Free Software# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
#
@@ -56,8 +55,6 @@ sub start_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
-
-
#when in a radiobutton response use these
&Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
push (@Apache::lonxml::namespace,'radiobuttonresponse');
@@ -103,9 +100,15 @@ sub start_radiobuttonresponse {
} else {
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}';
}
- $result .= '\begin{enumerate}';
+ if($env{'form.pdfFormFields'} eq 'yes') {
+ $result .= &Apache::lonxml::print_pdf_hiddenfield('meta', $env{'user.name'}, $env{'user.domain'});
+ $result .= "\n\\\\\n\\\\\n";
+ } else {
+ $result .= '\begin{enumerate}';
+ }
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
+ $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse';
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
}
return $result;
@@ -115,7 +118,9 @@ sub end_radiobuttonresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
- if ($target eq 'tex') { $result .= '\end{enumerate}'; }
+ if ($target eq 'tex' and $env{'form.pdfFormFields'} ne 'yes') {
+ $result .= '\end{enumerate}';
+ }
&Apache::response::end_response;
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
@@ -202,7 +207,8 @@ sub end_foilgroup {
my $bubble_lines;
my $bubbles_per_line;
my $answer_count;
- my $id = $Apache::inputtags::response['-1'];
+ my $id = $Apache::inputtags::response['-1'];
+ my $part = $Apache::inputtags::part;
$bubbles_per_line =
&Apache::response::get_response_param($Apache::inputtags::part."_$id",
'numbubbles',
@@ -244,11 +250,14 @@ sub end_foilgroup {
} elsif ( $target eq 'grade') {
&grade_response($answer, \@shown, $bubbles_per_line);
} elsif ( $target eq 'analyze') {
+ my $bubble_lines = &bubble_line_count($answer_count,
+ $bubbles_per_line);
&Apache::response::analyze_store_foilgroup(\@shown,
['text','value','location']);
- my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+ my $part_id="$part.$id";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },
('true','false'));
+
}
}
$Apache::lonxml::post_evaluate=0;
@@ -257,9 +266,13 @@ sub end_foilgroup {
&Apache::response::setup_prior_tries_hash(\&format_prior_answer,
[\%Apache::response::foilgroup]);
}
- $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
&Apache::response::poprandomnumber();
- &Apache::lonxml::increment_counter($bubble_lines);
+ $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line);
+ &Apache::lonxml::increment_counter($bubble_lines,
+ "$part.$id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
return $result;
}
@@ -341,13 +354,27 @@ sub displayallfoils {
$result.="";
} else {
if ($target eq 'tex') {
- $result .= '\item \vskip -2mm ';
- } else {
+ if($env{'form.pdfFormFields'} eq 'yes') {
+ my $fieldname = $env{'request.symb'}.
+ '&part_'. $Apache::inputtags::part.
+ '&radiobuttonresponse'.
+ '&HWVAL_' . $Apache::inputtags::response['-1'];
+ my $value = $temp;
+ my $text = $Apache::response::foilgroup{$name.'.text'};
+ $result .= &Apache::lonxml::print_pdf_radiobutton($fieldname,
+ $value,
+ $text)."\n";
+ } else {
+ $result .= '\item \vskip -2mm ';
+ }
+ } else {
$result.="';
@@ -436,7 +463,7 @@ sub whichfoils {
}
}
if (!$havetrue && $Apache::lonhomework::type ne 'survey') {
- &Apache::lonxml::error("There are no true statements available.'; } else { $result.='Correct: \textbf{';}
+ if ($target ne 'tex') {
+ $result.=&mt('Correct:').'';
+ } else {
+ $result.=&mt('Correct:').' \textbf{';
+ }
} else {
- $result.='Incorrect:';
+ $result.=&mt('Incorrect:');
}
if ($target eq 'web') { $result.=""; }
$result.=$Apache::response::foilgroup{$name.'.text'};
@@ -622,8 +653,19 @@ sub displayfoils {
$i++;
$bubble_number++;
} else {
- $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
- }
+ if($env{'form.pdfFormFields'} eq 'yes') {
+
+ my $fieldname = $env{'request.symb'}.
+ '&part_'. $Apache::inputtags::part.
+ '&radiobuttonresponse'.
+ '&HWVAL_' . $Apache::inputtags::response['-1'];
+ my $value = $temp;
+ my $text = $Apache::response::foilgroup{$name.'.text'};
+ $result .= &Apache::lonxml::print_pdf_radiobutton($fieldname, $value, $text).'\newline'."\n";
+ } else {
+ $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'};
+ }
+ }
}
if ($target ne 'tex' && $direction eq 'horizontal') {
$result.=" ";
@@ -754,11 +796,11 @@ sub end_foil {
if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
if ($name eq "") {
- &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+ &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
$name=$Apache::lonxml::curdepth;
}
if (defined($Apache::response::foilnames{$name})) {
- &Apache::lonxml::error(&mt("Foil name [_1] '.$name.'