--- loncom/homework/radiobuttonresponse.pm 2010/05/03 14:43:50 1.145 +++ loncom/homework/radiobuttonresponse.pm 2012/02/04 20:40:07 1.153.6.9 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.145 2010/05/03 14:43:50 onken Exp $ +# $Id: radiobuttonresponse.pm,v 1.153.6.9 2012/02/04 20:40:07 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,793 +25,1509 @@ # http://www.lon-capa.org/ # - - package Apache::radiobuttonresponse; use strict; use HTML::Entities(); use Apache::lonlocal; use Apache::lonnet; use Apache::response; +use Apache::caparesponse; my $default_bubbles_per_line = 10; +my @alphabet = ( 'A' .. 'Z' ); # Foil labels. + BEGIN { - &Apache::lonxml::register('Apache::radiobuttonresponse',('radiobuttonresponse')); + &Apache::lonxml::register( 'Apache::radiobuttonresponse', + ('radiobuttonresponse') ); } sub bubble_line_count { - my ($numfoils, $bubbles_per_line) = @_; + my ( $numfoils, $bubbles_per_line ) = @_; my $bubble_lines; - $bubble_lines = int($numfoils / $bubbles_per_line); - if (($numfoils % $bubbles_per_line) != 0) { - $bubble_lines++; + $bubble_lines = int( $numfoils / $bubbles_per_line ); + if ( ( $numfoils % $bubbles_per_line ) != 0 ) { + $bubble_lines++; } return $bubble_lines; - -} +} sub start_radiobuttonresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) = + @_; my $result; #when in a radiobutton response use these - &Apache::lonxml::register('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); - push (@Apache::lonxml::namespace,'radiobuttonresponse'); - my $id = &Apache::response::start_response($parstack,$safeeval); + &Apache::lonxml::register( 'Apache::radiobuttonresponse', + ( 'foilgroup', 'foil', 'conceptgroup' ) ); + push( @Apache::lonxml::namespace, 'radiobuttonresponse' ); + my $id = &Apache::response::start_response( $parstack, $safeeval ); - %Apache::hint::radiobutton=(); + %Apache::hint::radiobutton = (); undef(%Apache::response::foilnames); - if ($target eq 'meta') { - $result=&Apache::response::meta_package_write('radiobuttonresponse'); - } elsif ($target eq 'edit' ) { - $result.=&Apache::edit::start_table($token) - .''.&Apache::lonxml::description($token) - .&Apache::loncommon::help_open_topic('Radio_Response_Problems') - .'' - .''.&mt('Delete?').' ' - .&Apache::edit::deletelist($target,$token) - .'' - .' '.&Apache::edit::end_row() - .&Apache::edit::start_spanning_row(); - $result.= - &Apache::edit::text_arg('Max Number Of Shown Foils:','max', - $token,'4').' 'x 3 . - &Apache::edit::select_arg('Randomize Foil Order:','randomize', - ['yes','no'],$token).' 'x 3 . - &Apache::edit::select_arg('Display Direction:','direction', - ['vertical','horizontal'],$token). - &Apache::edit::end_row(). - &Apache::edit::start_spanning_row()."\n"; - } elsif ($target eq 'modified') { - my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'max', - 'randomize','direction'); - 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}.}'; - } else { - $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; - } - if($env{'form.pdfFormFields'} eq 'yes' && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { - $result .= '\begin{itemize}'; - } else { - $result .= '\begin{enumerate}'; + if ( $target eq 'meta' ) { + $result = &Apache::response::meta_package_write('radiobuttonresponse'); + } + elsif ( $target eq 'edit' ) { + $result .= + &Apache::edit::start_table($token) + . '' + . &Apache::lonxml::description($token) + . &Apache::loncommon::help_open_topic('Radio_Response_Problems') + . '' + . '' + . &mt('Delete?') . ' ' + . &Apache::edit::deletelist( $target, $token ) + . '' + . ' ' + . &Apache::edit::end_row() + . &Apache::edit::start_spanning_row(); + $result .= &Apache::edit::text_arg( 'Max Number Of Shown Foils:', + 'max', $token, '4' ) + . ' ' x 3 + . &Apache::edit::select_arg( 'Randomize Foil Order:', + 'randomize', [ 'yes', 'no' ], $token ) + . ' ' x 3 + . &Apache::edit::select_arg( + 'Display Direction:', 'direction', + [ 'vertical', 'horizontal' ], $token + ) + . &Apache::edit::end_row() + . &Apache::edit::start_spanning_row() . "\n"; + } + elsif ( $target eq 'modified' ) { + my $constructtag = + &Apache::edit::get_new_args( $token, $parstack, $safeeval, 'max', + 'randomize', 'direction' ); + 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 ($target eq 'analyze') { - my $part_id="$Apache::inputtags::part.$id"; + elsif ( $type eq 'a' ) { + $result .= ' \renewcommand{\labelenumi}{\alph{enumi}.}'; + } + elsif ( $type eq 'i' ) { + $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}'; + } + else { + $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}'; + } + + } + elsif ( $target eq 'analyze' ) { + my $part_id = "$Apache::inputtags::part.$id"; $Apache::lonhomework::analyze{"$part_id.type"} = 'radiobuttonresponse'; - push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push( @{ $Apache::lonhomework::analyze{"parts"} }, $part_id ); } return $result; } sub end_radiobuttonresponse { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) = + @_; my $result; - if ($target eq 'edit') { $result=&Apache::edit::end_table(); } - 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}'; - } - } + if ( $target eq 'edit' ) { $result = &Apache::edit::end_table(); } + &Apache::response::end_response; pop @Apache::lonxml::namespace; - &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup')); + &Apache::lonxml::deregister( 'Apache::radiobuttonresponse', + ( 'foilgroup', 'foil', 'conceptgroup' ) ); undef(%Apache::response::foilnames); return $result; } -%Apache::response::foilgroup=(); +%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::pushrandomnumber(); - if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') { - $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]'; - } - return $result; + my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) = + @_; + %Apache::response::foilgroup = (); + $Apache::radiobuttonresponse::conceptgroup = 0; + &Apache::response::pushrandomnumber( undef, $target ); + return; } sub storesurvey { my ($style) = @_; if ( !&Apache::response::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 $part = $Apache::inputtags::part; - my $id = $Apache::inputtags::response['-1']; - my @whichfoils=@{ $Apache::response::foilgroup{'names'} }; + if ( $response !~ /[0-9]+/ ) { return ''; } + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; + my @whichfoils = @{ $Apache::response::foilgroup{'names'} }; my %responsehash; - $responsehash{$whichfoils[$response]}=$response; - my $responsestr=&Apache::lonnet::hash2str(%responsehash); - $Apache::lonhomework::results{"resource.$part.$id.submission"}= - $responsestr; - my %previous=&Apache::response::check_for_previous($responsestr,$part,$id); + $responsehash{ $whichfoils[$response] } = $response; + my $responsestr = &Apache::lonnet::hash2str(%responsehash); + $Apache::lonhomework::results{"resource.$part.$id.submission"} = + $responsestr; + my %previous = + &Apache::response::check_for_previous( $responsestr, $part, $id ); my $ad; - 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'; - } elsif ($style eq 'surveycred') { - $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT'; - } else { - $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + + 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_CREDIT'; + } + elsif ( $style eq 'surveycred' ) { + $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} = + 'SUBMITTED_CREDIT'; + } + else { + $ad = $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} = + 'SUBMITTED'; } - &Apache::response::handle_previous(\%previous,$ad); + &Apache::response::handle_previous( \%previous, $ad ); &Apache::lonxml::debug("submitted a $response
\n"); return ''; } - sub grade_response { - my ($answer, $whichfoils, $bubbles_per_line)=@_; + my ( $answer, $whichfoils, $bubbles_per_line ) = @_; if ( !&Apache::response::submitted() ) { return; } my $response; - - if ($env{'form.submitted'} eq 'scantron') { - $response = &Apache::response::getresponse(1,undef, - &bubble_line_count(scalar(@{ $whichfoils}), - $bubbles_per_line), - $bubbles_per_line); - } else { - $response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']}; - } + if ( $env{'form.submitted'} eq 'scantron' ) { + $response = + &Apache::response::getresponse( 1, undef, + &bubble_line_count( scalar( @{$whichfoils} ), $bubbles_per_line ), + $bubbles_per_line ); + } + 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']; + if ( $response !~ /[0-9]+/ ) { return; } + my $part = $Apache::inputtags::part; + my $id = $Apache::inputtags::response['-1']; my %responsehash; - $responsehash{$whichfoils->[$response]}=$response; - my $responsestr=&Apache::lonnet::hash2str(%responsehash); - my %previous=&Apache::response::check_for_previous($responsestr, - $part,$id); - $Apache::lonhomework::results{"resource.$part.$id.submission"}= - $responsestr; + $responsehash{ $whichfoils->[$response] } = $response; + my $responsestr = &Apache::lonnet::hash2str(%responsehash); + my %previous = + &Apache::response::check_for_previous( $responsestr, $part, $id ); + $Apache::lonhomework::results{"resource.$part.$id.submission"} = + $responsestr; &Apache::lonxml::debug("submitted a $response
\n"); my $ad; - if ($response == $answer) { - $ad='EXACT_ANS'; - } else { - $ad='INCORRECT'; + + if ( $response == $answer ) { + $ad = 'EXACT_ANS'; } - $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; - &Apache::response::handle_previous(\%previous,$ad); + else { + $ad = 'INCORRECT'; + } + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"} = $ad; + &Apache::response::handle_previous( \%previous, $ad ); } sub end_foilgroup { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my ( $target, $token, $tagstack, $parstack, $parser, $safeeval, $style ) = + @_; my $result; my $bubble_lines; - my $bubbles_per_line; my $answer_count; - my $id = $Apache::inputtags::response['-1']; - my $part = $Apache::inputtags::part; - $bubbles_per_line = - &Apache::response::get_response_param($Apache::inputtags::part."_$id", - 'numbubbles', - $default_bubbles_per_line); - - - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || - $target eq 'tex' || $target eq 'analyze') { - my $style = $Apache::lonhomework::type; - my $direction = &Apache::lonxml::get_param('direction',$parstack, - $safeeval,'-2'); - if ( (($style eq 'survey') || ($style eq 'surveycred') || - ($style eq 'anonsurvey') || ($style eq 'anonsurveycred')) - && ($target ne 'analyze')) { - if ($target eq 'web' || $target eq 'tex') { - $result=&displayallfoils($direction, $target); - } elsif ( $target eq 'answer' ) { - $result=&displayallanswers(); - } elsif ( $target eq 'grade' ) { - $result=&storesurvey($style); - } - $answer_count = scalar(@{$Apache::response::foilgroup{'names'}}); + my $id = $Apache::inputtags::response['-1']; + my $part = $Apache::inputtags::part; + my $bubbles_per_line = &getbubblesnum( $part, $id ); + + + if ( $target eq 'grade' + || $target eq 'web' + || $target eq 'answer' + || $target eq 'tex' + || $target eq 'analyze' ) + { + my $style = $Apache::lonhomework::type; + my $direction = + &Apache::lonxml::get_param( 'direction', $parstack, $safeeval, '-2' ); + if ( + ( + ( $style eq 'survey' ) + || ( $style eq 'surveycred' ) + || ( $style eq 'anonsurvey' ) + || ( $style eq 'anonsurveycred' ) + ) + && ( $target ne 'analyze' ) + ) + { + if ( $target eq 'web' || $target eq 'tex' ) { + $result = &displayallfoils( $direction, $target ); + } + elsif ( $target eq 'answer' ) { + $result = &displayallanswers(); + } + elsif ( $target eq 'grade' ) { + $result = &storesurvey($style); + } + $answer_count = + scalar( @{ $Apache::response::foilgroup{'names'} } ); - } else { + } + else { - my $name; - my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval, - '-2'); - my $randomize = &Apache::lonxml::get_param('randomize',$parstack, - $safeeval,'-2'); - my ($answer, @shown) = &whichfoils($max, $randomize); - $answer_count = scalar(@shown); - - if ($target eq 'web' || $target eq 'tex') { - $result=&displayfoils($target, - $answer, \@shown, - $direction, - $bubbles_per_line); - } elsif ($target eq 'answer' ) { - $result=&displayanswers($answer, \@shown, $bubbles_per_line); - } elsif ( $target eq 'grade') { - &grade_response($answer, \@shown, $bubbles_per_line); - } elsif ( $target eq 'analyze') { - my $bubble_lines = &bubble_line_count($answer_count, - $bubbles_per_line); - &Apache::response::analyze_store_foilgroup(\@shown, - ['text','value','location']); - my $part_id="$part.$id"; - push (@{ $Apache::lonhomework::analyze{"$part_id.options"} }, - ('true','false')); + my $name; + my $max = + &Apache::lonxml::get_param( 'max', $parstack, $safeeval, '-2' ); + my $randomize = + &Apache::lonxml::get_param( 'randomize', $parstack, $safeeval, + '-2' ); + my ( $answer, @shown ) = &whichfoils( $max, $randomize ); + $answer_count = scalar(@shown); + + if ( $target eq 'web' || $target eq 'tex' ) { + $result = + &displayfoils( $target, $answer, \@shown, $direction, + $bubbles_per_line ); + } + elsif ( $target eq 'answer' ) { + $result = + &displayanswers( $answer, \@shown, $bubbles_per_line ); + } + elsif ( $target eq 'grade' ) { + &grade_response( $answer, \@shown, $bubbles_per_line ); + } + elsif ( $target eq 'analyze' ) { + my $bubble_lines = + &bubble_line_count( $answer_count, $bubbles_per_line ); + &Apache::response::analyze_store_foilgroup( \@shown, + [ 'text', 'value', 'location' ] ); + my $part_id = "$part.$id"; + push( + @{ $Apache::lonhomework::analyze{"$part_id.options"} }, + ( 'true', 'false' ) + ); - } - } - $Apache::lonxml::post_evaluate=0; + } + } + $Apache::lonxml::post_evaluate = 0; } - if ($target eq 'web') { - &Apache::response::setup_prior_tries_hash(\&format_prior_answer, - [\%Apache::response::foilgroup]); + if ( $target eq 'web' ) { + &Apache::response::setup_prior_tries_hash( \&format_prior_answer, + [ \%Apache::response::foilgroup ] ); } &Apache::response::poprandomnumber(); - $bubble_lines = &bubble_line_count($answer_count, $bubbles_per_line); - &Apache::lonxml::increment_counter($bubble_lines, - "$part.$id"); - if ($target eq 'analyze') { - &Apache::lonhomework::set_bubble_lines(); + $bubble_lines = &bubble_line_count( $answer_count, $bubbles_per_line ); + &Apache::lonxml::increment_counter( $bubble_lines, "$part.$id" ); + if ( $target eq 'analyze' ) { + &Apache::lonhomework::set_bubble_lines(); } return $result; } +sub getbubblesnum { + my ( $part, $id ) = @_; + my $bubbles_per_line; + my $default_numbubbles = $default_bubbles_per_line; + if ( ( $env{'form.bubbles_per_row'} =~ /^\d+$/ ) + && ( $env{'form.bubbles_per_row'} > 0 ) ) + { + $default_numbubbles = $env{'form.bubbles_per_row'}; + } + $bubbles_per_line = &Apache::response::get_response_param( $part . "_$id", + 'numbubbles', $default_numbubbles ); + return $bubbles_per_line; +} + sub getfoilcounts { my @names; - my $truecnt=0; - my $falsecnt=0; + my $truecnt = 0; + my $falsecnt = 0; my $name; if ( $Apache::response::foilgroup{'names'} ) { - @names= @{ $Apache::response::foilgroup{'names'} }; + @names = @{ $Apache::response::foilgroup{'names'} }; } foreach $name (@names) { - if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { - $truecnt++; - } elsif ($Apache::response::foilgroup{$name.'.value'} eq 'false') { - $falsecnt++; - } + if ( $Apache::response::foilgroup{ $name . '.value' } eq 'true' ) { + $truecnt++; + } + elsif ( $Apache::response::foilgroup{ $name . '.value' } eq 'false' ) { + $falsecnt++; + } } - return ($truecnt,$falsecnt); + return ( $truecnt, $falsecnt ); } sub format_prior_answer { - my ($mode,$answer,$other_data) = @_; + my ( $mode, $answer, $other_data ) = @_; my $foil_data = $other_data->[0]; - my %response = &Apache::lonnet::str2hash($answer); - my ($name) = keys(%response); - return ''. - $foil_data->{$name.'.text'}.''; + my %response = &Apache::lonnet::str2hash($answer); + my ($name) = keys(%response); + return + '' + . $foil_data->{ $name . '.text' } + . ''; } -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'} }; +## +# 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) = @_; + + my $newvariation; + my $lastresponse; # stringified last response. + + 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; + } + } + 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"}; } + my %lastresponse = &Apache::lonnet::str2hash($lastresponse); + - my $temp=0; - my $i =0; - 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'}))) { - $lastresponse = - $Apache::lonhomework::history{"resource.$part.$id.submission"}; + return \%lastresponse; + +} +## +# Removes the names from a foil group that are marked as unused. +# +# @param $names - reference to the array of names to filter. +# +# @return arrayref +# @retval reference to the filtered array. +# +sub remove_unused { + my ($names) = @_; + my @result; + + foreach my $name (@{$names}) { + if ($Apache::response::foilgroup{$name . '.value'} ne 'unused') { + push(@result, $name); + } } - if ($direction eq 'horizontal') { $result.=''; } - my %lastresponse=&Apache::lonnet::str2hash($lastresponse); - if (&Apache::response::show_answer() ) { - foreach my $name (@names) { - if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - if (($direction eq 'horizontal') && ($target ne 'tex')) { - $result.=""; } + return \@result; +} +## +# Displays all foils in a survey type problem for HTML rendition. +# TODO: See if there is any logic in this sub that can be shared +# with display_foils_html +# +# @param $names - ref to array of names of the foils to display. +# @param $part - Problem part number. +# @param $showanswer - If true, show the answers. +# @param $lastresponse - Ref to the last response hash. +# @param $direction - Display direction of the radiobuttons. +# +# @return string +# @retval HTML required to display the resource in a browser. +# +sub display_survey_html { + my ($names, $part, $showanswer, $lastresponse, $direction) = @_; + my $result; + + # Figure out a few fragments of html that depend onthe + # orientation of the radiobuttons: + # closing_html - HTML to emit at the end of the resource. + # pre_foil - HTML to emit prior to each foil. + # post_foil - HTML to emit following each foil. + # + # The opening HTML is just added to the $result now + # + # Figuring these outin advance compresses the loop over foils into something + # pretty simple: + # + # NOTE: There's probably a really cool way to do this with style sheets + # and picking the selector based on the orientation, if someone wants to puzzle + # that out. In that case, probably the whole thing lives in a
and each + # foil lives in a

