[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 26 Sep 2002 21:41:30 -0000
This is a MIME encoded message
--albertel1033076490
Content-Type: text/plain
albertel Thu Sep 26 17:41:30 2002 EDT
Modified files:
/loncom/homework optionresponse.pm
Log:
- supports all of the randomization that rbr does BUG#542
--albertel1033076490
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20020926174130.txt"
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.47 loncom/homework/optionresponse.pm:1.48
--- loncom/homework/optionresponse.pm:1.47 Thu Sep 26 16:45:00 2002
+++ loncom/homework/optionresponse.pm Thu Sep 26 17:41:30 2002
@@ -1,7 +1,7 @@
# LearningOnline Network with CAPA
# option list style responses
#
-# $Id: optionresponse.pm,v 1.47 2002/09/26 20:45:00 albertel Exp $
+# $Id: optionresponse.pm,v 1.48 2002/09/26 21:41:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,12 +50,14 @@
&Apache::edit::end_row().
&Apache::edit::start_spanning_row().
"\n";
- $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').
- &Apache::edit::end_row().
- &Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Max Number Of Shown Foils:','max',
+ $token,'4').
+ &Apache::edit::select_arg('Randomize Foil Order','randomize',
+ ['yes','no'],$token).
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'max');
+ $safeeval,'max','randomize');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
} elsif ($target eq 'meta') {
$result=&Apache::response::meta_package_write('optionresponse');
@@ -150,16 +152,16 @@
my $result;
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
my $name;
- my ($count,$max) = &getfoilcounts($parstack,$safeeval);
- if ($count>$max) { $count=$max }
- &Apache::lonxml::debug("Count is $count from $max");
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
&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') {
- $result.=&displayfoils($target,$count,@opt);
+ $result.=&displayfoils($target,$max,$randomize,@opt);
} elsif ( $target eq 'answer') {
- $result.=&displayanswers($count,@opt);
+ $result.=&displayanswers($max,$randomize,@opt);
} elsif ( $target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
@@ -171,10 +173,10 @@
$Apache::response::foilgroup{"$name.text"};
}
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') {
if ( defined $ENV{'form.submitted'}) {
- my @whichopt = &whichfoils($count);
+ my @whichopt = &whichfoils($max,$randomize);
my $temp=1;my $name;
my %responsehash;
my $right=0;
@@ -225,22 +227,38 @@
}
sub getfoilcounts {
- my ($parstack,$safeeval)=@_;
- my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+ my ($max)=@_;
# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
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 {
- my ($max)=@_;
+ my ($max,$randomize)=@_;
+ $max = &getfoilcounts($max);
+ &Apache::lonxml::debug("randomize $randomize");
my @names = @{ $Apache::response::foilgroup{'names'} };
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)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
my $aopt;
- if (&Apache::response::showallfoils()) {
+ if (&Apache::response::showallfoils() || ($randomize eq 'no')) {
$aopt=0;
} else {
$aopt=int(&Math::Random::random_uniform() * ($#names+1));
@@ -248,15 +266,28 @@
&Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);
&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;
}
sub displayanswers {
- my ($max,@opt)=@_;
+ my ($max,$randomize,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
- my @whichopt = &whichfoils($max);
+ my @whichopt = &whichfoils($max,$randomize);
my $result=&Apache::response::answer_header('optionresponse');
foreach my $name (@whichopt) {
$result.=&Apache::response::answer_part('optionresponse',
@@ -267,14 +298,14 @@
}
sub displayfoils {
- my ($target,$max,@opt)=@_;
+ my ($target,$max,$randomize,@opt)=@_;
my @names = @{ $Apache::response::foilgroup{'names'} };
my @truelist;
my @falselist;
my $result;
my $name;
my $displayoptionintex=0;
- my @whichopt = &whichfoils($max);
+ my @whichopt = &whichfoils($max,$randomize);
my $part=$Apache::inputtags::part;
my $id=$Apache::inputtags::response[-1];
if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) {
@@ -380,6 +411,8 @@
$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");
@@ -396,6 +429,8 @@
$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"};
}
}
}
@@ -422,10 +457,18 @@
my @opt;
eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
$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();
} 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); }
}
return $result;
@@ -436,13 +479,15 @@
my $text ='';
my $result = '';
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'
|| $target eq 'tex' || $target eq 'analyze') {
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {
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:");
if (!$name) { $name=$Apache::lonxml::curdepth; }
&Apache::lonxml::debug("Using a name of :$name:");
@@ -451,14 +496,12 @@
push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;
$Apache::response::conceptgroup{"$name.text"} = $text;
+ $Apache::response::conceptgroup{"$name.location"} = $location;
} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;
- if ($target eq 'tex') {
- $Apache::response::foilgroup{"$name.text"} = '\item '.$text;
- } else {
- $Apache::response::foilgroup{"$name.value"} = $value;
- $Apache::response::foilgroup{"$name.text"} = $text;
- }
+ $Apache::response::foilgroup{"$name.value"} = $value;
+ $Apache::response::foilgroup{"$name.text"} = $text;
+ $Apache::response::foilgroup{"$name.location"} = $location;
}
}
}
--albertel1033076490--