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

[albertel]

albertel		Thu Oct 21 02:37:36 2004 EDT

  Modified files:              
    /loncom/homework	imageresponse.pm chemresponse.pm 
  Log:
   - <imageresponse> <organicresponse> <reactionresponse> asupport survey mode, BUG#36
  
  
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.55 loncom/homework/imageresponse.pm:1.56
--- loncom/homework/imageresponse.pm:1.55	Thu Aug 12 02:00:39 2004
+++ loncom/homework/imageresponse.pm	Thu Oct 21 02:37:36 2004
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.55 2004/08/12 06:00:39 albertel Exp $
+# $Id: imageresponse.pm,v 1.56 2004/10/21 06:37:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,7 +85,7 @@
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     # +1 since instructors will count from 1
     my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
-    if (&Apache::response::showallfoils()) { $max=$count; }
+    #if (&Apache::response::showallfoils()) { $max=$count; }
     return ($count,$max);
 }
 
@@ -97,11 +97,11 @@
     while ((($#whichopt+1) < $max) && ($#names > -1)) {
 	&Apache::lonxml::debug("Have $#whichopt max is $max");
 	my $aopt;
-	if (&Apache::response::showallfoils()) {
-	    $aopt=0;
-	} else {
+#	if (&Apache::response::showallfoils()) {
+#	    $aopt=0;
+#	} else {
 	    $aopt=int(&Math::Random::random_uniform() * ($#names+1));
-	}
+#	}
 	&Apache::lonxml::debug("From $#names elms, picking $aopt");
 	$aopt=splice(@names,$aopt,1);
 	&Apache::lonxml::debug("Picked $aopt");
@@ -270,6 +270,8 @@
 	    $temp++;
 	}
     }
+    if ($result 
+	&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
     return '';
@@ -344,7 +346,8 @@
 	}
 	$Apache::response::foilnames{$name}++;
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils()) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    push(@{ $Apache::response::conceptgroup{'names'} }, $name);
 	} else {
 	    push(@{ $Apache::response::foilgroup{'names'} }, $name);
@@ -385,7 +388,8 @@
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
 	my $name = $Apache::imageresponse::curname;
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils() ) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
 	} else {
 	    $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
@@ -425,7 +429,8 @@
 	my $image = &Apache::lonxml::endredirection;
 	&Apache::lonxml::debug("original image is $image");
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils()) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    $Apache::response::conceptgroup{"$name.image"} = $image;
 	} else {
 	    $Apache::response::foilgroup{"$name.image"} = $image;
@@ -433,7 +438,8 @@
     } elsif ($target eq 'analyze') {
 	my $image = &Apache::lonxml::endredirection;
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils()) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    $Apache::response::conceptgroup{"$name.image"} = $image;
 	} else {
 	    $Apache::response::foilgroup{"$name.image"} = $image;
@@ -556,7 +562,8 @@
 	$area=~s/\s//g;
 	&Apache::lonxml::debug("out is $area for $name");
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils()) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
 	} else {
 	    push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
@@ -636,7 +643,8 @@
 	$area=~s/\s*//g;
 	&Apache::lonxml::debug("out is $area for $name");
 	if ( $Apache::imageresponse::conceptgroup
-	     && !&Apache::response::showallfoils()) {
+	     #&& !&Apache::response::showallfoils()
+	     ) {
 	    push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
 	} else {
 	    push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area";
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.41 loncom/homework/chemresponse.pm:1.42
--- loncom/homework/chemresponse.pm:1.41	Wed Sep 29 11:17:56 2004
+++ loncom/homework/chemresponse.pm	Thu Oct 21 02:37:36 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.41 2004/09/29 15:17:56 www Exp $
+# $Id: chemresponse.pm,v 1.42 2004/10/21 06:37:36 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -211,6 +211,9 @@
 		    $ad='INCORRECT';
 		}
 	    }
+	    if ($ad && $Apache::lonhomework::type eq 'survey') {
+		$ad='SUBMITTED';
+	    }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 	    $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"};
@@ -387,6 +390,9 @@
 		    $ad='INCORRECT';
 		}
 	    }
+	    if ($ad && $Apache::lonhomework::type eq 'survey') {
+		$ad='SUBMITTED';
+	    }
 	    &Apache::response::handle_previous(\%previous,$ad);
 	    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 	}