'.$syllabusfields{$_}.'
'. - $message.''); - } else { - $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'. - &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\'); - } - if ($allowed) { - $r->print('
'); - } - } + + if($allowed) { + $r->print(''); } if ($target ne 'tex') {$r->print('
');} else {$r->print('\\\\');} @@ -222,70 +346,130 @@ sub handler { } if ($target ne 'tex') { - &print_portfiles_link($r); + # &print_portfiles_link($r,$is_course); #old Print files + } - if ($env{'request.course.id'}) { - if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { - if ($target ne 'tex') { - $r->print(''); - $r->print('
'. - &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'
'. - &mt('Shared by course faculty and staff'). - &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). -''); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); - $r->print('
'); - if (&Apache::lonnet::allowed('vsa', - $env{'request.course.id'}) || - &Apache::lonnet::allowed('vsa', - $env{'request.course.id'}.'/'. - $env{'request.course.sec'})) { - $r->print(&Apache::loncommon::track_student_link - ('View recent activity by this student', - $cnum,$cdom).(' 'x2)); - } - $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); - } else { - $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); - &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + if ($env{'request.course.id'} + && &Apache::lonnet::allowed('srm',$env{'request.course.id'}) + && &in_course($cdom,$cnum)) { + if ($target ne 'tex') { + $r->print(''); + $r->print('
'. + &mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'
'. + &mt('Shared by course faculty and staff'). + &Apache::loncommon::help_open_topic("Course_Face_To_Face_Records,Course_Critical_Message"). + ''); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + $r->print('
'); + if (&Apache::lonnet::allowed('vsa', + $env{'request.course.id'}) || + &Apache::lonnet::allowed('vsa', + $env{'request.course.id'}.'/'. + $env{'request.course.sec'})) { + $r->print(&Apache::loncommon::track_student_link + ('View recent activity by this student', + $cnum,$cdom).(' 'x2)); } - } + $r->print(&Apache::loncommon::noteswrapper('Add Records',$cnum,$cdom)); + } else { + $r->print('\\\\\textbf{'.&mt('User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course').'}\\\\'.&mt('Shared by course faculty and staff').'\\\\\\\\'); + &Apache::lonmsgdisplay::disfacetoface($r,$cnum,$cdom); + } } if ($target ne 'tex') { + if ($env{'form.popup'}) { + $r->print('
'.&mt('Close window').''); + } $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); } + + + return OK; } +sub in_course { + my ($udom,$uname,$cdom,$cnum,$type) = @_; + $type ||= 'any'; + if (!defined($cdom) || !defined($cnum)) { + my $cid = $env{'request.course.id'}; + $cdom = $env{'course.'.$cid.'.domain'}; + $cnum = $env{'course.'.$cid.'.num'}; + } + my %roles = &Apache::lonnet::dump('roles',$udom,$uname); + my @course_roles = grep(m{^/\Q$cdom\E/\Q$cnum\E[/_]}, keys(%roles)); + return 0 if (!@course_roles); + return 1 if ($type eq 'any'); + my $now = time(); + foreach my $role (@course_roles) { + my (undef,$role_end,$role_start)=split(/\_/,$roles{$role}); + my $status = 'active'; + if ($role_start > 0 && $now < $role_start) { + $status = 'future'; + } + if ($role_end > 0 && $now > $role_end) { + $status = 'previous'; + } + return 1 if ($status eq $type); + } + return 0; +} + sub aboutme_info { - my ($r) = @_; + my ($r,$is_course) = @_; my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri); - my $name = &Apache::loncommon::plainname($cnum,$cdom); + my $name; + if (!$is_course) { + $name = &Apache::loncommon::plainname($cnum,$cdom); + } return ($cdom,$cnum,$name); } sub print_portfiles_link { - my ($r) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); - my $filecounts = &portfolio_files($r,'showlink'); + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); + my $filecounts = &portfolio_files($r,'showlink',undef,$is_course, + $cdom,$cnum,$name); my $query_string = &build_query_string(); my $output; + my %lt = &Apache::lonlocal::texthash( + vpfi => 'Viewable portfolio files', + vgpf => 'Viewable group portfolio files', + difl => 'Display file listing', + ); if ($filecounts->{'both'} > 0) { - $output = &mt('
Viewable portfolio files
'); + $output = ''; + $output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; + + #$output = ''.($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'
'; $output .= ''.&mt('Display file listing'). + $query_string.'">'.$lt{'difl'}. ''; - $output .= &mt('A total of [quant,_1,portfolio file] owned by [_2] are available.',$filecounts->{'both'},$name).'
- ';
+ if ($filecounts->{'both'} == 1) {
+ if ($is_course) {
+ $output .= &mt('One group portfolio file is available.').'
- '.&mt('[quant,_1,file] are publicly accessible.',$filecounts->{'withoutpass'}).' '; + $output .= '
- '.&mt('[quant,_1,file is,files are] publicly accessible.',$filecounts->{'withoutpass'}).' '; } if ($filecounts->{'withpass'}) { - $output .= '
- '.&mt('[quant,_1,file] require a passphrase for access.',$filecounts->{'withpass'}).' '; + $output .= '
- '.&mt('[quant,_1,file requires,files require] a passphrase for access.',$filecounts->{'withpass'}).' '; } $output .= '
- ';
+ } else {
+ $output .= &mt('One portfolio file owned by [_1] is available.',$name).'
- ';
+ }
+ } else {
+ if ($is_course) {
+ $output .= &mt('A total of [_1] group portfolio files are available.',$filecounts->{'both'}).'
- ';
+ } else {
+ $output .= &mt('A total of [_1] portfolio files owned by [_2] are available.',$filecounts->{'both'},$name).'
- ';
+ }
+ }
if ($filecounts->{'withoutpass'}) {
- $output .= '
'.&mt('Portfolio files for [_1]',$name).'
'; + $output .= ''.&mt('Group Portfolio files').'
'; + } else { + $output = + &Apache::loncommon::start_page('Viewable portfolio files',undef, + {'function' => $forcestudent, + 'domain' => $cdom,}); + if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/$cdom/$cnum/aboutme".$query_string, + text=>"Personal information - $name", + title=>"Go to personal information page for $name"}, {href=>"/adm/$cdom/$cnum/aboutme/portfolio", + text=>"Viewable files - $name", + title=>"Viewable portfolio files for $name"} + ); + $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Viewable portfolio files.')); + } + $output .= ''.&mt('Portfolio files for [_1]',$name).'
'; + } $r->print($output); return; } sub display_portfolio_files { - my ($r) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); + my ($r,$is_course) = @_; + my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course); my %lt = ( withoutpass => 'passphrase not required', withpass => 'passphrase protected', both => 'all access types ',); @@ -367,24 +562,31 @@ sub display_portfolio_files { if ($portaccess eq $type) { $output .= 'selected="selected"'; } - $output .= '>'.&mt($type).''; + $output .= '>'.$lt{$type}.''; } $output .= ''."\n". ''; $output .= ''; $r->print($output); - my $filecounts = &portfolio_files($r,'listfiles',\%lt); - my $query_string = &build_query_string(); - $r->print('
'. - &mt('Information about [_1]',$name).''); + my $filecounts = &portfolio_files($r,'listfiles',\%lt,$is_course, + $cdom,$cnum,$name); + if (!($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public')) { + my $query_string = &build_query_string(); + $r->print('
'); + if ($is_course) { + $r->print(&mt('Course Information page')); + } else { + $r->print(&mt('Information about [_1]',$name)); + } + $r->print(''); + } return; } sub portfolio_files { - my ($r,$mode,$lt) = @_; - my ($cdom,$cnum,$name) = &aboutme_info($r); + my ($r,$mode,$lt,$is_course,$cdom,$cnum,$name) = @_; my $filecounts = { withpass => 0, withoutpass => 0, @@ -394,7 +596,6 @@ sub portfolio_files { &Apache::lonnet::get_portfile_permissions($cdom,$cnum); my %access_controls = &Apache::lonnet::get_access_controls($current_permissions); - my %allfileshash; my $portaccess; if ($mode eq 'showlink') { $portaccess = 'both'; @@ -405,10 +606,63 @@ sub portfolio_files { } } - foreach my $filename (keys(%access_controls)) { - my $access_status = - &Apache::lonnet::get_portfolio_access($cdom,$cnum,$filename,undef, - $access_controls{$filename}); + my $diroutput; + if ($is_course) { + my %files_by_group; + foreach my $filename (sort(keys(%access_controls))) { + my ($group,$path) = split('/',$filename,2); + $files_by_group{$group}{$path} = $access_controls{$filename}; + } + foreach my $group (sort(keys(%files_by_group))) { + my %fileshash; + my $grpout .= &build_hierarchy($r,$cdom,$cnum,$portaccess, + $is_course,$filecounts,$mode, + $files_by_group{$group}, + \%fileshash,$group); + if ($grpout) { + $diroutput .= '
'.$group.'
'.$grpout.''; + } + } + } else { + my %allfileshash; + $diroutput = &build_hierarchy($r,$cdom,$cnum,$portaccess,$is_course, + $filecounts,$mode,\%access_controls, + \%allfileshash); + } + if ($mode eq 'listfiles') { + if ($filecounts->{'both'}) { + $r->print($diroutput); + } else { + my $access_text; + if (ref($lt) eq 'HASH') { + $access_text = $lt->{$portaccess}; + } + $r->print(&mt('There are no available files of the specified access type: [_1]',$access_text)); + } + } + return $filecounts; +} + +{ + my $count=0; + sub portfolio_table_start { + $count=0; + return '
| ';
@@ -494,10 +730,8 @@ sub parse_directory {
$output .= ' |