--- loncom/homework/inputtags.pm	2014/11/07 22:00:17	1.327
+++ loncom/homework/inputtags.pm	2015/03/19 08:40:38	1.333.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.327 2014/11/07 22:00:17 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.1 2015/03/19 08:40:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -464,12 +464,11 @@ sub start_textline {
 		    $name = "none";
 		}
 		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
-		     . ' type="text" '
-		     . $readonly.' name="'. $name . '"'
+		     . ' onfocus="javascript:disableAutoComplete(\''.$itemid.'\');"'
+		     . ' type="text" '.$readonly.' name="'. $name . '"'
 		     . ' id="' . $itemid . '"'
 		     . ' value="'.  $oldresponse.'"'
-		     . ' class="LC_textline spellchecked"  size="'.$size.'"'.$maxlength
-		     . ' autocomplete="off" />';
+		     . ' class="LC_textline spellchecked"  size="'.$size.'"'.$maxlength.' />';
 
 		$result .= &spellcheck_onblur($itemid, $spellcheck);
 	    }
@@ -878,7 +877,7 @@ END
 sub valid_award {
     my ($award) =@_;
     foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR',
-			       'NO_RESPONSE',
+			       'NO_RESPONSE','WRONG_NUMBOXESCHECKED',
 			       'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR',
 			       'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE',
 			       'UNIT_FAIL', 'NO_UNIT',
@@ -898,7 +897,7 @@ sub valid_award {
 
 {
     my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
-		  'TOO_LONG',
+		  'WRONG_NUMCHECKEDBOXES','TOO_LONG',
 		  'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
 		  'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
 		  'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
@@ -1125,6 +1124,13 @@ sub decideoutput {
         }
 	$css_class=$possible_class{'not_charged_try'};
 	$button = 1;
+    } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
+        $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
+        if ($target ne 'tex') {
+           $message .= &Apache::loncommon::help_open_topic('Wrong_Num_Boxes_Checked');
+        }
+        $css_class=$possible_class{'not_charged_try'};
+        $button = 1;
     } elsif ($award eq 'ERROR') {
 	$message = &mt('An error occurred while grading your answer.');
 	$css_class=$possible_class{'not_charged_try'};
@@ -1496,7 +1502,8 @@ sub setgradedata {
     $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
     $Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
     $Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
-    $Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); 
+    $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
+    $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
 }
 
 sub find_which_previous {
@@ -1723,15 +1730,15 @@ sub previous_tries {
 
     my $count;
     my %count_lookup;
-    my $lastrndseed;
+    my ($lastrndseed,$lasttype);
     my $numstamps = 0;
 
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
 	my $prefix = $i.":resource.$id";
-        my $is_anon; 
+        my $is_anon;
+        my $curr_type = $Apache::lonhomework::history{"$prefix.type"};    
         if (defined($env{'form.grade_symb'})) {
-            if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || 
-                ($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) {
+            if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) {
                 $is_anon = 1;
             }
         }
@@ -1770,8 +1777,9 @@ sub previous_tries {
                              {$1 <strong>$txt_correct</strong>. $3}s;
 	    }
             my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
-            if (($curr_rndseed || $lastrndseed) && ($i > 1)) {
-                if ($curr_rndseed ne $lastrndseed) {
+            if (($curr_rndseed ne '') &&  ($lastrndseed ne '')) {
+                if (($curr_rndseed ne $lastrndseed) && 
+                    (($curr_type eq 'randomizetry') || ($lasttype eq 'randomizetry'))) {
                     $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';
                 }
             } 
@@ -1812,6 +1820,7 @@ sub previous_tries {
 	}
 	$output.=&Apache::loncommon::end_data_table_row()."\n";
         $lastrndseed = $curr_rndseed;
+        $lasttype = $curr_type;
     }
     return if ($output eq '');
     my $headers = '<tr>'.