version 1.317, 2013/04/30 03:03:34
|
version 1.325, 2014/09/14 15:21:43
|
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 238 sub start_textfield {
|
Line 238 sub start_textfield {
|
if ($addchars) { |
if ($addchars) { |
$result.=&addchars($tagident, $addchars); |
$result.=&addchars($tagident, $addchars); |
} |
} |
my $textareaclass = 'class="LC_richDetectHtml spellchecked"'; |
my $textareaclass; |
|
unless (&Apache::londefdef::is_inside_of($tagstack, |
|
'externalresponse')) { |
|
$textareaclass = 'class="LC_richDetectHtml spellchecked"'; |
|
} |
$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' . |
$result.= '<textarea wrap="hard" name="'.$tagident.'" id="'.$tagident.'" ' . |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass |
'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass |
.'>'. |
.'>'. |
Line 254 sub start_textfield {
|
Line 258 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 424 sub start_textline {
|
Line 429 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 647 sub file_selector {
|
Line 652 sub file_selector {
|
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />'; |
} |
} |
if ($maxfilesize) { |
if ($maxfilesize) { |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].', |
$constraints .= &mt('Combined size of all files not to exceed: [_1] MB.', |
'<b>'.$maxfilesize.'</b>').'<br />'; |
'<b>'.$maxfilesize.'</b>').'<br />'; |
} |
} |
if ($constraints) { |
if ($constraints) { |
Line 691 sub current_file_submissions {
|
Line 696 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 $header = &Apache::loncommon::start_data_table(). |
my $header = &portpath_popup_js(). |
|
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(); |
&Apache::loncommon::start_data_table_header_row(); |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$header .= '<th>'.&mt('Delete?').'</th>'; |
$header .= '<th>'.&mt('Delete?').'</th>'; |
Line 757 sub current_file_submissions {
|
Line 763 sub current_file_submissions {
|
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
$num ++; |
$num ++; |
} |
} |
my $showname = $rows{$url}{path}.$name; |
my $pathid = 'HWFILE'.$jspart.'_'.$id.'_'.$num.'_path'; |
|
my $pathidtext = $pathid.'text'; |
|
my ($showname,$showpath); |
if ($legacy{$url}) { |
if ($legacy{$url}) { |
$showname = $name.' '.&mt('not in portfolio'); |
$showname = $name.' '.&mt('not in portfolio'); |
|
} else { |
|
$showname = $name; |
|
$showpath = '<br />'. |
|
'<span id="'.$pathidtext.'" class="LC_cusr_subheading">'. |
|
'<a href="javascript:showPortPath('."'$pathid','$pathidtext'".');" '. |
|
'class="LC_menubuttons_link">'. |
|
&mt('(Show path)').'</a></span>'. |
|
'<div id="'.$pathid.'" class="LC_dccid">'.$rows{$url}{path}.$name. |
|
'</div>'; |
} |
} |
$result .= |
$result .= |
'<td><a href="'.$link.'"><img src="'.$icon. |
'<td><a href="'.$link.'"><img src="'.$icon. |
'" border="0" alt="" />'.$showname.'</a></td>'."\n". |
'" border="0" alt="" />'.$showname.'</a>'.$showpath.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{size}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
'<td align="right" valign="bottom">'.$rows{$url}{lastmodified}.'</td>'."\n". |
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
Line 818 sub current_file_info {
|
Line 835 sub current_file_info {
|
return ($status,\%info,$error); |
return ($status,\%info,$error); |
} |
} |
|
|
|
sub portpath_popup_js { |
|
my %lt = &Apache::lonlocal::texthash( |
|
show => '(Show path)', |
|
hide => '(Hide)', |
|
); |
|
return <<"END"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function showPortPath(id,idtext) { |
|
document.getElementById(id).style.display='block'; |
|
document.getElementById(id).style.textAlign='left'; |
|
document.getElementById(id).style.textFace='normal'; |
|
if (document.getElementById(idtext)) { |
|
document.getElementById(idtext).innerHTML ='<a href="javascript:hidePortPath(\\''+id+'\\',\\''+idtext+'\\'); '+ |
|
'"class="LC_menubuttons_link">$lt{'hide'}</a> '; |
|
} |
|
return; |
|
} |
|
|
|
function hidePortPath(id,idtext) { |
|
if (document.getElementById(id)) { |
|
document.getElementById(id).style.display='none'; |
|
} |
|
if (document.getElementById(idtext)) { |
|
document.getElementById(idtext).innerHTML ='<a href="javascript:showPortPath(\\''+id+'\\',\\''+idtext+'\\');" '+ |
|
'class="LC_menubuttons_link">$lt{'show'}</a>'; |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
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', |
Line 943 sub finalizeawards {
|
Line 997 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 1088 sub decideoutput {
|
Line 1142 sub decideoutput {
|
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'EXCESS_FILESIZE') { |
} elsif ($award eq 'EXCESS_FILESIZE') { |
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.'); |
$message = &mt("Submission won't be graded. The combined size of submitted files exceeded the amount allowed."); |
$css_class=$possible_class{'not_charged_try'}; |
$css_class=$possible_class{'not_charged_try'}; |
$button=1; |
$button=1; |
} elsif ($award eq 'FILENAME_INUSE') { |
} elsif ($award eq 'FILENAME_INUSE') { |
Line 1519 sub grade {
|
Line 1573 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 1534 sub get_grade_messages {
|
Line 1588 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 1575 sub get_grade_messages {
|
Line 1629 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 1583 sub get_grade_messages {
|
Line 1637 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 1597 sub gradestatus {
|
Line 1651 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 1613 sub gradestatus {
|
Line 1668 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 1642 sub gradestatus {
|
Line 1705 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 1658 sub previous_tries {
|
Line 1721 sub previous_tries {
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
my $lastrndseed; |
my $lastrndseed; |
|
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"; |
Line 1714 sub previous_tries {
|
Line 1778 sub previous_tries {
|
$message =~ s{(<td.*?>)}{<td>}; |
$message =~ s{(<td.*?>)}{<td>}; |
|
|
|
|
$output.='<tr class="'.$class.'">'; |
$output .= '<tr class="'.$class.'">'. |
$output.='<td align="center">'.$count.'</td>'; |
'<td align="center">'.$count.'</td>'.$message; |
$output.=$message; |
if ((!$is_anon) && ($Apache::lonhomework::history{"$prefix.tries"}) && |
|
($Apache::lonhomework::history{"$prefix.award"} ne 'ASSIGNED_SCORE') && |
|
($Apache::lonhomework::history{$i.':timestamp'})) { |
|
$output .= '<td>'.&Apache::lonlocal::locallocaltime( |
|
$Apache::lonhomework::history{$i.':timestamp'}).'</td>'; |
|
$numstamps ++; |
|
} else { |
|
$output .= '<td></td>'; |
|
} |
foreach my $resid (@Apache::inputtags::response) { |
foreach my $resid (@Apache::inputtags::response) { |
my $prefix = $prefix.".$resid"; |
my $prefix = $prefix.".$resid"; |
if (exists($Apache::lonhomework::history{"$prefix.submission"})) { |
if (exists($Apache::lonhomework::history{"$prefix.submission"})) { |
Line 1740 sub previous_tries {
|
Line 1811 sub previous_tries {
|
$lastrndseed = $curr_rndseed; |
$lastrndseed = $curr_rndseed; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = |
my $headers = '<tr>'. |
'<tr>'.'<th>'.&mt('Submission #').'</th><th>'.&mt('Try'). |
'<th>'.&mt('Submission #').'</th>'. |
'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'. |
'<th>'.&mt('Try').'</th><th>'; |
&mt('Submitted Answer').'</th>'; |
if ($numstamps) { |
|
$headers .= &mt('When'); |
|
} |
|
$headers .= '</th>'; |
|
my $colspan = scalar(@Apache::inputtags::response); |
|
if ($colspan > 1) { |
|
$headers .= '<th colspan="'.$colspan.'">'; |
|
} else { |
|
$headers .= '<th>'; |
|
} |
|
$headers .= &mt('Submitted Answer').'</th></tr>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
$output ='<table class="LC_prior_tries">'.$headers.$output.'</table>'; |
|
|
my $tries_text = &get_tries_text('link'); |
my $tries_text = &get_tries_text('link'); |