[LON-CAPA-cvs] cvs: loncom /homework radiobuttonresponse.pm

[albertel]

albertel		Sun Aug 29 22:03:44 2004 EDT

  Modified files:              
    /loncom/homework	radiobuttonresponse.pm 
  Log:
  - making horizontal work in survey mode
  
  
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.92 loncom/homework/radiobuttonresponse.pm:1.93
--- loncom/homework/radiobuttonresponse.pm:1.92	Fri Aug 27 17:47:34 2004
+++ loncom/homework/radiobuttonresponse.pm	Sun Aug 29 22:03:44 2004
@@ -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 @@
     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 @@
 						 '-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 displayallfoils {
+    my ($direction)=@_;
     my $result;
     &Apache::lonxml::debug("survey style display");
     my @names = @{ $Apache::response::foilgroup{'names'} };
@@ -232,11 +232,16 @@
     my $part=$Apache::inputtags::part;
     my $lastresponse=
 	$Apache::lonhomework::history{"resource.$part.$id.submission"};
+    if ($direction eq 'horizontal') { $result.='<table><tr>'; }
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     if (&Apache::response::show_answer() ) {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br />";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} else {
+		    $result.="<br />";
+		}
 		if (defined($lastresponse{$name})) {
 		    $result.='<b>';
 		}
@@ -244,18 +249,26 @@
 		if (defined($lastresponse{$name})) {
 		    $result.='</b>';
 		}
+		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
 	}
     } else {
 	foreach my $name (@names) {
 	    if ($Apache::response::foilgroup{$name.'.value'} ne 'unused') {
-		$result.="<br /><input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
+		if ($direction eq 'horizontal') {
+		    $result.="<td>";
+		} else {
+		    $result.="<br />";
+		}
+		$result.="<input type=\"radio\" name=\"HWVAL_$Apache::inputtags::response['-1']\" value=\"$temp\" ";
 		if (defined($lastresponse{$name})) { $result .= 'checked="on"'; }
 		$result .= '>'.$Apache::response::foilgroup{$name.'.text'}."</input>";
 		$temp++;
+		if ($direction eq 'horizontal') { $result.="</td>"; }
 	    }
 	}
     }
+    if ($direction eq 'horizontal') { $result.='</tr></table>'; }
     return $result;
 }