version 1.333.2.4, 2016/08/05 23:17:10
|
version 1.340, 2016/04/02 04:30:39
|
Line 646 sub file_selector {
|
Line 646 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 667 sub file_selector {
|
Line 667 sub file_selector {
|
$result .= $constraints.'<br />'; |
$result .= $constraints.'<br />'; |
} |
} |
if ($which eq 'uploadonly' || $which eq 'both') { |
if ($which eq 'uploadonly' || $which eq 'both') { |
$result.=&mt('Submit a file: (only one file per submission)'). |
my $free_space = $maxfilesize * 1048576; |
' <br /><input type="file" size="50" name="HWFILE'. |
$result .= &mt('Submit a file: (only one file per submission)'). |
$jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />'; |
' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id. |
} |
'" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'. |
|
'<input type="hidden" id="free_space" value="'.$free_space.'" /><br />' |
|
} |
if ( $which eq 'both') { |
if ( $which eq 'both') { |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />'; |
} |
} |
Line 704 sub current_file_submissions {
|
Line 706 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 714 sub current_file_submissions {
|
Line 725 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 733 sub current_file_submissions {
|
Line 744 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 1048 sub decideoutput {
|
Line 1059 sub decideoutput {
|
# |
# |
|
|
my $computer = ($handgrade || $nocorrect)? '' |
my $computer = ($handgrade || $nocorrect)? '' |
: &mt("Computer's answer now shown above."); |
: " ".&mt("Computer's answer now shown above."); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
&Apache::lonxml::debug("handgrade has :$handgrade:"); |
|
|
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
if ($previous) { $previousmsg=&mt('You have entered that answer before'); } |
Line 1072 sub decideoutput {
|
Line 1083 sub decideoutput {
|
$message = '\textbf{'.$message.'}'; |
$message = '\textbf{'.$message.'}'; |
} else { |
} else { |
$message = "<b>".$message."</b>"; |
$message = "<b>".$message."</b>"; |
if ($computer) { |
$message.= $computer; |
$message = "$computer $message"; |
|
} |
|
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
if ($awarded > 0) { |
if ($awarded > 0) { |
Line 1118 sub decideoutput {
|
Line 1127 sub decideoutput {
|
$message = '\textbf{'.&mt('You are correct.').'}'; |
$message = '\textbf{'.&mt('You are correct.').'}'; |
} else { |
} else { |
$message = "<b>".&mt('You are correct.')."</b>"; |
$message = "<b>".&mt('You are correct.')."</b>"; |
if ($computer) { |
$message.= $computer; |
$message = "$computer $message"; |
|
} |
|
} |
} |
$added_computer_text=1; |
$added_computer_text=1; |
if ($awarded > 0 |
if ($awarded > 0 |
Line 1329 sub decideoutput {
|
Line 1336 sub decideoutput {
|
} |
} |
$css_class=$possible_class{'no_grade'}; |
$css_class=$possible_class{'no_grade'}; |
$button=1; |
$button=1; |
|
if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') { |
|
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { |
|
$message = 'Answer Submitted'; |
|
} else { |
|
undef($message); |
|
} |
|
} |
} |
} |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && |
!$added_computer_text && $target ne 'tex') { |
!$added_computer_text && $target ne 'tex') { |
if ($computer) { |
$message.= $computer; |
$message = "$computer $message"; |
|
} |
|
$added_computer_text=1; |
$added_computer_text=1; |
} |
} |
if ($Apache::lonhomework::type eq 'practice') { |
if ($Apache::lonhomework::type eq 'practice') { |
Line 1631 sub get_grade_messages {
|
Line 1643 sub get_grade_messages {
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$message='\vskip 2 mm '.$message.' '; |
$message='\vskip 2 mm '.$message.' '; |
} else { |
} else { |
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
if ($message) { |
|
$message="<td class=\"$tdclass $css_class\">$message</td>"; |
|
} else { |
|
$message="<td class=\"$tdclass\"></td>"; |
|
} |
if ($previousmsg) { |
if ($previousmsg) { |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
$previousmsg="<td class=\"$tdclass LC_answer_previous\">$previousmsg</td>"; |
} |
} |
Line 1701 sub gradestatus {
|
Line 1717 sub gradestatus {
|
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'NOT_IN_A_SLOT' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'RESERVABLE_LATER' |
&& $status ne 'NOTRESERVABLE') { |
&& $status ne 'NOTRESERVABLE' |
|
&& $status ne 'NEED_DIFFERENT_IP') { |
|
|
if ($status eq 'SHOW_ANSWER') { |
if ($status eq 'SHOW_ANSWER') { |
$showbutton = 0; |
$showbutton = 0; |
Line 1734 sub gradestatus {
|
Line 1751 sub gradestatus {
|
} |
} |
|
|
} |
} |
my $output= $previousmsg.$latemessage.$message.$trystr; |
my $output= $previousmsg.$latemessage.$message; |
|
my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}; |
|
unless ($crstype eq 'Placement') { |
|
$output .= $trystr; |
|
} |
if ($output =~ /^\s*$/) { |
if ($output =~ /^\s*$/) { |
return $button; |
return $button; |
} else { |
} else { |
Line 1743 sub gradestatus {
|
Line 1764 sub gradestatus {
|
} else { |
} else { |
$output = |
$output = |
'<table><tr><td>'.$button.'</td>'.$output; |
'<table><tr><td>'.$button.'</td>'.$output; |
if (!$no_previous) { |
if ((!$no_previous) && ($crstype ne 'Placement')) { |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
$output.='<td class="'.$tdclass.'">'.&previous_tries($id,$target).'</td>'; |
} |
} |
$output.= '</tr></table>'; |
$output.= '</tr></table>'; |