version 1.323, 2014/01/13 15:29:10
|
version 1.333.2.2, 2015/04/21 22:52:44
|
Line 235 sub start_textfield {
|
Line 235 sub start_textfield {
|
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
$result=''; |
$result=''; |
my $tagident = 'HWVAL_' . $resid; |
my $tagident = 'HWVAL_' . $resid; |
|
my $itemid = 'HWVAL_'.$partid.'_'.$resid; |
if ($addchars) { |
if ($addchars) { |
$result.=&addchars($tagident, $addchars); |
$result.=&addchars($tagident, $addchars); |
} |
} |
my $textareaclass = 'class="LC_richDetectHtml spellchecked"'; |
my $textareaclass; |
$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' . |
unless (&Apache::londefdef::is_inside_of($tagstack, |
|
'externalresponse')) { |
|
$textareaclass = 'class="LC_richDetectHtml spellchecked"'; |
|
} |
|
$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$itemid.'" ' . |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass |
.'>'. |
.'>'. |
&HTML::Entities::encode($oldresponse,'<>&"'); |
&HTML::Entities::encode($oldresponse,'<>&"'); |
Line 321 sub end_textfield {
|
Line 326 sub end_textfield {
|
my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval); |
my $spellcheck = &Apache::lonxml::get_param('spellcheck', $parstack, $safeeval); |
$Apache::lonxml::evaluate++; |
$Apache::lonxml::evaluate++; |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
|
my $partid=$Apache::inputtags::part; |
my $resid = $Apache::inputtags::response[-1]; |
my $resid = $Apache::inputtags::response[-1]; |
my $tagident = 'HWVAL_' . $resid; |
my $itemid = 'HWVAL_' . $partid . '_' . $resid; |
my $result = "</textarea>"; |
my $result = "</textarea>"; |
$result .= &spellcheck_onblur($tagident, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
return $result; |
return $result; |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
Line 453 sub start_textline {
|
Line 459 sub start_textline {
|
$readonly=''; |
$readonly=''; |
} |
} |
my $name = 'HWVAL_'.$id; |
my $name = 'HWVAL_'.$id; |
|
my $itemid = 'HWVAL_'.$partid.'_'.$id; |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
$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="' . $name . '"' |
. ' id="' . $itemid . '"' |
. ' value="'. $oldresponse.'"' |
. ' value="'. $oldresponse.'"' |
. ' class="spellchecked" size="'.$size.'"'.$maxlength |
. ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength.' />'; |
. '/>'; |
|
|
|
$result .= &spellcheck_onblur($name, $spellcheck); |
$result .= &spellcheck_onblur($itemid, $spellcheck); |
} |
} |
if ($Apache::lonhomework::type eq 'exam' |
if ($Apache::lonhomework::type eq 'exam' |
&& &needs_exam_box($tagstack)) { |
&& &needs_exam_box($tagstack)) { |
Line 871 END
|
Line 877 END
|
sub valid_award { |
sub valid_award { |
my ($award) =@_; |
my ($award) =@_; |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
foreach my $possibleaward ('EXTRA_ANSWER','MISSING_ANSWER', 'ERROR', |
'NO_RESPONSE', |
'NO_RESPONSE','WRONG_NUMBOXESCHECKED', |
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', |
'TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', |
'UNIT_FAIL', 'NO_UNIT', |
'UNIT_FAIL', 'NO_UNIT', |
Line 891 sub valid_award {
|
Line 897 sub valid_award {
|
|
|
{ |
{ |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', |
'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 981 sub finalizeawards {
|
Line 987 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 993 sub finalizeawards {
|
Line 1016 sub finalizeawards {
|
} |
} |
|
|
sub decideoutput { |
sub decideoutput { |
my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_; |
my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect,$tdclass)=@_; |
|
|
my $message=''; |
my $message=''; |
my $button=0; |
my $button=0; |
Line 1118 sub decideoutput {
|
Line 1141 sub decideoutput {
|
} |
} |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button = 1; |
$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') { |
} elsif ($award eq 'ERROR') { |
$message = &mt('An error occurred while grading your answer.'); |
$message = &mt('An error occurred while grading your answer.'); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
Line 1489 sub setgradedata {
|
Line 1519 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 1569 sub grade {
|
Line 1600 sub grade {
|
} |
} |
|
|
sub get_grade_messages { |
sub get_grade_messages { |
my ($id,$prefix,$target,$status,$nocorrect) = @_; |
my ($id,$prefix,$target,$status,$nocorrect,$tdclass) = @_; |
# nocorrect suppresses "Computer's answer now shown above" |
# nocorrect suppresses "Computer's answer now shown above" |
my ($message,$latemessage,$trystr,$previousmsg); |
my ($message,$latemessage,$trystr,$previousmsg); |
my $showbutton = 1; |
my $showbutton = 1; |
Line 1584 sub get_grade_messages {
|
Line 1615 sub get_grade_messages {
|
&Apache::lonxml::debug('Getting message'); |
&Apache::lonxml::debug('Getting message'); |
($showbutton,my $css_class,$message,$previousmsg) = |
($showbutton,my $css_class,$message,$previousmsg) = |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
&decideoutput($award,$awarded,$awardmsg,$solved,$previous, |
$target,(($status eq 'CAN_ANSWER') || $nocorrect)); |
$target,(($status eq 'CAN_ANSWER') || $nocorrect),$tdclass); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
$message="<td class=\"$css_class\">$message</td>"; |
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
if ($previousmsg) { |
if ($previousmsg) { |
$previousmsg="<td class=\"LC_answer_previous\">$previousmsg</td>"; |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
} |
} |
} |
} |
} |
} |
Line 1625 sub get_grade_messages {
|
Line 1656 sub get_grade_messages {
|
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
$trial.="/".$Apache::inputtags::params{'maxtries'}; |
} |
} |
} |
} |
$trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
$trystr = '<td class="'.$tdclass.'"><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>'; |
} |
} |
} |
} |
|
|
Line 1633 sub get_grade_messages {
|
Line 1664 sub get_grade_messages {
|
#last submissions was after due date |
#last submissions was after due date |
$latemessage=&mt(' The last submission was after the Due Date ');; |
$latemessage=&mt(' The last submission was after the Due Date ');; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$latemessage='<td class="LC_answer_late">'.$latemessage.'</td>'; |
$latemessage='<td class="'.$tdclass.' LC_answer_late">'.$latemessage.'</td>'; |
} |
} |
} |
} |
return ($previousmsg,$latemessage,$message,$trystr,$showbutton); |
return ($previousmsg,$latemessage,$message,$trystr,$showbutton); |
Line 1647 sub gradestatus {
|
Line 1678 sub gradestatus {
|
my $trystr=''; |
my $trystr=''; |
my $button=''; |
my $button=''; |
my $previousmsg=''; |
my $previousmsg=''; |
|
my $tdclass=''; |
|
|
my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
&Apache::lonxml::debug("gradestatus has :$status:"); |
&Apache::lonxml::debug("gradestatus has :$status:"); |
Line 1663 sub gradestatus {
|
Line 1695 sub gradestatus {
|
$showbutton = 0; |
$showbutton = 0; |
} |
} |
|
|
|
unless (($status eq 'SHOW_ANSWER') || ($status eq 'CANNOT_ANSWER')) { |
|
if ($target ne 'tex') { |
|
$tdclass = 'LC_status_submit_'.$id; |
|
} |
|
} |
|
|
($previousmsg,$latemessage,$message,$trystr) = |
($previousmsg,$latemessage,$message,$trystr) = |
&get_grade_messages($id,"resource.$id",$target,$status, |
&get_grade_messages($id,"resource.$id",$target,$status, |
$showbutton); |
$showbutton,$tdclass); |
if ($status eq 'CANNOT_ANSWER') { |
if ($status eq 'CANNOT_ANSWER') { |
$showbutton = 0; |
$showbutton = 0; |
} |
} |
if ( $status eq 'SHOW_ANSWER') { |
if ( $status eq 'SHOW_ANSWER') { |
undef($previousmsg); |
undef($previousmsg); |
} |
} |
if ( $showbutton ) { |
if ( $showbutton ) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$button = |
$button = |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
'<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';" |
type="submit" name="submit_'.$id.'" |
type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" |
value="'.&mt('Submit Answer').'" />'; |
value="'.&mt('Submit Answer').'" /> '. |
|
'<div id="msg_submit_'.$id.'" style="display:none">'. |
|
&mt('Processing your submission ...').'</div>'; |
} |
} |
} |
} |
|
|
Line 1692 sub gradestatus {
|
Line 1732 sub gradestatus {
|
$output = |
$output = |
'<table><tr><td>'.$button.'</td>'.$output; |
'<table><tr><td>'.$button.'</td>'.$output; |
if (!$no_previous) { |
if (!$no_previous) { |
$output.='<td>'.&previous_tries($id,$target).'</td>'; |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
} |
} |
$output.= '</tr></table>'; |
$output.= '</tr></table>'; |
return $output; |
return $output; |
Line 1707 sub previous_tries {
|
Line 1747 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 1754 sub previous_tries {
|
Line 1794 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 1796 sub previous_tries {
|
Line 1837 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>'. |