version 1.229, 2011/11/29 17:43:30
|
version 1.231, 2012/10/12 12:45:46
|
Line 1136 sub whichorder {
|
Line 1136 sub whichorder {
|
my ($max,$randomize,$showall,$hash,$rndseed)=@_; |
my ($max,$randomize,$showall,$hash,$rndseed)=@_; |
#&Apache::lonxml::debug("man $max randomize $randomize"); |
#&Apache::lonxml::debug("man $max randomize $randomize"); |
if (!defined(@{ $$hash{'names'} })) { return; } |
if (!defined(@{ $$hash{'names'} })) { return; } |
my @names = @{ $$hash{'names'} }; |
my @names; |
|
if (ref($hash->{'names'}) eq 'ARRAY') { |
|
@names = @{$hash->{'names'}}; |
|
} |
|
return if (!@names); |
my @whichopt =(); |
my @whichopt =(); |
my (%top,@toplist,%bottom,@bottomlist); |
my (%top,@toplist,%bottom,@bottomlist); |
if (!($showall || ($randomize eq 'no'))) { |
if (!($showall || ($randomize eq 'no'))) { |
Line 1189 sub show_answer {
|
Line 1193 sub show_answer {
|
my $status = $Apache::inputtags::status[-1]; |
my $status = $Apache::inputtags::status[-1]; |
my $canshow = 0; |
my $canshow = 0; |
if ($award =~ /^correct/) { |
if ($award =~ /^correct/) { |
if ((&Apache::inputtags::grading_is_nonlenient($part)) || |
if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) || |
($Apache::lonhomework::history{"resource.$part.awarded"} == 1)) { |
(&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) { |
$canshow = 1; |
$canshow = 1; |
} |
} |
} |
} |
Line 1223 sub check_if_computed {
|
Line 1227 sub check_if_computed {
|
|
|
sub pick_foil_for_concept { |
sub pick_foil_for_concept { |
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_; |
my ($target,$attrs,$hinthash,$parstack,$safeeval)=@_; |
if (not defined(@{ $Apache::response::conceptgroup{'names'} })) { return; } |
my @names; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
if (ref($Apache::response::conceptgroup{'names'}) eq 'ARRAY') { |
|
@names = @{ $Apache::response::conceptgroup{'names'} }; |
|
} |
|
return if (!@names); |
my $pick=int(&Math::Random::random_uniform() * ($#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; |