+ # + + my $closing_html; + my $pre_foil; + my $post_foil; + + if ($direction eq 'horizontal') { + $result .= '

"; - } else { - if ($target eq 'tex') { - $result .= '\item \vskip -2mm '; - } else { - $result.="
"; - } - } - if (defined($lastresponse{$name})) { - if ($target eq 'tex') { - $result .= '}'; - } else { - $result.=''; - } - } - $result .= $Apache::response::foilgroup{$name.'.text'}; - if (defined($lastresponse{$name}) && ($target ne 'tex')) { - $result.=''; - } - if (($direction eq 'horizontal') && ($target ne 'tex')) { $result.="
'; + $closing_html = '
'; + $pre_foil = ''; + $post_foil = ''; + } else { + $pre_foil = '
'; + } + # Different rendering depending on whether answers are shown: + + + if ($showanswer) { + foreach my $name (@{$names}) { + + $result .= $pre_foil; + my $foiltext = $Apache::response::foilgroup{$name . '.text'}; + + # Bold the prior response: + + if (defined($lastresponse->{$name})) { + $result .= '' . $foiltext . ''; + } else { + $result .= $foiltext; } + + $result .= $post_foil; } } else { - foreach my $name (@names) { - if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - if ($direction eq 'horizontal') { - $result.=""; - } else { - if ($target eq 'tex') { - if($env{'form.pdfFormFields'} eq 'yes' && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') { - my $fieldname = $env{'request.symb'}.'&part_'. $Apache::inputtags::part - .'&radiobuttonresponse'.'&HWVAL_'.$Apache::inputtags::response['-1']; - $result .= '\item[{'.&Apache::lonxml::print_pdf_radiobutton($fieldname,$temp).'}]' - .$Apache::response::foilgroup{$name.'.text'}."\n"; - } else { - $result .= '\item \vskip -2mm '; - } - } else { - $result.="
"; - } - } - if ($target eq 'tex') { - if($env{'form.pdfFormFields'} ne 'yes' or $Apache::inputtags::status[-1] ne 'CAN_ANSWER') { - $result .= '$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\'; #' stupid emacs - } - $i++; - } else { - $result .= '