version 1.46, 2002/08/26 18:15:22
|
version 1.48, 2002/09/26 21:41:30
|
Line 50 sub start_optionresponse {
|
Line 50 sub start_optionresponse {
|
&Apache::edit::end_row(). |
&Apache::edit::end_row(). |
&Apache::edit::start_spanning_row(). |
&Apache::edit::start_spanning_row(). |
"\n"; |
"\n"; |
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4'). |
$result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max', |
&Apache::edit::end_row(). |
$token,'4'). |
&Apache::edit::start_spanning_row(); |
&Apache::edit::select_arg('Randomize Foil Order','randomize', |
|
['yes','no'],$token). |
|
&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,'max'); |
$safeeval,'max','randomize'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result=&Apache::response::meta_package_write('optionresponse'); |
$result=&Apache::response::meta_package_write('optionresponse'); |
Line 150 sub end_foilgroup {
|
Line 152 sub end_foilgroup {
|
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 $name; |
my $name; |
my ($count,$max) = &getfoilcounts($parstack,$safeeval); |
|
if ($count>$max) { $count=$max } |
|
&Apache::lonxml::debug("Count is $count from $max"); |
|
my @opt; |
my @opt; |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); |
&Apache::lonxml::debug("Options are $#opt"); |
&Apache::lonxml::debug("Options are $#opt"); |
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
|
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
|
$safeeval,'-2'); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result.=&displayfoils($target,$count,@opt); |
$result.=&displayfoils($target,$max,$randomize,@opt); |
} elsif ( $target eq 'answer') { |
} elsif ( $target eq 'answer') { |
$result.=&displayanswers($count,@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 $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; |
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { |
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) { |
Line 171 sub end_foilgroup {
|
Line 173 sub end_foilgroup {
|
$Apache::response::foilgroup{"$name.text"}; |
$Apache::response::foilgroup{"$name.text"}; |
} |
} |
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt); |
push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($count)); |
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($count); |
my @whichopt = &whichfoils($max,$randomize); |
my $temp=1;my $name; |
my $temp=1;my $name; |
my %responsehash; |
my %responsehash; |
my $right=0; |
my $right=0; |
Line 225 sub end_foilgroup {
|
Line 227 sub end_foilgroup {
|
} |
} |
|
|
sub getfoilcounts { |
sub getfoilcounts { |
my ($parstack,$safeeval)=@_; |
my ($max)=@_; |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
|
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
if (&Apache::response::showallfoils()) { $max=$count; } |
if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
if ($count>$max) { $count=$max } |
|
&Apache::lonxml::debug("Count is $count from $max"); |
|
return $count; |
} |
} |
|
|
sub whichfoils { |
sub whichfoils { |
my ($max)=@_; |
my ($max,$randomize)=@_; |
|
$max = &getfoilcounts($max); |
|
&Apache::lonxml::debug("randomize $randomize"); |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichopt =(); |
my @whichopt =(); |
|
my (%top,@toplist,%bottom,@bottomlist); |
|
if (!(&Apache::response::showallfoils() || ($randomize eq 'no'))) { |
|
my $current=0; |
|
foreach my $name (@names) { |
|
$current++; |
|
if ($Apache::response::foilgroup{$name.'.location'} eq 'top') { |
|
$top{$name}=$current; |
|
} elsif ($Apache::response::foilgroup{$name.'.location'} eq |
|
'bottom') { |
|
$bottom{$name}=$current; |
|
} |
|
} |
|
} |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt; |
my $aopt; |
if (&Apache::response::showallfoils()) { |
if (&Apache::response::showallfoils() || ($randomize eq 'no')) { |
$aopt=0; |
$aopt=0; |
} else { |
} else { |
$aopt=int(rand($#names+1)); |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
} |
} |
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
push (@whichopt,$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; |
return @whichopt; |
} |
} |
|
|
sub displayanswers { |
sub displayanswers { |
my ($max,@opt)=@_; |
my ($max,$randomize,@opt)=@_; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @whichopt = &whichfoils($max); |
my @whichopt = &whichfoils($max,$randomize); |
my $result=&Apache::response::answer_header('optionresponse'); |
my $result=&Apache::response::answer_header('optionresponse'); |
foreach my $name (@whichopt) { |
foreach my $name (@whichopt) { |
$result.=&Apache::response::answer_part('optionresponse', |
$result.=&Apache::response::answer_part('optionresponse', |
Line 267 sub displayanswers {
|
Line 298 sub displayanswers {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,@opt)=@_; |
my ($target,$max,$randomize,@opt)=@_; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @names = @{ $Apache::response::foilgroup{'names'} }; |
my @truelist; |
my @truelist; |
my @falselist; |
my @falselist; |
my $result; |
my $result; |
my $name; |
my $name; |
my $displayoptionintex=0; |
my $displayoptionintex=0; |
my @whichopt = &whichfoils($max); |
my @whichopt = &whichfoils($max,$randomize); |
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $id=$Apache::inputtags::response[-1]; |
my $id=$Apache::inputtags::response[-1]; |
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { |
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { |
Line 373 sub end_conceptgroup {
|
Line 404 sub end_conceptgroup {
|
#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'} })) { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my $pick=int rand $#names+1; |
my $pick=int(&Math::Random::random_uniform() * ($#names+1)); |
my $name=$names[$pick]; |
my $name=$names[$pick]; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
$Apache::response::foilgroup{"$name.value"} = |
$Apache::response::foilgroup{"$name.value"} = |
$Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::foilgroup{"$name.text"} = |
$Apache::response::foilgroup{"$name.text"} = |
$Apache::response::conceptgroup{"$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); |
my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); |
$Apache::response::foilgroup{"$name.concept"} = $concept; |
$Apache::response::foilgroup{"$name.concept"} = $concept; |
&Apache::lonxml::debug("Selecting $name in $concept"); |
&Apache::lonxml::debug("Selecting $name in $concept"); |
Line 396 sub end_conceptgroup {
|
Line 429 sub end_conceptgroup {
|
$Apache::response::conceptgroup{"$name.value"}; |
$Apache::response::conceptgroup{"$name.value"}; |
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
$Apache::lonhomework::analyze{"$part_id.foil.text.$name"} = |
$Apache::response::conceptgroup{"$name.text"}; |
$Apache::response::conceptgroup{"$name.text"}; |
|
$Apache::lonhomework::analyze{"$part_id.foil.location.$name"} = |
|
$Apache::response::conceptgroup{"$name.location"}; |
} |
} |
} |
} |
} |
} |
Line 422 sub start_foil {
|
Line 457 sub start_foil {
|
my @opt; |
my @opt; |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level); |
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.=&Apache::edit::text_arg('Name:','name',$token); |
$result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15'); |
$result.= &Apache::edit::select_or_text_arg('Correct Option:','value', |
|
['unused',(@opt)],$token,'15'); |
|
my $randomize=&Apache::lonxml::get_param('randomize',$parstack, |
|
$safeeval,'-3'); |
|
if ($randomize ne 'no') { |
|
$result.=&Apache::edit::select_arg('Location:','location', |
|
['random','top','bottom'],$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,$safeeval,'value','name'); |
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, |
|
'value','name','location'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return $result; |
return $result; |
Line 436 sub end_foil {
|
Line 479 sub end_foil {
|
my $text =''; |
my $text =''; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$text=&Apache::lonxml::endredirection; |
$text=&Apache::lonxml::endredirection; |
|
if ($target eq 'tex') { $text = '\item '.$text; } |
} |
} |
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') { |
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) { $name=$Apache::lonxml::curdepth; } |
&Apache::lonxml::debug("Using a name of :$name:"); |
&Apache::lonxml::debug("Using a name of :$name:"); |
Line 451 sub end_foil {
|
Line 496 sub end_foil {
|
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; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
push @{ $Apache::response::foilgroup{'names'} }, $name; |
if ($target eq 'tex') { |
$Apache::response::foilgroup{"$name.value"} = $value; |
$Apache::response::foilgroup{"$name.text"} = '\item '.$text; |
$Apache::response::foilgroup{"$name.text"} = $text; |
} else { |
$Apache::response::foilgroup{"$name.location"} = $location; |
$Apache::response::foilgroup{"$name.value"} = $value; |
|
$Apache::response::foilgroup{"$name.text"} = $text; |
|
} |
|
} |
} |
} |
} |
} |
} |