--- loncom/homework/radiobuttonresponse.pm 2002/09/26 21:45:53 1.53 +++ loncom/homework/radiobuttonresponse.pm 2003/04/18 17:10:08 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.53 2002/09/26 21:45:53 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.70 2003/04/18 17:10:08 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' ) { @@ -61,6 +62,16 @@ sub start_radiobuttonresponse { $safeeval,'max','randomize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } elsif ($target eq 'tex') { + my $type=&Apache::lonxml::get_param('TeXtype',$parstack,$safeeval,undef,0); + if ($type eq '1') { + $result .= ' \renewcommand{\labelenumi}{\arabic{enumi}.}'; + } elsif ($type eq 'A') { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; + } elsif ($type eq 'a') { + $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}'; + } elsif ($type eq 'i') { + $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}'; + } $result .= '\begin{enumerate}'; } return $result; @@ -79,15 +90,20 @@ 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.'}.]'; + } + return $result; } sub storesurvey { if ( !defined($ENV{'form.submitted'})) { return ''; } - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']}; &Apache::lonxml::debug("Here I am!:$response:"); if ( $response !~ /[0-9]+/) { return ''; } my $id = $Apache::inputtags::response['-1']; @@ -102,12 +118,18 @@ sub storesurvey { sub grade_response { my ($max,$randomize)=@_; + #keep the random numbers the same must always call this + my ($answer,@whichfoils)=&whichfoils($max,$randomize); if (!defined($ENV{'form.submitted'})) { return; } - my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']}; + my $response; + if ($ENV{'form.submitted'} eq 'scantron') { + $response=&Apache::response::getresponse(); + } else { + $response = $ENV{'form.HWVAL_'.$Apache::inputtags::response['-1']}; + } if ( $response !~ /[0-9]+/) { return; } my $part=$Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; - my ($answer,@whichfoils)=&whichfoils($max,$randomize); my %responsehash; $responsehash{$whichfoils[$response]}=$response; my $responsestr=&Apache::lonnet::hash2str(%responsehash); @@ -152,6 +174,7 @@ sub end_foilgroup { } } } + &Apache::lonxml::increment_counter(); return $result; } @@ -198,7 +221,7 @@ sub displayallfoils { } else { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - $result.="
\n"; $temp++; @@ -270,12 +293,11 @@ sub whichfoils { #pick a true statement my $whichtrue = int(&Math::Random::random_uniform() * ($#truelist+1)); &Apache::lonxml::debug("Max is $max, From $#truelist elms, picking $whichtrue"); - my $numinserted; my (@toplist, @bottomlist); my $topcount=0; # assign everyone to either toplist/bottomlist or whichfalse # which false is randomized, toplist bottomlist are in order - while ((($numinserted) < $max-1) && ($#falselist > -1)) { + while ((($#whichfalse) < $max-2) && ($#falselist > -1)) { &Apache::lonxml::debug("Have $#whichfalse max is $max"); my $afalse=int(&Math::Random::random_uniform() * ($#falselist+1)); &Apache::lonxml::debug("From $#falselist elms, picking $afalse"); @@ -337,15 +359,19 @@ sub displayfoils { my $result; my ($answer,@whichfoils)=&whichfoils($max,$randomize); - if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ || ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER')) { + my $part=$Apache::inputtags::part; + my $solved=$Apache::lonhomework::history{"resource.$part.solved"}; + my $status=$Apache::inputtags::status[-1]; + if ( ($target ne 'tex') && + (($solved =~ /^correct/) || ($status eq 'SHOW_ANSWER')) ) { foreach my $name (@whichfoils) { if ($target ne 'tex') { $result.="
"; } else { - $result.='\vskip 0 mm \item '; + $result.='\item \vskip -2 mm '; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: ';} + if ($target ne 'tex') { $result.='Correct:'; } else { $result.='Correct: \textbf{';} } else { $result.='Incorrect:'; } @@ -355,22 +381,29 @@ sub displayfoils { $result.=$Apache::response::foilgroup{$name.'.text'}; } if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - if ($target ne 'tex') { $result.='';} + if ($target ne 'tex') { $result.='';} else {$result.='}';} } } } else { - my $temp=0; + my @alphabet = ('A'..'Z'); + my $i = 0; + my $temp=0; my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"}; my %lastresponse=&Apache::lonnet::str2hash($lastresponse); foreach my $name (@whichfoils) { if ($target ne 'tex') { - $result.="
\n"; } else { - $result .= '\item '.$Apache::response::foilgroup{$name.'.text'}; + if ($Apache::lonhomework::type eq 'exam') { + $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++; } @@ -424,6 +457,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();