version 1.79, 2010/02/28 23:39:00
|
version 1.88, 2013/04/25 17:58:32
|
Line 34 use Apache::optionresponse();
|
Line 34 use Apache::optionresponse();
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::lonxml; |
use Apache::lonxml; |
|
use POSIX qw(ceil); |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
Line 103 sub start_itemgroup {
|
Line 104 sub start_itemgroup {
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::select_arg('Randomize Order:','randomize', |
$result.=&Apache::edit::select_arg('Randomize Order:','randomize', |
['yes','no'],$token).' 'x 3; |
['yes','no'],$token); |
$result.=&Apache::edit::select_arg('Items Display Location:', |
$result.=&Apache::edit::select_arg('Items Display Location:', |
'location', |
'location', |
['top','bottom','left','right'], |
['top','bottom','left','right'], |
$token).' 'x 3; |
$token); |
$result.=&Apache::edit::select_arg('Items Display Direction:', |
$result.=&Apache::edit::select_arg('Items Display Direction:', |
'direction', |
'direction', |
['vertical','horizontal'], |
['vertical','horizontal'], |
$token); |
$token); |
|
$result.=&Apache::edit::select_arg('Items Columns:', |
|
'columns', |
|
[['','default'],'1','2','3','4'], |
|
$token); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'randomize', |
$safeeval,'randomize', |
'location','direction'); |
'location','direction', |
|
'columns'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'web' or $target eq 'tex') { |
} elsif ($target eq 'web' or $target eq 'tex') { |
$Apache::matchresponse::itemtable{'location'}= |
$Apache::matchresponse::itemtable{'location'}= |
Line 131 sub end_itemgroup {
|
Line 137 sub end_itemgroup {
|
my $result; |
my $result; |
|
|
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } |
if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') { |
|
if(!@{ $Apache::response::itemgroup{'names'} }) { return; } |
|
} else { |
|
return; |
|
} |
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my @names=@{ $Apache::response::itemgroup{'names'} }; |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
my $randomize =&Apache::lonxml::get_param('randomize',$parstack,$safeeval); |
if ($randomize ne 'no' ) { |
if ($randomize ne 'no' ) { |
Line 154 sub end_itemgroup {
|
Line 164 sub end_itemgroup {
|
$Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; |
$Apache::response::itemgroup{'letter_name_map'}=\%letter_name_map; |
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; |
$Apache::response::itemgroup{'name_letter_map'}=\%name_letter_map; |
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval); |
my $direction=&Apache::lonxml::get_param('direction',$parstack,$safeeval); |
|
my $columns=&Apache::lonxml::get_param('columns',$parstack,$safeeval); |
|
|
|
unless ($columns =~ /^\d+$/) { |
|
undef($columns); |
|
} |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
|
my $table='<br /><table>'; # extra space to match what latex does. |
my $table='<br /><table>'; # extra space to match what latex does. |
my $i=0; |
if ((!$columns) || ($columns < 0)) { |
if ($direction eq 'horizontal') { $table .='<tr>';} |
if ($direction eq 'horizontal') { |
foreach my $name (@names) { |
if (@names > 0) { |
if ($direction ne 'horizontal') { $table.='<tr>'; } |
$columns = scalar(@names); |
$table.='<td>'.$alphabet[$i].'</td><td>'. |
} else { |
$Apache::response::itemgroup{$name.'.text'}.'</td>'; |
$columns = 1; |
if ($direction ne 'horizontal') { $table.='</tr>'; } |
} |
$i++; |
} else { |
} |
$columns = 1; |
if ($direction eq 'horizontal') { $table .='</tr>';} |
} |
|
} |
|
my $rows=ceil(scalar(@names)/$columns); |
|
my $endloop = $columns*$rows; |
|
for (my $i=0; $i<$endloop; $i++) { |
|
my $label = ' '; |
|
my $item = ' '; |
|
my $index; |
|
if ($direction eq 'horizontal') { |
|
$index = $i; |
|
} else { |
|
$index = ($i % $columns)*$rows+int($i/$columns); |
|
} |
|
if ($index < scalar(@names)) { |
|
$label = $alphabet[$index]; |
|
$item = $Apache::response::itemgroup{$names[$index].'.text'}; |
|
} |
|
if ($i % $columns == 0) { |
|
$table.='<tr>'; |
|
} |
|
$table.= '<td>'.$label.'</td><td>'.$item.'</td>'; |
|
if ($columns > 1) { |
|
$table .= '<td> </td>'; |
|
} |
|
if ( ! (($i+1) % $columns) ) { |
|
$table.='</tr>'; |
|
} |
|
} |
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} '; |
my $i=0; |
my $i=0; |
|
my ($numrows,$bubbles_per_row); |
|
if ($Apache::lonhomework::type eq 'exam') { |
|
($numrows,$bubbles_per_row) = |
|
&Apache::optionresponse::getnumrows(scalar(@names)); |
|
} else { |
|
$numrows = 1; |
|
} |
foreach my $name (@names) { |
foreach my $name (@names) { |
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$table.='\item['.$alphabet[$i].'] '. |
my $item; |
|
if (($numrows > 1) && ($bubbles_per_row > 0)) { |
|
my $num = 1+int($i/$bubbles_per_row); |
|
my $idx = int($i % $bubbles_per_row); |
|
if ($idx == 0) { |
|
if ($num == 1) { |
|
$table .= '\item[\footnotesize {'.&mt('(first line)').'}]'; |
|
} else { |
|
$table .= '\item[\footnotesize {'.&mt('(next line)').'}]'; |
|
} |
|
} |
|
$item = $alphabet[$idx]; |
|
} else { |
|
$item = $alphabet[$i]; |
|
} |
|
$table.='\item['.$item.'] '. |
$Apache::response::itemgroup{$name.'.text'}; |
$Apache::response::itemgroup{$name.'.text'}; |
$i++; |
$i++; |
} |
} |
Line 198 sub start_item {
|
Line 262 sub start_item {
|
$result=&Apache::edit::tag_start($target,$token,"Item"); |
$result=&Apache::edit::tag_start($target,$token,"Item"); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
if ($randomize ne 'no') { |
if ($randomize ne 'no') { |
$result.=' 'x 3 . |
$result.= |
&Apache::edit::select_arg('Location:','location', |
&Apache::edit::select_arg('Location:','location', |
['random','top','bottom'], |
['random','top','bottom'], |
$token); |
$token); |
Line 252 sub start_foilgroup {
|
Line 316 sub start_foilgroup {
|
my $result; |
my $result; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(undef,$target); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
Line 288 sub end_foilgroup {
|
Line 352 sub end_foilgroup {
|
['text','value','location']); |
['text','value','location']); |
#FIXME need to store options in some way |
#FIXME need to store options in some way |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max), |
my ($numrows,$bubbles_per_row); |
"$part.$response_id"); |
if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { |
|
my $numitems; |
|
if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') { |
|
$numitems = scalar(@{ $Apache::response::itemgroup{'names'} }); |
|
($numrows,$bubbles_per_row) = |
|
&Apache::optionresponse::getnumrows($numitems); |
|
} |
|
} |
|
if ($numrows < 1) { |
|
$numrows = 1; |
|
} |
|
my $increment = &getfoilcounts($max) * $numrows; |
|
&Apache::lonxml::increment_counter($increment,"$part.$response_id"); |
if ($target eq 'analyze') { |
if ($target eq 'analyze') { |
&Apache::lonhomework::set_bubble_lines(); |
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
Line 311 sub whichfoils {
|
Line 387 sub whichfoils {
|
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') { |
|
if (!@{ $Apache::response::foilgroup{'names'} }) { return; } |
|
} else { |
|
return; |
|
} |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), |
my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), |
$randomize, |
$randomize, |
&Apache::response::showallfoils(), |
&Apache::response::showallfoils(), |
\%Apache::response::foilgroup); |
\%Apache::response::foilgroup); |
my %name_letter_map; |
my %name_letter_map; |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') { |
%name_letter_map= |
if (%{$Apache::response::itemgroup{'name_letter_map'}}) { |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%name_letter_map= |
|
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
|
} |
} |
} |
my $result; |
my $result; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 354 sub grade_response {
|
Line 436 sub grade_response {
|
if (!&Apache::response::submitted()) { return; } |
if (!&Apache::response::submitted()) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
|
my %answerhash; |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(1,0,0,0); |
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') { |
%letter_name_map= |
if (%{$Apache::response::itemgroup{'letter_name_map'}}) { |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
%letter_name_map= |
|
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
|
} |
} |
} |
my @items; |
my @items; |
|
my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} }); |
|
my ($numrows,$bubbles_per_row); |
|
if ($Apache::lonhomework::scantronmode) { |
|
my $numitems = scalar(@{ $Apache::response::itemgroup{'names'} }); |
|
($numrows,$bubbles_per_row) = |
|
&Apache::optionresponse::getnumrows($numitems); |
|
} |
|
if ($numrows < 1) { |
|
$numrows = 1; |
|
} |
|
my @alphabet=('A'..'Z'); |
|
my %nums_from_letters; |
|
for (my $i=0; $i<@alphabet; $i++) { |
|
$nums_from_letters{$alphabet[$i]} = $i; |
|
} |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = &Apache::response::getresponse($temp,'letter'); |
my $response; |
|
if ($numrows > 1) { |
|
my $num = $temp; |
|
my $totalnum; |
|
for (my $i=0; $i<$numrows; $i++) { |
|
my $item = &Apache::response::getresponse($num,'letter'); |
|
if ($item =~ /^\w$/) { |
|
$totalnum = $i*$bubbles_per_row + $nums_from_letters{$item}; |
|
} |
|
$num ++; |
|
} |
|
if ($totalnum =~ /^\d+$/) { |
|
$response = $alphabet[$totalnum]; |
|
} |
|
$temp += $numrows; |
|
} else { |
|
$response = &Apache::response::getresponse($temp,'letter'); |
|
$temp ++; |
|
} |
push(@items,$response); |
push(@items,$response); |
my $responsename = $letter_name_map{$response}; |
my $responsename = $letter_name_map{$response}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$answerhash{$name} = $value; |
|
} |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
$responsehash{$name}=$responsename; |
$responsehash{$name}=$responsename; |
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
Line 377 sub grade_response {
|
Line 498 sub grade_response {
|
} else { |
} else { |
$ignored++; |
$ignored++; |
} |
} |
$temp++; |
|
} |
} |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
|
my $nonlenient=&Apache::optionresponse::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 $itemstr =&Apache::lonnet::array2str(@items); |
my $itemstr =&Apache::lonnet::array2str(@items); |
Line 392 sub grade_response {
|
Line 513 sub grade_response {
|
$itemstr; |
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$gradestr; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils); |
|
} |
if (($Apache::lonhomework::type eq 'survey') || |
if (($Apache::lonhomework::type eq 'survey') || |
($Apache::lonhomework::type eq 'surveycred') || |
($Apache::lonhomework::type eq 'surveycred') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
Line 413 sub grade_response {
|
Line 537 sub grade_response {
|
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER'; |
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER'; |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
} |
} |
} elsif (!$Apache::lonhomework::scantronmode) { |
} elsif ($nonlenient) { |
my $ad; |
my $ad; |
if ($wrong==0 && $ignored==0) { |
if ($wrong==0 && $ignored==0) { |
$ad='EXACT_ANS'; |
$ad='EXACT_ANS'; |
} elsif ($wrong==0 && $right==0) { |
} elsif ($wrong==0 && $right==0) { |
#nothing submitted |
#nothing submitted |
} else { |
} else { |
if ($ignored==0) { |
if ($ignored==0) { |
$ad='INCORRECT'; |
$ad='INCORRECT'; |
} else { |
} else { |
$ad='MISSING_ANSWER'; |
$ad='MISSING_ANSWER'; |
} |
} |
} |
} |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
&Apache::response::handle_previous(\%previous,$ad); |
&Apache::response::handle_previous(\%previous,$ad); |
} else { |
} else { |
my $ad; |
my $ad; |
if ($wrong==0 && $right==0) { |
if ($wrong==0 && $right==0) { |
#nothing submitted |
#nothing submitted only assign a score if we |
} else { |
#need to override a previous grade |
$ad='ASSIGNED_SCORE'; |
if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) { |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}= |
$ad='ASSIGNED_SCORE'; |
$ad; |
} |
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
} else { |
$right/(scalar(@whichfoils)); |
$ad='ASSIGNED_SCORE'; |
$Apache::lonhomework::results{"resource.$part.$id.numfoils"}= |
} |
scalar(@whichfoils); |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
} |
$Apache::lonhomework::results{"resource.$part.$id.awarded"}= |
|
$right/(scalar(@whichfoils)); |
|
$Apache::lonhomework::results{"resource.$part.$id.numfoils"}= |
|
scalar(@whichfoils); |
} |
} |
} |
} |
|
|
Line 487 sub displayfoils {
|
Line 614 sub displayfoils {
|
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (ref($Apache::response::itemgroup{'letter_name_map'}) eq 'HASH') { |
%letter_name_map= |
if (%{$Apache::response::itemgroup{'letter_name_map'}}) { |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
%letter_name_map= |
|
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
|
} |
} |
} |
my %name_letter_map; |
my %name_letter_map; |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
if (ref($Apache::response::itemgroup{'name_letter_map'}) eq 'HASH') { |
%name_letter_map= |
if (%{$Apache::response::itemgroup{'name_letter_map'}}) { |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%name_letter_map= |
|
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
|
} |
} |
} |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
Line 512 sub displayfoils {
|
Line 643 sub displayfoils {
|
my $temp=1; |
my $temp=1; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $lastresponse; |
my ($lastresponse,$newvariation); |
unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { |
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 ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred') && (defined($env{'form.grade_symb'}))) || $newvariation) { |
$lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
$lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
} |
} |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my @alphabet=('A'..'Z'); |
my @alphabet=('A'..'Z'); |
my @used_letters=sort(keys(%letter_name_map)); |
my @used_letters=sort(keys(%letter_name_map)); |
my $internal_counter=$Apache::lonxml::counter; |
my $internal_counter=$Apache::lonxml::counter; |
|
my ($numrows,$bubbles_per_row); |
|
if (($target eq 'tex') && ($Apache::lonhomework::type eq 'exam')) { |
|
($numrows,$bubbles_per_row) = |
|
&Apache::optionresponse::getnumrows(scalar(@used_letters)); |
|
} else { |
|
$numrows = 1; |
|
} |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $lastopt=$lastresponse{$name}; |
my $lastopt=$lastresponse{$name}; |
my $last_letter=$name_letter_map{$lastopt}; |
my $last_letter=$name_letter_map{$lastopt}; |
Line 542 sub displayfoils {
|
Line 688 sub displayfoils {
|
foreach $option (@used_letters) { |
foreach $option (@used_letters) { |
if ($option eq $last_letter) { |
if ($option eq $last_letter) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$optionlist.="<option selected=\"on\">$option</option>\n"; |
$optionlist.="<option selected=\"selected\">$option</option>\n"; |
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} |
} |
} else { |
} else { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$optionlist.="<option>$option</option>\n"; |
$optionlist.="<option>$option</option>\n"; |
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
} elsif ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER' |
|
&& $Apache::lonhomework::type ne 'exam') { |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
$optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option); |
} |
} |
} |
} |
Line 596 sub displayfoils {
|
Line 744 sub displayfoils {
|
# Note that if left or right positioned, we must |
# Note that if left or right positioned, we must |
# confine the bubbles to righttabsize: |
# confine the bubbles to righttabsize: |
# |
# |
if ($Apache::lonhomework::type eq 'exam' && $env{'form.pdfFormFields'} ne 'yes') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
.'\item \hskip -3mm '; |
|
if ($numrows == 1) { |
|
$question .= '\textbf{'.$internal_counter.'}'; |
|
} else { |
|
my $linetext; |
|
for (my $i=0; $i<$numrows; $i++) { |
|
$linetext .= $internal_counter+$i.', '; |
|
} |
|
$linetext =~ s/,\s$//; |
|
$question .= '\small {\textbf{'.$linetext.'}} '. |
|
'\hskip 2 mm {\footnotesize '. |
|
&mt('(Bubble once in [_1] lines)',$numrows). |
|
'} \vskip 3 mm'; |
|
} |
|
my $max_width; |
if (&itemdisplay('left') || &itemdisplay('right')) { |
if (&itemdisplay('left') || &itemdisplay('right')) { |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
$max_width = $righttabsize; |
} |
} |
else { |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems,'',$max_width,$numrows,$bubbles_per_row,$internal_counter); |
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
|
} |
|
$question .= '\end{list} \vskip -8 mm \strut '; |
$question .= '\end{list} \vskip -8 mm \strut '; |
$internal_counter++; |
$internal_counter += $numrows; |
} else { |
} else { |
if($env{'form.pdfFormFields'} eq 'yes' |
if($env{'form.pdfFormFields'} eq 'yes' |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
Line 650 sub displayfoils {
|
Line 810 sub displayfoils {
|
} |
} |
} |
} |
if ($target eq 'web') { |
if ($target eq 'web') { |
|
my $questiontype; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$questiontype = $Apache::lonhomework::type; |
|
} |
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
[\@whichfoils, |
[\@whichfoils, |
'submissiongrading', |
'submissiongrading', |
'submissionitems']); |
'submissionitems'], |
|
$questiontype); |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |
Line 724 sub start_foil {
|
Line 889 sub start_foil {
|
if ($$tagstack[-2] eq 'conceptgroup') { $level = '-3'; } |
if ($$tagstack[-2] eq 'conceptgroup') { $level = '-3'; } |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
my @names; |
my @names; |
if (defined(@{ $Apache::response::itemgroup{'names'} })) { |
if (ref($Apache::response::itemgroup{'names'}) eq 'ARRAY') { |
@names=@{ $Apache::response::itemgroup{'names'} }; |
if (@{ $Apache::response::itemgroup{'names'} }) { |
|
@names=@{ $Apache::response::itemgroup{'names'} }; |
|
} |
} |
} |
$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',@names],$token,'15'); |
$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',@names],$token,'15'); |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
Line 801 sub insert_foil {
|
Line 968 sub insert_foil {
|
<endouttext /> |
<endouttext /> |
</foil>'; |
</foil>'; |
} |
} |
|
|
1; |
1; |
__END__ |
__END__ |