--- loncom/homework/optionresponse.pm 2008/12/11 01:59:01 1.151.2.1
+++ loncom/homework/optionresponse.pm 2010/02/05 20:54:33 1.160
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.151.2.1 2008/12/11 01:59:01 raeburn Exp $
+# $Id: optionresponse.pm,v 1.160 2010/02/05 20:54:33 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,6 +25,11 @@
#
# http://www.lon-capa.org/
#
+
+
+
+
+
package Apache::optionresponse;
use strict;
use Apache::response();
@@ -161,8 +166,12 @@ ENDTABLE
} # else nothing changed so just use the default mechanism
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+ if($env{'form.pdfFormFields'} ne 'yes') {
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
\begin{enumerate} ';
+ } else {
+ $result .= "\\\\";
+ }
}
return $result;
}
@@ -292,7 +301,11 @@ sub end_foilgroup {
$result.=&Apache::edit::end_table();
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
+ if($env{'form.pdfFormFields'} ne 'yes') {
$result .= '\end{enumerate}';
+ } else {
+ $result .= "\\\\";
+ }
}
&Apache::response::poprandomnumber();
return $result;
@@ -346,6 +359,11 @@ sub displayanswers {
return $result;
}
+sub check_box_opt {
+# Check if we are in checkbox mode. If so, return "checked" value
+ return '';
+}
+
sub check_for_invalid {
my ($names,$options) = @_;
my %bad_names;
@@ -414,6 +432,11 @@ sub displayfoils {
my $temp=1;
my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
my $internal_counter=$Apache::lonxml::counter;
+ my $checkboxopt=&check_box_opt();
+ if ($checkboxopt) {
+ $result.='
'.&mt('Choices: ').''.$opt[0].','.$opt[1].'. '.
+ &mt('Select all that are [_1].',$checkboxopt);
+ }
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -425,20 +448,61 @@ sub displayfoils {
}
my $lastopt=$lastresponse{$name};
my $optionlist="\n";
+
+ if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ my $fieldname = $env{'request.symb'}.'&part_'.$Apache::inputtags::part.'&optionresponse'.'&HWVAL_'.$Apache::inputtags::response['-1'].':'.$temp;
+ $optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname);
+ }
+
foreach my $option (@opt) {
my $escopt=&HTML::Entities::encode($option,'\'"&<>');
- if ($option eq $lastopt) {
- $optionlist.="\n";
- } else {
- $optionlist.="\n";
- }
+ if ($option eq $lastopt) {
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+ } else {
+ $optionlist.="\n";
+ }
+ } else {
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+ } else {
+ $optionlist.="\n";
+ }
+ }
}
if ($target ne 'tex') {
if ($Apache::lonhomework::type ne 'exam') {
- $optionlist='