--- loncom/homework/optionresponse.pm 2007/01/17 10:46:13 1.136
+++ loncom/homework/optionresponse.pm 2012/10/12 12:45:46 1.187
@@ -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.187 2012/10/12 12:45:46 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;
}
@@ -93,7 +103,7 @@ sub start_foilgroup {
my $result='';
%Apache::response::foilgroup=();
$Apache::optionresponse::conceptgroup=0;
- &Apache::response::pushrandomnumber();
+ &Apache::response::pushrandomnumber(undef,$target);
if ($target eq 'edit') {
my $optionlist="<option></option>\n";
my $option;
@@ -113,10 +123,24 @@ sub start_foilgroup {
</td>
<td>Delete an Option:
<select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+ </td>
ENDTABLE
- $result.= &Apache::edit::checked_arg('Print options:','texoptions',
+ $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
[ ['nochoice','Don\'t show option list'] ]
- ,$token);
+ ,$token).'</td>';
+ $result.= '<td><label>'.&mt('Two-option checkboxes for:').
+ '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
+ foreach $option (('',@opt)) {
+ $result.='<option value="'.$option.'"';
+ if ($option eq &Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval)) {
+ $result.=' selected="selected"';
+ }
+ $result.='>'.$option.'</option>';
+ }
+ $result.='</select></label>';
+ $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
+ [ ['nochoice','Don\'t show option list'] ]
+ ,$token).'</td>';
$result.= &Apache::edit::end_row();
$result.= &Apache::edit::start_spanning_row();
$result.= $insertlist.'<br />';
@@ -131,17 +155,13 @@ ENDTABLE
splice(@options,$delopt-1,1);
$optchanged=1;
}
- if ($env{"form.$Apache::lonxml::curdepth.options"}) {
+ if ($env{"form.$Apache::lonxml::curdepth.options"} ne '') {
my $newopt = $env{"form.$Apache::lonxml::curdepth.options"};
- if ($options[0]) {
- push(@options,$newopt);
- } else {
- $options[0]=$newopt;
- }
+ push(@options,$newopt);
$optchanged=1;
}
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
- ('texoptions'));
+ 'texoptions','checkboxvalue','checkboxoptions');
if ($optchanged || $rebuildtag ) {
$result = "<foilgroup options=\"(";
foreach my $option (@options) {
@@ -152,12 +172,17 @@ ENDTABLE
chop $result;
$result.=')" ';
$result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
+ $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
+ $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
$result .= '>';
} # else nothing changed so just use the default mechanism
}
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
- $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
- \begin{enumerate} ';
+ if($env{'form.pdfFormFields'} ne 'yes') {
+ $result .= ' \begin{itemize} ';
+ } else {
+ $result .= "\\\\";
+ }
}
return $result;
}
@@ -176,13 +201,18 @@ sub end_foilgroup {
my $TeXlayout=&Apache::lonxml::get_param('TeXlayout',$parstack,$safeeval,
-2,0);
+ my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
+ my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
+ my $noprompt =&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
+
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
&Apache::lonxml::debug("Options are $#opt");
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
$safeeval,'-2');
if ($target eq 'web' || $target eq 'tex') {
- $result.=&displayfoils($target,$max,$randomize,$TeXlayout,@opt);
+ $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt);
+ $Apache::lonxml::post_evaluate=0;
} elsif ( $target eq 'answer') {
$result.=&displayanswers($max,$randomize,@opt);
@@ -193,7 +223,9 @@ sub end_foilgroup {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
} elsif ( $target eq 'grade') {
+
if ( &Apache::response::submitted()) {
+
my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
@@ -201,11 +233,43 @@ sub end_foilgroup {
my $right=0;
my $wrong=0;
my $ignored=0;
+ my ($numrows,$bubbles_per_row);
+ if ($Apache::lonhomework::scantronmode) {
+ my $numitems = scalar(@opt);
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows($numitems);
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
foreach $name (@whichopt) {
- my $response=&Apache::response::getresponse($temp);
- if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) {
- $response = $opt[$response];
- }
+ my $response;
+ if ($env{'form.submitted'} eq 'scantron') {
+ if ($numrows > 1) {
+ my $num = $temp;
+ my $totalnum;
+ for (my $i=0; $i<$numrows; $i++) {
+ my $item = &Apache::response::getresponse($num);
+ if ($item =~ /^\d+$/) {
+ $totalnum = $i*$bubbles_per_row + $item;
+ }
+ $num ++;
+ }
+ if ($totalnum =~ /^\d+$/) {
+ $response = $opt[$totalnum];
+ }
+ $temp += $numrows;
+ } else {
+ $response=&Apache::response::getresponse($temp);
+ if ($response=~/\S/) {
+ $response = $opt[$response];
+ }
+ $temp ++;
+ }
+ } else {
+ $response=&Apache::response::getresponse($temp);
+ $temp ++;
+ }
if ( $response =~ /[^\s]/) {
$responsehash{$name}=$response;
my $value=$Apache::response::foilgroup{$name.'.value'};
@@ -218,9 +282,9 @@ sub end_foilgroup {
} else {
$ignored++;
}
- $temp++;
}
my $part=$Apache::inputtags::part;
+ my $nonlenient=&grading_is_nonlenient($part);
my $id = $Apache::inputtags::response['-1'];
my $responsestr=&Apache::lonnet::hash2str(%responsehash);
my $gradestr =&Apache::lonnet::hash2str(%grade);
@@ -230,17 +294,34 @@ sub end_foilgroup {
$Apache::lonhomework::results{"resource.$part.$id.submission"}=
$responsestr;
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
-
- if ($Apache::lonhomework::type eq 'survey') {
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
+ }
+ if (($Apache::lonhomework::type eq 'survey') ||
+ ($Apache::lonhomework::type eq 'surveycred') ||
+ ($Apache::lonhomework::type eq 'anonsurvey') ||
+ ($Apache::lonhomework::type eq 'anonsurveycred')) {
if ($ignored == 0) {
- my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ my $ad;
+ if ($Apache::lonhomework::type eq 'anonsurveycred') {
+ $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
+ } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+ $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
+ } elsif ($Apache::lonhomework::type eq 'surveycred') {
+ $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
+ } else {
+ $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
} elsif ($wrong==0 && $right==0) {
} else {
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
&Apache::response::handle_previous(\%previous,$ad);
}
- } elsif (!$Apache::lonhomework::scantronmode) {
+ } elsif ($nonlenient) {
+#
+# Non-lenient mode. All right or all wrong
+#
my $ad;
if ($wrong==0 && $ignored==0) {
$ad='EXACT_ANS';
@@ -256,6 +337,9 @@ sub end_foilgroup {
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
&Apache::response::handle_previous(\%previous,$ad);
} else {
+#
+# This is lenient mode
+#
my $ad;
if ($wrong==0 && $right==0) {
#nothing submitted only assign a score if we
@@ -274,17 +358,56 @@ sub end_foilgroup {
}
}
}
- &Apache::lonxml::increment_counter(&getfoilcounts($max));
+ my $part_id = $Apache::inputtags::part;
+ my $response_id = $Apache::inputtags::response[-1];
+ my ($numrows,$bubbles_per_row);
+ if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) {
+ ($numrows,$bubbles_per_row) =
+ &Apache::optionresponse::getnumrows(scalar(@opt));
+ }
+ if ($numrows < 1) {
+ $numrows = 1;
+ }
+ my $increment = &getfoilcounts($max) * $numrows;
+ &Apache::lonxml::increment_counter($increment,"$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') {
- $result .= '\end{enumerate}';
+ if($env{'form.pdfFormFields'} ne 'yes') {
+ $result .= '\end{itemize}';
+ } else {
+ $result .= "\\\\";
+ }
}
&Apache::response::poprandomnumber();
return $result;
}
+sub grading_is_nonlenient {
+ my ($part) = @_;
+# Web mode: we are non-lenient unless told otherwise
+ my $defaultparm = 'off';
+ my $nonlenient = 0;
+# Grading a bubblesheet exam: we are grading lenient unless told otherwise
+ if ($Apache::lonhomework::scantronmode) {
+ $defaultparm = 'on';
+ $nonlenient = 1;
+ }
+ my $lenientparm =
+ &Apache::response::get_response_param($part,'lenient',$defaultparm);
+ if ($lenientparm=~/^0|off|no$/i) {
+ $nonlenient = 1;
+ } elsif ($lenientparm=~/^1|on|yes$/i) {
+ $nonlenient = 0;
+ }
+ return $nonlenient;
+}
+
sub getfoilcounts {
my ($max)=@_;
# +1 since instructors will count from 1
@@ -304,8 +427,11 @@ sub whichfoils {
sub displayanswers {
my ($max,$randomize,@opt)=@_;
- if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+ @names = @{ $Apache::response::foilgroup{'names'} };
+ }
+ return if (!@names);
my @whichopt = &whichfoils($max,$randomize);
my $result;
if ($Apache::lonhomework::type eq 'exam') {
@@ -333,6 +459,15 @@ sub displayanswers {
return $result;
}
+sub check_box_opt {
+ my ($target,$checkboxvalue,@opt)=@_;
+# Check if we are in checkbox mode: checkboxvalue specified, on web, only two options.
+# If so, return "checked" value
+ if ($#opt!=1) { return ''; }
+ if ($target ne 'web') { return ''; }
+ return $checkboxvalue;
+}
+
sub check_for_invalid {
my ($names,$options) = @_;
my %bad_names;
@@ -355,7 +490,8 @@ sub check_for_invalid {
}
sub displayfoils {
- my ($target,$max,$randomize,$TeXlayout,@opt)=@_;
+ my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
+ $tex_option_switch, $no_tfprompt, @opt)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
@@ -365,17 +501,22 @@ sub displayfoils {
my $displayoptionintex=1;
my @alphabet = ('A'..'Z');
my @whichopt = &whichfoils($max,$randomize);
- &check_for_invalid(\@whichopt,\@opt);
+ unless (($target eq 'tex') && ($tex_option_switch eq 'nochoice')) {
+ &check_for_invalid(\@whichopt,\@opt);
+ }
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
my $break;
- my $solved=$Apache::lonhomework::history{"resource.$part.solved"};
if ( ($target ne 'tex') &&
&Apache::response::show_answer() ) {
my $temp=1;
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
- my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my $lastresp;
+ unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
+ $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+ }
+ my %lastresponse=&Apache::lonnet::str2hash($lastresp);
my $lastopt=$lastresponse{$name};
if ($text!~/^\s*$/) { $break='<br />'; }
$result.=$break;
@@ -388,7 +529,9 @@ sub displayfoils {
$text='<b>'.$value.':</b> '.$text;
}
} else {
- $text='•'.$text;
+ if (@whichopt > 1) {
+ $text='•'.$text;
+ }
}
$result.=$text."\n";
}
@@ -399,8 +542,26 @@ sub displayfoils {
}
} else {
my $temp=1;
- my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ my %lastresponse;
+ my $newvariation;
+ if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) &&
+ ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+ if ($env{'form.'.$part.'.rndseed'} ne
+ $Apache::lonhomework::history{"resource.$part.rndseed"}) {
+ $newvariation = 1;
+ }
+ }
+ unless ($newvariation) {
+ %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+ }
my $internal_counter=$Apache::lonxml::counter;
+ my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
+ if ($checkboxopt && (!$no_tfprompt)) {
+ $result.='<br />'.
+ ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
+ &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
+ }
foreach $name (@whichopt) {
my $text=$Apache::response::foilgroup{$name.'.text'};
if ($text!~/^\s*$/) {
@@ -412,25 +573,71 @@ sub displayfoils {
}
my $lastopt=$lastresponse{$name};
my $optionlist="<option></option>\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.="<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'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+ && $Apache::lonhomework::type ne 'exam') {
+ $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'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+ && $Apache::lonhomework::type ne 'exam') {
+ $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_'.
+# we are on the web, this is not an exam, and the problem can be answered
+ if ($checkboxopt) {
+# generate checkboxes
+ my $fieldname=$Apache::inputtags::response['-1'].':'.$temp;
+ my $altopt=$opt[0];
+ if ($opt[0] eq $checkboxopt) {
+ $altopt=$opt[1];
+ }
+ my $defopt=$lastopt;
+ unless ($defopt) { $defopt=$altopt; }
+ my $escdefopt=&HTML::Entities::encode($defopt,'\'"&<>');
+ my $esccheckboxopt=&HTML::Entities::encode($checkboxopt,'\'"&<>');
+ my $escaltopt=&HTML::Entities::encode($altopt,'\'"&<>');
+# checkboxopt is how the box is labelled
+# altopt is the alternative option
+# lastopt is what the user submitted before
+# defopt is what the field is going to start out with: either previous choice or altopt
+# fieldname is this input field's name after HWVAL_
+ $optionlist='<input type="hidden" name="HWVAL_'.$fieldname.'" value="'.$escdefopt.'" />'.
+ '<input type="checkbox" name="HWCHK_'.$fieldname.'" onclick="javascript:if (this.form.elements[\'HWCHK_'.
+ $fieldname.'\'].checked) { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$esccheckboxopt.'\'; } else { this.form.elements[\'HWVAL_'.$fieldname.'\'].value=\''.$escaltopt.'\'; };setSubmittedPart(\''.$part.'\');"'.($defopt eq $checkboxopt?' checked="checked"':'')." />\n";
+ } else {
+# classic selection list
+ $optionlist='<select onchange="javascript:setSubmittedPart(\''.
+ $part.'\');" name="HWVAL_'.
$Apache::inputtags::response['-1'].':'.$temp.'">'.
$optionlist."</select>\n";
+ }
} else {
$optionlist='<u>'.(' 'x10).'</u>';
}
if ($text=~s|<drawoptionlist\s*/>|$optionlist|) {
if ($Apache::lonhomework::type ne 'exam') {
- $text='•'.$text;
+ if (@whichopt > 1) {
+ $text='•'.$text;
+ }
}
} else {
if ($Apache::lonhomework::type ne 'exam') {
@@ -455,25 +662,62 @@ 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') {
- $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
- $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
- '\end{enumerate} \vskip -8 mm \strut ';
- $internal_counter++;
+ $result.='\vskip -1 mm\noindent';
+ my ($numrows,$bubbles_per_row) = &getnumrows(scalar(@opt));
+ if ($numrows == 1) {
+ $result .= '\textbf{'.$internal_counter.'}. \vskip -3mm';
+ } else {
+ my $linetext;
+ for (my $i=0; $i<$numrows; $i++) {
+ $linetext .= $internal_counter+$i.', ';
+ }
+ $linetext =~ s/,\s$//;
+ $result .= '\small {\textbf{'.$linetext.'}} '.
+ '\hskip 2 mm {\footnotesize '.
+ &mt('(Bubble once in [_1] lines)',$numrows).
+ '} \vskip 1 mm';
+ }
+ $result.= &bubbles(\@alphabet,\@opt,undef,undef,$numrows,
+ $bubbles_per_row,$internal_counter).
+ ' \strut ';
+ $internal_counter += $numrows;
}
+ if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
+ && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+ && $Apache::lonhomework::type ne 'exam') {
+ $text =~ s/\\item//m;
+ $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
+ $temp++;
+ }
$displayoptionintex=0;
}
}
}
+
+ if ($target eq 'web') {
+ my $data = [\@whichopt,'submissiongrading'];
+ my $questiontype;
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $questiontype = $Apache::lonhomework::type,
+ }
+ &Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer,$data,$questiontype);
+ }
+
if ($target ne 'tex') {
return $result.$break;
} else {
@@ -484,7 +728,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,42 +776,59 @@ sub webbubbles {
sub bubbles {
- my ($ralphabet,$ropt,$response) = @_;
+ my ($ralphabet,$ropt,$response,$max_width,$numrows,$bubbles_per_row,
+ $internal_counter) = @_;
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 $item;
+ if ($numrows > 1) {
+ my $num = $internal_counter+int($ind/$bubbles_per_row);
+ my $idx = int($ind % $bubbles_per_row);
+ $item = $num.$alphabet[$idx];
+ } else {
+ $item = $alphabet[$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;
+
+ $current_length += (length($opt[$ind])+length($item)+5)*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].'} & ';
+
+ $line.='\hskip 4 mm {\small \textbf{'.$item.'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
$head.='lr';
} else {
$line=~s/\&\s*$//;
- $result.='\vskip -2 mm\noindent\setlength{\tabcolsep}{2 mm}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
- $line = '\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';;
+ $result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm';
+ $line = '\hskip 4 mm {\small \textbf{'.$item.'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
$head ='lr';
- $current_length = (length($opt[$ind])+length($alphabet[$ind]))*2;
+ $current_length = (length($opt[$ind])+length($item))*2;
}
}
return $result;
}
-
sub start_conceptgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$Apache::optionresponse::conceptgroup=1;
@@ -658,12 +919,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 +950,108 @@ 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 />';
+}
+
+sub getnumrows {
+ my ($numitems) = @_;
+ my $bubbles_per_row;
+ my $default_numbubbles = 10;
+ if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
+ ($env{'form.bubbles_per_row'} > 0)) {
+ $bubbles_per_row = $env{'form.bubbles_per_row'};
+ } else {
+ $bubbles_per_row = $default_numbubbles;
+ }
+ my $numrows = int ($numitems/$bubbles_per_row);
+ if (($numitems % $bubbles_per_row) != 0) {
+ $numrows ++;
+ }
+ return ($numrows,$bubbles_per_row);
+}
+
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