--- loncom/homework/optionresponse.pm	2011/10/07 22:39:59	1.181
+++ loncom/homework/optionresponse.pm	2014/11/27 17:37:09	1.194
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.181 2011/10/07 22:39:59 raeburn Exp $
+# $Id: optionresponse.pm,v 1.194 2014/11/27 17:37:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,7 +64,7 @@ sub start_optionresponse {
 				     $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order:','randomize',
 				  ['yes','no'],$token).
-        &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',
+        &Apache::edit::select_arg('Display of options when printed','TeXlayout',
 				  [['horizontal','Normal list'],
 				   ['vertical','Listed in a vertical column']],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();
@@ -108,7 +108,11 @@ sub start_foilgroup {
     my $optionlist="<option></option>\n";
     my $option;
     my @opt;
-    eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
+    my @raw_options = &Apache::lonxml::get_param('options', $parstack, $safeeval, 0,  0, 1);
+
+
+    eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1);
+
     my $count=1;
     foreach $option (@opt) {
       $optionlist.="<option value=\"$count\">$option</option>\n";
@@ -116,17 +120,22 @@ sub start_foilgroup {
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($token);
+    my %lt = &Apache::lonlocal::texthash(
+        sel => 'Select Options',
+        add => 'Add new Option:',
+        del => 'Delete an Option:',
+    );
     $result.= (<<ENDTABLE);
-      <tr><td>Select Options</td>
+      <tr><td>$lt{'sel'}</td>
         <td>
-	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+	  $lt{'add'} <input type="text" name="$Apache::lonxml::curdepth.options" />
         </td>
-        <td>Delete an Option:
+        <td>$lt{'del'}
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
         </td>
 ENDTABLE
     $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
-					 [ ['nochoice','Don\'t show option list'] ]
+					 [ ['nochoice',"Don't show option list"] ]
 					 ,$token).'</td>';
     $result.= '<td><label>'.&mt('Two-option checkboxes for:').
               '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
@@ -137,9 +146,12 @@ ENDTABLE
        }
        $result.='>'.$option.'</option>';
     }
-    $result.='</select></label>';
+    $result.='</select></label> ';
     $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
-                                         [ ['nochoice','Don\'t show option list'] ]
+                                         [ ['nochoice',"Don't show option list"] ]
+                                         ,$token).' '.
+             &Apache::edit::checked_arg('','noprompt',
+                                         [ ['nochoice','Omit "Select all that are ... "' ] ]
                                          ,$token).'</td>';
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
@@ -148,7 +160,10 @@ ENDTABLE
   if ($target eq 'modified') {
     my @options;
     my $optchanged=0;
-    eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+
+
+    eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval, 0, 0, 1);
+
     if ($env{"form.$Apache::lonxml::curdepth.deleteopt"}) {
       my $delopt=$env{"form.$Apache::lonxml::curdepth.deleteopt"};
       &Apache::lonxml::debug("Deleting :$delopt:");
@@ -161,7 +176,8 @@ ENDTABLE
       $optchanged=1;
     }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'texoptions','checkboxvalue','checkboxoptions');
+						 'texoptions','checkboxvalue','checkboxoptions',
+                                                 'noprompt');
     if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
@@ -173,7 +189,8 @@ ENDTABLE
       $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
       $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
-      $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
+      $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
+      $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
       $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
@@ -203,13 +220,15 @@ sub end_foilgroup {
 					     -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
+    my $noprompt=&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
+
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");
     my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
     my $randomize = &Apache::lonxml::get_param('randomize',$parstack,
 					       $safeeval,'-2');
     if ($target eq 'web' || $target eq 'tex') {
-      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt);
+      $result.=&displayfoils($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,$tex_option_switch, $noprompt, @opt);
       $Apache::lonxml::post_evaluate=0;
     } elsif ( $target eq 'answer') {
       $result.=&displayanswers($max,$randomize,@opt);
@@ -282,7 +301,7 @@ sub end_foilgroup {
 	  }
 	}
 	my $part=$Apache::inputtags::part;
-        my $nonlenient=&is_nonlenient($part);
+        my $nonlenient=&grading_is_nonlenient($part);
 	my $id = $Apache::inputtags::response['-1'];
 	my $responsestr=&Apache::lonnet::hash2str(%responsehash);
 	my $gradestr   =&Apache::lonnet::hash2str(%grade);
@@ -386,18 +405,18 @@ sub end_foilgroup {
   return $result;
 }
 
