version 1.89, 2004/05/27 04:25:13
|
version 1.90, 2004/08/24 23:32:13
|
Line 181 sub end_foilgroup {
|
Line 181 sub end_foilgroup {
|
'-2'); |
'-2'); |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
my $randomize = &Apache::lonxml::get_param('randomize',$parstack, |
$safeeval,'-2'); |
$safeeval,'-2'); |
|
my $direction = &Apache::lonxml::get_param('direction',$parstack, |
|
$safeeval,'-2'); |
|
&Apache::lonxml::debug("direction is $direction"); |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
$result=&displayfoils($target,$max,$randomize); |
$result=&displayfoils($target,$max,$randomize,$direction); |
} elsif ($target eq 'answer' ) { |
} elsif ($target eq 'answer' ) { |
$result=&displayanswers($max,$randomize); |
$result=&displayanswers($max,$randomize); |
} elsif ( $target eq 'grade') { |
} elsif ( $target eq 'grade') { |
Line 390 sub whichfoils {
|
Line 393 sub whichfoils {
|
} |
} |
|
|
sub displayfoils { |
sub displayfoils { |
my ($target,$max,$randomize)=@_; |
my ($target,$max,$randomize,$direction)=@_; |
my $result; |
my $result; |
|
|
my ($answer,@whichfoils)=&whichfoils($max,$randomize); |
my ($answer,@whichfoils)=&whichfoils($max,$randomize); |
Line 398 sub displayfoils {
|
Line 401 sub displayfoils {
|
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; |
if ( ($target ne 'tex') && |
if ( ($target ne 'tex') && |
&Apache::response::show_answer() ) { |
&Apache::response::show_answer() ) { |
|
if ($direction eq 'horizontal') { |
|
if ($target ne 'tex') { |
|
$result.='<table><tr>'; |
|
} |
|
} |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
|
if ($direction eq 'horizontal') { |
|
if ($target ne 'tex') { $result.='<td>'; } |
|
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result.="<br />"; |
$result.="<br />"; |
} else { |
} else { |
Line 409 sub displayfoils {
|
Line 420 sub displayfoils {
|
} else { |
} else { |
$result.='Incorrect:'; |
$result.='Incorrect:'; |
} |
} |
if ($target ne 'tex') { |
$result.=$Apache::response::foilgroup{$name.'.text'}; |
$result.=$Apache::response::foilgroup{$name.'.text'}."</input>\n"; |
if ($target eq 'web') { $result.="</input>\n"; } |
} else { |
|
$result.=$Apache::response::foilgroup{$name.'.text'}; |
|
} |
|
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { |
if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { |
if ($target ne 'tex') { $result.='</b>';} else {$result.='}';} |
if ($target ne 'tex') { $result.='</b>';} else {$result.='}';} |
} |
} |
|
if ($direction eq 'horizontal') { |
|
if ($target ne 'tex') { $result.='</td>'; } |
|
} |
|
} |
|
if ($direction eq 'horizontal') { |
|
if ($target ne 'tex') { |
|
$result.='</tr></table>'; |
|
} |
} |
} |
} else { |
} else { |
my @alphabet = ('A'..'Z'); |
my @alphabet = ('A'..'Z'); |
Line 426 sub displayfoils {
|
Line 442 sub displayfoils {
|
my $part=$Apache::inputtags::part; |
my $part=$Apache::inputtags::part; |
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
my %lastresponse=&Apache::lonnet::str2hash($lastresponse); |
|
if ($target ne 'tex' && $direction eq 'horizontal') { |
|
$result.="<table><tr>"; |
|
} |
foreach my $name (@whichfoils) { |
foreach my $name (@whichfoils) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
if ($direction eq 'horizontal') { |
|
$result.="<td>"; |
|
} else { |
|
$result.="<br />"; |
|
} |
|
} |
|
if ($target ne 'tex') { |
|
$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" "; |
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
if (defined($lastresponse{$name})) { $result .= 'checked="on"'; } |
$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n"; |
$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>\n"; |
} else { |
} else { |
Line 439 sub displayfoils {
|
Line 465 sub displayfoils {
|
$result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; |
$result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; |
} |
} |
} |
} |
|
if ($target ne 'tex' && $direction eq 'horizontal') { |
|
$result.="</td>"; |
|
} |
$temp++; |
$temp++; |
} |
} |
|
if ($target ne 'tex' && $direction eq 'horizontal') { |
|
$result.="</tr></table>"; |
|
} |
} |
} |
if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; } |
if ($target ne 'tex') { $result.="<br />"; } else { $result.='\vskip 0 mm '; } |
return $result; |
return $result; |