--- loncom/interface/portfolio.pm 2017/11/01 02:50:05 1.254.2.2.2.1 +++ loncom/interface/portfolio.pm 2019/08/07 16:08:04 1.260 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.254.2.2.2.1 2017/11/01 02:50:05 raeburn Exp $ +# $Id: portfolio.pm,v 1.260 2019/08/07 16:08:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -112,13 +112,17 @@ sub display_common { END } + # Find space available before uploading + my $free_space = &free_space($group); + # Upload File $r->print('
' .'
' .'
' .''.$lt{'upload_label'}.'' .$groupitem - .'' + .'' + .'' .'' .'' .'' @@ -233,7 +237,7 @@ sub display_directory_line { 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); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath); $fname =~ s|^/||; $anchor_fields{'showversions'} = $fname.'.'.$extension; } @@ -366,7 +370,7 @@ sub display_directory { } (@{$dir_list})) { my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); $filename =~ s/\s+$//; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename); if ($version) { my $fullpath = &prepend_group($current_path.$fname.'.'.$extension); push(@{ $versioned{$fullpath} }, @@ -379,7 +383,7 @@ sub display_directory { my $zerobyte; foreach my $dir_line (@dir_lines) { my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line; - my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename); + my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename); if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) { my $version_flag; my $show_versions; @@ -2598,6 +2602,19 @@ STATE return $state; } +# Find space available in a user's portfolio (convert to bytes) +sub free_space { + my ($group) = @_; + my $disk_quota = &get_quota($group); # Expressed in kB + my ($uname,$udom) = &get_name_dom($group); + my $portfolio_root = &get_portfolio_root(); + my $getpropath = 1; + my $current_disk_usage = &Apache::lonnet::diskusage($udom, $uname, + $portfolio_root, $getpropath); # Expressed in kB + my $free_space = 1024 * ($disk_quota - $current_disk_usage); + return $free_space; +} + sub valid_container { my ($uname,$udom,$group) = @_; my $container_prefix; @@ -2724,16 +2741,19 @@ sub handler { # Give the LON-CAPA page header my $brcrum = [{href=>"/adm/portfolio",text=>"Portfolio Manager"}]; + my $js = ''; + if ($env{"form.mode"} eq 'selectfile'){ - $r->print(&Apache::loncommon::start_page($title,undef, + $r->print(&Apache::loncommon::start_page($title, $js, {'only_body' => 1})); } elsif ($env{'form.action'} eq 'rolepicker') { - $r->print(&Apache::loncommon::start_page('New role-based condition',undef, + $r->print(&Apache::loncommon::start_page('New role-based condition', $js, {'no_nav_bar' => 1, })); } elsif ($caller eq 'coursegrp_portfolio') { - $r->print(&Apache::loncommon::start_page($title)); + $r->print(&Apache::loncommon::start_page($title, $js)); } else { - $r->print(&Apache::loncommon::start_page($title,undef, + $r->print(&Apache::loncommon::start_page($title, $js, {'bread_crumbs' => $brcrum})); if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) { $r->print('

'.&mt('No user portfolio available') .'

'.