--- loncom/interface/portfolio.pm 2004/09/10 21:33:48 1.46
+++ loncom/interface/portfolio.pm 2004/12/11 19:54:22 1.64
@@ -33,20 +33,22 @@ use Apache::lonlocal;
# receives a file name and path stub from username/userfiles/portfolio/
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
- my ($filename, $current_path) = @_;
- my $anchor = ''.$filename.'';
+ my ($filename, $current_path, $current_mode, $field_name) = @_;
+ my $anchor = ''.$filename.'';
return $anchor;
}
-
my $dirptr=16384;
-sub display_directory {
+sub display_common {
my ($r,$current_path,$is_empty,$dir_list)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
$r->print('
');
$r->print('');
my $displayOut = '';
$r->print($displayOut);
@@ -54,40 +56,49 @@ sub display_directory {
$displayOut = '';
$r->print($displayOut);
$r->print(' |
');
my @tree = split (/\//,$current_path);
- $r->print(''.&make_anchor('portfolio','/').'/');
+ $r->print(''.&make_anchor('portfolio','/',$ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
+ $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $ENV{"form.mode"},$ENV{"form.fieldname"}).'/');
}
}
$r->print('');
&Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
- #Fixme -- remove from recent those paths that are deleted
- $r->print('
");
+}
+sub display_directory {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ my $iconpath= $r->dir_config('lonIconsURL') . "/";
+ my $display_out;
+ my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($ENV{'user.domain'},$ENV{'user.name'});
if ($is_empty && ($current_path ne '/')) {
- $displayOut = '';
- $r->print($displayOut);
+ $r->print($display_out);
return;
}
$r->print(''.
'Actions | | Name | Size | Last Modified |
');
my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('
');
+ $r->print('
+
+
+
+ ');
+}
+sub display_file_select {
+ my ($r,$current_path,$is_empty,$dir_list)=@_;
+ 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 = '';
+
+ $r->print($display_out);
+ return;
+ }
+ $r->print(''.
+ 'Select | | Name | Size | Last Modified |
');
+ my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('
+
+
+
+
+
+
+ ');
}
sub open_form {
@@ -168,14 +246,24 @@ sub display_file {
sub done {
return ('');
+ $ENV{'form.currentpath'}.
+ '&fieldname='.$ENV{'form.fieldname'}.
+ '&mode='.$ENV{'form.mode'}.
+ '">'.&mt('Done').'');
}
sub delete {
my ($r)=@_;
- &open_form($r);
- $r->print(''.&mt('Delete').' '.&display_file().'?
');
- &close_form($r);
+ my @check;
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'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());
+ } else {
+ &open_form($r);
+ $r->print(''.&mt('Delete').' '.&display_file().'?
');
+ &close_form($r);
+ }
}
sub delete_confirmed {
@@ -228,10 +316,16 @@ sub delete_dir_confirmed {
sub rename {
my ($r)=@_;
- &open_form($r);
- $r->print(''.&mt('Rename').' '.&display_file().' to
- ?
');
- &close_form($r);
+ my $file_name = $ENV{'form.currentpath'}.$ENV{'form.rename'};
+ if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
+ $r->print ("The file is locked and cannot be renamed.
");
+ $r->print(&done());
+ } else {
+ &open_form($r);
+ $r->print(''.&mt('Rename').' '.&display_file().' to
+ ?
');
+ &close_form($r);
+ }
}
sub rename_confirmed {
@@ -247,7 +341,7 @@ sub rename_confirmed {
my $result=
&Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
- 'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
+ 'portfolio'.$ENV{'form.currentpath'}.$filenewname);
if ($result ne 'ok') {
$r->print(' An errror occured ('.$result.
') while trying to rename '.&display_file().' to '.
@@ -255,7 +349,52 @@ sub rename_confirmed {
}
$r->print(&done());
}
-
+sub select_files {
+ my ($r)=@_;
+ if ($ENV{'form.continue'} eq 'true') {
+ # here we update the selections for the currentpath
+ # eventually, have to handle removing those not checked, but . . .
+ my @items=&Apache::loncommon::get_env_multiple('form.selectedfile');
+ &Apache::lonnet::save_selected_files($ENV{'user.name'}, $ENV{'form.currentpath'}, @items);
+ } else {
+ if ($ENV{'form.currentpath'} eq '/') {
+ #empty the file for a fresh start
+ # &Apache::lonnet::clear_selected_files($ENV{'user.name'});
+ }
+ }
+ my @files = &Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'});
+ my $java_files = join ",", @files;
+ if ($java_files) {
+ $java_files.=',';
+ }
+ my $javascript =(<
+ function finishSelect() {
+ENDSMP
+ $javascript .= 'fileList = "'.$java_files.'";';
+ $javascript .= (<
+ENDSMP
+ $r->print($javascript);
+ $r->print("Select portfolio files
+ Check as many as you wish in response to the essay problem.
");
+ $r->print("Files selected from other directories:
");
+ foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
+ $r->print($_."
");
+ }
+}
sub upload {
my ($r)=@_;
my $fname=$ENV{'form.uploaddoc.filename'};
@@ -335,7 +474,7 @@ sub createdir {
sub handler {
# this handles file management
my $r = shift;
- my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
+ my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
$ENV{'user.name'}).
'/userfiles/portfolio';
&Apache::loncommon::no_cache($r);
@@ -349,7 +488,7 @@ sub handler {
$r->rflush();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
- 'currentfile']);
+ '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...'.
@@ -367,7 +506,9 @@ sub handler {
&delete_dir($r);
} elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
&rename_confirmed($r);
- } elsif ($ENV{'form.action'} eq 'rename') {
+ } elsif ($ENV{'form.rename'}) {
+ $ENV{'form.selectfile'} = $ENV{'form.rename'};
+ $ENV{'form.action'} = 'rename';
&rename($r);
} elsif ($ENV{'form.createdir'}) {
&createdir($r);
@@ -400,7 +541,13 @@ sub handler {
}
# need to know if directory is empty so it can be removed if desired
my $is_empty=(@dir_list == 2);
- &display_directory($r,$current_path,$is_empty,\@dir_list);
+ &display_common($r,$current_path,$is_empty,\@dir_list);
+ if ($ENV{"form.mode"} eq 'selectfile'){
+ &select_files($r);
+ &display_file_select($r,$current_path,$is_empty,\@dir_list);
+ } else {
+ &display_directory($r,$current_path,$is_empty,\@dir_list);
+ }
$r->print("