--- loncom/homework/optionresponse.pm 2007/01/17 10:46:13 1.136
+++ loncom/homework/optionresponse.pm 2008/12/10 21:48:21 1.157
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.136 2007/01/17 10:46:13 foxr Exp $
+# $Id: optionresponse.pm,v 1.157 2008/12/10 21:48:21 raeburn 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();
@@ -45,21 +50,23 @@ sub start_optionresponse {
%Apache::hint::option=();
undef(%Apache::response::foilnames);
if ($target eq 'edit') {
- $result.=&Apache::edit::start_table($token).
- "<tr><td>Multiple Option Response Question ".
- &Apache::loncommon::help_open_topic('Option_Response_Problems')."</td><td>Delete:".
- &Apache::edit::deletelist($target,$token)
- ."</td><td> ".
- &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- "\n";
+ $result.=&Apache::edit::start_table($token)
+ .'<tr><td><span class="LC_nobreak">'.&mt('Multiple Option Response Question').'</span> '
+ .&Apache::loncommon::help_open_topic('Option_Response_Problems')."</td>"
+ .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+ .&Apache::edit::deletelist($target,$token)
+ .'</span></td>'
+ ."<td> "
+ .&Apache::edit::end_row()
+ .&Apache::edit::start_spanning_row()
+ ."\n";
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
$token,'4').
- &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ &Apache::edit::select_arg('Randomize Foil Order:','randomize',
['yes','no'],$token).
&Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
- [['horizontal',&mt('Normal list')],
- ['vertical',&mt('Listed in a vertical column')]],$token).
+ [['horizontal','Normal list'],
+ ['vertical','Listed in a vertical column']],$token).
&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -70,7 +77,10 @@ sub start_optionresponse {
$result=&Apache::response::meta_package_write('optionresponse');
} elsif ($target eq 'analyze') {
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{"$part_id.bubble_lines"} }, 1);
+
}
return $result;
}
@@ -156,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;
}
@@ -183,6 +197,7 @@ sub end_foilgroup {
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
+ $Apache::lonxml::post_evaluate=0;
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
@@ -274,12 +289,23 @@ sub end_foilgroup {
}
}
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ my $part_id = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+ &Apache::lonxml::increment_counter(&getfoilcounts($max),
+ "$part_id.$response_id");
+ if ($target eq 'analyze') {
+ &Apache::lonhomework::set_bubble_lines();
+ }
+
} elsif ($target eq 'edit') {
$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;
@@ -412,17 +438,32 @@ sub displayfoils {
}
my $lastopt=$lastresponse{$name};
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) {
my $escopt=&HTML::Entities::encode($option,'\'"&<>');
- if ($option eq $lastopt) {
- $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
- } else {
- $optionlist.="<option value='".$escopt."'>$option</option>\n";
- }
+ if ($option eq $lastopt) {
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes') {
+ $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
+ } 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 ($Apache::lonhomework::type ne 'exam') {
- $optionlist='<select name="HWVAL_'.
+ $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+ $part.'\');" name="HWVAL_'.
$Apache::inputtags::response['-1'].':'.$temp.'">'.
$optionlist."</select>\n";
} else {
@@ -455,13 +496,18 @@ sub displayfoils {
if ($text=~m/\\item /) {
if ($Apache::lonhomework::type eq 'exam') {
$text=~s/\\item/\\vskip 2 mm/;
- }
- $result.= $texoptionlist.$text;
- } else {
+ } elsif ($env{'form.pdfFormFields'} ne 'yes') {
+ $result.= $texoptionlist.$text;
+ }
+ } else {
if ($Apache::lonhomework::type eq 'exam') {
$result.= $texoptionlist.' '.$text;
- } else {
- if ($text=~/\S/) {$result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;} else {$result.= $texoptionlist;}
+ } elsif ($env{'form.pdfFormFields'} ne 'yes') {
+ if ($text=~/\S/) {
+ $result.= $texoptionlist.'\vspace*{-2 mm}\item '.$text;
+ } else {
+ $result.= $texoptionlist;
+ }
}
}
if ($Apache::lonhomework::type eq 'exam') {
@@ -470,10 +516,23 @@ sub displayfoils {
'\end{enumerate} \vskip -8 mm \strut ';
$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;
}
}
}
+
+ if ($target eq 'web') {
+ &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,
+ [\@whichopt,
+ 'submissiongrading']);
+ }
+
if ($target ne 'tex') {
return $result.$break;
} else {
@@ -484,7 +543,7 @@ sub displayfoils {
sub optionlist_correction {
my ($TeXlayout,@options) = @_;
- my $texoptionlist='\\item [] Choices: ';
+ my $texoptionlist='\\item [] '.&mt('Choices:').' ';
if ($TeXlayout eq 'vertical') {$texoptionlist='\\item []';}
if (scalar(@options) > 0) {
foreach my $option (@options) {
@@ -532,25 +591,32 @@ sub webbubbles {
sub bubbles {
- my ($ralphabet,$ropt,$response) = @_;
+ my ($ralphabet,$ropt,$response, $max_width) = @_;
my @alphabet = @$ralphabet;
my @opt = @$ropt;
my ($result,$head,$line) =('','','');
my $number_of_bubbles = $#opt + 1;
my $current_length = 0;
my $textwidth;
- if ($env{'form.textwidth'} ne '') {
+ if (defined($max_width)) {
+ $textwidth=$max_width;
+ &Apache::lonxml::debug("Max width passed in: $max_width");
+ } elsif ($env{'form.textwidth'} ne '') {
$env{'form.textwidth'}=~/(\d+)/;
$textwidth=$1;
+ &Apache::lonxml::debug("Max width from form: $textwidth");
} else {
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/;
$textwidth=$1.'.'.$2;
+ &Apache::lonxml::debug("Max width defaults? $textwidth");
}
+ &Apache::lonxml::debug("Final maxwidth: $textwidth");
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) {
my $leftmargin;
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]);
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
+
$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
$line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
@@ -658,12 +724,12 @@ sub end_foil {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");
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;
}
&Apache::lonxml::debug("Using a name of :$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}++;
my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval);
@@ -689,25 +755,90 @@ sub end_foil {
sub start_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if (($target ne 'meta') && ($target ne 'answer')) {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[4];
}
}
sub end_drawoptionlist {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- if (($target ne 'meta') && ($target ne 'answer')) {
+ if ($target !~ /^(?:meta|answer|modified|edit)$/) {
return $token->[2];
}
}
sub insert_foil {
- return '
+ return '
<foil name="" value="unused">
<startouttext />
<endouttext />
</foil>';
}
+
+sub insert_drawoptionlist {
+ return '<drawoptionlist />';
+}
1;
__END__
+=head1 NAME
+
+Apache::optionresponse.pm;
+
+=head1 SYNOPSIS
+
+Handles tags associated with showing a list of
+options.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+start_optionresponse()
+
+=head1 OTHER SUBROUTINES
+
+=over
+
+=item end_optionresponse()
+
+=item start_foilgroup()
+
+=item end_foilgroup()
+
+=item getfoilcounts()
+
+=item displayanswers()
+
+=item check_for_invalid()
+
+=item displayfoils()
+
+=item optionlist_correction()
+
+=item webbubbles()
+
+=item bubbles()
+
+=item start_conceptgroup()
+
+=item end_conceptgroup()
+
+=item insert_conceptgroup()
+
+=item start_foil()
+
+=item end_foil()
+
+=item start_drawoptionlist()
+
+=item end_drawoptionlist()
+
+=item insert_foil()
+
+=item insert_drawoptionlist()
+
+=back
+
+=cut