version 1.84.2.2, 2003/10/15 19:51:29
|
version 1.96, 2003/11/15 06:28:02
|
Line 25
|
Line 25
|
# |
# |
# http://www.lon-capa.org/ |
# http://www.lon-capa.org/ |
# |
# |
# 2/21 Guy |
|
# 01/18 Alex |
|
package Apache::optionresponse; |
package Apache::optionresponse; |
use strict; |
use strict; |
use Apache::response; |
use Apache::response; |
Line 63 sub start_optionresponse {
|
Line 61 sub start_optionresponse {
|
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('optionresponse'); |
$result=&Apache::response::meta_package_write('optionresponse'); |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
my $part_id="$Apache::inputtags::part.$id"; |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); |
} |
} |
return $result; |
return $result; |
Line 151 sub end_foilgroup {
|
Line 149 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' || $target eq 'analyze') { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval); |
my $tex_option_switch=&Apache::lonxml::get_param('texoptions',$parstack,$safeeval); |
my $name; |
my $name; |
my @opt; |
my @opt; |
Line 166 sub end_foilgroup {
|
Line 165 sub end_foilgroup {
|
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($max,$randomize,@opt); |
$result.=&displayanswers($max,$randomize,@opt); |
} elsif ( $target eq 'analyze') { |
} elsif ( $target eq 'analyze') { |
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
my @shown = &whichfoils($max,$randomize); |
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { |
&Apache::response::analyze_store_foilgroup(\@shown, |
if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; } |
['text','value','location']); |
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name); |
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
$Apache::response::foilgroup{"$name.value"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
|
$Apache::response::foilgroup{"$name.text"}; |
|
} |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize)); |
|
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
if ( defined $ENV{'form.submitted'}) { |
if ( defined $ENV{'form.submitted'}) { |
my @whichopt = &whichfoils($max,$randomize); |
my @whichopt = &whichfoils($max,$randomize); |
Line 191 sub end_foilgroup {
|
Line 184 sub end_foilgroup {
|
if ($ENV{'form.submitted'} eq 'scantron') { |
if ($ENV{'form.submitted'} eq 'scantron') { |
$response = $opt[$response]; |
$response = $opt[$response]; |
} |
} |
$responsehash{$name}=$response; |
|
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
|
$responsehash{$name}=$response; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
&Apache::lonxml::debug("submitted a $response for $value<br />\n"); |
if ($value eq $response) { |
if ($value eq $response) { |
Line 302 sub displayfoils {
|
Line 295 sub displayfoils {
|
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
my $break; |
my $break; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $status=$Apache::inputtags::status[-1]; |
|
if ( ($target ne 'tex') && |
if ( ($target ne 'tex') && |
&Apache::response::show_answer() ) { |
&Apache::response::show_answer() ) { |
my $temp=1; |
my $temp=1; |
Line 326 sub displayfoils {
|
Line 318 sub displayfoils {
|
} else { |
} else { |
$text=$value.': '.$text; |
$text=$value.': '.$text; |
} |
} |
|
} else { |
|
$text='•'.$text; |
} |
} |
$result.=$text."\n"; |
$result.=$text."\n"; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 375 sub displayfoils {
|
Line 369 sub displayfoils {
|
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') { |
if (!($text=~s|<drawoptionlist\s*/>|$optionlist|) && $Apache::lonhomework::type ne 'exam') { |
$text=$optionlist.$text; |
$text=$optionlist.$text; |
|
} else { |
|
$text='•'.$text; |
} |
} |
$result.=$break.$text."\n"; |
$result.=$break.$text."\n"; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 441 sub optionlist_correction {
|
Line 437 sub optionlist_correction {
|
|
|
my $texoptionlist = shift; |
my $texoptionlist = shift; |
if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) { |
if ($texoptionlist=~/<option selected/ or $texoptionlist=~/<option>[^<]+<\/option>/) { |
$texoptionlist =~ s/<option><\/option>/\\item \[\] Choose from: /; |
$texoptionlist =~ s/<option><\/option>/\\item \[\] Choices: /; |
$texoptionlist =~ s/<option>/\{\\bf /g; |
$texoptionlist =~ s/<option>/\{\\bf /g; |
$texoptionlist =~ s/<option selected="on">/\{\\bf /g; |
$texoptionlist =~ s/<option selected="on">/\{\\bf /g; |
$texoptionlist =~ s/<\/option>/\},/g; |
$texoptionlist =~ s/<\/option>/\},/g; |
Line 527 sub end_conceptgroup {
|
Line 523 sub end_conceptgroup {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::optionresponse::conceptgroup=0; |
$Apache::optionresponse::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' || |
|| $target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
#if not there aren't any foils to display and thus no question |
#if not there aren't any foils to display and thus no question |
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::option, |
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 'analyze') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::lonhomework::analyze{"$part_id.concept.$concept"}= |
|
$Apache::response::conceptgroup{'names'}; |
|
foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) { |
|
push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} }, |
|
$name); |
|
$Apache::lonhomework::analyze{"$part_id.foil.value.$name"} = |
|
$Apache::response::conceptgroup{"$name.value"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
|
$Apache::response::conceptgroup{"$name.text"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.location.$name"} = |
|
$Apache::response::conceptgroup{"$name.location"}; |
|
} |
|
} elsif ($target eq 'web') { |
|
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
|
push(@{ $Apache::hint::option{"$part_id.concepts"} }, |
|
$concept); |
|
$Apache::hint::option{"$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 612 sub end_foil {
|
Line 574 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 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; } |
if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') { $text = '\vspace*{-2 mm}\item '.$text; } |
} |
} |
Line 632 sub end_foil {
|
Line 594 sub end_foil {
|
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text; |
$Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text; |
} else { |
} else { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$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 { |
Line 645 sub end_foil {
|
Line 603 sub end_foil {
|
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text; |
} else { |
} else { |
if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{"$name.text"} = $text; |
$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; |
} |
} |