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

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 27 Oct 2003 18:26:15 -0000


albertel		Mon Oct 27 13:26:15 2003 EDT

  Modified files:              
    /loncom/homework	radiobuttonresponse.pm 
  Log:
  - does analyze target now
  
  
  
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.76 loncom/homework/radiobuttonresponse.pm:1.77
--- loncom/homework/radiobuttonresponse.pm:1.76	Fri Oct 24 14:06:06 2003
+++ loncom/homework/radiobuttonresponse.pm	Mon Oct 27 13:26:15 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # mutliple choice style responses
 #
-# $Id: radiobuttonresponse.pm,v 1.76 2003/10/24 18:06:06 sakharuk Exp $
+# $Id: radiobuttonresponse.pm,v 1.77 2003/10/27 18:26:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,9 @@
 	  $result .= ' \renewcommand{\labelenumi}{\roman{enumi}.}';
       }
       $result .= '\begin{enumerate}';
+  } elsif ($target eq 'analyze') {
+      my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
   }
   return $result;
 }
@@ -152,9 +155,9 @@
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
   my $result;
-  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') {
     my $style = $Apache::lonhomework::type;
-    if ( $style eq 'survey' ) {
+    if ( $style eq 'survey'  && $target ne 'analyze') {
       if ($target eq 'web' || $target eq 'answer' || $target eq 'tex') {
 	$result=&displayallfoils();
       } elsif ( $target eq 'grade' ) {
@@ -171,6 +174,17 @@
 	$result=&displayanswers($max,$randomize);
       } elsif ( $target eq 'grade') {
 	&grade_response($max,$randomize);
+      }  elsif ( $target eq 'analyze') {
+	  my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
+	  foreach my $name (@{ $Apache::response::foilgroup{'names'} }) {
+	      if (defined($Apache::lonhomework::analyze{"$part_id.foil.value.$name"})) { next; }
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },$name);
+	      $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+		  $Apache::response::foilgroup{"$name.value"};
+	      $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+		  $Apache::response::foilgroup{"$name.text"};
+	  }
+	  push (@{ $Apache::lonhomework::analyze{"$part_id.shown"} },&whichfoils($max,$randomize));
       }
     }
   }
@@ -454,7 +468,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'  || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex' || $target eq 'analyze') {
     if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
       my @names = @{ $Apache::response::conceptgroup{'names'} };
       my $pick=int(&Math::Random::random_uniform() * ($#names+1));
@@ -470,6 +484,22 @@
       push(@{ $Apache::hint::radiobutton{"$part_id.concepts"} },$concept);
       $Apache::hint::radiobutton{"$part_id.concept.$concept"}=
 	  $Apache::response::conceptgroup{'names'};
+      if ($target eq 'analyze') {
+	  push (@{ $Apache::lonhomework::analyze{"$part_id.concepts"} },
+		$concept);
+	  $Apache::lonhomework::analyze{"$part_id.concept.$concept"}=
+	      $Apache::response::conceptgroup{'names'};
+	  foreach my $name (@{ $Apache::response::conceptgroup{'names'} }) {
+	      push (@{ $Apache::lonhomework::analyze{"$part_id.foils"} },
+		    $name);
+	      $Apache::lonhomework::analyze{"$part_id.foil.value.$name"} =
+		  $Apache::response::conceptgroup{"$name.value"};
+	      $Apache::lonhomework::analyze{"$part_id.foil.text.$name"} =
+		  $Apache::response::conceptgroup{"$name.text"};
+	      $Apache::lonhomework::analyze{"$part_id.foil.location.$name"} =
+		  $Apache::response::conceptgroup{"$name.location"};
+	  }
+      }
     }
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::end_table();
@@ -485,7 +515,7 @@
 sub start_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
     &Apache::lonxml::startredirection;
   } elsif ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token);
@@ -510,8 +540,10 @@
 sub end_foil {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $text='';
-  if ($target eq 'web' || $target eq 'tex') { $text=&Apache::lonxml::endredirection; }
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+      $text=&Apache::lonxml::endredirection;
+  }
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer'  || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);