version 1.321, 2013/08/29 12:47:30
|
version 1.331, 2015/03/10 23:11:22
|
Line 222 sub start_textfield {
|
Line 222 sub start_textfield {
|
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') || |
} elsif (($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurvey') || |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) { |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred')) { |
$oldresponse = '* '.&mt('only shown to submitter').' *'; |
$oldresponse = '* '.&mt('(only shown to submitter)').' *'; |
} else { |
} else { |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$resid.submission"}; |
} |
} |
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 254 sub start_textfield {
|
Line 259 sub start_textfield {
|
&& &Apache::londefdef::is_inside_of($tagstack, |
&& &Apache::londefdef::is_inside_of($tagstack, |
'essayresponse') ) { |
'essayresponse') ) { |
$result='<table class="LC_pastsubmission"><tr><td>'. |
$result='<table class="LC_pastsubmission"><tr><td>'. |
$oldresponse.'</td></tr></table>'; |
&HTML::Entities::encode($oldresponse,'"<>&'). |
|
'</td></tr></table>'; |
} |
} |
#get rid of any startup text |
#get rid of any startup text |
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
&Apache::lonxml::get_all_text("/textfield",$parser,$style); |
Line 320 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 424 sub start_textline {
|
Line 431 sub start_textline {
|
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') || |
($Apache::lonhomework::history{"resource.$partid.type"} eq 'anonsurveycred') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
$oldresponse = '* '.&mt('only shown to submitter').' *'; |
$oldresponse = '* '.&mt('(only shown to submitter)').' *'; |
} else { |
} else { |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
} |
} |
Line 452 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 633 sub file_selector {
|
Line 640 sub file_selector {
|
my $current_files_display = ¤t_file_submissions($part,$id); |
my $current_files_display = ¤t_file_submissions($part,$id); |
my $addfiles; |
my $addfiles; |
if ($current_files_display) { |
if ($current_files_display) { |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')). |
$result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')). |
$current_files_display. |
$current_files_display. |
&Apache::lonhtmlcommon::row_closure(); |
&Apache::lonhtmlcommon::row_closure(); |
$addfiles = &mt('Submit other file(s)'); |
$addfiles = &mt('Submit other file(s)'); |
Line 691 sub current_file_submissions {
|
Line 698 sub current_file_submissions {
|
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"}; |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/)); |
|
my @unversioned; |
|
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
|
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
|
my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name); |
|
unless ($version) { |
|
push(@unversioned,$file); |
|
} |
|
} |
|
return if (!@unversioned); |
my $header = &portpath_popup_js(). |
my $header = &portpath_popup_js(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
Line 701 sub current_file_submissions {
|
Line 717 sub current_file_submissions {
|
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Size (MB)').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
'<th>'.&mt('Last Modified').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser(); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
if ($uploadedfile) { |
if ($uploadedfile) { |
Line 720 sub current_file_submissions {
|
Line 736 sub current_file_submissions {
|
push(@bad_file_list,$error); |
push(@bad_file_list,$error); |
} |
} |
} |
} |
if ($portfiles =~ /[^\s]/) { |
if (@unversioned > 0) { |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
my $prefix = "/uploaded/$udom/$uname/portfolio"; |
foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) { |
foreach my $file (@unversioned) { |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$}); |
my $url = $prefix.$path.$name; |
my $url = $prefix.$path.$name; |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
my $uploadedfile = &HTML::Entities::encode($url,'<>&"'); |
Line 870 END
|
Line 886 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 890 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', |
'TOO_LONG', |
'WRONG_NUMCHECKEDBOXES','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 992 sub finalizeawards {
|
Line 1008 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 1117 sub decideoutput {
|
Line 1133 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 1488 sub setgradedata {
|
Line 1511 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 1568 sub grade {
|
Line 1592 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 1583 sub get_grade_messages {
|
Line 1607 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 1624 sub get_grade_messages {
|
Line 1648 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 1632 sub get_grade_messages {
|
Line 1656 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 1646 sub gradestatus {
|
Line 1670 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 1662 sub gradestatus {
|
Line 1687 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 1691 sub gradestatus {
|
Line 1724 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; |