--- loncom/interface/portfolio.pm 2004/12/12 01:35:44 1.65 +++ loncom/interface/portfolio.pm 2005/02/20 20:39:30 1.76 @@ -96,7 +96,7 @@ sub display_directory { return; } $r->print(''. - ''); + ''); my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path"; $r->print(''); foreach my $line (sort @@ -110,17 +110,18 @@ sub display_directory { my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); if (($filename ne '.') && ($filename ne '..')) { if ($dirptr&$testdir) { - $r->print(''); + $r->print(''); $r->print(''); $r->print(''); $r->print(''); } else { $r->print(''); if (exists $locked_files{$current_path.$filename}){ - $r->print(''); + $r->print(''); } else { - $r->print(' + '); } $r->print(''); @@ -148,9 +149,6 @@ sub display_file_select { my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $display_out; my $checked_files = &Apache::lonnet::files_in_path($ENV{'user.name'}, $ENV{'form.currentpath'}); - foreach my $key (keys %$checked_files) { - &Apache::lonnet::logthis("a key is $key $$checked_files{$key} is the value"); - } if ($is_empty && ($current_path ne '/')) { $display_out = ''. ''. @@ -188,9 +186,6 @@ sub display_file_select { $r->print(''); $r->print(''); @@ -249,7 +244,7 @@ sub display_file { $display_file_text = ''.$path.$filename.''; } elsif (ref($filename) eq "ARRAY") { foreach (@$filename) { - $display_file_text .= ''.$path.$_.''; + $display_file_text .= ''.$path.$_.'
'; } } elsif (ref($filename) eq "SCALAR") { $display_file_text = ''.$path.$filename.''; @@ -258,11 +253,15 @@ sub display_file { } sub done { + my ($message)=@_; + unless (defined $message) { + $message='Done'; + } return ('

'.&mt('Done').'

'); + '">'.&mt($message).''); } sub delete { @@ -270,13 +269,19 @@ sub delete { my @check; my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'}; my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); + if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') { $r->print ("The file is locked and cannot be deleted.
"); - $r->print(&done()); + $r->print(&done('Back')); } else { - &open_form($r); - $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); - &close_form($r); + if (scalar(@files)) { + &open_form($r); + $r->print('

'.&mt('Delete').' '.&display_file(undef,\@files).'?

'); + &close_form($r); + } else { + $r->print("No file was checked to delete.
"); + $r->print(&done()); + } } } @@ -285,7 +290,6 @@ sub delete_confirmed { my @files=&Apache::loncommon::get_env_multiple('form.selectfile'); my $result; foreach my $delete_file (@files) { - &Apache::lonnet::logthis("trying to delete $delete_file"); $result=&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'. $ENV{'form.currentpath'}. @@ -366,6 +370,9 @@ sub rename_confirmed { ') while trying to rename '.&display_file().' to '. &display_file(undef,$filenewname).'
'); } + if ($filenewname ne $ENV{'form.filenewname'}) { + $r->print("The new file name was changed from:
".$ENV{'form.filenewname'}." to $filenewname "); + } $r->print(&done()); } sub select_files { @@ -428,29 +435,43 @@ sub upload { $ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); my $found_file = 0; + my $locked_file = 0; foreach my $line (@dir_list) { - my ($filename)=split(/\&/,$line,2); - if ($filename eq $fname){ + my ($file_name)=split(/\&/,$line,2); + if ($file_name eq $fname){ $found_file = 1; + if (&Apache::lonnet::is_locked($ENV{'form.currentpath'}.$file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') { + $locked_file = 1; + } } } my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root); - if (($current_disk_usage + $filesize) > $disk_quota){ + if ((($current_disk_usage/1000) + $filesize) > $disk_quota){ $r->print('Unable to upload '.$fname.' (size = '.$filesize.' kilobytes. Disk quota will be exceeded.'. '
Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.'); + $r->print(&done('Back')); } - elsif ($found_file){ - $r->print('Unable to upload '.$fname.', a file by that name was found in '.$ENV{'form.currentpath'}.''. - '
To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'}); + elsif ($found_file){ + if ($locked_file){ + $r->print('Unable to upload '.$fname.', a locked file by that name was found in portfolio'.$ENV{'form.currentpath'}.''. + '
You will be able to rename or delete existing '.$fname.' after a grade has been assigned.'); + $r->print(&done('Back')); + } else { + $r->print('Unable to upload '.$fname.', a file by that name was found in portfolio'.$ENV{'form.currentpath'}.''. + '
To upload, rename or delete existing '.$fname.' in portfolio'.$ENV{'form.currentpath'}); + $r->print(&done('Back')); + } } else { my $result=&Apache::lonnet::userfileupload('uploaddoc','', 'portfolio'.$ENV{'form.currentpath'}); if ($result !~ m|^/uploaded/|) { $r->print(' An errror occured ('.$result. ') while trying to upload '.&display_file().'
'); + $r->print(&done('Back')); + } else { + $r->print(&done()); } } - $r->print(&done()); } sub createdir { @@ -487,6 +508,9 @@ sub createdir { ') while trying to create a new directory '.&display_file().'
'); } } + if ($newdir ne $ENV{'form.newdir'}) { + $r->print("The new directory name was changed from:
".$ENV{'form.newdir'}." to $newdir "); + } $r->print(&done()); } @@ -496,23 +520,37 @@ sub handler { my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'}, $ENV{'user.name'}). '/userfiles/portfolio'; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['selectfile','currentpath','meta', + 'currentfile','action','fieldname','mode','rename']); &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; # Give the LON-CAPA page header - $r->print(''. + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'<head><title>'. &mt('Portfolio Manager'). - "\n". - &Apache::loncommon::bodytag('Portfolio Manager')); + "\n"); + if ($ENV{"form.mode"} eq 'selectfile'){ + $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1)); + } else { + $r->print(&Apache::loncommon::bodytag('Portfolio Manager')); + } $r->rflush(); - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['selectfile','currentpath', - 'currentfile','action','fieldname','mode','rename']); if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){ $r->print(' No file was selected to upload.'. 'To upload a file, click Browse...'. ', select a file, then click Upload,'); } + if ($ENV{'form.meta'}) { + &open_form($r); +# $r->print(&edit_meta_data($r, $ENV{'form.currentpath'}.$ENV{'form.selectfile'})); + $r->print('Edit the meta data
'); + &close_form($r); + } + if ($ENV{'form.store'}) { + } + if ($ENV{'form.uploaddoc.filename'}) { &upload($r); } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
Actions NameSizeLast Modified
Actions NameSizeLast Modified
Go to ...'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'
LockedLockedDelete - Rename + $r->print(' + RenameMeta print("CHECKED"); - &Apache::lonnet::logthis("checked"); - } else { - &Apache::lonnet::logthis("not checked $$checked_files{$filename} $filename"); } $r->print('>