version 1.16, 2003/07/16 13:14:12
|
version 1.17.2.2, 2003/10/15 19:49:06
|
Line 121 sub get_correct_order {
|
Line 121 sub get_correct_order {
|
} |
} |
@value_names = |
@value_names = |
sort { |
sort { |
if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] cmp $b->[0]);} |
if (abs($a->[0] - $b->[0]) > $tol) {return ($a->[0] <=> $b->[0]);} |
return 0; |
return 0; |
} @value_names; |
} @value_names; |
my @value_names_tmp=@value_names; |
my @value_names_tmp=@value_names; |
Line 187 sub grade_response {
|
Line 187 sub grade_response {
|
my ($temp,$right,$wrong,$ignored)=(0,0,0,0); |
my ($temp,$right,$wrong,$ignored)=(0,0,0,0); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1'].":$temp"}; |
my $response = &Apache::response::getresponse($temp); |
$responsehash{$name}=$response; |
$responsehash{$name}=$response; |
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
if ( $response =~ /[^\s]/) { |
if ( $response =~ /[^\s]/) { |
Line 241 sub displayfoils {
|
Line 241 sub displayfoils {
|
my $status=$Apache::inputtags::status[-1]; |
my $status=$Apache::inputtags::status[-1]; |
my @whichopt=(1..($#whichfoils+1)); |
my @whichopt=(1..($#whichfoils+1)); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
my @correctorder=&get_correct_order($tol,@whichfoils); |
if (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) { |
if ( &Apache::response::show_answer() ) { |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
my $value=shift(@correctorder); |
my $value=shift(@correctorder); |
Line 283 sub displayfoils {
|
Line 283 sub displayfoils {
|
$result.='<br />'.$text."\n"; |
$result.='<br />'.$text."\n"; |
} |
} |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&Apache::optionresponse::webbubbles(\@alp,\@whichopt,$temp); |
my @values=(1..scalar(@whichopt)); |
|
$result.=&Apache::optionresponse::webbubbles(\@values,\@whichopt,$temp,$lastopt); |
} |
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |