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

sakharuk lon-capa-cvs@mail.lon-capa.org
Wed, 03 Apr 2002 16:54:37 -0000


sakharuk		Wed Apr  3 11:54:37 2002 EDT

  Modified files:              
    /loncom/homework	radiobuttonresponse.pm 
  Log:
  can be printed now
  
  
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.37 loncom/homework/radiobuttonresponse.pm:1.38
--- loncom/homework/radiobuttonresponse.pm:1.37	Fri Jan 25 11:11:37 2002
+++ loncom/homework/radiobuttonresponse.pm	Wed Apr  3 11:54:37 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.37 2002/01/25 16:11:37 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.38 2002/04/03 16:54:37 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,6 +56,8 @@
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
 						 $safeeval,'max');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+  } elsif ($target eq 'tex') {
+      $result .= '\begin{enumerate}';
   }
   return $result;
 }
@@ -64,6 +66,7 @@
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+  if ($target eq 'tex') { $result .= '\end{enumerate}'; }
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
   &Apache::lonxml::deregister('Apache::radiobuttonresponse',('foilgroup','foil','conceptgroup'));
@@ -123,10 +126,10 @@
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result;
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
     my $style = $Apache::lonhomework::type;
     if ( $style eq 'survey' ) {
-      if ($target eq 'web' || $target eq 'answer') {
+      if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
 	$result=&storesurvey();
@@ -139,8 +142,8 @@
       if (($falsecnt+1)>$max) { $count=$max } else { $count=$falsecnt+1; }
       my $answer = int(rand ($count));
       &Apache::lonxml::debug("Answer is $answer, $count from $max, $falsecnt");
-      if ($target eq 'web') {
-	$result=&displayfoils($max,$answer);
+      if ($target eq 'web' || $target eq 'tex') {
+	$result=&displayfoils($target,$max,$answer);
       } elsif ($target eq 'answer' ) {
 	$result=&displayanswers($max,$answer);
       } elsif ( $target eq 'grade') {
@@ -230,13 +233,15 @@
 }
 
 sub displayfoils {
-  my ($max,$answer)=@_;
+  my ($target,$max,$answer)=@_;
   my $result;
 
   my @whichfoils=&whichfoils($max,$answer);
   if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
     foreach my $name (@whichfoils) {
-      $result.="<br />";
+      if ($target ne 'tex') {
+	  $result.="<br />";
+      }
       if ($Apache::response::foilgroup{$name.'.value'} eq 'true') { 
 	$result.='Correct';
       } else {
@@ -251,13 +256,21 @@
     my $lastresponse=$Apache::lonhomework::history{"resource.$part.$id.submission"};
     my %lastresponse=&Apache::lonnet::str2hash($lastresponse);
     foreach my $name (@whichfoils) {
-       $result.="<br /><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>\n";
+      if ($target ne 'tex') {
+	  $result.="<br /><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>\n";
+      } else {
+	  $result .= $Apache::response::foilgroup{$name.'.text'};
+      }
       $temp++;
     }
   }
-  return $result."<br />";
+      if ($target ne 'tex') {
+	  return $result."<br />";
+      } else {
+	  return $result;
+      }
 }
 
 sub displayanswers {
@@ -293,7 +306,7 @@
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   $Apache::radiobuttonresponse::conceptgroup=0;
   my $result;
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(rand($#names+1));
@@ -319,8 +332,11 @@
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'tex') {
     &Apache::lonxml::startredirection;
+    if ($target eq 'tex') {
+	$result .= '\item ';
+    }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
@@ -331,15 +347,15 @@
      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						  'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
-  }
+  } 
   return $result;
 }
 
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
-  if ($target eq 'web') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ) {
+  if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);