-sub is_nonlenient {
+sub grading_is_nonlenient {
     my ($part) = @_;
-# Web mode: we are non-lenient unless told otherwise 
+# Web mode: we are non-lenient unless told otherwise
     my $defaultparm = 'off';
     my $nonlenient = 0;
-# Grading a bubblesheet exam: we are grading lenient unless told otherwise 
+# Grading a bubblesheet exam: we are grading lenient unless told otherwise
     if ($Apache::lonhomework::scantronmode) {
         $defaultparm = 'on';
         $nonlenient = 1;
     }
-    my $lenientparm = 
-        &Apache::response::get_response_param($part,'lenient',$defaultparm);  
+    my $lenientparm =
+        &Apache::response::get_response_param($part,'lenient',$defaultparm);
     if ($lenientparm=~/^0|off|no$/i) {
         $nonlenient = 1;
     } elsif ($lenientparm=~/^1|on|yes$/i) {
@@ -425,8 +444,11 @@ sub whichfoils {
 
 sub displayanswers {
     my ($max,$randomize,@opt)=@_;
-    if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
-    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @names;
+    if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+        @names = @{ $Apache::response::foilgroup{'names'} };
+    }
+    return if (!@names);
     my @whichopt = &whichfoils($max,$randomize);
     my $result;
     if ($Apache::lonhomework::type eq 'exam') {
@@ -485,9 +507,13 @@ sub check_for_invalid {
 }
 
 sub displayfoils {
-  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,@opt)=@_;
-  if (!defined(@{ $Apache::response::foilgroup{'names'} })) {return;}
-  my @names = @{ $Apache::response::foilgroup{'names'} };
+  my ($target,$max,$randomize,$TeXlayout,$checkboxvalue,$checkboxchoices,
+      $tex_option_switch, $no_tfprompt, @opt)=@_;
+  my @names; 
+  if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+      @names = @{ $Apache::response::foilgroup{'names'} };
+  }
+  unless (@names > 0) { return;}
   my @truelist;
   my @falselist;
   my $result;  
@@ -495,7 +521,9 @@ sub displayfoils {
   my $displayoptionintex=1;
   my @alphabet = ('A'..'Z');
   my @whichopt = &whichfoils($max,$randomize);
-  &check_for_invalid(\@whichopt,\@opt);
+  unless (($target eq 'tex') && ($tex_option_switch eq 'nochoice')) {
+      &check_for_invalid(\@whichopt,\@opt);
+  }
   my $part=$Apache::inputtags::part;
   my $id=$Apache::inputtags::response[-1];
   my $break;
@@ -505,8 +533,15 @@ sub displayfoils {
     foreach $name (@whichopt) {
 	my $text=$Apache::response::foilgroup{$name.'.text'};
         my $lastresp;
-        unless ((($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') || ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) && (defined($env{'form.grade_symb'}))) {
+        if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+            (($env{'form.grade_username'} eq $env{'user.name'}) &&
+             ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
             $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+        } else {
+            unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+                    ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+                $lastresp = $Apache::lonhomework::history{"resource.$part.$id.submission"};
+            }
         }
 	my %lastresponse=&Apache::lonnet::str2hash($lastresp);
 	my $lastopt=$lastresponse{$name};
@@ -545,14 +580,25 @@ sub displayfoils {
         }
     }
     unless ($newvariation) {
-        %lastresponse=&Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+        if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+            (($env{'form.grade_username'} eq $env{'user.name'}) &&
+             ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+                 %lastresponse =
+                     &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+        } else {
+            unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+                    ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+                %lastresponse =
+                    &Apache::lonnet::str2hash($Apache::lonhomework::history{"resource.$part.$id.submission"});
+            }
+        }
     }
     my $internal_counter=$Apache::lonxml::counter;
     my $checkboxopt=&check_box_opt($target,$checkboxvalue,@opt);
-    if ($checkboxopt) {
+    if ($checkboxopt && (!$no_tfprompt)) {
        $result.='<br />'.
                 ($checkboxchoices?&mt('Choices: ').'<b>'.$opt[0].','.$opt[1].'</b>. ':'').
-                 &mt('Select all that are <b>[_1]</b>.',$checkboxopt);
+                 &mt('Select all that are [_1].','<b>'.$checkboxopt.'</b>');
     }
     foreach $name (@whichopt) {
       my $text=$Apache::response::foilgroup{$name.'.text'};
@@ -803,7 +849,7 @@ sub bubbles {
 	if ($response eq 'rankresponse') {$opt[$ind]='Rank '.$opt[$ind];}
 	if ($ind==0) {$leftmargin=6;} else {$leftmargin=10;}
 
-	$current_length += (length($opt[$ind])+length($item)+4)*2;
+	$current_length += (length($opt[$ind])+length($item)+5)*2;
         
 	if ($current_length<($textwidth-$leftmargin) and $ind!=$number_of_bubbles) {