version 1.15, 2003/03/26 22:41:34
|
version 1.80, 2010/04/27 14:11:17
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 2/21 Guy |
|
|
|
package Apache::matchresponse; |
package Apache::matchresponse; |
use strict; |
use strict; |
use HTML::Entities(); |
use HTML::Entities(); |
use Math::Random(); |
use Math::Random(); |
use Apache::optionresponse; |
use Apache::optionresponse(); |
|
use Apache::lonlocal; |
my $flag_for_exam_printing = 1; |
use Apache::lonnet; |
|
use Apache::lonxml; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
Line 49 sub start_matchresponse {
|
Line 49 sub start_matchresponse {
|
push (@Apache::lonxml::namespace,'matchresponse'); |
push (@Apache::lonxml::namespace,'matchresponse'); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
my $id = &Apache::response::start_response($parstack,$safeeval); |
%Apache::hint::match=(); |
%Apache::hint::match=(); |
|
undef(%Apache::response::foilnames); |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('matchresponse'); |
$result=&Apache::response::meta_package_write('matchresponse'); |
} elsif ($target eq 'edit' ) { |
} elsif ($target eq 'edit' ) { |
$result.=&Apache::edit::start_table($token). |
$result.=&Apache::edit::start_table($token). |
'<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:". |
'<tr><td>'.&Apache::lonxml::description($token).'</td>' |
&Apache::edit::deletelist($target,$token) |
.'<td><span class="LC_nobreak">'.&mt('Delete?').' ' |
."</td><td> ".&Apache::edit::end_row() |
.&Apache::edit::deletelist($target,$token) |
.&Apache::edit::start_spanning_row(); |
.'</span></td>' |
|
.'<td> '.&Apache::edit::end_row() |
|
.&Apache::edit::start_spanning_row(); |
|
|
$result.= |
$result.= |
&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). |
&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). |
['yes','no'],$token). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n"; |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
Line 68 sub start_matchresponse {
|
Line 71 sub start_matchresponse {
|
$safeeval,'max', |
$safeeval,'max', |
'randomize'); |
'randomize'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
|
} elsif ($target eq 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$id"; |
|
$Apache::lonhomework::analyze{"$part_id.type"} = 'matchresponse'; |
|
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, |
|
1); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 80 sub end_matchresponse {
|
Line 89 sub end_matchresponse {
|
pop @Apache::lonxml::namespace; |
pop @Apache::lonxml::namespace; |
&Apache::lonxml::deregister('Apache::matchresponse', |
&Apache::lonxml::deregister('Apache::matchresponse', |
('foilgroup','foil','conceptgroup')); |
('foilgroup','foil','conceptgroup')); |
|
undef(%Apache::response::foilnames); |
return $result; |
return $result; |
} |
} |
|
|
Line 93 sub start_itemgroup {
|
Line 103 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); |
['yes','no'],$token).' 'x 3; |
$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; |
|
$result.=&Apache::edit::select_arg('Items Display Direction:', |
|
'direction', |
|
['vertical','horizontal'], |
$token); |
$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'); |
'location','direction'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web' or $target eq 'tex') { |
$Apache::matchresponse::itemtable{'location'}= |
$Apache::matchresponse::itemtable{'location'}= |
&Apache::lonxml::get_param('location',$parstack,$safeeval); |
&Apache::lonxml::get_param('location',$parstack,$safeeval); |
|
$Apache::matchresponse::TeXitemgroupwidth=&Apache::lonxml::get_param('TeXitemgroupwidth',$parstack,$safeeval,undef,0); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 115 sub end_itemgroup {
|
Line 130 sub end_itemgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
|
|
|
if ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { return; } |
if (!defined(@{ $Apache::response::itemgroup{'names'} })) { 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' ) { |
@names=&whichorder($#names+1,$randomize,0, |
@names=&Apache::response::whichorder($#names+1,$randomize,0, |
\%Apache::response::itemgroup) |
\%Apache::response::itemgroup); |
|
} |
|
if ($target eq 'analyze') { |
|
my $partid="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push (@{ $Apache::lonhomework::analyze{"$partid.items"} }, @names); |
} |
} |
my %letter_name_map; |
my %letter_name_map; |
my %name_letter_map; |
my %name_letter_map; |
Line 133 sub end_itemgroup {
|
Line 153 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); |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $table='<table>'; |
|
|
my $table='<br /><table>'; # extra space to match what latex does. |
my $i=0; |
my $i=0; |
|
if ($direction eq 'horizontal') { $table .='<tr>';} |
foreach my $name (@names) { |
foreach my $name (@names) { |
$table.='<tr><td>'.$alphabet[$i].'</td><td>'. |
if ($direction ne 'horizontal') { $table.='<tr>'; } |
$Apache::response::itemgroup{$name.'.text'}. |
$table.='<td>'.$alphabet[$i].'</td><td>'. |
'</td></tr>'; |
$Apache::response::itemgroup{$name.'.text'}.'</td>'; |
|
if ($direction ne 'horizontal') { $table.='</tr>'; } |
$i++; |
$i++; |
} |
} |
|
if ($direction eq 'horizontal') { $table .='</tr>';} |
$table.='</table>'; |
$table.='</table>'; |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $table=' \\\\\\\\ \begin{tabular}{ll} '; |
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; |
foreach my $name (@names) { |
foreach my $name (@names) { |
$Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
# $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g; |
$table.=' '.$alphabet[$i].' & '. |
$table.='\item['.$alphabet[$i].'] '. |
$Apache::response::itemgroup{$name.'.text'}. |
$Apache::response::itemgroup{$name.'.text'}; |
' \\\\ '; |
|
$i++; |
$i++; |
} |
} |
$table.=' \end{tabular} \\\\ '; |
$table.=' \end{description} \strut '; |
|
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
} elsif ($target eq 'edit') { $result=&Apache::edit::end_table(); } |
$Apache::lonxml::post_evaluate=0; |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub start_item { |
sub start_item { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
Line 171 sub start_item {
|
Line 198 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.=&Apache::edit::select_arg('Location:','location', |
$result.=' 'x 3 . |
|
&Apache::edit::select_arg('Location:','location', |
['random','top','bottom'], |
['random','top','bottom'], |
$token); |
$token); |
} |
} |
Line 189 sub end_item {
|
Line 217 sub end_item {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'edit' || $target eq 'tex') { |
$target eq 'edit' || $target eq 'tex' || $target eq 'analyze') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $location=&Apache::lonxml::get_param('location',$parstack, |
my $location=&Apache::lonxml::get_param('location',$parstack, |
$safeeval); |
$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { $name=$Apache::lonxml::curdepth; } |
if ($name eq "") { $name=$Apache::lonxml::curdepth; } |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
push @{ $Apache::response::itemgroup{'names'} }, $name; |
push @{ $Apache::response::itemgroup{'names'} }, $name; |
$Apache::response::itemgroup{"$name.text"} = $text; |
$Apache::response::itemgroup{"$name.text"} = $text; |
Line 224 sub start_foilgroup {
|
Line 252 sub start_foilgroup {
|
my $result; |
my $result; |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result.=&Apache::edit::start_table($token) |
$result.=&Apache::edit::start_table($token) |
."<tr><td>Collection Of Foils</td><td>Delete:" |
.'<tr><td>'.&mt('Collection Of Foils').'</td>' |
|
.'<td><span class="LC_nobreak">'.&mt('Delete?') |
.&Apache::edit::deletelist($target,$token) |
.&Apache::edit::deletelist($target,$token) |
."</td><td> ".&Apache::edit::end_row() |
.'</span></td>' |
|
.'<td> '.&Apache::edit::end_row() |
.&Apache::edit::start_spanning_row()."\n"; |
.&Apache::edit::start_spanning_row()."\n"; |
} |
} |
return $result; |
return $result; |
Line 238 sub start_foilgroup {
|
Line 268 sub start_foilgroup {
|
sub end_foilgroup { |
sub end_foilgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { |
my $part = $Apache::inputtags::part; |
|
my $response_id = $Apache::inputtags::response[-1]; |
|
|
|
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { |
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); |
$result=&displayfoils($target,$max,$randomize); |
|
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
&grade_response($max,$randomize); |
&grade_response($max,$randomize); |
|
} elsif ( $target eq 'analyze') { |
|
my @shown=&whichfoils($max,$randomize); |
|
&Apache::response::analyze_store_foilgroup(\@shown, |
|
['text','value','location']); |
|
#FIXME need to store options in some way |
|
} |
|
&Apache::lonxml::increment_counter(&getfoilcounts($max), |
|
"$part.$response_id"); |
|
if ($target eq 'analyze') { |
|
&Apache::lonhomework::set_bubble_lines(); |
} |
} |
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
|
sub whichfoils { |
|
my ($max,$randomize)=@_; |
|
return &Apache::response::whichorder(&getfoilcounts($max), |
|
$randomize, |
|
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
|
} |
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,$randomize,@opt)=@_; |
my ($max,$randomize,@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 @whichfoils = &whichorder(&getfoilcounts($max),$randomize, |
my @whichfoils = &Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
my $result=&Apache::response::answer_header('matchresponse'); |
\%Apache::response::foilgroup); |
my %name_letter_map; |
my %name_letter_map; |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'name_letter_map'} })) { |
%name_letter_map= |
%name_letter_map= |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
} |
} |
foreach my $name (@whichfoils) { |
my $result; |
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
if ($Apache::lonhomework::type eq 'exam') { |
my $letter=$name_letter_map{$value_name}; |
my $i=0; |
$result.=&Apache::response::answer_part('matchresponse',$letter); |
foreach my $name (@whichfoils) { |
|
$result.=&Apache::response::answer_header('matchresponse',$i++); |
|
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
|
my $letter=$name_letter_map{$value_name}; |
|
$result.=&Apache::response::answer_part('matchresponse',$letter); |
|
$result.=&Apache::response::answer_footer('matchresponse'); |
|
} |
|
} else { |
|
$result=&Apache::response::answer_header('matchresponse'); |
|
foreach my $name (@whichfoils) { |
|
my $value_name=$Apache::response::foilgroup{$name.'.value'}; |
|
my $letter=$name_letter_map{$value_name}; |
|
$result.=&Apache::response::answer_part('matchresponse',$letter); |
|
} |
|
$result.=&Apache::response::answer_footer('matchresponse'); |
} |
} |
$result.=&Apache::response::answer_footer('matchresponse'); |
|
return $result; |
return $result; |
} |
} |
|
|
|
|
sub grade_response { |
sub grade_response { |
my ($max,$randomize)=@_; |
my ($max,$randomize)=@_; |
my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
if (!defined($ENV{'form.submitted'})) { return; } |
\%Apache::response::foilgroup); |
|
if (!&Apache::response::submitted()) { return; } |
my %responsehash; |
my %responsehash; |
my %grade; |
my %grade; |
my ($temp,$right,$wrong,$ignored)=(0,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 (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
%letter_name_map= |
%letter_name_map= |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
%{ $Apache::response::itemgroup{'letter_name_map'} }; |
} |
} |
|
my @items; |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response = &Apache::response::getresponse($temp,'letter'); |
|
push(@items,$response); |
my $responsename = $letter_name_map{$response}; |
my $responsename = $letter_name_map{$response}; |
$responsehash{$name}=$responsename; |
|
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
$responsehash{$name}=$responsename; |
|
&Apache::lonxml::debug("submitted a $response($responsename) for $value<br />\n"); |
if ($value eq $responsename) { |
if ($value eq $responsename) { |
$grade{$name}='1'; $right++; |
$grade{$name}='1'; $right++; |
} else { |
} else { |
Line 312 sub grade_response {
|
Line 382 sub grade_response {
|
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::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 $gradestr =&Apache::lonnet::hash2str(%grade); |
my $gradestr =&Apache::lonnet::hash2str(%grade); |
my %previous =&Apache::response::check_for_previous($responsestr, |
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); |
$part,$id); |
|
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
&Apache::lonxml::debug("Got $right right and $wrong wrong, and $ignored were ignored "); |
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$responsestr; |
$responsestr; |
|
$Apache::lonhomework::results{"resource.$part.$id.submissionitems"}= |
|
$itemstr; |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}= |
$gradestr; |
$gradestr; |
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
if (($Apache::lonhomework::type eq 'survey') || |
&Apache::response::handle_previous(\%previous,$ad); |
($Apache::lonhomework::type eq 'surveycred') || |
|
($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
|
if ($ignored == 0) { |
|
my $ad; |
|
if ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; |
|
} 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) { |
|
my $ad; |
|
if ($wrong==0 && $ignored==0) { |
|
$ad='EXACT_ANS'; |
|
} elsif ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
if ($ignored==0) { |
|
$ad='INCORRECT'; |
|
} else { |
|
$ad='MISSING_ANSWER'; |
|
} |
|
} |
|
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; |
|
&Apache::response::handle_previous(\%previous,$ad); |
|
} else { |
|
my $ad; |
|
if ($wrong==0 && $right==0) { |
|
#nothing submitted |
|
} else { |
|
$ad='ASSIGNED_SCORE'; |
|
$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); |
|
} |
|
} |
|
} |
|
|
|
sub format_prior_answer { |
|
my ($mode,$answer,$other_data) = @_; |
|
my %answer =&Apache::lonnet::str2hash($answer); |
|
my $foil_order =$other_data->[0]; |
|
my %grading =&Apache::lonnet::str2hash($other_data->[1]); |
|
my @items =&Apache::lonnet::str2array($other_data->[2]); |
|
my $output; |
|
|
|
foreach my $name (@{ $foil_order }) { |
|
my $item=shift(@items); |
|
$output .= '<tr><td>'.$item.'</td></tr>'; |
|
} |
|
return if (!defined($output)); |
|
|
|
$output = '<table class="LC_prior_match">'.$output.'</table>'; |
|
return $output; |
} |
} |
|
|
sub itemdisplay { |
sub itemdisplay { |
Line 347 sub itemdisplay {
|
Line 473 sub itemdisplay {
|
} |
} |
return undef; |
return undef; |
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize)=@_; |
|
my ($tabsize, $lefttabsize, $righttabsize); |
|
|
my $result; |
my $result; |
my $question; |
my $question; |
my (@whichfoils)=&whichorder(&getfoilcounts($max),$randomize, |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
&Apache::response::showallfoils(), |
$randomize, |
\%Apache::response::foilgroup); |
&Apache::response::showallfoils(), |
|
\%Apache::response::foilgroup); |
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 $status=$Apache::inputtags::status[-1]; |
|
my %letter_name_map; |
my %letter_name_map; |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
if (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
%letter_name_map= |
%letter_name_map= |
Line 367 sub displayfoils {
|
Line 496 sub displayfoils {
|
%name_letter_map= |
%name_letter_map= |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
%{ $Apache::response::itemgroup{'name_letter_map'} }; |
} |
} |
if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { |
if ( &Apache::response::show_answer() && ($target ne 'tex')) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
Line 375 sub displayfoils {
|
Line 504 sub displayfoils {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$question.=' \\\\ '.$letter.':'.$text; |
$question.=' \\\\ '.$letter.':'.$text; |
} else { |
} else { |
$question.='<br />'.$letter.':'.$text; |
$question.='<br /><b>'.$letter.':</b> '.$text; |
} |
} |
} |
} |
} else { |
} else { |
my $i = 0; |
my $i = 0; |
my $temp=0; |
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=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
my $lastresponse; |
|
unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { |
|
$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; |
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 395 sub displayfoils {
|
Line 528 sub displayfoils {
|
$optionlist="<option></option>\n"; |
$optionlist="<option></option>\n"; |
} else { |
} else { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$optionlist='\framebox[5 mm][s]{\tiny\strut}'; |
if($env{'form.pdfFormFields'} eq 'yes' |
} |
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
my $fieldname = $env{'request.symb'} . '&part_'. $Apache::inputtags::part .'&matchresponse'. '&HWVAL_' . $Apache::inputtags::response['-1'] . ':' . $temp . '&submit_' . $Apache::inputtags::part . '&'; |
|
$optionlist = &Apache::lonxml::print_pdf_start_combobox($fieldname); |
|
} else { |
|
|
|
$optionlist='\framebox[10 mm][s]{\tiny\strut}'; |
|
} |
|
} |
} |
} |
my $option; |
my $option; |
foreach $option (@used_letters) { |
foreach $option (@used_letters) { |
if ($option eq $last_letter) { |
if ($option eq $last_letter) { |
if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";} |
if ($target ne 'tex') { |
|
$optionlist.="<option selected=\"on\">$option</option>\n"; |
|
} elsif ($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 { |
} else { |
if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";} |
if ($target ne 'tex') { |
|
$optionlist.="<option>$option</option>\n"; |
|
} elsif ($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); |
|
} |
} |
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select onchange="javascript:setSubmittedPart(\''. |
|
$part.'\');" name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
} |
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
|
# |
|
# Factor out the tex computations of the left/right 1/2 minipage |
|
# widths for left or right positioning. This allows us |
|
# to, if necessary constrain the bubble widths: |
|
# |
|
if ($target eq 'tex' && |
|
(&itemdisplay('left') || &itemdisplay('right'))) { |
|
$tabsize=&Apache::londefdef::recalc($env{'form.textwidth'}); |
|
($lefttabsize,$righttabsize)=(0,0); |
|
if ($Apache::matchresponse::TeXitemgroupwidth ne '') { |
|
$Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/; |
|
$lefttabsize=$tabsize*$1/100; |
|
$righttabsize=0.95*($tabsize-$lefttabsize); |
|
} else { |
|
$tabsize=~/(\d+\.?\d*)/; |
|
$lefttabsize=$1/2.1; |
|
$righttabsize=0.95*($1-$lefttabsize); |
|
} |
|
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$question.='<br />'.$optionlist.$text."\n"; |
if ($Apache::lonhomework::type ne 'exam') { |
|
$question.="<br />\n".$optionlist.$text; |
|
} else { |
|
$question.="<br />\n".$text; |
|
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters); |
my @blank; |
|
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
} |
} |
} else { |
} else { |
|
# Note that if left or right positioned, we must |
|
# confine the bubbles to righttabsize: |
|
# |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$question.=' '.$optionlist.$text."\n"; |
$question.=' '.$optionlist.$text."\n"; |
my @emptyItems = (); |
my @emptyItems = (); |
for (my $i=0;$i<=$#Items;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@empthItems).'}\end{enumerate}} \vskip -10 mm \strut '; |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
|
.'\item \hskip -3mm \textbf{'.$internal_counter.'}'; |
|
if (&itemdisplay('left') || &itemdisplay('right')) { |
|
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize); |
|
} |
|
else { |
|
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems); |
|
} |
|
$question .= '\end{list} \vskip -8 mm \strut '; |
|
$internal_counter++; |
} else { |
} else { |
$question.=' \\\\ '.$optionlist.$text."\n"; |
if($env{'form.pdfFormFields'} eq 'yes' |
|
&& $Apache::inputtags::status['-1'] eq 'CAN_ANSWER') { |
|
$question .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut'; |
|
} else { |
|
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n"; |
|
} |
} |
} |
} |
} |
$temp++; |
$temp++; |
Line 435 sub displayfoils {
|
Line 629 sub displayfoils {
|
} elsif ($result=&itemdisplay('bottom')) { |
} elsif ($result=&itemdisplay('bottom')) { |
$result=$question.$result; |
$result=$question.$result; |
} elsif ($result=&itemdisplay('right')) { |
} elsif ($result=&itemdisplay('right')) { |
$result='<table><tr><td>'.$question.'</td><td>'.$result. |
if ($target ne 'tex') { |
'</td></tr></table>'; |
#remove the first <br /> |
|
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$question. |
|
'</td><td valign="top">'.$result.'</td></tr></table>'; |
|
} else { |
|
$lefttabsize.=' mm '; |
|
$righttabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}'; |
|
} |
} elsif ($result=&itemdisplay('left')) { |
} elsif ($result=&itemdisplay('left')) { |
$result='<table><tr><td>'.$result.'</td><td>'.$question. |
if ($target ne 'tex') { |
'</td></tr></table>'; |
#remove the first <br /> |
|
$question=~s|<br />||; |
|
$result='<table><tr><td valign="top">'.$result. |
|
'</td><td valign="top">'.$question.'</td></tr></table>'; |
|
} else { |
|
$lefttabsize.=' mm '; |
|
$righttabsize.=' mm '; |
|
$result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}'; |
|
} |
|
} |
|
if ($target eq 'web') { |
|
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
|
[\@whichfoils, |
|
'submissiongrading', |
|
'submissionitems']); |
} |
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |
Line 455 sub getfoilcounts {
|
Line 671 sub getfoilcounts {
|
return $count; |
return $count; |
} |
} |
|
|
sub whichorder { |
|
my ($max,$randomize,$showall,$hash)=@_; |
|
#&Apache::lonxml::debug("man $max randomize $randomize"); |
|
if (!defined(@{ $$hash{'names'} })) { return; } |
|
my @names = @{ $$hash{'names'} }; |
|
my @whichopt =(); |
|
my (%top,@toplist,%bottom,@bottomlist); |
|
if (!($showall || ($randomize eq 'no'))) { |
|
my $current=0; |
|
foreach my $name (@names) { |
|
$current++; |
|
if ($$hash{"$name.location"} eq 'top') { |
|
$top{$name}=$current; |
|
} elsif ($$hash{"$name.location"} eq 'bottom') { |
|
$bottom{$name}=$current; |
|
} |
|
} |
|
} |
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
|
#&Apache::lonxml::debug("Have $#whichopt max is $max"); |
|
my $aopt; |
|
if ($showall || ($randomize eq 'no')) { |
|
$aopt=0; |
|
} else { |
|
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
|
} |
|
#&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
|
$aopt=splice(@names,$aopt,1); |
|
#&Apache::lonxml::debug("Picked $aopt"); |
|
if ($top{$aopt}) { |
|
$toplist[$top{$aopt}]=$aopt; |
|
} elsif ($bottom{$aopt}) { |
|
$bottomlist[$bottom{$aopt}]=$aopt; |
|
} else { |
|
push (@whichopt,$aopt); |
|
} |
|
} |
|
for (my $i=0;$i<=$#toplist;$i++) { |
|
if ($toplist[$i]) { unshift(@whichopt,$toplist[$i]) } |
|
} |
|
for (my $i=0;$i<=$#bottomlist;$i++) { |
|
if ($bottomlist[$i]) { push(@whichopt,$bottomlist[$i]) } |
|
} |
|
|
|
return @whichopt; |
|
} |
|
|
|
sub start_conceptgroup { |
sub start_conceptgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
Line 525 sub end_conceptgroup {
|
Line 695 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::matchresponse::conceptgroup=0; |
$Apache::matchresponse::conceptgroup=0; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
#if not there aren't any foils to display and thus no question |
$target eq 'tex' || $target eq 'analyze') { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
&Apache::response::pick_foil_for_concept($target, |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
['value','text','location'], |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
\%Apache::hint::match, |
my $name=$names[$pick]; |
$parstack,$safeeval); |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
|
$Apache::response::foilgroup{"$name.value"} = |
|
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::response::foilgroup{"$name.text"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
|
$Apache::response::foilgroup{"$name.location"} = |
|
$Apache::response::conceptgroup{"$name.location"}; |
|
my $concept = &Apache::lonxml::get_param('concept',$parstack, |
|
$safeeval); |
|
$Apache::response::foilgroup{"$name.concept"} = $concept; |
|
&Apache::lonxml::debug("Selecting $name in $concept"); |
|
if ($target eq 'web') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push(@{ $Apache::hint::match{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::hint::match{"$part_id.concept.$concept"}= |
|
$Apache::response::conceptgroup{'names'}; |
|
} |
|
} |
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
Line 564 sub insert_conceptgroup {
|
Line 715 sub insert_conceptgroup {
|
sub start_foil { |
sub start_foil { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
|
if ($target eq 'analyze') { |
|
&Apache::response::check_if_computed($token,$parstack,$safeeval,'value'); |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
$result=&Apache::edit::tag_start($target,$token,"Foil"); |
my $level='-2'; |
my $level='-2'; |
Line 596 sub end_foil {
|
Line 750 sub end_foil {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { |
|
$text='\vskip 5mm $\triangleright$ '.$text; |
|
} |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); |
if ($value ne 'unused') { |
if ($value ne 'unused') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $location =&Apache::lonxml::get_param('location',$parstack,$safeeval); |
|
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { $name=$Apache::lonxml::curdepth; } |
if (!$name) { |
|
&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:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
|
if (defined($Apache::response::foilnames{$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); |
if ( $Apache::matchresponse::conceptgroup |
if ( $Apache::matchresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
&& !&Apache::response::showallfoils() ) { |
|
|
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
push @{ $Apache::response::conceptgroup{'names'} }, $name; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
$Apache::response::conceptgroup{"$name.value"} = $value; |
if ($target eq 'tex') { |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::conceptgroup{"$name.text"} = $text; |
|
} |
|
$Apache::response::conceptgroup{"$name.location"} = $location; |
$Apache::response::conceptgroup{"$name.location"} = $location; |
} else { |
} else { |
|
|
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.value"} = $value; |
if ($Apache::lonhomework::type eq 'exam' and $flag_for_exam_printing) { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
|
} else { |
|
if ($target eq 'tex') { |
|
$Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text; |
|
} else { |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
} |
|
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.location"} = $location; |
} |
} |
} |
} |