--- loncom/homework/optionresponse.pm	2010/02/05 21:38:41	1.161
+++ loncom/homework/optionresponse.pm	2010/08/23 04:43:04	1.167
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.161 2010/02/05 21:38:41 www Exp $
+# $Id: optionresponse.pm,v 1.167 2010/08/23 04:43:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,10 +123,21 @@ sub start_foilgroup {
         </td>
         <td>Delete an Option:
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
+        </td>
 ENDTABLE
-    $result.= &Apache::edit::checked_arg('Print options:','texoptions',
+    $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
 					 [ ['nochoice','Don\'t show option list'] ]
-					 ,$token);
+					 ,$token).'</td>';
+    $result.= '<td><label>'.&mt('Two-option checkboxes for:').
+              '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
+    foreach $option (('',@opt)) {
+       $result.='<option value="'.$option.'"';
+       if ($option eq &Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval)) {
+          $result.=' selected="selected"';
+       }
+       $result.='>'.$option.'</option>';
+    }
+    $result.='</select></label>';  
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
     $result.= $insertlist.'<br />';
@@ -151,7 +162,7 @@ ENDTABLE
       $optchanged=1;
     }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 ('texoptions'));
+						 'texoptions','checkboxvalue');
     if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
@@ -162,13 +173,13 @@ ENDTABLE
       chop $result;
       $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
+      $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
       $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
     if($env{'form.pdfFormFields'} ne 'yes') {
-      $result .= ' \renewcommand{\labelenumi}{\Alph{enumi}.}
-                   \begin{enumerate} ';
+      $result .= ' \begin{itemize} ';
     } else {
       $result .= "\\\\";
     }
@@ -247,9 +258,21 @@ sub end_foilgroup {
 	    $responsestr;
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
 	
-	if ($Apache::lonhomework::type eq 'survey') {
+	if (($Apache::lonhomework::type eq 'survey') ||
+            ($Apache::lonhomework::type eq 'surveycred') ||
+            ($Apache::lonhomework::type eq 'anonsurvey') ||
+            ($Apache::lonhomework::type eq 'anonsurveycred')) {
 	    if ($ignored == 0) {
-		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+                my $ad;
+                if ($Apache::lonhomework::type eq 'anonsurveycred') {
+                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS_CREDIT';
+                } elsif ($Apache::lonhomework::type eq 'anonsurvey') {
+                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='ANONYMOUS';
+                } elsif ($Apache::lonhomework::type eq 'surveycred') {
+                    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED_CREDIT';
+                } else {
+		    $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+                }
 		&Apache::response::handle_previous(\%previous,$ad);
 	    } elsif ($wrong==0 && $right==0) {
 	    } else {
@@ -303,7 +326,7 @@ sub end_foilgroup {
   }
   if ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
     if($env{'form.pdfFormFields'} ne 'yes') {
-      $result .= '\end{enumerate}';
+      $result .= '\end{itemize}'; 
     } else {
       $result .= "\\\\";
     }
@@ -411,7 +434,11 @@ sub displayfoils {
     my $temp=1;
     foreach $name (@whichopt) {
 	my $text=$Apache::response::foilgroup{$name.'.text'};
-	my %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+        my $lastresp;
+        unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
+            $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+        }
+	my %lastresponse=&Apache::lonnet::str2hash($lastresp);
 	my $lastopt=$lastresponse{$name};
 	if ($text!~/^\s*$/) { $break='<br />'; }
 	$result.=$break;
@@ -439,8 +466,7 @@ sub displayfoils {
     my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
     if ($checkboxopt) {
-       $result.='<br />'.&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. '.
-                &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
+       $result.='<br />'.&mt('Select all that are <b>[_1]</b>.',$checkboxopt);
     }
     foreach $name (@whichopt) {
       my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -464,14 +490,16 @@ sub displayfoils {
 	  my $escopt=&HTML::Entities::encode($option,'\'"&<>');
           if ($option eq $lastopt) {
               if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
-                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+                  && $Apache::lonhomework::type ne 'exam') {
                   $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
               } else {
                   $optionlist.="<option value='".$escopt."' selected=\"selected\">$option</option>\n";
               }
           } else {
               if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
-                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+                  && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+                  && $Apache::lonhomework::type ne 'exam') {
                   $optionlist .= &Apache::lonxml::print_pdf_add_combobox_option($option);
               } else {
                   $optionlist.="<option value='".$escopt."'>$option</option>\n";
@@ -553,13 +581,14 @@ sub displayfoils {
 	      }
 	  }
 	  if ($Apache::lonhomework::type eq 'exam') {
-	      $result.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.
-		  $internal_counter.'}.]'.&bubbles(\@alphabet,\@opt).
-		  '\end{enumerate} \vskip -8 mm \strut ';
+	      $result.='\vskip -1 mm\noindent';
+              $result.= '\textbf{'. $internal_counter.'}. \vskip -3mm'.&bubbles(\@alphabet,\@opt).
+		                 ' \strut ';
 	      $internal_counter++;
 	  }
           if ($target eq 'tex' && $env{'form.pdfFormFields'} eq 'yes'
-              && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+              && $Apache::inputtags::status[-1] eq 'CAN_ANSWER'
+              && $Apache::lonhomework::type ne 'exam') {
               $text =~ s/\\item//m;
               $result .= " $optionlist ". &Apache::lonxml::print_pdf_end_combobox($text).'\strut \\\\';
               $temp++;
@@ -661,7 +690,7 @@ sub bubbles {
 
 	$current_length += (length($opt[$ind])+length($alphabet[$ind])+4)*2;
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {
-	    $line.='\hskip -1 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
+	    $line.='\hskip 1pc {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -1 mm & \hskip -3 mm {\small '.$opt[$ind].'} & ';
 	    $head.='lr';
 	} else {
 	    $line=~s/\&\s*$//;