version 1.268, 2010/08/23 03:05:12
|
version 1.271.2.3, 2010/12/21 14:56:03
|
Line 175 sub start_textfield {
|
Line 175 sub start_textfield {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
my $partid=$Apache::inputtags::part; |
my $partid=$Apache::inputtags::part; |
my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
my ($oldresponse,$newvariation); |
|
if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') || |
|
($Apache::lonhomework::type eq 'randomizetry')) && |
|
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
|
if ($env{'form.'.$partid.'.rndseed'} ne |
|
$Apache::lonhomework::history{"resource.$partid.rndseed"}) { |
|
$newvariation = 1; |
|
} |
|
} |
|
unless ($newvariation) { |
|
$oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"'); |
|
} |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval); |
if ( $cols eq '') { $cols = 80; } |
if ( $cols eq '') { $cols = 80; } |
Line 331 sub start_textline {
|
Line 342 sub start_textline {
|
$maxlength = ' maxlength="'.$size.'"'; |
$maxlength = ' maxlength="'.$size.'"'; |
} |
} |
} |
} |
my $oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
my ($oldresponse,$newvariation); |
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
if ((($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry') || |
|
($Apache::lonhomework::type eq 'randomizetry')) && |
if (ref($oldresponse) eq 'ARRAY') { |
($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) { |
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
if ($env{'form.'.$partid.'.rndseed'} ne |
} |
$Apache::lonhomework::history{"resource.$partid.rndseed"}) { |
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
$newvariation = 1; |
$oldresponse =~ s/^\s+//; |
} |
$oldresponse =~ s/\s+$//; |
} |
$oldresponse =~ s/\s+/ /g; |
unless ($newvariation) { |
|
$oldresponse = $Apache::lonhomework::history{"resource.$partid.$id.submission"}; |
|
&Apache::lonxml::debug("oldresponse $oldresponse is ".ref($oldresponse)); |
|
|
|
if (ref($oldresponse) eq 'ARRAY') { |
|
$oldresponse = $oldresponse->[$#Apache::inputtags::inputlist]; |
|
} |
|
$oldresponse = &HTML::Entities::encode($oldresponse,'<>&"'); |
|
$oldresponse =~ s/^\s+//; |
|
$oldresponse =~ s/\s+$//; |
|
$oldresponse =~ s/\s+/ /g; |
|
} |
if ($Apache::lonhomework::type ne 'exam') { |
if ($Apache::lonhomework::type ne 'exam') { |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); |
$result=''; |
$result=''; |
Line 527 sub current_file_submissions {
|
Line 549 sub current_file_submissions {
|
my ($part,$id) = @_; |
my ($part,$id) = @_; |
my $jspart=$part; |
my $jspart=$part; |
$jspart=~s/\./_/g; |
$jspart=~s/\./_/g; |
my $uploadedfile=&HTML::Entities::encode($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 = &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(); |
'<th>'.&mt('Delete?').'</th>'. |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
'<th>'.&mt('Name').'</th>'. |
$header .= '<th>'.&mt('Delete?').'</th>'; |
|
} |
|
$header .= '<th>'.&mt('File').'</th>'. |
'<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 (undef,$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,@bad_file_list); |
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list); |
if ($uploadedfile) { |
if ($uploadedfile) { |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"}; |
my ($path,$name) = ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E/(essayresponse/.+/)([^/]+))}); |
my $link = &HTML::Entities::encode($url,'<>&"'); |
|
my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$}); |
my ($status,$hashref,$error) = |
my ($status,$hashref,$error) = |
¤t_file_info($url,$uploadedfile,$name,$path); |
¤t_file_info($url,$link,$name,$path); |
if ($status eq 'ok') { |
if ($status eq 'ok') { |
push(@{$okfiles{$name}},$url); |
push(@{$okfiles{$name}},$url); |
$rows{$url} = $hashref; |
$rows{$url} = $hashref; |
|
$legacy{$url} = 1; |
&Apache::lonxml::extlink($url); |
&Apache::lonxml::extlink($url); |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
&Apache::lonnet::allowuploaded('/adm/essayresponse',$url); |
} else { |
} else { |
Line 572 sub current_file_submissions {
|
Line 598 sub current_file_submissions {
|
} |
} |
foreach my $name (sort(keys(%okfiles))) { |
foreach my $name (sort(keys(%okfiles))) { |
if (ref($okfiles{$name}) eq 'ARRAY') { |
if (ref($okfiles{$name}) eq 'ARRAY') { |
|
my $num = 0; |
foreach my $url (@{$okfiles{$name}}) { |
foreach my $url (@{$okfiles{$name}}) { |
if (ref($rows{$url}) eq 'HASH') { |
if (ref($rows{$url}) eq 'HASH') { |
my $link = $rows{$url}{link}; |
my $link = $rows{$url}{link}; |
Line 584 sub current_file_submissions {
|
Line 611 sub current_file_submissions {
|
$header_shown = 1; |
$header_shown = 1; |
} |
} |
$result.= |
$result.= |
&Apache::loncommon::start_data_table_row()."\n". |
&Apache::loncommon::start_data_table_row()."\n"; |
'<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete" value="'. |
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') { |
$portfile.'" /></td>'."\n". |
$result .= |
|
'<td valign="bottom"><input type="checkbox" name="HWFILE'.$jspart.'_'.$id.'_delete"'. |
|
' value="'.$portfile.'" id="HWFILE'.$jspart.'_'.$id.'_'.$num.'_delete" /></td>'."\n"; |
|
$num ++; |
|
} |
|
my $showname = $rows{$url}{path}.$name; |
|
if ($legacy{$url}) { |
|
$showname = $name.' '.&mt('not in portfolio'); |
|
} |
|
$result .= |
'<td><a href="'.$link.'"><img src="'.$icon. |
'<td><a href="'.$link.'"><img src="'.$icon. |
'" border="0" />'.$name.'</a></td>'."\n". |
'" border="0" />'.$showname.'</a></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 598 sub current_file_submissions {
|
Line 634 sub current_file_submissions {
|
} |
} |
} |
} |
if ($header_shown) { |
if ($header_shown) { |
$result .= &Apache::loncommon::end_data_table(); |
$result .= &Apache::loncommon::end_data_table(). |
|
'<br /><span class="LC_warning">'. |
|
&mt('Items checked for deletion will not be included amongst the files evaluated when your submission is graded.').'</span>'; |
} |
} |
if (@bad_file_list) { |
if (@bad_file_list) { |
my $bad_files = '<span class="LC_filename">'. |
my $bad_files = '<span class="LC_filename">'. |
Line 1228 sub setgradedata {
|
Line 1266 sub setgradedata {
|
&Apache::response::add_to_gradingqueue(); |
&Apache::response::add_to_gradingqueue(); |
} |
} |
if (($Apache::lonhomework::type eq 'anonsurvey') || |
if (($Apache::lonhomework::type eq 'anonsurvey') || |
($Apache::lonhomework::type eq 'anonsurveycred')) { |
($Apache::lonhomework::type eq 'anonsurveycred') || |
|
($Apache::lonhomework::type eq 'randomizetry')) { |
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
$Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type; |
} |
} |
|
if ($Apache::lonhomework::type eq 'randomizetry') { |
|
$Apache::lonhomework::results{"resource.$id.rndseed"} = $env{'form.'.$id.'.rndseed'}; |
|
} |
} |
} |
|
|
sub find_which_previous { |
sub find_which_previous { |
Line 1439 sub previous_tries {
|
Line 1481 sub previous_tries {
|
|
|
my $count; |
my $count; |
my %count_lookup; |
my %count_lookup; |
|
my $lastrndseed; |
|
|
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 1452 sub previous_tries {
|
Line 1495 sub previous_tries {
|
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
next if (!exists($Apache::lonhomework::history{"$prefix.award"})); |
$count++; |
$count++; |
$count_lookup{$i} = $count; |
$count_lookup{$i} = $count; |
|
my $curr_rndseed = $Apache::lonhomework::history{"$prefix.rndseed"}; |
|
|
my ($previousmsg,$latemessage,$message,$trystr); |
my ($previousmsg,$latemessage,$message,$trystr); |
|
|
($previousmsg,$latemessage,$message,$trystr) = |
($previousmsg,$latemessage,$message,$trystr) = |
Line 1474 sub previous_tries {
|
Line 1518 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) { |
|
if ($curr_rndseed ne $lastrndseed) { |
|
$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>'; |
|
} |
|
} |
$message =~ s{(</td>)}{ $trystr $1}; |
$message =~ s{(</td>)}{ $trystr $1}; |
} |
} |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
my ($class) = ($message =~ m{<td.*class="([^"]*)"}); #" |
Line 1503 sub previous_tries {
|
Line 1552 sub previous_tries {
|
} |
} |
} |
} |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
$output.=&Apache::loncommon::end_data_table_row()."\n"; |
|
$lastrndseed = $curr_rndseed; |
} |
} |
return if ($output eq ''); |
return if ($output eq ''); |
my $headers = |
my $headers = |