--- loncom/homework/caparesponse/caparesponse.pm	2010/08/20 03:44:18	1.236.12.1
+++ loncom/homework/caparesponse/caparesponse.pm	2010/10/14 04:02:07	1.240
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.236.12.1 2010/08/20 03:44:18 raeburn Exp $
+# $Id: caparesponse.pm,v 1.240 2010/10/14 04:02:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -305,7 +305,7 @@ sub start_numericalresponse {
 	my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 	&Apache::lonxml::debug("Got unit $hideunit for $partid $id");
 	#no way to enter units, with radio buttons
-        if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) {
+	if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) {
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    if ($unit =~ /\S/) { $result.=" (in $unit) "; }
@@ -533,11 +533,18 @@ sub end_numericalresponse {
 					   $Apache::inputtags::params{'sig'});
 		}
 		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-		if ($Apache::lonhomework::type eq 'survey' &&
-		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
-		     $ad eq 'EXACT_ANS')) {
-		    $ad='SUBMITTED';
-		}
+                if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+                     $ad eq 'EXACT_ANS')) {
+		    if ($Apache::lonhomework::type eq 'survey') {
+		        $ad='SUBMITTED';
+		    } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                        $ad='SUBMITTED_CREDIT';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+                        $ad='ANONYMOUS';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+                        $ad='ANONYMOUS_CREDIT';                     
+                    }
+                }
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
@@ -585,9 +592,16 @@ sub end_numericalresponse {
 			&get_table_sizes($number_of_bubbles,$bubble_display);
 		    my $j=0;
 		    my $cou=0;
-		    $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
+		    $result.='\vskip 2mm \noindent ';
+		    $result .= '\textbf{'.$Apache::lonxml::counter.'.} \vskip -3mm ';
+
 		    for (my $i=0;$i<$number_of_tables;$i++) {
-			$result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{';
+			if ($i == 0) {
+			    $result .= '\vskip -1mm ';
+			} else {
+			    $result .= '\vskip 1mm ';
+			}
+			$result.='\noindent \setlength{\tabcolsep}{2 mm}\hskip 2pc\begin{tabular}{';
 			for (my $ind=0;$ind<$table_range[$j];$ind++) {
 			    $result.='p{3 mm}p{'.$celllength.' mm}';
 			}
@@ -600,7 +614,6 @@ sub end_numericalresponse {
 			$j++;
 			$result.='\\\\\end{tabular}\vskip 0 mm ';
 		    }
-		    $result.='\end{enumerate}';
 		} else {
 		    $increment = &Apache::response::repetition();
 		}
@@ -1181,16 +1194,23 @@ sub end_stringresponse {
 			push(@names,$name);
 			&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		    }
-		    my ($ad, $msg, $name) = 
+		    ($ad, $msg, my $name) = 
 			&Apache::inputtags::finalizeawards(\@final_awards,
 							   \@final_msgs,
 							   \@names,1);
 		}
-		if ($Apache::lonhomework::type eq 'survey' &&
-		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
-		     $ad eq 'EXACT_ANS')) {
-		    $ad='SUBMITTED';
-		}
+                if (($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+                     $ad eq 'EXACT_ANS')) {
+		    if ($Apache::lonhomework::type eq 'survey') {
+		        $ad='SUBMITTED';
+		    } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                        $ad='SUBMITTED_CREDIT';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+                        $ad='ANONYMOUS';
+                    } elsif ($Apache::lonhomework::type eq 'anonsurveycred') {
+                        $ad='ANONYMOUS_CREDIT';
+                    }
+                }
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;