version 1.148, 2008/01/31 05:14:06
|
version 1.152, 2008/09/11 17:38:14
|
Line 70 sub start_optionresponse {
|
Line 70 sub start_optionresponse {
|
$result=&Apache::response::meta_package_write('optionresponse'); |
$result=&Apache::response::meta_package_write('optionresponse'); |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$id"; |
my $part_id="$Apache::inputtags::part.$id"; |
|
$Apache::lonhomework::analyze{"$part_id.type"} = 'optionresponse'; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); |
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); |
|
|
Line 158 ENDTABLE
|
Line 159 ENDTABLE
|
} # else nothing changed so just use the default mechanism |
} # else nothing changed so just use the default mechanism |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
|
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
$result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.} |
\begin{enumerate} '; |
\begin{enumerate} '; |
|
} else { |
|
$result .= "\\\\"; |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 289 sub end_foilgroup {
|
Line 294 sub end_foilgroup {
|
$result.=&Apache::edit::end_table(); |
$result.=&Apache::edit::end_table(); |
} |
} |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { |
|
if($env{'form.pdfFormFields'} ne 'yes') { |
$result .= '\end{enumerate}'; |
$result .= '\end{enumerate}'; |
|
} else { |
|
$result .= "\\\\"; |
|
} |
} |
} |
&Apache::response::poprandomnumber(); |
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
Line 422 sub displayfoils {
|
Line 431 sub displayfoils {
|
} |
} |
my $lastopt=$lastresponse{$name}; |
my $lastopt=$lastresponse{$name}; |
my $optionlist="<option></option>\n"; |
my $optionlist="<option></option>\n"; |
|
|
|
if($target eq 'tex' and $env{'form.pdfFormFields'} eq 'yes') { |
|
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) { |
foreach my $option (@opt) { |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
my $escopt=&HTML::Entities::encode($option,'\'"&<>'); |
if ($option eq $lastopt) { |
if ($option eq $lastopt) { |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
} else { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
} else { |
} |
$optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n"; |
|
} |
|
} else { |
|
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
|
} else { |
|
$optionlist.="<option value='".$escopt."'>$option</option>\n"; |
|
} |
|
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
Line 466 sub displayfoils {
|
Line 489 sub displayfoils {
|
if ($text=~m/\\item /) { |
if ($text=~m/\\item /) { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$text=~s/\\item/\\vskip 2 mm/; |
$text=~s/\\item/\\vskip 2 mm/; |
} |
} elsif ($env{'form.pdfFormFields'} ne 'yes') { |
$result.= $texoptionlist.$text; |
$result.= $texoptionlist.$text; |
} else { |
} |
|
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= $texoptionlist.' '.$text; |
$result.= $texoptionlist.' '.$text; |
} else { |
} elsif ($env{'form.pdfFormFields'} ne 'yes') { |
if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;} |
if ($text=~/\S/) { |
|
$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text; |
|
} else { |
|
$result.= $texoptionlist; |
|
} |
} |
} |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 481 sub displayfoils {
|
Line 509 sub displayfoils {
|
'\end{enumerate} \vskip -8 mm \strut '; |
'\end{enumerate} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter++; |
} |
} |
|
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') { |
|
$text =~ s/.*indent(.*)$/$1/; |
|
$text = $1; |
|
$result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\'; |
|
$temp++; |
|
} |
$displayoptionintex=0; |
$displayoptionintex=0; |
} |
} |
} |
} |
Line 502 sub displayfoils {
|
Line 536 sub displayfoils {
|
|
|
sub optionlist_correction { |
sub optionlist_correction { |
my ($TeXlayout,@options) = @_; |
my ($TeXlayout,@options) = @_; |
my $texoptionlist='\\item [] Choices: '; |
my $texoptionlist='\\item [] '.&mt('Choices:').' '; |
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} |
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';} |
if (scalar(@options) > 0) { |
if (scalar(@options) > 0) { |
foreach my $option (@options) { |
foreach my $option (@options) { |
Line 683 sub end_foil {
|
Line 717 sub end_foil {
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if ($name eq "") { |
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; |
$name=$Apache::lonxml::curdepth; |
} |
} |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>')); |
} |
} |
$Apache::response::foilnames{$name}++; |
$Apache::response::foilnames{$name}++; |
my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); |
my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); |