version 1.140, 2007/04/05 10:29:58
|
version 1.147, 2007/10/15 09:47:29
|
Line 71 sub start_optionresponse {
|
Line 71 sub start_optionresponse {
|
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$id"; |
my $part_id="$Apache::inputtags::part.$id"; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
|
push (@{ $Apache::lonhomeowrk::analyze{"$part_id.bubble_lines"} }, 1); |
|
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 275 sub end_foilgroup {
|
Line 277 sub end_foilgroup {
|
} |
} |
} |
} |
} |
} |
&Apache::lonxml::increment_counter(&getfoilcounts($max)); |
my $part_id = $Apache::inputtags::part; |
|
my $response_id = $Apache::inputtags::response[-1]; |
|
&Apache::lonxml::increment_counter(&getfoilcounts($max), |
|
"$part_id.$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 355 sub check_for_invalid {
|
Line 364 sub check_for_invalid {
|
} |
} |
} |
} |
|
|
sub setup_prior_tries_hash { |
|
my ($whichopt) = @_; |
|
my $part=$Apache::inputtags::part; |
|
my $id=$Apache::inputtags::response[-1]; |
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
|
my $key = "$i:resource.$part.$id.submission"; |
|
next if (!exists($Apache::lonhomework::history{"$key"})); |
|
my %lastresponse= |
|
&Apache::lonnet::str2hash($Apache::lonhomework::history{$key}); |
|
my $output; |
|
foreach my $name (@$whichopt) { |
|
next if (!defined($lastresponse{$name})); |
|
$output .= '<td>'.$lastresponse{$name}.'</td>'; |
|
} |
|
next if (!defined($output)); |
|
$output = |
|
'<table class="LC_optres_prior"><tr>'.$output.'</tr></table>'; |
|
$Apache::inputtags::submission_display{$key} = $output; |
|
} |
|
} |
|
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize,$TeXlayout,@opt)=@_; |
my ($target,$max,$randomize,$TeXlayout,@opt)=@_; |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;} |
Line 499 sub displayfoils {
|
Line 487 sub displayfoils {
|
} |
} |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
&setup_prior_tries_hash(\@whichopt); |
&Apache::response::setup_prior_tries_hash(\&Apache::rankresponse::format_prior_answer, |
|
[\@whichopt, |
|
'submissiongrading']); |
} |
} |
|
|
if ($target ne 'tex') { |
if ($target ne 'tex') { |
Line 567 sub bubbles {
|
Line 557 sub bubbles {
|
my $number_of_bubbles = $#opt + 1; |
my $number_of_bubbles = $#opt + 1; |
my $current_length = 0; |
my $current_length = 0; |
my $textwidth; |
my $textwidth; |
if ($max_width) { |
if (defined($max_width)) { |
$textwidth=$max_width; |
$textwidth=$max_width; |
&Apache::lonnet::logthis("Max width passed in: $max_width"); |
&Apache::lonxml::debug("Max width passed in: $max_width"); |
} |
} elsif ($env{'form.textwidth'} ne '') { |
elsif ($env{'form.textwidth'} ne '') { |
|
$env{'form.textwidth'}=~/(\d+)/; |
$env{'form.textwidth'}=~/(\d+)/; |
$textwidth=$1; |
$textwidth=$1; |
&Apache::lonnet::logthis("Max width from form: $textwidth"); |
&Apache::lonxml::debug("Max width from form: $textwidth"); |
} else { |
} else { |
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/; |
$env{'form.textwidth'}=~/(\d*)\.?(\d*)/; |
$textwidth=$1.'.'.$2; |
$textwidth=$1.'.'.$2; |
&Apache::lonnet::logthis("Max width defaults? $textwidth"); |
&Apache::lonxml::debug("Max width defaults? $textwidth"); |
} |
} |
&Apache::lonnet::logthis("Final maxwidth: $textwidth"); |
&Apache::lonxml::debug("Final maxwidth: $textwidth"); |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
for (my $ind=0;$ind<=$number_of_bubbles;$ind++) { |
my $leftmargin; |
my $leftmargin; |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
$opt[$ind]=&Apache::lonxml::latex_special_symbols($opt[$ind]); |
Line 725 sub end_foil {
|
Line 714 sub end_foil {
|
|
|
sub start_drawoptionlist { |
sub start_drawoptionlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if (($target ne 'meta') && ($target ne 'answer')) { |
if ($target !~ /^(?:meta|answer|modified|edit)$/) { |
return $token->[4]; |
return $token->[4]; |
} |
} |
} |
} |
|
|
sub end_drawoptionlist { |
sub end_drawoptionlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if (($target ne 'meta') && ($target ne 'answer')) { |
if ($target !~ /^(?:meta|answer|modified|edit)$/) { |
return $token->[2]; |
return $token->[2]; |
} |
} |
} |
} |
|
|
sub insert_foil { |
sub insert_foil { |
return ' |
return ' |
<foil name="" value="unused"> |
<foil name="" value="unused"> |
<startouttext /> |
<startouttext /> |
<endouttext /> |
<endouttext /> |
</foil>'; |
</foil>'; |
} |
} |
|
|
|
sub insert_drawoptionlist { |
|
return '<drawoptionlist />'; |
|
} |
1; |
1; |
__END__ |
__END__ |
|
|