version 1.175, 2011/03/07 19:42:21
|
version 1.187, 2012/10/12 12:45:46
|
Line 155 ENDTABLE
|
Line 155 ENDTABLE
|
splice(@options,$delopt-1,1); |
splice(@options,$delopt-1,1); |
$optchanged=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"}; |
my $newopt = $env{"form.$Apache::lonxml::curdepth.options"}; |
if ($options[0]) { |
push(@options,$newopt); |
push(@options,$newopt); |
|
} else { |
|
$options[0]=$newopt; |
|
} |
|
$optchanged=1; |
$optchanged=1; |
} |
} |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval, |
Line 207 sub end_foilgroup {
|
Line 203 sub end_foilgroup {
|
-2,0); |
-2,0); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval); |
my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice'); |
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=();} |
if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();} |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
$safeeval,'-2'); |
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt); |
$result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt); |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($max,$randomize,@opt); |
$result.=&displayanswers($max,$randomize,@opt); |
Line 226 sub end_foilgroup {
|
Line 224 sub end_foilgroup {
|
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
|
|
my $nonlenient=0; |
|
my $part=$Apache::inputtags::part; |
|
my $lenientparm=&Apache::lonnet::EXT("resource.$part.lenient"); |
|
|
|
if ($Apache::lonhomework::scantronmode) { |
|
$nonlenient=0; |
|
# Grading an exam: we are grading lenient unless told not to |
|
if ($lenientparm=~/^0|off|no$/i) { |
|
$nonlenient=1; |
|
} |
|
} else { |
|
# Web mode: we are non-lenient unless told to |
|
$nonlenient=1; |
|
if ($lenientparm=~/^1|on|yes$/i) { |
|
$nonlenient=0; |
|
} |
|
} |
|
if ( &Apache::response::submitted()) { |
if ( &Apache::response::submitted()) { |
|
|
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
Line 252 sub end_foilgroup {
|
Line 233 sub end_foilgroup {
|
my $right=0; |
my $right=0; |
my $wrong=0; |
my $wrong=0; |
my $ignored=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) { |
foreach $name (@whichopt) { |
my $response=&Apache::response::getresponse($temp); |
my $response; |
if ($env{'form.submitted'} eq 'scantron' && $response=~/\S/) { |
if ($env{'form.submitted'} eq 'scantron') { |
$response = $opt[$response]; |
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]/) { |
if ( $response =~ /[^\s]/) { |
$responsehash{$name}=$response; |
$responsehash{$name}=$response; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
Line 269 sub end_foilgroup {
|
Line 282 sub end_foilgroup {
|
} else { |
} else { |
$ignored++; |
$ignored++; |
} |
} |
$temp++; |
|
} |
} |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
|
my $nonlenient=&grading_is_nonlenient($part); |
my $id = $Apache::inputtags::response['-1']; |
my $id = $Apache::inputtags::response['-1']; |
my $responsestr=&Apache::lonnet::hash2str(%responsehash); |
my $responsestr=&Apache::lonnet::hash2str(%responsehash); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
Line 347 sub end_foilgroup {
|
Line 360 sub end_foilgroup {
|
} |
} |
my $part_id = $Apache::inputtags::part; |
my $part_id = $Apache::inputtags::part; |
my $response_id = $Apache::inputtags::response[-1]; |
my $response_id = $Apache::inputtags::response[-1]; |
&Apache::lonxml::increment_counter(&getfoilcounts($max), |
my ($numrows,$bubbles_per_row); |
"$part_id.$response_id"); |
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') { |
if ($target eq 'analyze') { |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
Line 367 sub end_foilgroup {
|
Line 388 sub end_foilgroup {
|
return $result; |
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 { |
sub getfoilcounts { |
my ($max)=@_; |
my ($max)=@_; |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
Line 386 sub whichfoils {
|
Line 427 sub whichfoils {
|
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
my @names; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { |
|
@names = @{ $Apache::response::foilgroup{'names'} }; |
|
} |
|
return if (!@names); |
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
my $result; |
my $result; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 446 sub check_for_invalid {
|
Line 490 sub check_for_invalid {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices, |
|
$tex_option_switch, $no_tfprompt, @opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @truelist; |
my @truelist; |
Line 456 sub displayfoils {
|
Line 501 sub displayfoils {
|
my $displayoptionintex=1; |
my $displayoptionintex=1; |
my @alphabet = ('A'..'Z'); |
my @alphabet = ('A'..'Z'); |
my @whichopt = &whichfoils($max,$randomize); |
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 $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $break; |
my $break; |
Line 510 sub displayfoils {
|
Line 557 sub displayfoils {
|
} |
} |
my $internal_counter=$Apache::lonxml::counter; |
my $internal_counter=$Apache::lonxml::counter; |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt); |
if ($checkboxopt) { |
if ($checkboxopt && (!$no_tfprompt)) { |
$result.='<br />'. |
$result.='<br />'. |
($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':''). |
($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':''). |
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
&mt('Select all that are <b>[_1]</b>.',$checkboxopt); |
Line 631 sub displayfoils {
|
Line 678 sub displayfoils {
|
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.='\vskip -1 mm\noindent'; |
$result.='\vskip -1 mm\noindent'; |
$result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt). |
my ($numrows,$bubbles_per_row) = &getnumrows(scalar(@opt)); |
' \strut '; |
if ($numrows == 1) { |
$internal_counter++; |
$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' |
if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
&& $Apache::inputtags::status[-1] eq 'CAN_ANSWER' |
Line 714 sub webbubbles {
|
Line 776 sub webbubbles {
|
|
|
|
|
sub bubbles { |
sub bubbles { |
my ($ralphabet,$ropt,$response, $max_width) = @_; |
my ($ralphabet,$ropt,$response,$max_width,$numrows,$bubbles_per_row, |
|
$internal_counter) = @_; |
my @alphabet = @$ralphabet; |
my @alphabet = @$ralphabet; |
my @opt = @$ropt; |
my @opt = @$ropt; |
my ($result,$head,$line) =('','',''); |
my ($result,$head,$line) =('','',''); |
Line 735 sub bubbles {
|
Line 798 sub bubbles {
|
} |
} |
&Apache::lonxml::debug("Final maxwidth: $textwidth"); |
&Apache::lonxml::debug("Final maxwidth: $textwidth"); |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
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; |
my $leftmargin; |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} |
if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];} |
if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;} |
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) { |
if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) { |
$line.='\hskip 4 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'; |
$head.='lr'; |
} else { |
} else { |
$line=~s/\&\s*$//; |
$line=~s/\&\s*$//; |
$result.='\vskip -1 mm\noindent\setlength{\tabcolsep}{2 mm}\renewcommand{\arraystretch}{1.25}\begin{tabular}{'.$head.'}'.$line.'\\\\\end{tabular}\vskip 0 mm'; |
$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{'.$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'; |
$head ='lr'; |
$current_length = (length($opt[$ind])+length($alphabet[$ind]))*2; |
$current_length = (length($opt[$ind])+length($item))*2; |
} |
} |
|
|
} |
} |
return $result; |
return $result; |
} |
} |
|
|
|
|
sub start_conceptgroup { |
sub start_conceptgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::optionresponse::conceptgroup=1; |
$Apache::optionresponse::conceptgroup=1; |
Line 901 sub insert_foil {
|
Line 973 sub insert_foil {
|
sub insert_drawoptionlist { |
sub insert_drawoptionlist { |
return '<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; |
1; |
__END__ |
__END__ |
|
|