--- loncom/homework/inputtags.pm 2014/11/28 18:23:04 1.328 +++ 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.328 2014/11/28 18:23:04 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.= ''; + . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; $result .= &spellcheck_onblur($itemid, $spellcheck); } @@ -1503,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 { @@ -1730,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; } } @@ -1777,8 +1777,9 @@ sub previous_tries { {$1 $txt_correct. $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 .= '
'.&mt('New problem variation this try.').''; } } @@ -1819,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 = ''.