--- loncom/homework/radiobuttonresponse.pm 2004/08/27 21:47:34 1.92 +++ loncom/homework/radiobuttonresponse.pm 2004/08/30 02:03:44 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # mutliple choice style responses # -# $Id: radiobuttonresponse.pm,v 1.92 2004/08/27 21:47:34 albertel Exp $ +# $Id: radiobuttonresponse.pm,v 1.93 2004/08/30 02:03:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -167,9 +167,11 @@ sub end_foilgroup { 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' && $target ne 'analyze') { if ($target eq 'web' || $target eq 'tex') { - $result=&displayallfoils(); + $result=&displayallfoils($direction); } elsif ( $target eq 'answer' ) { $result=&displayallanswers(); } elsif ( $target eq 'grade' ) { @@ -181,9 +183,6 @@ sub end_foilgroup { '-2'); my $randomize = &Apache::lonxml::get_param('randomize',$parstack, $safeeval,'-2'); - my $direction = &Apache::lonxml::get_param('direction',$parstack, - $safeeval,'-2'); - &Apache::lonxml::debug("direction is $direction"); if ($target eq 'web' || $target eq 'tex') { $result=&displayfoils($target,$max,$randomize,$direction); } elsif ($target eq 'answer' ) { @@ -224,6 +223,7 @@ sub getfoilcounts { } sub displayallfoils { + my ($direction)=@_; my $result; &Apache::lonxml::debug("survey style display"); my @names = @{ $Apache::response::foilgroup{'names'} }; @@ -232,11 +232,16 @@ sub displayallfoils { my $part=$Apache::inputtags::part; my $lastresponse= $Apache::lonhomework::history{"resource.$part.$id.submission"}; + 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') { - $result.="
"; + if ($direction eq 'horizontal') { + $result.=""; } } } } else { foreach my $name (@names) { if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') { - $result.="
"; $temp++; + if ($direction eq 'horizontal') { $result.=""; } } } } + if ($direction eq 'horizontal') { $result.='
"; + } else { + $result.="
"; + } if (defined($lastresponse{$name})) { $result.=''; } @@ -244,18 +249,26 @@ sub displayallfoils { if (defined($lastresponse{$name})) { $result.=''; } + if ($direction eq 'horizontal') { $result.="
'; } return $result; }