version 1.50, 2005/01/31 22:00:40
|
version 1.83, 2011/10/07 22:39:59
|
Line 32 use HTML::Entities();
|
Line 32 use HTML::Entities();
|
use Math::Random(); |
use Math::Random(); |
use Apache::optionresponse(); |
use Apache::optionresponse(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
|
use Apache::lonnet; |
|
use Apache::lonxml; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
&Apache::lonxml::register('Apache::matchresponse',('matchresponse')); |
Line 52 sub start_matchresponse {
|
Line 54 sub start_matchresponse {
|
$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 69 sub start_matchresponse {
|
Line 73 sub start_matchresponse {
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$id"; |
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{"parts"} },$part_id); |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, |
|
1); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 96 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' or $target eq 'tex') { |
} elsif ($target eq 'web' or $target eq 'tex') { |
$Apache::matchresponse::itemtable{'location'}= |
$Apache::matchresponse::itemtable{'location'}= |
Line 142 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{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++; |
} |
} |
$table.=' \end{description} \strut '; |
$table.=' \end{description} \strut '; |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';} |
$Apache::matchresponse::itemtable{'display'}=$table; |
$Apache::matchresponse::itemtable{'display'}=$table; |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 180 sub start_item {
|
Line 220 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 207 sub end_item {
|
Line 248 sub end_item {
|
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 233 sub start_foilgroup {
|
Line 274 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>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 247 sub start_foilgroup {
|
Line 290 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; |
|
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') { |
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') { |
Line 263 sub end_foilgroup {
|
Line 310 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); |
|
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') { |
|
&Apache::lonhomework::set_bubble_lines(); |
|
} |
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
Line 287 sub displayanswers {
|
Line 351 sub displayanswers {
|
$randomize, |
$randomize, |
&Apache::response::showallfoils(), |
&Apache::response::showallfoils(), |
\%Apache::response::foilgroup); |
\%Apache::response::foilgroup); |
my $result=&Apache::response::answer_header('matchresponse'); |
|
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; |
} |
} |
|
|
Line 312 sub grade_response {
|
Line 388 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 (defined(%{ $Apache::response::itemgroup{'letter_name_map'} })) { |
Line 319 sub grade_response {
|
Line 396 sub grade_response {
|
%{ $Apache::response::itemgroup{'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 335 sub grade_response {
|
Line 448 sub grade_response {
|
} else { |
} else { |
$ignored++; |
$ignored++; |
} |
} |
$temp++; |
|
} |
} |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
|
my $nonlenient=&Apache::optionresponse::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 350 sub grade_response {
|
Line 463 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 'survey') { |
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$Apache::lonhomework::results{"resource.$part.$id.foilorder"} = &Apache::lonnet::array2str(@whichfoils); |
|
} |
|
if (($Apache::lonhomework::type eq 'survey') || |
|
($Apache::lonhomework::type eq 'surveycred') || |
|
($Apache::lonhomework::type eq 'anonsurvey') || |
|
($Apache::lonhomework::type eq 'anonsurveycred')) { |
if ($ignored == 0) { |
if ($ignored == 0) { |
my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; |
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); |
&Apache::response::handle_previous(\%previous,$ad); |
} elsif ($wrong==0 && $right==0) { |
} elsif ($wrong==0 && $right==0) { |
} else { |
} else { |
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); |
|
} |
|
} |
|
|
|
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 401 sub itemdisplay {
|
Line 550 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)=&Apache::response::whichorder(&getfoilcounts($max), |
my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max), |
Line 429 sub displayfoils {
|
Line 581 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 { |
Line 437 sub displayfoils {
|
Line 589 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=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
my ($lastresponse,$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 ((($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"}; |
|
} |
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 450 sub displayfoils {
|
Line 620 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=\"selected\">$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' && $Apache::lonhomework::type ne 'exam') { |
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') { |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
$question.="<br />\n".$optionlist.$text; |
$question.="<br />\n".$optionlist.$text; |
Line 478 sub displayfoils {
|
Line 687 sub displayfoils {
|
$question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter); |
$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<=$#used_letters;$i++) {push @emptyItems, ' ';} |
for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';} |
$question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut '; |
$question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}' |
$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')) { |
|
$max_width = $righttabsize; |
|
} |
|
$question .= '\vskip -4 mm' . &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems,'',$max_width,$numrows,$bubbles_per_row,$internal_counter); |
|
$question .= '\end{list} \vskip -8 mm \strut '; |
|
$internal_counter += $numrows; |
} else { |
} else { |
$question.=' '.$optionlist.$text.'\strut\\\\\strut '."\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 502 sub displayfoils {
|
Line 739 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$question. |
$result='<table><tr><td valign="top">'.$question. |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
'</td><td valign="top">'.$result.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
|
my ($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); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' 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}'; |
$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}'; |
Line 524 sub displayfoils {
|
Line 750 sub displayfoils {
|
$result='<table><tr><td valign="top">'.$result. |
$result='<table><tr><td valign="top">'.$result. |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
'</td><td valign="top">'.$question.'</td></tr></table>'; |
} else { |
} else { |
my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'}); |
|
my ($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); |
|
} |
|
$lefttabsize.=' mm '; |
$lefttabsize.=' mm '; |
$righttabsize.=' 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}'; |
$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') { |
|
my $questiontype; |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$questiontype = $Apache::lonhomework::type; |
|
} |
|
&Apache::response::setup_prior_tries_hash(\&format_prior_answer, |
|
[\@whichfoils, |
|
'submissiongrading', |
|
'submissionitems'], |
|
$questiontype); |
|
} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';} |
return $result; |
return $result; |
} |
} |
Line 647 sub end_foil {
|
Line 873 sub end_foil {
|
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
&Apache::lonxml::debug("Got a name of :$name:"); |
&Apache::lonxml::debug("Got a name of :$name:"); |
if (!$name) { |
if (!$name) { |
&Apache::lonxml::error("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; |
$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})) { |
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}++; |
$Apache::response::foilnames{$name}++; |
my $location =&Apache::lonxml::get_param('location',$parstack, |
my $location =&Apache::lonxml::get_param('location',$parstack, |
$safeeval); |
$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; |
$Apache::response::conceptgroup{"$name.text"} = $text; |
$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; |
$Apache::response::foilgroup{"$name.text"} = $text; |
$Apache::response::foilgroup{"$name.text"} = $text; |
Line 684 sub insert_foil {
|
Line 912 sub insert_foil {
|
<endouttext /> |
<endouttext /> |
</foil>'; |
</foil>'; |
} |
} |
|
|
1; |
1; |
__END__ |
__END__ |