version 1.58, 2002/11/07 16:45:55
|
version 1.61, 2002/11/11 20:13:47
|
Line 327 sub displayfoils {
|
Line 327 sub displayfoils {
|
$result.='\vskip 0 mm '; |
$result.='\vskip 0 mm '; |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result .=$Apache::response::foilgroup{$name.'.value'}. |
my $text=$Apache::response::foilgroup{$name.'.text'}; |
":".$Apache::response::foilgroup{$name.'.text'}."\n"; |
my $value=$Apache::response::foilgroup{$name.'.value'}; |
|
if (!($text=~s|<drawoptionlist\s*/>|$value|)) { |
|
$text=$value.': '.$text; |
|
} |
|
$result.=$text."\n"; |
} else { |
} else { |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//; |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item//; |
$result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. |
$result .='\item \textit{'.$Apache::response::foilgroup{$name.'.value'}.'}'. |
Line 358 sub displayfoils {
|
Line 362 sub displayfoils {
|
} |
} |
} |
} |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">" |
$optionlist='<select name="HWVAL_'. |
.$optionlist |
$Apache::inputtags::response['-1'].':'.$temp.'">'. |
."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n"; |
$optionlist."</select>\n"; |
|
my $text=$Apache::response::foilgroup{$name.'.text'}; |
|
if (!($text=~s|<drawoptionlist\s*/>|$optionlist|)) { |
|
$text=$optionlist.$text; |
|
} |
|
$result.="<br />".$text."\n"; |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.=&webbubbles(\@opt,\@alphabet); |
$result.=&webbubbles(\@opt,\@alphabet); |
} |
} |
$temp++; |
$temp++; |
} else { |
} else { |
|
my $texoptionlist = &optionlist_correction($optionlist); |
if ($displayoptionintex == 0) { |
if ($displayoptionintex == 0) { |
my $texoptionlist = &optionlist_correction($optionlist); |
if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} #if exam we do not need to show optionlist |
if ($Apache::lonhomework::type eq 'exam') {$texoptionlist='';} |
|
if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { |
if ($Apache::response::foilgroup{$name.'.text'}=~m/\\item /) { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; |
} |
} |
$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; |
if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) { |
|
$Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; |
|
$result.= $texoptionlist.$Apache::response::foilgroup{$name.'.text'}; |
|
} |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |
$result.= $texoptionlist.'\vspace*{-2 mm}\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |
Line 390 sub displayfoils {
|
Line 402 sub displayfoils {
|
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; |
$Apache::response::foilgroup{$name.'.text'}=~s/\\item/\\item[\\textbf{$Apache::lonxml::counter}\.]/; |
} |
} |
$result.= $Apache::response::foilgroup{$name.'.text'}; |
if ($Apache::response::foilgroup{$name.'.text'}=~/<drawoptionlist\s*\/>/) { |
|
$Apache::response::foilgroup{$name.'.text'}=~s|<drawoptionlist\s*/>| \\makebox\[0\.3in\]\[b\]\{\\hrulefill\} |; |
|
} |
|
$result.= $Apache::response::foilgroup{$name.'.text'}; |
} else { |
} else { |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
$result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |
$result.= '\item[\textbf{'.$Apache::lonxml::counter.'}.]'.$Apache::response::foilgroup{$name.'.text'}; |