--- loncom/interface/portfolio.pm 2006/08/11 23:45:18 1.153
+++ loncom/interface/portfolio.pm 2006/08/24 17:38:21 1.161
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.153 2006/08/11 23:45:18 banghart Exp $
+# $Id: portfolio.pm,v 1.161 2006/08/24 17:38:21 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -164,17 +164,41 @@ TABLE
}
sub display_directory_line {
- my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
+ my ($r,$select_mode, $filename, $mtime, $size, $css_class,
$line, $access_controls, $curr_access, $now, $version_flag,
$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
- # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);
+
+ my $fullpath = &prepend_group($current_path.$filename);
$r->print('<tr class="'.$css_class.'">');
$r->print($line); # contains first two cells of table
- if ($$version_flag{$filename}) { # versioned can't be versioned, so TRUE when root file
+ my $lock_info;
+ if ($version_flag) { # versioned can't be versioned, so TRUE when root file
$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
- $r->print('<td>'.$$version_flag{$filename}.'</td>');
+ $r->print('<td>'.$version_flag.'</td>');
} else { # this is a graded or handed back file
- $r->print('<td colspan="2"> </td>');
+ my ($user,$domain) = &get_name_dom();
+ my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
+ if (defined($$permissions_hash{$fullpath})) {
+ foreach my $array_item (@{$$permissions_hash{$fullpath}}) {
+ if (ref($array_item) eq 'ARRAY') {
+ if ($$array_item[-1] eq 'handback') {
+ $lock_info = 'Handback';
+ } elsif ($$array_item[-1] eq 'graded') {
+ $lock_info = 'Graded';
+ }
+ }
+ }
+ }
+ if ($lock_info) {
+ my %anchor_fields = ('lockinfo' => $fullpath);
+ if ($versions) { # hold the folder open
+ my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+ $fname =~ s|^/||;
+ $anchor_fields{'showversions'} = $fname.'.'.$extension;
+ }
+ $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
+ }
+ $r->print('<td colspan="2">'.$lock_info.'</td>');
}
# $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
$r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</td>');
@@ -243,7 +267,6 @@ sub display_directory {
my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
my @dir_lines;
- my @version_lines;
my %versioned;
foreach my $dir_line (sort
{
@@ -257,8 +280,9 @@ sub display_directory {
$filename =~ s/\s+$//;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if ($version) {
- push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
- $versioned{$fname.'.'.$extension} .= $version.",";
+ my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
+ push(@{ $versioned{$fullpath} },
+ [$filename,$dom,$testdir,$size,$mtime,$obs,]);
} else {
push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
}
@@ -267,27 +291,28 @@ sub display_directory {
my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
- my %version_flag;
+ my $version_flag;
my $show_versions;
+ my $fullpath = &prepend_group($current_path.$filename);
if ($env{'form.showversions'} eq $filename) {
$show_versions = 'true';
}
- if (exists($versioned{$filename})) {
+ if (exists($versioned{$fullpath})) {
my %anchor_fields = (
- 'selectfile' => $filename,
+ 'selectfile' => $fullpath,
'continue' => 'false',
'currentpath' => $current_path,
);
if ($show_versions) {
- $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ $version_flag = &make_anchor('portfolio',\%anchor_fields,
'<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
} else {
$anchor_fields{'showversions'} = $filename;
- $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+ $version_flag = &make_anchor('portfolio',\%anchor_fields,
'<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
}
} else {
- $version_flag{$filename} = ' ';
+ $version_flag = ' ';
}
if ($dirptr&$testdir) {
my $colspan='colspan="2"';
@@ -303,13 +328,11 @@ sub display_directory {
'fieldname' => $env{"form.fieldname"},
'continue' => $env{"form.continue"}
);
- $r->print('<td>'.$version_flag{$filename}.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
+ $r->print('<td>'.$version_flag.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
my $line;
- my $fullpath = $current_path.$filename;
- $fullpath = &prepend_group($fullpath);
if ($select_mode eq 'true') {
$line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
if ($$checked_files{$filename} eq 'selected') {
@@ -319,7 +342,7 @@ sub display_directory {
} else {
if (exists $locked_files{$fullpath}) {
my %anchor_fields = (
- 'lockinfo' => $current_path.$filename
+ 'lockinfo' => $fullpath
);
$line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
$css_class= 'LC_browser_file_locked';
@@ -340,7 +363,7 @@ sub display_directory {
currentpath => $current_path
);
$line .= &make_anchor($url,\%anchor_fields,'Rename');
- $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+ $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',\%anchor_fields,$cat);
# '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
}
$line .= '</td>';
@@ -379,19 +402,17 @@ sub display_directory {
$curr_access = join('+ ',@allaccesses);
}
}
- &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line,
- \%access_controls, $curr_access,$now, \%version_flag, $href_location,
+ &display_directory_line($r,$select_mode, $filename, $mtime, $size, $css_class, $line,
+ \%access_controls, $curr_access,$now, $version_flag, $href_location,
$url, $current_path, $access_admin_text);
if ($show_versions) {
- foreach my $dir_line (@version_lines) {
- my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
- my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+ foreach my $dir_line (@{ $versioned{$fullpath} }) {
+ my ($v_filename,$dom,$testdir,$size,$mtime,$obs) =
+ @$dir_line;
$line = '<td colspan="2"> </td>';
- if (($v_fname eq $fname)&&($v_extension eq $extension)) {
- &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size,
- $css_class, $line, \%access_controls, $curr_access, $now,
- \%version_flag, $href_location, $url, $current_path, $access_admin_text, 1);
- }
+ &display_directory_line($r,$select_mode, $v_filename, $mtime, $size,
+ $css_class, $line, \%access_controls, $curr_access, $now,
+ undef, $href_location, $url, $current_path, $access_admin_text, 1);
}
}
}
@@ -480,6 +501,7 @@ sub done {
$message='Done';
}
my %anchor_fields = (
+ 'showversions' => $env{'form.showversions'},
'currentpath' => $env{'form.currentpath'},
'fieldname' => $env{'form.fieldname'},
'mode' => $env{'form.mode'}
@@ -620,18 +642,14 @@ sub display_access {
my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
my $aclcount = keys(%access_controls);
my $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
- my $info .= &mt('Access to this file by others can be set to be one or ');
- $info .= &mt('more of the following types: public, passphrase-protected or conditional.');
+ my $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
$info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
- $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require ');
- $info .= &mt('the viewer to enter the passphrase you set.');
- $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts ');
- $info .= &mt('in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
- $info .= &mt('The conditions can include affiliation with a particular course or group, ');
- $info .= &mt('or a user account in a specific domain.').'<br />';
+ $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
+ $info .= '</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
+ $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
$info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
if ($group eq '') {
- $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));
+ $info .= (&mt("A listing of files viewable without log-in is available at: <a href='/adm/$udom/$uname/aboutme/portfolio'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />"));
}
if ($can_setacl) {
@@ -1591,24 +1609,35 @@ sub lock_info {
$file_name = &prepend_group($file_name);
if (defined($file_name) && defined($$current_permissions{$file_name})) {
foreach my $array_item (@{$$current_permissions{$file_name}}) {
- if (ref($array_item) eq 'ARRAY') {
- my $filetext;
- if (defined($group)) {
- $filetext = '<strong>'.$env{'form.lockinfo'}.
- '</strong> (group: '.$group.')';
- } else {
- $filetext = '<strong>'.$file_name.'</strong>';
- }
- $r->print(&mt('[_1] was submitted in response to problem: ',
- $filetext).
- '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
- '</strong><br />');
- my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
- $r->print(&mt('In the course: <strong>[_1]</strong><br />',
- $course_description{'description'}));
- # $r->print('the third is '.$$array_item[2].'<br>');
- # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
- }
+ next if (ref($array_item) ne 'ARRAY');
+
+ my $filetext;
+ if (defined($group)) {
+ $filetext = '<strong>'.$env{'form.lockinfo'}.
+ '</strong> (group: '.$group.')';
+ } else {
+ $filetext = '<strong>'.$file_name.'</strong>';
+ }
+
+ my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
+ '</strong><br />';
+ if ($$array_item[-1] eq 'graded') {
+ $r->print(&mt('[_1] was submitted in response to problem: [_2]',
+ $filetext,$title));
+ } elsif ($$array_item[-1] eq 'handback') {
+ $r->print(&mt('[_1] was handed back in response to problem: [_2]',
+ $filetext,$title));
+ } else {
+ # submission style lock
+ $r->print(&mt('[_1] was submitted in response to problem: [_2]',
+ $filetext,$title));
+ }
+ my %course_description =
+ &Apache::lonnet::coursedescription($$array_item[1]);
+ if ( $course_description{'description'} ne '') {
+ $r->print(&mt('In the course: <strong>[_1]</strong><br />',
+ $course_description{'description'}));
+ }
}
}
$r->print(&done('Back',$url));
@@ -1654,7 +1683,10 @@ sub createdir {
}
sub get_portfolio_root {
- my ($uname,$udom) = &get_name_dom();
+ my ($udom,$uname) = @_;
+ if (!(defined($udom)) || !(defined($uname))) {
+ ($uname,$udom) = &get_name_dom();
+ }
my $path;
if (defined($env{'form.group'})) {
$path = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';