--- loncom/interface/portfolio.pm 2006/08/12 06:18:44 1.154 +++ loncom/interface/portfolio.pm 2006/08/14 21:34:17 1.157 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.154 2006/08/12 06:18:44 banghart Exp $ +# $Id: portfolio.pm,v 1.157 2006/08/14 21:34:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -164,42 +164,36 @@ 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(''); $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(''); - $r->print(''.$$version_flag{$filename}.''); + $r->print(''.$version_flag.''); } else { # this is a graded or handed back file my ($user,$domain) = &get_name_dom(); my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user); - my $lock_info; - foreach my $key (keys(%$permissions_hash)) { - $key =~ s|^/||; - if ($key =~ /$filename/) { - &Apache::lonnet::logthis("filename match"); - my $value = $$permissions_hash{$key}; - if (ref($value) eq 'ARRAY') { - my $info = pop(@$value); - my $info2 = pop(@$info); - &Apache::lonnet::logthis("the info2 is $info2"); - $lock_info = $info2; - #foreach my $key2(keys(%hash)){ - # &Apache::lonnet::logthis("a key2 is $key2"); - #} - foreach my $value_element (@$value) { - #&Apache::lonnet::logthis("and the array element is $value_element"); - foreach my $sub_value (@$value_element) { - #&Apache::lonnet::logthis("subvalue is $sub_value"); - } + 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'; } - } + } } } - $r->print(''.$lock_info.''); + if ($lock_info) { + my %anchor_fields = ('lockinfo' => $fullpath); + $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info); + } + $r->print(''.$lock_info.''); } # $r->print(''.$$version_flag{$filename}.''); $r->print(''.&make_anchor($href_location.$filename,undef,$filename).''); @@ -268,7 +262,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 { @@ -282,8 +275,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]); } @@ -292,27 +286,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, ''.&mt('opened folder').''); } else { $anchor_fields{'showversions'} = $filename; - $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields, + $version_flag = &make_anchor('portfolio',\%anchor_fields, ''.&mt('closed folder').''); } } else { - $version_flag{$filename} = ' '; + $version_flag = ' '; } if ($dirptr&$testdir) { my $colspan='colspan="2"'; @@ -328,13 +323,11 @@ sub display_directory { 'fieldname' => $env{"form.fieldname"}, 'continue' => $env{"form.continue"} ); - $r->print(''.$version_flag{$filename}.''.&make_anchor($url,\%anchor_fields,$filename.'/').''); + $r->print(''.$version_flag.''.&make_anchor($url,\%anchor_fields,$filename.'/').''); $r->print(''); } else { my $css_class = 'LC_browser_file'; my $line; - my $fullpath = $current_path.$filename; - $fullpath = &prepend_group($fullpath); if ($select_mode eq 'true') { $line=' $current_path.$filename + 'lockinfo' => $fullpath ); $line.=''.&make_anchor($url,\%anchor_fields,'Locked').''; $css_class= 'LC_browser_file_locked'; @@ -404,19 +397,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 = ' '; - 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); } } } @@ -645,16 +636,13 @@ sub display_access { my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name); my $aclcount = keys(%access_controls); my $header = '

'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'

'; - 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 or passphrase-protected.'); $info .= '
'; + $info .= '
  • '.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.'); +# $info .= '
  • '.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'
    '; +# $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'
    '; +# $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'); + $info .= '
    • '; if ($group eq '') { $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:
    http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme")); } @@ -1102,24 +1090,24 @@ sub access_setting_table { $passwd.'" />'); $r->print(&Apache::loncommon::end_data_table_row()); $r->print(&Apache::loncommon::end_data_table()); - $r->print(' '); - &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); - $r->print(' '); - &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); - $r->print(''); - if (@courses > 0 || @groups > 0) { - $r->print(''); - } else { - $r->print(''); - } - &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); - $r->print(''); - if (@courses > 0 || @groups > 0) { - $r->print(' '); - } else { - $r->print(' '); - } - &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); +# $r->print(' '); +# &access_element($r,'domains',\%acl_count,\@domains,$access_controls,$now,$then); +# $r->print(' '); +# &access_element($r,'users',\%acl_count,\@users,$access_controls,$now,$then); +# $r->print(''); +# if (@courses > 0 || @groups > 0) { +# $r->print(''); +# } else { +# $r->print(''); +# } +# &access_element($r,'course',\%acl_count,\@courses,$access_controls,$now,$then); +# $r->print(''); +# if (@courses > 0 || @groups > 0) { +# $r->print(' '); +# } else { +# $r->print(' '); +# } +# &access_element($r,'group',\%acl_count,\@groups,$access_controls,$now,$then); $r->print(''); } @@ -1616,24 +1604,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 = ''.$env{'form.lockinfo'}. - ' (group: '.$group.')'; - } else { - $filetext = ''.$file_name.''; - } - $r->print(&mt('[_1] was submitted in response to problem: ', - $filetext). - ''.&Apache::lonnet::gettitle($$array_item[0]). - '
    '); - my %course_description = &Apache::lonnet::coursedescription($$array_item[1]); - $r->print(&mt('In the course: [_1]
    ', - $course_description{'description'})); - # $r->print('the third is '.$$array_item[2].'
    '); - # $r->print("item is $$array_item[0]
    and $$array_item[0]"); - } + next if (ref($array_item) ne 'ARRAY'); + + my $filetext; + if (defined($group)) { + $filetext = ''.$env{'form.lockinfo'}. + ' (group: '.$group.')'; + } else { + $filetext = ''.$file_name.''; + } + + my $title =''.&Apache::lonnet::gettitle($$array_item[0]). + '
    '; + 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: [_1]
    ', + $course_description{'description'})); + } } } $r->print(&done('Back',$url));