version 1.11, 2003/03/27 16:55:31
|
version 1.14, 2003/06/06 04:26:44
|
Line 104 sub end_foilgroup {
|
Line 104 sub end_foilgroup {
|
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
&grade_response($max,$randomize,$tol); |
&grade_response($max,$randomize,$tol); |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 264 sub displayfoils {
|
Line 266 sub displayfoils {
|
if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";} |
if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";} |
} |
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') { |
$optionlist='<select name="HWVAL_'. |
$optionlist='<select name="HWVAL_'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$Apache::inputtags::response[-1].':'.$temp.'">'. |
$optionlist."</select>\n"; |
$optionlist."</select>\n"; |
Line 273 sub displayfoils {
|
Line 275 sub displayfoils {
|
} |
} |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result.='<br />'.$optionlist.$text."\n"; |
if ($Apache::lonhomework::type ne 'exam') { |
|
$result.='<br />'.$optionlist.$text."\n"; |
|
} else { |
|
$result.='<br />'.$text."\n"; |
|
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt); |
$result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp); |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 304 sub getfoilcounts {
|
Line 310 sub getfoilcounts {
|
|
|
sub whichfoils { |
sub whichfoils { |
my ($max,$randomize)=@_; |
my ($max,$randomize)=@_; |
$max = &getfoilcounts($max); |
return &Apache::response::whichorder($max,$randomize, |
# &Apache::lonxml::debug("man $max randomize $randomize"); |
&Apache::response::showallfoils(), |
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; } |
\%Apache::response::foilgroup); |
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() || ($randomize eq 'no')) { |
|
$aopt=0; |
|
} else { |
|
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
|
} |
|
# &Apache::lonxml::debug("From $#whichopt $max $#names elms, picking $aopt"); |
|
$aopt=splice(@names,$aopt,1); |
|
# &Apache::lonxml::debug("Picked $aopt"); |
|
if ($top{$aopt}) { |
|
$toplist[$top{$aopt}]=$aopt; |
|
} elsif ($bottom{$aopt}) { |
|
$bottomlist[$bottom{$aopt}]=$aopt; |
|
} else { |
|
push (@whichopt,$aopt); |
|
} |
|
} |
|
# &Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist); |
|
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]) } |
|
} |
|
&Apache::lonxml::debug("Grr, ".$#whichopt.":".$#toplist.':'.$#bottomlist); |
|
return @whichopt; |
|
} |
} |
|
|
sub start_conceptgroup { |
sub start_conceptgroup { |