--- loncom/interface/portfolio.pm 2004/09/10 20:48:33 1.45
+++ loncom/interface/portfolio.pm 2004/11/03 21:02:49 1.54
@@ -37,16 +37,17 @@ sub make_anchor {
my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'¤tpath='.$current_path.'">'.$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="submit" name="storeupl" value="Upload" />'.
'</form>';
$r->print($displayOut);
@@ -54,6 +55,8 @@ 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="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
'</form>';
$r->print($displayOut);
@@ -74,15 +77,26 @@ sub display_directory {
&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,6 +111,13 @@ 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>');
@@ -133,6 +154,60 @@ 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;
+ 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.'/').'</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="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,7 +243,9 @@ 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'}.
+ '">'.&mt('Done').'</a></h3>');
}
sub delete {
@@ -255,7 +332,30 @@ sub rename_confirmed {
}
$r->print(&done());
}
-
+sub select_files {
+ my ($r)=@_;
+ 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 />");
+}
sub upload {
my ($r)=@_;
my $fname=$ENV{'form.uploaddoc.filename'};
@@ -335,7 +435,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 +449,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>'.
@@ -379,28 +479,36 @@ sub handler {
my @dir_list=&Apache::lonnet::dirlist($current_path,
$ENV{'user.domain'},
$ENV{'user.name'},$portfolio_root);
- if ($dir_list[0] eq 'no_such_dir'){
- # two main reasons for this: 1) never been here, so directory structure not created
- # 2) back-button navigation after deleting a directory
- if ($current_path eq '/'){
+ if ($dir_list[0] eq 'no_such_dir'){
+ # two main reasons for this:
+ # 1) never been here, so directory structure not created
+ # 2) back-button navigation after deleting a directory
+ if ($current_path eq '/'){
&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
- $ENV{'user.domain'},'portfolio');
- } else { # some directory that snuck in
- # get rid of the directory from the recent pulldown, just in case
- &Apache::lonhtmlcommon::remove_recent('portfolio',[$current_path]);
- $current_path = '/'; # force it back to the root
- }
- # now grab the directory list again, for the first time
- @dir_list=&Apache::lonnet::dirlist($current_path,
- $ENV{'user.domain'},
- $ENV{'user.name'},$portfolio_root);
-
+ $ENV{'user.domain'},'portfolio');
+ } else {
+ # some directory that snuck in get rid of the directory
+ # from the recent pulldown, just in case
+ &Apache::lonhtmlcommon::remove_recent('portfolio',
+ [$current_path]);
+ $current_path = '/'; # force it back to the root
+ }
+ # now grab the directory list again, for the first time
+ @dir_list=&Apache::lonnet::dirlist($current_path,
+ $ENV{'user.domain'},
+ $ENV{'user.name'},$portfolio_root);
}
- # need to know if directory is empty so it can be removed if desired
- my $is_empty=(@dir_list == 2);
+ # need to know if directory is empty so it can be removed if desired
+ my $is_empty=(@dir_list == 2);
+ &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;
+ }
+ $r->print("</body>\n</html>\n");
+ return OK;
}
}
1;