--- loncom/homework/radiobuttonresponse.pm 2010/02/28 23:42:24 1.144 +++ loncom/homework/radiobuttonresponse.pm 2010/12/19 04:24:29 1.147 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.144 2010/02/28 23:42:24 raeburn Exp $ +# $Id: radiobuttonresponse.pm,v 1.147 2010/12/19 04:24:29 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -105,8 +105,7 @@ sub start_radiobuttonresponse { $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; } if($env{'form.pdfFormFields'} eq 'yes' && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { - $result .= &Apache::lonxml::print_pdf_hiddenfield('meta', $env{'user.name'}, $env{'user.domain'}); - $result .= "\n\\\\\n\\\\\n"; + $result .= '\begin{itemize}'; } else { $result .= '\begin{enumerate}'; } @@ -122,8 +121,12 @@ sub end_radiobuttonresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'edit') { $result=&Apache::edit::end_table(); } - if ($target eq 'tex' and ($env{'form.pdfFormFields'} ne 'yes' or $Apache::inputtags::status[-1] ne 'CAN_ANSWER')) { - $result .= '\end{enumerate}'; + if ($target eq 'tex' ) { + if($env{'form.pdfFormFields'} eq 'yes' and $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { + $result .= '\end{itemize}'; + } else { + $result .= '\end{enumerate}'; + } } &Apache::response::end_response; pop @Apache::lonxml::namespace; @@ -138,7 +141,7 @@ sub start_foilgroup { my $result; %Apache::response::foilgroup=(); $Apache::radiobuttonresponse::conceptgroup=0; - &Apache::response::pushrandomnumber(); + &Apache::response::pushrandomnumber(undef,$target); if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; } @@ -164,7 +167,7 @@ sub storesurvey { if ($style eq 'anonsurvey') { $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS'; } elsif ($style eq 'anonsurveycred') { - $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CRED'; + $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT'; } elsif ($style eq 'surveycred') { $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; } else { @@ -334,13 +337,24 @@ sub displayallfoils { my $id=$Apache::inputtags::response['-1']; my $part=$Apache::inputtags::part; my $lastresponse; - unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) { + my ($lastresponse,$newvariation,$showanswer); + if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') || + ($Apache::lonhomework::type eq 'randomizetry')) && + ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { + if ($env{'form.'.$part.'.rndseed'} ne + $Apache::lonhomework::history{"resource.$part.rndseed"}) { + $newvariation = 1; + } + } + $showanswer = &Apache::response::show_answer(); + unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'})) || + ($newvariation && !$showanswer)) { $lastresponse = $Apache::lonhomework::history{"resource.$part.$id.submission"}; } if ($direction eq 'horizontal') { $result.='