--- loncom/homework/radiobuttonresponse.pm 2012/01/25 12:00:33 1.153.6.7 +++ loncom/homework/radiobuttonresponse.pm 2012/01/30 11:36:55 1.153.6.8 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.153.6.7 2012/01/25 12:00:33 foxr Exp $ +# $Id: radiobuttonresponse.pm,v 1.153.6.8 2012/01/30 11:36:55 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -375,46 +375,25 @@ sub format_prior_answer { } -## -sub displayallfoils{ - my ( $direction, $target ) = @_; - my $result; - &Apache::lonxml::debug("survey style display"); - my @names; - if ( $Apache::response::foilgroup{'names'} ) { - @names = @{ $Apache::response::foilgroup{'names'} }; - } - - # Figure out how to bracket the list of foils for - # the TeX target: - # - - my $begin_environment; - my $end_environment; - - if ($target eq 'tex') { - - # Decide how to bracket the list of foils: - +## +# Return the last survey response. The logic is slightly different than that of +# get_last_responses. TODO: See if there are chunks of code betweenthis and +# get_last_reponses that are common and can be factored. +# +# @param $part - Problem part under consideration. +# @param $showanswer - True if answers should be shown. +# @param $id - Problem id. +# +# @return hash reference. +# @retval reference to the has indexed by answer selection that +# indicates the most recent answer. +# +sub get_last_survey_response { + my ($part, $showanswer, $id) = @_; - if ( $env{'form.pdfFormFields'} eq 'yes' - && $Apache::inputtags::status[-1] eq 'CAN_ANSWER' ) - { - $begin_environment = '\begin{itemize}'; - $end_environment = '\end{itemize}'; - } - else { - $begin_environment = '\begin{enumerate}'; - $end_environment = '\end{enumerate}'; - } - $result .= $begin_environment; - } + my $newvariation; + my $lastresponse; # stringified last response. - my $temp = 0; - my $i = 0; - my $id = $Apache::inputtags::response['-1']; - my $part = $Apache::inputtags::part; - my ( $lastresponse, $newvariation, $showanswer ); if ( ( ( @@ -432,7 +411,6 @@ sub displayallfoils{ $newvariation = 1; } } - $showanswer = &Apache::response::show_answer(); unless ( ( ( @@ -449,122 +427,237 @@ sub displayallfoils{ $lastresponse = $Apache::lonhomework::history{"resource.$part.$id.submission"}; } - if ( $direction eq 'horizontal' && $target ne 'tex') { - $result .= '