--- loncom/homework/inputtags.pm 2010/06/17 00:13:20 1.264
+++ loncom/homework/inputtags.pm 2010/06/21 02:15:37 1.265
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.264 2010/06/17 00:13:20 raeburn Exp $
+# $Id: inputtags.pm,v 1.265 2010/06/21 02:15:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,6 +53,7 @@ package Apache::inputtags;
use HTML::Entities();
use strict;
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::lonnet;
use LONCAPA;
@@ -479,87 +480,162 @@ sub file_selector {
$jspart=~s/\./_/g;
my $result;
-
- $result.='
';
- if (($uploadedfiletypes ne '*') || ($maxfilesize)) {
- if ($uploadedfiletypes ne '*') {
- $result.=
- &mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.'').' ';
- }
- if ($maxfilesize) {
- $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
- ''.$maxfilesize.'').' ';
- }
- $result .= ' ';
+ my $current_files_display = ¤t_file_submissions($part,$id);
+ my $addfiles;
+ if ($current_files_display) {
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files:')).
+ $current_files_display.
+ &Apache::lonhtmlcommon::row_closure();
+ $addfiles = &mt('Submit other file(s)');
+ } else {
+ $addfiles = &mt('Choose file(s) to submit');
+ }
+ $result .= &Apache::lonhtmlcommon::row_title($addfiles);
+ my $constraints;
+ if ($uploadedfiletypes ne '*') {
+ $constraints =
+ &mt('Allowed filetypes: [_1]',''.$uploadedfiletypes.'').' ';
+ }
+ if ($maxfilesize) {
+ $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+ ''.$maxfilesize.'').' ';
+ }
+ if ($constraints) {
+ $result .= $constraints.' ';
}
if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file can be uploaded)').
+ $result.=&mt('Submit a file: (only one file per submission)').
'
';
- $result .= &show_past_file_submission($part,$id);
}
- if ( $which eq 'both') {
+ if ( $which eq 'both') {
$result.=' '.''.&mt('OR:').' ';
}
if ($which eq 'portfolioonly' || $which eq 'both') {
$result.=$extratext.''.
- &mt('Select Portfolio Files').' '.
+ &mt('Select Portfolio Files: (one or more files per submission)').' '.
''.
' ';
- $result .= &show_past_portfile_submission($part,$id);
+
}
- $result.=' |
';
+ $result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
}
-sub show_past_file_submission {
+sub current_file_submissions {
my ($part,$id) = @_;
- my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
-
- return if (!$uploadedfile);
-
- my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- &Apache::lonxml::extlink($url);
- &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
- my $icon=&Apache::loncommon::icon($url);
- my $curfile=''.$uploadedfile.'';
- return &mt('Currently submitted: [_1]',''.$curfile.'');
-
-}
-
-sub show_past_portfile_submission {
- my ($part,$id) = @_;
- if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}!~/[^\s]/){
- return;
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+ my $uploadedfile=&HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+ my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
+ return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+ my $header = &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ ''.&mt('Delete?').' | '.
+ ''.&mt('Name').' | '.
+ ''.&mt('Size (MB)').' | '.
+ ''.&mt('Last Modified').' | '.
+ &Apache::loncommon::end_data_table_header_row();
+ my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+ my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
+ my ($result,$header_shown,%okfiles,%rows,@bad_file_list);
+ if ($uploadedfile) {
+ my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
+ my ($path,$name) = ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E/(essayresponse/.+/)([^/]+))});
+ my ($status,$hashref,$error) =
+ ¤t_file_info($url,$uploadedfile,$name,$path);
+ if ($status eq 'ok') {
+ push(@{$okfiles{$name}},$url);
+ $rows{$url} = $hashref;
+ &Apache::lonxml::extlink($url);
+ &Apache::lonnet::allowuploaded('/adm/essayresponse',$url);
+ } else {
+ push(@bad_file_list,$error);
+ }
}
- my (@file_list,@bad_file_list);
- foreach my $file (split(/\s*,\s*/,&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
- my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
- my $url="/uploaded/$domain/$user/portfolio$file";
- my $icon=&Apache::loncommon::icon($url);
- push(@file_list,''.$file.'');
- if (! &Apache::lonnet::stat_file($url)) {
- &Apache::lonnet::logthis("bad file is $url");
- push(@bad_file_list,''.$file.'');
- }
+ if ($portfiles =~ /[^\s]/) {
+ my $prefix = "/uploaded/$udom/$uname/portfolio";
+ foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+ my $url = $prefix.$path.$name;
+ my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
+ my ($status,$hashref,$error) =
+ ¤t_file_info($url,$uploadedfile,$name,$path);
+ if ($status eq 'ok') {
+ push(@{$okfiles{$name}},$url);
+ $rows{$url} = $hashref;
+ } else {
+ push(@bad_file_list,$error);
+ }
+ }
+ }
+ foreach my $name (sort(keys(%okfiles))) {
+ if (ref($okfiles{$name}) eq 'ARRAY') {
+ foreach my $url (@{$okfiles{$name}}) {
+ if (ref($rows{$url}) eq 'HASH') {
+ my $link = $rows{$url}{link};
+ my $portfile = $rows{$url}{path}.$rows{$url}{name};
+ $portfile = &HTML::Entities::encode($portfile,'<>&"');
+ if ($link) {
+ my $icon=&Apache::loncommon::icon($url);
+ unless ($header_shown) {
+ $result .= $header;
+ $header_shown = 1;
+ }
+ $result.=
+ &Apache::loncommon::start_data_table_row()."\n".
+ ' | '."\n".
+ ''.$name.' | '."\n".
+ ''.$rows{$url}{size}.' | '."\n".
+ ''.$rows{$url}{lastmodified}.' | '."\n".
+ &Apache::loncommon::end_data_table_row();
+ }
+ }
+ }
+ }
+ }
+ if ($header_shown) {
+ $result .= &Apache::loncommon::end_data_table();
}
- my $files = ''.
- join(', ',@file_list).
- '';
- my $result = &mt("Portfolio files previously selected: [_1]",$files);
if (@bad_file_list) {
- my $bad_files = ''.
- join(', ',@bad_file_list).
- '';
- $result.=''
- .&mt("These file(s) don't exist: [_1]",$bad_files)
- .'
';
+ my $bad_files = ''.
+ join(', ',@bad_file_list).
+ '';
+ $result.=''.
+ &mt("These file(s) don't exist: [_1]",$bad_files).
+ '
';
}
return $result;
+}
+sub current_file_info {
+ my ($url,$uploadedfile,$name,$path) = @_;
+ my ($status,$error,%info);
+ my @stat = &Apache::lonnet::stat_file($url);
+ if ((@stat) && ($stat[0] ne 'no_such_dir')) {
+ my ($lastmod,$size);
+ if ($stat[9] =~ /^\d+$/) {
+ $lastmod = &Apache::lonlocal::locallocaltime($stat[9]);
+ }
+ $size = $stat[7]/(1024*1024);
+ $size = sprintf("%.3f",$size);
+ %info = (
+ link => $uploadedfile,
+ name => $name,
+ path => $path,
+ size => $size,
+ lastmodified => $lastmod,
+ );
+ $status = 'ok';
+ } else {
+ &Apache::lonnet::logthis("bad file is $url");
+ my $icon=&Apache::loncommon::icon($url);
+ $error = ''.$uploadedfile.'';
+ }
+ return ($status,\%info,$error);
}
sub valid_award {