--- loncom/homework/optionresponse.pm 2002/01/11 16:32:29 1.30 +++ loncom/homework/optionresponse.pm 2002/01/18 16:37:05 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.30 2002/01/11 16:32:29 matthew Exp $ +# $Id: optionresponse.pm,v 1.32 2002/01/18 16:37:05 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,11 +26,12 @@ # http://www.lon-capa.org/ # # 2/21 Guy +# 01/18 Alex package Apache::optionresponse; use strict; use Apache::response; -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::optionresponse',('optionresponse')); } @@ -61,6 +62,7 @@ sub start_optionresponse { if ($target eq 'meta') { $result=&Apache::response::meta_package_write('optionresponse'); } +# if ($target eq 'tex') {$result .= '\begin{itemize}';} return $result; } @@ -71,6 +73,7 @@ sub end_optionresponse { &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup')); my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } +# if ($target eq 'tex') {$result .= '\end{itemize}';} return $result; } @@ -136,6 +139,7 @@ ENDTABLE $result.=')">'; } # else nothing changed so just use the default mechanism } + if ($target eq 'tex') {$result .= '\begin{itemize}';} return $result; } @@ -143,7 +147,7 @@ sub end_foilgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { my $name; my ($count,$max) = &getfoilcounts($parstack,$safeeval); if ($count>$max) { $count=$max } @@ -151,8 +155,8 @@ sub end_foilgroup { my @opt; eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval); &Apache::lonxml::debug("Options are $#opt"); - if ($target eq 'web') { - $result.=&displayfoils($count,@opt); + if ($target eq 'web' || $target eq 'tex') { + $result.=&displayfoils($target,$count,@opt); } elsif ( $target eq 'answer') { $result.=&displayanswers($count,@opt); } elsif ( $target eq 'grade') { @@ -198,7 +202,8 @@ sub end_foilgroup { } } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table(); - } + } + if ($target eq 'tex') {$result .= '\end{itemize}';} return $result; } @@ -239,19 +244,25 @@ sub displayanswers { } sub displayfoils { - my ($max,@opt)=@_; + my ($target,$max,@opt)=@_; my @names = @{ $Apache::response::foilgroup{'names'} }; my @truelist; my @falselist; my $result; my $name; + $Apache::optionresponse::displayoptionintex=0; my @whichopt = &whichfoils($max); my $part=$Apache::inputtags::part; my $id=$Apache::inputtags::response[-1]; if (($Apache::lonhomework::history{"resource.$part.solved"} =~ /^correct/) || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { foreach $name (@whichopt) { - $result.="<br />".$Apache::response::foilgroup{$name.'.value'}. - ":".$Apache::response::foilgroup{$name.'.text'}."\n"; + if ($target eq 'web') { + $result.="<br />"; + } elsif ($target eq 'tex') { + $result.='\newline'; + } + $result .=$Apache::response::foilgroup{$name.'.value'}. + ":".$Apache::response::foilgroup{$name.'.text'}."\n"; } } else { my $temp=1; @@ -267,13 +278,32 @@ sub displayfoils { $optionlist.="<option>$option</option>\n"; } } - $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">" - .$optionlist - ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n"; - $temp++; + if ($target ne 'tex') { + $result.="<br /><select name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\">" + .$optionlist + ."</select>\n".$Apache::response::foilgroup{$name.'.text'}."\n"; + $temp++; + } else { + if ($Apache::optionresponse::displayoptionintex == 0) { + my $durtyoptionlist = $optionlist; + $durtyoptionlist =~ s/<option><\/option>/\\item \[\] The possible answers are:/; + $durtyoptionlist =~ s/<option>/{\\bf /g; + $durtyoptionlist =~ s/<\/option>/},/g; + $durtyoptionlist =~ s/,$/\./g; + $result.= $durtyoptionlist.$Apache::response::foilgroup{$name.'.text'}; + $Apache::optionresponse::displayoptionintex=1; + } else { + $result.= $Apache::response::foilgroup{$name.'.text'}; + } + } } + } + if ($target ne 'tex') { + return $result."<br />"; + } + else { + return $result; } - return $result."<br />"; } @@ -298,7 +328,8 @@ sub end_conceptgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; $Apache::optionresponse::conceptgroup=0; my $result=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' + || $target eq 'tex') { #if not there aren't any foils to display and thus no question if (defined(@{ $Apache::response::conceptgroup{'names'} })) { my @names = @{ $Apache::response::conceptgroup{'names'} }; @@ -326,7 +357,7 @@ sub insert_conceptgroup { sub start_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token,"Foil"); @@ -340,7 +371,8 @@ sub start_foil { } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } - } + } + if ($target eq 'tex') {$result .= '\item ';} return $result; } @@ -348,8 +380,11 @@ sub end_foil { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $text =''; my $result = ''; - if ($target eq 'web') { $text=&Apache::lonxml::endredirection; } - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + if ($target eq 'web' || $target eq 'tex') { + $text=&Apache::lonxml::endredirection; + } + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' + || $target eq 'tex') { my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval); if ($value ne 'unused') { my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);