version 1.329, 2014/12/22 17:04:03
|
version 1.335, 2015/04/21 16:03:37
|
Line 464 sub start_textline {
|
Line 464 sub start_textline {
|
$name = "none"; |
$name = "none"; |
} |
} |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"' |
. ' type="text" ' |
. ' onfocus="javascript:disableAutoComplete(\''.$itemid.'\');"' |
. $readonly.' name="'. $name . '"' |
. ' type="text" '.$readonly.' name="'. $name . '"' |
. ' id="' . $itemid . '"' |
. ' id="' . $itemid . '"' |
. ' value="'. $oldresponse.'"' |
. ' value="'. $oldresponse.'"' |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; |
. ' autocomplete="off" />'; |
|
|
|
$result .= &spellcheck_onblur($itemid, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
} |
} |
Line 907 sub valid_award {
|
Line 906 sub valid_award {
|
|
|
{ |
{ |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
'WRONG_NUMCHECKEDBOXES','TOO_LONG', |
'WRONG_NUMBOXESCHECKED','TOO_LONG', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', |
Line 997 sub finalizeawards {
|
Line 996 sub finalizeawards {
|
$j++; |
$j++; |
} |
} |
|
|
|
# if at least one response item is set to include lenient grading |
|
# and that item is partially correct then overall award reflects |
|
# that, unless an award for one of the other response items does |
|
# not fall within the basic awards for correct or incorrect. |
|
if ($Apache::inputtags::leniency) { |
|
if (($$awardref[$which] eq 'INCORRECT') |
|
&& (grep { $_ eq 'EXACT_ANS' || |
|
$_ eq 'APPROX_ANS' || |
|
$_ eq 'ASSIGNED_SCORE' } (@$awardref)) |
|
&& !((grep { $_ ne 'INCORRECT' && |
|
$_ ne 'EXACT_ANS' && |
|
$_ ne 'APPROX_ANS' && |
|
$_ ne 'ASSIGNED_SCORE' } (@$awardref)))) { |
|
return ('ASSIGNED_SCORE'); |
|
} |
|
} |
|
|
if (defined($which)) { |
if (defined($which)) { |
if (ref($nameref)) { |
if (ref($nameref)) { |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
return ($$awardref[$which],$$msgref[$which],$$nameref[$which]); |
Line 1512 sub setgradedata {
|
Line 1528 sub setgradedata {
|
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
$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.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate"); |
$Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries"); |
$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 { |
sub find_which_previous { |
Line 1739 sub previous_tries {
|
Line 1756 sub previous_tries {
|
|
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
my $lastrndseed; |
my ($lastrndseed,$lasttype); |
my $numstamps = 0; |
my $numstamps = 0; |
|
|
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
foreach my $i (1..$Apache::lonhomework::history{'version'}) { |
my $prefix = $i.":resource.$id"; |
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 (defined($env{'form.grade_symb'})) { |
if (($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurvey') || |
if (($curr_type eq 'anonsurvey') || ($curr_type eq 'anonsurveycred')) { |
($Apache::lonhomework::history{"$prefix.type"} eq 'anonsurveycred')) { |
|
$is_anon = 1; |
$is_anon = 1; |
} |
} |
} |
} |
Line 1786 sub previous_tries {
|
Line 1803 sub previous_tries {
|
{$1 <strong>$txt_correct</strong>. $3}s; |
{$1 <strong>$txt_correct</strong>. $3}s; |
} |
} |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")"; |
if (($curr_rndseed || $lastrndseed) && ($i > 1)) { |
if (($curr_rndseed ne '') && ($lastrndseed ne '')) { |
if ($curr_rndseed ne $lastrndseed) { |
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>'; |
$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>'; |
} |
} |
} |
} |
Line 1828 sub previous_tries {
|
Line 1846 sub previous_tries {
|
} |
} |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$lastrndseed = $curr_rndseed; |
$lastrndseed = $curr_rndseed; |
|
$lasttype = $curr_type; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = '<tr>'. |
my $headers = '<tr>'. |