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

sakharuk lon-capa-cvs@mail.lon-capa.org
Thu, 17 Oct 2002 14:40:23 -0000


sakharuk		Thu Oct 17 10:40:23 2002 EDT

  Modified files:              
    /loncom/homework	radiobuttonresponse.pm 
  Log:
  For the exam 1. correctly adjust the size of bubbles to the text width;
  2. use correct enumeration through the environment variable;
  
  
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.55 loncom/homework/radiobuttonresponse.pm:1.56
--- loncom/homework/radiobuttonresponse.pm:1.55	Mon Oct 14 16:33:57 2002
+++ loncom/homework/radiobuttonresponse.pm	Thu Oct 17 10:40:23 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.55 2002/10/14 20:33:57 albertel Exp $
+# $Id: radiobuttonresponse.pm,v 1.56 2002/10/17 14:40:23 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,10 +79,19 @@
 
 %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::setrandomnumber();
-  return '';
+  if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+      $result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+      $Apache::lonxml::counter++;
+      my %moreenv;
+      $moreenv{'form.counter'}=$Apache::lonxml::counter;
+      &Apache::lonnet::appenv(%moreenv);
+  }
+  return $result;
 }
 
 sub storesurvey {
@@ -360,6 +369,8 @@
       }
     }
   } else {
+    my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
+    my $i = 0;
     my $temp=0;  
     my $id=$Apache::inputtags::response['-1'];
     my $part=$Apache::inputtags::part;
@@ -374,11 +385,11 @@
 	      $result .= '<table border="1"><tr><td>A: &nbsp;&nbsp;Correct</td><td>B: &nbsp;&nbsp;Incorrect</td></tr></table>';
 	  }
       } else {
-	  $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
 	  if ($Apache::lonhomework::type eq 'exam') {
-	      $result.= '\vskip 2 mm \noindent \begin{tabular}{|lr|lr|}\hline ';
-	      $result.= 'A: &  Correct & B: & Incorrect';
-	      $result.='\\\\\hline\end{tabular}\vskip 0 mm ';
+	      $result .= '{\small \textbf{'.$alphabet[$i].'}}$\bigcirc$'.$Apache::response::foilgroup{$name.'.text'}.'\\\\';
+	      $i++;
+	  } else {
+	      $result .= '\item '.$Apache::response::foilgroup{$name.'.text'};
 	  }
       }
       $temp++;