--- loncom/homework/radiobuttonresponse.pm 2002/10/14 20:33:57 1.55 +++ loncom/homework/radiobuttonresponse.pm 2002/10/28 14:28:04 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.55 2002/10/14 20:33:57 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.59 2002/10/28 14:28:04 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,6 +42,7 @@ sub start_radiobuttonresponse { &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); push (@Apache::lonxml::namespace,'radiobuttonresponse'); my $id = &Apache::response::start_response($parstack,$safeeval); + %Apache::hint::radiobutton=(); if ($target eq 'meta') { $result=&Apache::response::meta_package_write('radiobuttonresponse'); } elsif ($target eq 'edit' ) { @@ -79,10 +80,16 @@ sub end_radiobuttonresponse { %Apache::response::foilgroup=(); sub start_foilgroup { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; %Apache::response::foilgroup=(); $Apache::radiobuttonresponse::conceptgroup=0; &Apache::response::setrandomnumber(); - return ''; + if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { + $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; + &Apache::lonxml::increment_counter(); + } + return $result; } sub storesurvey { @@ -360,6 +367,8 @@ sub displayfoils { } } } else { + my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'); + my $i = 0; my $temp=0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; @@ -374,11 +383,11 @@ sub displayfoils { $result .= '
A:   CorrectB:   Incorrect
'; } } else { - $result .= '\item '.$Apache::response::foilgroup{$name.'.text'}; if ($Apache::lonhomework::type eq 'exam') { - $result.= '\vskip 2 mm \noindent \begin{tabular}{|lr|lr|}\hline '; - $result.= 'A: & Correct & B: & Incorrect'; - $result.='\\\\\hline\end{tabular}\vskip 0 mm '; + $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs + $i++; + } else { + $result .= '\vspace*{-2 mm}\item '.$Apache::response::foilgroup{$name.'.text'}; } } $temp++; @@ -433,6 +442,10 @@ sub end_conceptgroup { my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval); $Apache::response::foilgroup{"$name.concept"} = $concept; &Apache::lonxml::debug("Selecting $name in $concept"); + my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]"; + push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept); + $Apache::hint::radiobutton{"$part_id.concept.$concept"}= + $Apache::response::conceptgroup{'names'}; } } elsif ($target eq 'edit') { $result=&Apache::edit::end_table();