--- loncom/interface/portfolio.pm 2004/09/10 21:33:48 1.46
+++ loncom/interface/portfolio.pm 2004/12/04 02:15:42 1.60
@@ -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 = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$filename.'</a>';
+ my ($filename, $current_path, $current_mode, $field_name) = @_;
+ my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'&mode='.$current_mode.'&fieldname='.$field_name.'">'.$filename.'</a>';
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('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
$r->print('<td bgcolor="#ccddaa" align="center">');
my $displayOut = '<form method="post" enctype="multipart/form-data">';
- $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
+ $displayOut .= '<input name="uploaddoc" type="file" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+ '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
+ '<input type="hidden" name="mode" value="'.$ENV{"form.mode"}.'" />'.
'<input type="submit" name="storeupl" value="Upload" />'.
'</form>';
$r->print($displayOut);
@@ -54,35 +56,48 @@ sub display_directory {
$displayOut = '<form method="post">';
$displayOut .= '<input name="newdir" type="input" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+ '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
+ '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
+ '<input type="hidden" name="mode" value="'.$ENV{"form.mode"}.'" />'.
'<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
'</form>';
$r->print($displayOut);
$r->print('</td></tr></table>');
my @tree = split (/\//,$current_path);
- $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
+ $r->print('<font size="+2">'.&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('</font>');
&Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
- #Fixme -- remove from recent those paths that are deleted
- $r->print('<br /><form method=post action="/adm/portfolio">'.
+ $r->print('<br /><form method=post action="/adm/portfolio?mode='.$ENV{"form.mode"}.'&fieldname='.$ENV{"form.fieldname"}.'">'.
&Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
'this.form.submit();'));
$r->print("</form>");
+}
+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::dump('file_permissions',
+ $ENV{'user.domain'},$ENV{'user.name'});
+ my $locked_file;
+ foreach my $key (keys %locked_files) {
+ $locked_file .= $locked_files{$key}.':';
+ }
if ($is_empty && ($current_path ne '/')) {
- $displayOut = '<form method="post" action="/adm/portfolio">'.
+ $display_out = '<form method="post" action="/adm/portfolio">'.
'<input type="hidden" name="action" value="deletedir" />'.
'<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
'<input type="hidden" name="selectfile" value="" />'.
'<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
'</form>';
- $r->print($displayOut);
+ $r->print($display_out);
return;
}
$r->print('<table border="0" cellspacing="2" cellpadding="2">'.
@@ -97,11 +112,18 @@ sub display_directory {
#$strip holds directory/file name
#$dom
my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+ if ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){
+ &Apache::lonnet::logthis("found submitted file");
+ &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+ } else {
+ &Apache::lonnet::logthis("$filename not found submitted file");
+ &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
+ }
if (($filename ne '.') && ($filename ne '..')) {
if ($dirptr&$testdir) {
$r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
$r->print('<td>Go to ...</td>');
- $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
$r->print('</tr>');
} else {
$r->print('<tr bgcolor="#CCCCFF">');
@@ -133,6 +155,65 @@ sub display_directory {
# $r->print(&display_actions($current_path, $currentFile, $isEmpty));
$r->print('</table></form>');
}
+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'});
+ if ($is_empty && ($current_path ne '/')) {
+ $display_out = '<form method="post" action="/adm/portfolio">'.
+ '<input type="hidden" name="action" value="deletedir" />'.
+ '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
+ '<input type="hidden" name="selectfile" value="" />'.
+ '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
+
+ '</form>';
+
+ $r->print($display_out);
+ return;
+ }
+ $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
+ '<tr><th>Select</th><th> </th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+ my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
+ $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+ foreach my $line (sort
+ {
+ my ($afile)=split('&',$a,2);
+ my ($bfile)=split('&',$b,2);
+ return (lc($afile) cmp lc($bfile));
+ } (@$dir_list)) {
+ #$strip holds directory/file name
+ #$dom
+ 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('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
+ $r->print('<td>Go to ...</td>');
+ $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$ENV{'form.mode'},$ENV{"form.fieldname"}).'</td>');
+ $r->print('</tr>');
+ } else {
+ $r->print('<tr bgcolor="#CCCCFF">');
+ $r->print('<td>
+ <input type="checkbox" name="selectedfile" value="'.$filename.'" >
+ </td>');
+ $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+ $r->print('<td><a href="'.$href_location.$filename.'">'.
+ $filename.'</a></td>');
+ $r->print('<td>'.$size.'</td>');
+ $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+ $r->print('</tr>');
+ }
+ }
+ }
+ $r->print('</table>
+ <input type="hidden" name="continue" value="true">
+ <input type="hidden" name="fieldname" value="'.$ENV{'form.fieldname'}.'">
+ <input type="hidden" name="mode" value="selectfile">
+ <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
+ <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
+ <input type="hidden" name="currentpath" value="'.$current_path.'" />
+ </form>');
+}
sub open_form {
my ($r)=@_;
@@ -168,14 +249,24 @@ sub display_file {
sub done {
return ('<h3><a href="/adm/portfolio?currentpath='.
- $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
+ $ENV{'form.currentpath'}.
+ '&fieldname='.$ENV{'form.fieldname'}.
+ '&mode='.$ENV{'form.mode'}.
+ '">'.&mt('Done').'</a></h3>');
}
sub delete {
my ($r)=@_;
- &open_form($r);
- $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
- &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.<br />");
+ $r->print(&done());
+ } else {
+ &open_form($r);
+ $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
+ &close_form($r);
+ }
}
sub delete_confirmed {
@@ -228,10 +319,16 @@ sub delete_dir_confirmed {
sub rename {
my ($r)=@_;
- &open_form($r);
- $r->print('<p>'.&mt('Rename').' '.&display_file().' to
- <input name="filenewname" type="input" size="50" />?</p>');
- &close_form($r);
+ 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 renamed.<br />");
+ $r->print(&done());
+ } else {
+ &open_form($r);
+ $r->print('<p>'.&mt('Rename').' '.&display_file().' to
+ <input name="filenewname" type="input" size="50" />?</p>');
+ &close_form($r);
+ }
}
sub rename_confirmed {
@@ -247,7 +344,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('<font color="red"> An errror occured ('.$result.
') while trying to rename '.&display_file().' to '.
@@ -255,7 +352,40 @@ 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);
+ }
+ my $java_script =(<<ENDSMP);
+ <script language='javascript'>
+ function finishSelect() {
+ fileList = "";
+ for (i=0;i<document.forms.checkselect.length;i++) {
+ if (document.forms.checkselect[i].checked){
+ fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
+ }
+ }
+ opener.document.forms.lonhomework.
+ENDSMP
+ $java_script .= $ENV{'form.fieldname'};
+ $java_script .= (<<ENDSMP);
+ .value=fileList;
+ self.close();
+ }
+ </script>
+ENDSMP
+ $r->print($java_script);
+ $r->print("<h1>Select portfolio files</h1>
+ Check as many as you wish in response to the essay problem.<br />");
+ $r->print("<strong>Files selected:</strong><br />");
+ foreach (&Apache::lonnet::files_not_in_path($ENV{'user.name'}, $ENV{'form.currentpath'})) {
+ $r->print($_."<br />");
+ }
+}
sub upload {
my ($r)=@_;
my $fname=$ENV{'form.uploaddoc.filename'};
@@ -335,7 +465,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 +479,7 @@ sub handler {
$r->rflush();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath',
- 'currentfile']);
+ 'currentfile','action','fieldname','mode']);
if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
$r->print('<font color="red"> No file was selected to upload.'.
'To upload a file, click <strong>Browse...</strong>'.
@@ -400,7 +530,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("</body>\n</html>\n");
return OK;
}