--- loncom/interface/loncoursegroups.pm 2006/07/17 15:07:26 1.52 +++ loncom/interface/loncoursegroups.pm 2010/01/27 13:08:01 1.109 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: loncoursegroups.pm,v 1.52 2006/07/17 15:07:26 raeburn Exp $ +# $Id: loncoursegroups.pm,v 1.109 2010/01/27 13:08:01 wenzelju Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,13 +29,14 @@ package Apache::loncoursegroups; use strict; use Apache::lonnet; -use Apache::loncommon; -use Apache::lonhtmlcommon; +use Apache::loncommon(); +use Apache::lonhtmlcommon(); use Apache::lonlocal; -use Apache::lonnavmaps; -use Apache::longroup; -use Apache::portfolio; +use Apache::lonnavmaps(); +use Apache::longroup(); +use Apache::portfolio(); use Apache::Constants qw(:common :http); +use LONCAPA::map(); use lib '/home/httpd/lib/perl/'; use LONCAPA; @@ -53,7 +54,7 @@ sub handler { if (! ($env{'request.course.fn'})) { # Not in a course $env{'user.error.msg'}= - "/adm/coursegroups:mdg:0:0:Cannot edit or view course groups"; + "/adm/coursegroups:mdg:0:0:Cannot edit or view course/community groups"; return HTTP_NOT_ACCEPTABLE; } @@ -74,11 +75,11 @@ sub handler { my $crstype = &Apache::loncommon::course_type(); my %functions = ( - email => 'E-mail', - discussion => 'Discussion boards', - chat => 'Chat', - files => 'File repository', - roster => 'Membership roster', + email => 'Send Messages', + discussion => 'Discussion Boards', + chat => 'Chat Room', + files => 'Group Portfolio', + roster => 'Membership Roster', homepage => $ucgpterm.' home page', ); @@ -91,20 +92,29 @@ sub handler { my $action = $env{'form.action'}; my $state = $env{'form.state'}; - if ((!defined($action)) || ($action eq 'view')) { + if ((!defined($action)) || ($action eq 'view') || ($action eq 'modify') || ($action eq 'delete') || ($action eq 'reenable')) { if (!defined($state)) { $state = 'view'; } } - if ($action eq 'create' || $action eq 'modify' || $action eq 'view') { + if ($action eq 'create' || $action eq 'modify' || $action eq 'view' || + $action eq 'delete' || $action eq 'reenable') { if ($view_permission || $manage_permission) { - &group_administration($r,$action,$state,$cdom,$cnum, - \%functions,\%idx,$view_permission, - $manage_permission,$gpterm,$ucgpterm, - $crstype); + if ($state eq 'view') { + &print_main_menu($r,$cdom,$cnum,\%functions,\%idx, + $view_permission,$manage_permission, + $action,$state,$gpterm,$ucgpterm,$crstype); + } else { + &group_administration($r,$action,$state,$cdom,$cnum, + \%functions,\%idx,$view_permission, + $manage_permission,$gpterm,$ucgpterm, + $crstype); + } } else { - $r->print(&mt('You do not have [_1] administration '. - 'privileges in this [_2]',$gpterm,lc($crstype))); + $r->print('
' + .&mt('You do not have '.$gpterm.' administration ' + .'privileges in this '.lc($crstype).'.') + .'
'); } } else { &print_main_menu($r,$cdom,$cnum,\%functions,\%idx,$view_permission, @@ -117,17 +127,34 @@ sub handler { sub print_main_menu { my ($r,$cdom,$cnum,$functions,$idx,$view_permission,$manage_permission, $action,$state,$gpterm,$ucgpterm,$crstype) = @_; - my $pagename = "$crstype $ucgpterm".'s'; my $jscript = qq| function changeSort(caller) { document.$state.sortby.value = caller; document.$state.submit(); +} +function openGroupRoster(group,status) { + var url = '/adm/grouproster?'; + url += 'group='+group+'&status='+status+'&ref=popup'; + var title = 'Group Membership'; + var options = 'scrollbars=1,resizable=1,menubar=0'; + options += ',width=700,height=600'; + rosterbrowser = open(url,title,options,'1'); + rosterbrowser.focus(); }\n|; - $r->print(&header($pagename,$jscript,$action,$state)); + $r->print(&header('My Space',$jscript,$action,$state)); + if ($env{'form.refpage'} eq 'cusr') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/createuser", + text=>"User Management"}); + } &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/coursegroups", - text=>"$pagename"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs($pagename)); + text=>"Groups"}); + my $helpitem; + if ($manage_permission) { + $helpitem = 'Creating_Groups'; + } + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Groups',$helpitem)); &display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission, $manage_permission,$action,$state,$gpterm,$ucgpterm, $crstype); @@ -142,42 +169,65 @@ sub display_groups { my %grp_info = (); my %actionlinks = ( modify => ' ' 'Modify', view => 'View', delete => 'Delete', + reenable => 'Re-enable', act => 'Action', - gname => "$ucgpterm Name", - desc => 'Description', + gname => 'Group Name', + desc => 'Group Title', crea => 'Creator', crtd => 'Created', last => 'Last Modified', - func => 'Functionality', + func => 'Collaborative Tools', quot => 'Quota (Mb)', memb => 'Members', file => 'Files', dibd => 'Discussion Boards', dius => 'Disk Use (%)', - nogr => 'No '.$gpterm.'s exist.', - crng => 'Create a new '.$gpterm, + nogr => 'No groups exist.', + crng => 'Create a new group', + redg => 'Re-enable a deleted group', alth => 'Although your current role has privileges'. - ' to view any existing '.$gpterm.'s in this'. - lc($crstype).', you do not have privileges'. - 'to create new '.$gpterm.'s.', + ' to view any existing groups in this '. + lc($crstype).', you do not have privileges '. + 'to create new groups.', ); if ($view_permission) { if (!defined($action)) { $action = 'view'; } - my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); + my ($status,$reenable_link); + if ($action eq 'reenable') { + $status = 'deleted_groups'; + } else { + if ($manage_permission) { + my %deleted_groups = + &Apache::longroup::coursegroups($cdom,$cnum,undef,'deleted_groups'); + if (keys(%deleted_groups) > 0) { + $reenable_link = '    '.$lt{'redg'}.''; + } + } + } + my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,undef, + $status); + if (%curr_groups) { if ($manage_permission) { - $r->print('
'.$lt{'crng'}.''); + if ($action ne 'reenable') { + $r->print('
'.$lt{'crng'}.''); + } + if ($reenable_link) { + $r->print($reenable_link); + } } $r->print('

'); $r->print(&Apache::loncommon::start_data_table(). @@ -206,13 +256,13 @@ END my $members_result = &group_members($cdom,$cnum,$group, \%grp_info); my $port_path = '/userfiles/groups/'.$group.'/portfolio'; - my $port_dir = &Apache::loncommon::propath($cdom,$cnum).$port_path; my $totaldirs = 0; my $totalfiles = 0; - &group_files($group,$port_dir,\$totalfiles,\$totaldirs); + &group_files($group,$port_path,\$totalfiles,\$totaldirs); $grp_info{$group}{'totalfiles'} = $totalfiles; $grp_info{$group}{'totaldirs'} = $totaldirs; - my $diskuse = &Apache::lonnet::diskusage($cdom,$cnum,$port_dir); + my $getpropath = 1; + my $diskuse = &Apache::lonnet::diskusage($cdom,$cnum,$port_path, $getpropath); if ($grp_info{$group}{'quota'} > 0) { my $pct_use = 0.1 * $diskuse/$grp_info{$group}{'quota'}; $grp_info{$group}{'diskuse'} = sprintf("%.0f",$pct_use); @@ -270,17 +320,22 @@ END $functionality = &mt('None available'); } my $link = $actionlinks{$action}; - if ($action eq 'modify' || $action eq 'delete') { + if ($action eq 'modify' || $action eq 'delete' || + $action eq 'reenable') { $link .= $group; } else { $link .= $group.'/smppg?ref=grouplist'; + if (exists($env{'form.refpage'})) { + $link .= '&refpage='.$env{'form.refpage'}; + } } $link .= '">'.$lt{$action}.''; if ($action eq 'view') { - if (($manage_permission) && - ($env{'form.refpage'} ne 'enrl')) { + if ($manage_permission) { $link .= '  '.$actionlinks{'modify'}. - $group.'">'.$lt{'modify'}.''; + $group.'">'.$lt{'modify'}.''. + '  '.$actionlinks{'delete'}. + $group.'">'.$lt{'delete'}.''; } } $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense'). @@ -293,7 +348,10 @@ END ''.$functionality.''. ''.$quota.''. ''.$totalmembers.''. - ''.&mt('Files: ').$totalfiles.'
'.&mt('Folders: ').$totaldirs.''. + ''. + ''.&mt('Files: [_1]',$totalfiles).'
'. + ''.&mt('Folders: [_1]',$totaldirs).''. + ''. ''.$boards.''. ''.$diskuse.''. &Apache::loncommon::end_data_table_row()); @@ -312,10 +370,14 @@ END } else { $r->print($lt{'nogr'}); if ($manage_permission) { - $r->print('

'.$lt{'crng'}.''); + $r->print('

'.$lt{'crng'}.''); + if ($action ne 'reenable') { + if ($reenable_link) { + $r->print($reenable_link); + } + } } else { $r->print('

'.$lt{'alth'}); - } } } else { @@ -333,9 +395,7 @@ END } } } else { - $r->print(&mt('You are not currently a member of any '. - 'active [_1]s in this [_2]',$gpterm, - lc($crstype))); + $r->print(&mt('You are not currently a member of any active '.$gpterm.'s in this '.lc($crstype).'.')); } } return; @@ -400,11 +460,9 @@ sub group_administration { if ($state eq '') { if (defined($env{'form.groupname'})) { $state = 'pick_task'; - } else { - $state = 'pick_group'; } } else { - %stored = &retrieve_settings($cdom,$cnum,$groupname); + %stored = &retrieve_settings($cdom,$cnum,$groupname,$action); if (ref($stored{'types'}) eq 'ARRAY') { @types = @{$stored{'types'}}; } @@ -479,7 +537,7 @@ sub group_administration { if (ref($stored{'autorole'}) eq 'ARRAY') { foreach my $role (@{$stored{'autorole'}}) { - unless ($role eq 'cc') { + unless (($role eq 'cc') || ($role eq 'co')) { $elements{'modify'}{'change_settings'}{'sec_'.$role} = 'selectbox'; } @@ -495,11 +553,9 @@ sub group_administration { (($action eq 'modify') && (($state eq 'change_settings') || ($state eq 'add_members')))) { %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum); - if (%sectioncount) { - $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox'; - $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox'; - $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox'; - } + $elements{'create'}{'pick_name'}{'sectionpick'} = 'selectbox'; + $elements{'modify'}{'change_mapping'}{'sectionpick'} = 'selectbox'; + $elements{'modify'}{'add_members'}{'sectionpick'} = 'selectbox'; } if (($action eq 'create') || @@ -512,9 +568,6 @@ sub group_administration { } if (defined($env{'form.sectionpick'})) { @sections=&Apache::loncommon::get_env_multiple('form.sectionpick'); - if (grep/^all$/,@sections) { - @sections = sort {$a cmp $b} keys(%sectioncount); - } } } @@ -724,15 +777,15 @@ sub group_administration { my $space_trim = '/^\s*|\s*\$/g,""'; my $float_check = '/^([0-9]*\.?[0-9]*)$/'; $validate_script = ' - var newquota = document.'.$state.'.quota.value; + var newquota = new String(document.'.$state.'.quota.value); newquota.replace('.$space_trim.'); if (newquota == "" ) { document.'.$state.'.quota.value = 0; - newquota = 0; + newquota = "0"; } - var maxposs = '.$maxposs.'; + var maxposs = '.sprintf("%.2f",$maxposs).'; if (newquota > maxposs) { - alert("The file repository quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number."); + alert("The group portfolio quota you entered for this group ("+newquota+" Mb) exceeds the maximum possible ("+maxposs+" Mb). Please enter a smaller number."); return; } var re_quota = '.$float_check.'; @@ -751,7 +804,7 @@ sub group_administration { } } if (warn_zero == 1) { - alert("You have indicated that the file repository should be enabled, but you have set the respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature."); + alert("You have indicated that the group portfolio should be enabled, but you have set the respository quota to 0 Mb.\nThis will prevent any upload of files.\nPlease set a value or disable the repository feature."); return; } } @@ -781,7 +834,9 @@ function changeSort(caller) { my %states = (); my %branchstates = (); @{$states{'create'}} = ('pick_name','pick_members','pick_privs','result'); - @{$states{'modify'}} = ('pick_group','pick_task'); + @{$states{'modify'}} = ('pick_task'); + @{$states{'delete'}} = ('verify','result'); + @{$states{'reenable'}} = ('verify','result'); @{$branchstates{'noprivs'}} = ('result'); @{$branchstates{'settings'}} = ('change_settings','chgresult'); @{$branchstates{'members'}} = ('change_members','change_privs','memresult'); @@ -792,7 +847,7 @@ function changeSort(caller) { push (@{$states{$action}},@{$branchstates{$env{'form.branch'}}}); } - if (($action eq 'create') || ($action eq 'modify')) { + if (($action eq 'create') || ($action eq 'modify') || ($action eq 'delete') || ($action eq 'reenable')) { my $done = 0; my $i=0; while ($i<@{$states{$action}} && !$done) { @@ -805,20 +860,30 @@ function changeSort(caller) { } my $loaditems = &onload_action($action,$state); - my $crumbtitle = "$crstype $ucgpterm".'s'; - $r->print(&header("$crumbtitle Manager", + $r->print(&header("Groups Manager", $jscript,$action,$state,$page,$loaditems)); - if ($env{'form.refpage'} eq 'enrl') { + if ($env{'form.refpage'} eq 'cusr') { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/dropadd", - text=>"Enrollment Manager", + ({href=>"/adm/createuser", + text=>"User Management", faq=>9,bug=>'Instructor Interface',}); - } else { + if ($action eq 'modify' || $action eq 'delete') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/coursegroups?refpage=cusr&action=$action", + text=>"Groups", + faq=>9,bug=>'Instructor Interface',}); + } + } else { &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"/adm/coursegroups", - text=>"$crumbtitle", - faq=>9,bug=>'Instructor Interface',}); + ({href=>"/adm/coursegroups", + text=>"Groups", + faq=>9,bug=>'Instructor Interface',}); + if ($env{'form.refpage'} eq 'grouplist') { + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"/adm/$cdom/$cnum/$env{'form.groupname'}/smppg?ref=grouplist", + text=>"Group: $description",}); + } } my %trail = (); @@ -829,7 +894,6 @@ function changeSort(caller) { result => 'Creation Complete', ); %{$trail{'modify'}} = &Apache::lonlocal::texthash( - pick_group => $ucgpterm.'s', pick_task => 'Choose Task', change_settings => "$ucgpterm Settings", change_members => 'Modify/Delete Members', @@ -842,22 +906,30 @@ function changeSort(caller) { memresult => 'Modifications Complete', addresult => 'Additions Complete', ); + %{$trail{'delete'}} = &Apache::lonlocal::texthash( + verify => 'Verify deletion', + result => 'Deletion Complete' + ); + %{$trail{'reenable'}} = &Apache::lonlocal::texthash( + verify => 'Verify Re-enable', + result => 'Re-enabled' + ); my %navbuttons = &Apache::lonlocal::texthash( - gtns => 'Go to next step', - gtps => 'Go to previous step', + gtns => 'Next',#'Go to next step', + gtps => 'Back',#'Go to previous step', crgr => 'Create '.$gpterm, - mose => 'Modify settings', - gtpp => 'Go to previous page', + mose => 'Save',#'Modify settings', + gtpp => 'Back',#'Go to previous page', adme => 'Add members', ); - if ((($action eq 'create') || ($action eq 'modify')) && + if ((($action eq 'create') || ($action eq 'modify') || ($action eq 'delete') || ($action eq 'reenable')) && ($manage_permission)) { for (my $i=0; $i<@{$states{$action}}; $i++) { if ($state eq $states{$action}[$i]) { &Apache::lonhtmlcommon::add_breadcrumb( {text=>"$trail{$action}{$state}"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - ("$crumbtitle Manager")); + ("Groups Manager","Creating_Groups")); &display_control($r,$cdom,$cnum,$action,$state,$page, \%sectioncount,$groupname,$description,$functions, \@tools,$toolprivs,$fixedprivs,$startdate,$enddate, @@ -868,35 +940,43 @@ function changeSort(caller) { $crstype); last; } else { - if (($state eq 'result') && ($i > 0)) { - &Apache::lonhtmlcommon::add_breadcrumb( + if (($action eq 'create') || ($action eq 'modify')) { + if (($state eq 'result') && ($i > 0)) { + &Apache::lonhtmlcommon::add_breadcrumb( {href=>"javascript:backPage(document.$state,'$states{$action}[0]')", text=>"$trail{$action}{$states{$action}[$i]}"}); - } else { - &Apache::lonhtmlcommon::add_breadcrumb( + } else { + &Apache::lonhtmlcommon::add_breadcrumb( {href=>"javascript:backPage(document.$state,'$states{$action}[$i]')", text=>"$trail{$action}{$states{$action}[$i]}"}); + } } - } + } } } elsif (($action eq 'view') && ($view_permission)) { &Apache::lonhtmlcommon::add_breadcrumb( {text=>"View $gpterm".'s'}); - my $crumbtitle = "$crstype $ucgpterm".'s Manager'; $r->print(&Apache::lonhtmlcommon::breadcrumbs - (&mt($crumbtitle))); + ('Groups Manager')); &display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission, $manage_permission,$action,$state,$gpterm,$ucgpterm, $crstype); - } $r->print(&footer()); return; } sub retrieve_settings { - my ($cdom,$cnum,$groupname) = @_; - my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$groupname); + my ($cdom,$cnum,$groupname,$action) = @_; + my %curr_groups; + my $namespace; + if ($action eq 'reenable') { + $namespace = 'deleted_groups'; + } else { + $namespace = 'coursegroups'; + } + %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$groupname, + $namespace); return if (!%curr_groups); @@ -941,6 +1021,7 @@ sub retrieve_settings { foreach my $role (sort(keys(%{$groupinfo{'autosec'}}))) { if (ref($groupinfo{'autosec'}{$role}) eq 'ARRAY') { foreach my $section (@{$groupinfo{'autosec'}{$role}}) { + push (@{$stored{'sec_'.$role}},$section); } if (@{$groupinfo{'autosec'}{$role}} > 0) { @@ -988,11 +1069,7 @@ sub display_control { } } elsif ($action eq 'modify') { my $groupname = $env{'form.groupname'}; - if ($state eq 'pick_group') { - &display_groups($r,$cdom,$cnum,$functions,$idx,$view_permission, - $manage_permission,$action,$state,$gpterm, - $ucgpterm,$crstype); - } elsif ($state eq 'pick_task') { + if ($state eq 'pick_task') { &modify_menu($r,$groupname,$page,$gpterm); } elsif ($state eq 'change_settings') { &general_settings_form($r,$cdom,$cnum,$action,$state,$page, @@ -1006,10 +1083,10 @@ sub display_control { $userdata,$granularity,$quota,$specificity, $idx,$states,$navbuttons,$gpterm,$ucgpterm); } elsif ($state eq 'add_members') { - &add_members_form($r,$action,$state,$page,$startdate, + &add_members_form($r,$cdom,$cnum,$action,$state,$page,$startdate, $enddate,$groupname,$description,$granularity, $quota,$sectioncount,$tools,$functions,$stored, - $states,$navbuttons,$gpterm,$ucgpterm); + $states,$navbuttons,$gpterm,$ucgpterm,$crstype); } elsif ($state eq 'pick_members') { &choose_members_form($r,$cdom,$cnum,$action,$state,$page, $groupname,$description,$granularity,$quota, @@ -1038,7 +1115,346 @@ sub display_control { $sections,$states,$navbuttons,$memchg, $sectioncount,$stored,$gpterm,$ucgpterm,$crstype); } + } elsif ($action eq 'delete') { + my %stored = &retrieve_settings($cdom,$cnum,$groupname,$action); + if ($state eq 'verify') { + &verify_delete($r,$groupname,$state,$action,$page,$states, + \%stored,$crstype); + } elsif ($state eq 'result') { + &delete_group($r,$cdom,$cnum,$groupname,$crstype); + } + } elsif ($action eq 'reenable') { + my %stored = &retrieve_settings($cdom,$cnum,$groupname,$action); + if ($state eq 'verify') { + &verify_reenable($r,$groupname,$state,$action,$page,$states, + \%stored,$crstype); + } elsif ($state eq 'result') { + &reenable_group($r,$cdom,$cnum,$groupname,$crstype); + } + } +} + +sub verify_delete { + my ($r,$groupname,$formname,$action,$page,$states,$stored,$crstype) = @_; + $r->print(&Apache::lonhtmlcommon::echo_form_input([])); + $r->print(&mt('You have requested deletion of the group [_1].' + ,''.$stored->{'description'}.''). + '

'.&mt('When a group is deleted the following occurs:').''.&mt("Although a deleted group is no longer accessible, the group name used for the group will be reserved, and will not be available for assignment to a new group in the same community in the future.")); + } else { + $r->print( '
  • '.&mt("The group folder is removed from the folder containing it - normally this is the 'Course Groups' folder which contains folders for all groups in the course.").'
    • '. + ''.&mt("Although a deleted group is no longer accessible, the group name used for the group will be reserved, and will not be available for assignment to a new group in the same course in the future.")); + } + my $prevtext = &mt('Go back'); + my $nexttext = &mt('Delete group'); + my $prev; + if ($env{'form.refpage'} eq 'cusr') { + $prev = 'view'; + } + &display_navbuttons($r,$formname,$prev,$prevtext, + $$states{$action}[$page+1],$nexttext); + return; +} + +sub delete_group { + my ($r,$cdom,$cnum,$groupname,$crstype) = @_; + my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum, + $groupname); + my $now = time; + my $num_users = 0; + my $num_fail = 0; + my $num_ok = 0; + my @deleted; + my @undeleted; + my %usersettings; + my $context = 'deletegroup'; + foreach my $key (sort(keys(%membership))) { + if ($key =~ /^\Q$groupname\E:([^:]+:[^:]+)$/) { + my $user = $1; + my($end,$start,$userprivs) = split(/:/,$membership{$key},3); + if ($start != -1) { + $num_users ++; + $usersettings{$groupname.':'.$user} = $now.':-1:'.$userprivs; + if (&Apache::lonnet::modify_group_roles($cdom,$cnum, + $groupname,$user, + $now,'-1',$userprivs, + '',$context) + eq 'ok') { + $num_ok ++; + push(@deleted,$user); + } else { + push(@undeleted,$user); + $num_fail ++; + } + } + } + } + if ($num_ok > 0) { + my $roster_result = + &Apache::lonnet::modify_coursegroup_membership($cdom,$cnum, + \%usersettings); + } + if ($num_fail > 0) { + $r->print('
    ' + .&mt('Group deletion failed because deletion of [_1] out of [_2] members failed.' + ,$num_fail,$num_users) + .'
    '); + } else { + my ($result,$message) = + &Apache::lonnet::toggle_coursegroup_status($cdom,$cnum, + $groupname,'delete'); + if ($result eq 'ok') { + my $outcome = &modify_folders($cdom,$cnum,$groupname,$crstype); + if ($outcome eq '') { + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Group successfully deleted.')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + } else { + $r->print('
    '); + if ($crstype eq 'Community') { + $r->print(&mt("Although the group was deleted, an error occurred when removing the group's folder from the 'Community Groups' folder: [_1]",$outcome)); + } else { + $r->print(&mt("Although the group was deleted, an error occurred when removing the group's folder from the 'Course Groups' folder: [_1]",$outcome)); + } + $r->print('
    '); + } + } else { + my $msg = &Apache::lonhtmlcommon::confirm_success(&mt('Group deletion failed.'),1); + $msg = &Apache::loncommon::confirmwrapper($msg); + $r->print($msg); + } + } + return; +} + +sub reenable_folder { + my ($cdom,$cnum,$groupname,$description,$crstype) = @_; + my $outcome; + my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/'; + my $allgrpsmap = $crspath.'group_allfolders.sequence'; + my $foldertitle; + if ($crstype eq 'Community') { + $foldertitle = &mt("Community Folder -[_1]",$description); + } else { + $foldertitle = &mt("Course Folder -[_1]",$description); + } + my $mapurl = $crspath.'group_folder_'. + $groupname.'.sequence'; + my ($errtext,$fatal)=&LONCAPA::map::mapread($allgrpsmap); + if ($fatal) { + $outcome='
    ' + .&mt('An error occurred when reading contents of parent folder to group:') + ."
    ($allgrpsmap): $errtext" + .'
    '; + } else { + my $idx=&LONCAPA::map::getresidx($mapurl); + $LONCAPA::map::resources[$idx] = $foldertitle.':'.$mapurl. + ':false:normal:res'; + $LONCAPA::map::order[1+$#LONCAPA::map::order]=$idx; + my ($outtext,$errtext) = &LONCAPA::map::storemap($allgrpsmap,1); + if ($errtext) { + $outcome='
    ' + .&mt('An error occurred when saving updated parent folder to group:' + ,"
    $allgrpsmap - $errtext") + .'
    '; + } else { + my ($furl,$ferr) = + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + } } + return $outcome; +} + +sub modify_folders { + my ($cdom,$cnum,$groupname,$crstype) = @_; + my ($outcome,$groupmap,$groupmapres,$map,$id,$src); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (!defined($navmap)) { + $outcome = '
    '; + if ($crstype eq 'Community') { + $outcome .= &mt("Error reading community contents.").' '. + &mt("You need to re-initialize the community."); + } else { + $outcome .= &mt("Error reading course contents.").' '. + &mt("You need to re-initialize the course."); + } + $outcome .= '
    '; + return $outcome; + } + $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'. + $groupname.'.sequence'; + $groupmapres = $navmap->getResourceByUrl($groupmap); + if ($groupmapres) { + ($map,$id,$src)=&Apache::lonnet::decode_symb($groupmapres->symb()); + } + undef($navmap); + if ($map) { + $map = '/'.$map; + my ($errtext,$fatal) = &LONCAPA::map::mapread($map); + if ($fatal) { + $outcome='
    ' + .&mt('An error occurred when reading contents of parent folder to group:') + ."
    ($map): $errtext" + .'
    '; + } else { + my $idx = 0; + my $grpidx; + foreach my $item (@LONCAPA::map::order) { + my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$item]); + $url=&LONCAPA::map::qtescape($url); + if ($url eq $groupmap) { + $grpidx = $idx; + last; + } else { + $idx++; + } + } + + if ($grpidx ne '') { + &LONCAPA::map::makezombie($LONCAPA::map::order[$grpidx]); + for (my $i=$grpidx;$i<$#LONCAPA::map::order;$i++) { + $LONCAPA::map::order[$i] = $LONCAPA::map::order[$i+1]; + } + $#LONCAPA::map::order--; + my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1); + if ($errtext) { + $outcome='
    ' + .&mt('An error occurred when saving updated parent folder to group:') + ."
    $map - $errtext" + .'
    '; + } else { + my ($furl,$ferr) = + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + } + } + } + } + return $outcome; +} + +sub verify_reenable { + my ($r,$groupname,$formname,$action,$page,$states,$stored,$crstype) = @_; + $r->print(&Apache::lonhtmlcommon::echo_form_input([])); + $r->print(&mt('You have requested enabling the previously deleted group [_1].' + ,''.$stored->{'description'}.''). + '

    '.&mt('When a deleted group is re-enabled the following occurs:').''); + my $prevtext = &mt('Go back'); + my $nexttext = &mt('Reenable group'); + my $prev; + if ($env{'form.refpage'} eq 'cusr') { + $prev = 'view'; + } + &display_navbuttons($r,$formname,$prev,$prevtext, + $$states{$action}[$page+1],$nexttext); + return; +} + +sub reenable_group { + my ($r,$cdom,$cnum,$groupname,$crstype) = @_; + my %groups = + &Apache::longroup::coursegroups($cdom,$cnum,$groupname, + 'deleted_groups'); + if (keys(%groups) == 0) { + $r->print(&mt('The group [_1] was not re-enabled, because it is not a deleted group.[_2]Perhaps it has already been re-enabled?',''.$groupname.''),'
    '); + return; + } + my %groupinfo = + &Apache::longroup::get_group_settings($groups{$groupname}); + my $defstart = $groupinfo{'startdate'}; + my $defend = $groupinfo{'enddate'}; + my $showstart = &Apache::lonlocal::locallocaltime($defstart); + my $showend; + if ($defend == 0) { + $showend = &mt('No end date set'); + } else { + $showend = &Apache::lonlocal::locallocaltime($defend); + } + my $description = &unescape($groupinfo{'description'}); + my $num_users = 0; + my $num_ok = 0; + my $num_fail = 0; + my $context = 'reenablegroup'; + my (%usersettings,@enabled,@unenabled); + my ($result,$message) = + &Apache::lonnet::toggle_coursegroup_status($cdom,$cnum,$groupname, + 'reenable'); + if ($result eq 'ok') { + my %membership = &Apache::lonnet::get_group_membership($cdom,$cnum, + $groupname); + foreach my $key (sort(keys(%membership))) { + if ($key =~ /^\Q$groupname\E:([^:]+:[^:]+)$/) { + my $user = $1; + my($end,$start,$userprivs) = split(/:/,$membership{$key},3); + if (($start == -1) && ($end == $groupinfo{'modified'})) { + $num_users ++; + $usersettings{$groupname.':'.$user} = $defend.':'. + $defstart.':'. + $userprivs; + if (&Apache::lonnet::modify_group_roles($cdom,$cnum, + $groupname,$user, + $defend,$defstart, + $userprivs,'', +$context) eq 'ok') { + $num_ok ++; + push(@enabled,$user); + } else { + push(@unenabled,$user); + $num_fail ++; + } + } + } + } + if ($num_users > 0) { + if ($num_ok > 0) { + my $roster_result = + &Apache::lonnet::modify_coursegroup_membership($cdom,$cnum, + \%usersettings); + if ($roster_result eq 'ok') { + $r->print('
    ' + .&mt('Membership reinstated for [quant,_1,user], each with start and end dates for group access set to defaults: [_2] and [_3]',$num_ok,$showstart,$showend) + .'
    '); + } + } else { + $r->print('
    ' + .&mt('A problem occurred when trying to reinstate [_1] of the [_2] members of the pre-existing group.',$num_fail,$num_users) + .'
    '); + } + } else { + $r->print('
    ' + .&mt('There were no group members to reinstate, as none were removed when the group was deleted.') + .'
    '); + } + my $outcome = &reenable_folder($cdom,$cnum,$groupname,$description,$crstype); + if ($outcome eq '') { + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Group successfully re-enabled.')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + } else { + $r->print('
    '); + if ($crstype eq 'Community') { + $r->print(&mt("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Community Groups' folder: [_1]",$outcome)); + } else { + $r->print(&mt("Although the group was re-enabled, an error occurred when adding the group's folder to the 'Course Groups' folder: [_1]",$outcome)); + } + $r->print('
    '); + } + } else { + my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Re-enabling group failed.'),1); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); + } + return; } sub header { @@ -1050,7 +1466,7 @@ sub header { {'add_entries' => $loaditems,}); my $output = <<"END"; $start_page -
    + END if ($action eq 'create' || $action eq 'modify') { @@ -1077,8 +1493,7 @@ sub onload_action { } if (($action eq 'modify') && ($state eq 'change_settings' || $state eq 'change_members' || - $state eq 'change_privs' || $state eq 'add_members' || - $state eq 'pick_members')) { + $state eq 'change_privs' || $state eq 'add_members')) { $loaditems{'onload'} = 'javascript:setFormElements(document.'.$state.')'; } @@ -1109,16 +1524,16 @@ sub build_members_list { } sub group_files { - my ($group,$currdir,$numfiles,$numdirs) = @_; + my ($group,$portpath,$numfiles,$numdirs) = @_; my $dirptr=16384; - my @dir_list=&Apache::portfolio::get_dir_list($currdir,$group); + my @dir_list=&Apache::portfolio::get_dir_list($portpath,undef,$group); foreach my $line (@dir_list) { my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); if (($filename !~ /^\.\.?$/) && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/) && ($filename ne 'no_such_dir')) { if ($dirptr&$testdir) { - $currdir .= '/'.$filename; + $portpath .= '/'.$filename; $$numdirs ++; - &group_files($numfiles,$numdirs) + &group_files($group,$portpath,$numfiles,$numdirs) } else { $$numfiles ++; } @@ -1131,39 +1546,54 @@ sub group_members { my ($cdom,$cnum,$group,$group_info) = @_; my %memberhash = &Apache::lonnet::get_group_membership($cdom,$cnum,$group); my $now = time; - my ($tmp)=keys(%memberhash); - if ($tmp=~/^error:/) { - $$group_info{'totalmembers'} = 'Unknown - an error occurred'; - return $tmp; - } + my %lt = &Apache::lonlocal::texthash ( + active => 'active', + previous => 'previous', + future => 'future', + ); + my %membercounts = ( + active => 0, + previous => 0, + future => 0, + ); my $totalmembers = 0; - my $active = 0; - my $previous = 0; - my $future = 0; foreach my $member (keys %memberhash) { $totalmembers ++; my ($end,$start) = split(/:/,$memberhash{$member}); unless ($start == -1) { if (($end!=0) && ($end<$now)) { - $previous ++; + $membercounts{previous} ++; } elsif (($start!=0) && ($start>$now)) { - $future ++; + $membercounts{future} ++; } else { - $active ++; + $membercounts{active} ++; } } } if ($totalmembers == 0) { $$group_info{$group}{'totalmembers'} = 'None'; } else { - $$group_info{$group}{'totalmembers'} = ''.$active. - ' - active
    '.$previous. - ' - previous
    '.$future. - ' - future'; + foreach my $type ('active','previous','future') { + $$group_info{$group}{'totalmembers'} .= + &open_list_window($group,$type,$membercounts{$type},$lt{$type}); + } } return 'ok'; } +sub open_list_window { + my ($group,$status,$count,$text) = @_; + my $entry; + if ($count > 0) { + $entry = ''.$text.' - '.$count. + '
    '; + } else { + $entry = ''.$text.' - '.$count.'
    '; + } + return $entry; +} + sub general_settings_form { my ($r,$cdom,$cnum,$action,$formname,$page,$functions,$tools, @@ -1174,8 +1604,8 @@ sub general_settings_form { $gpterm,$ucgpterm,$crstype); &access_date_settings($r,$action,$formname,$stored,2,$gpterm,$ucgpterm); if ($action eq 'create') { - &membership_options($r,$action,$formname,$sectioncount,3,$gpterm, - $ucgpterm); + &membership_options($r,$cdom,$cnum,$action,$formname,$sectioncount,3, + $gpterm,$ucgpterm,$crstype); $nexttext = $$navbuttons{'gtns'}; } else { my @available = (); @@ -1184,10 +1614,10 @@ sub general_settings_form { @{$tools} = sort(keys(%{$functions})); &privilege_specificity($r,$action,3,$tools,$stored,$toolprivs, $fixedprivs,\@available,$formname, - $gpterm,$ucgpterm); + $gpterm,$ucgpterm,$functions,$crstype); &mapping_options($r,$action,$formname,$page,$sectioncount, $states,$stored,$navbuttons,4,5, - $gpterm,$ucgpterm,$crstype); + $gpterm,$ucgpterm,$crstype,$cdom,$cnum); $nexttext = $$navbuttons{'mose'}; } $prevtext = $$navbuttons{'gtpp'}; @@ -1200,42 +1630,42 @@ sub groupsettings_options { my ($r,$functions,$action,$formname,$stored,$image,$gpterm, $ucgpterm,$crstype) = @_; my %lt = &Apache::lonlocal::texthash( - 'gdat' => "$ucgpterm open and close dates", - 'sten' => "Set a start date/time and end date/time for the $gpterm", - 'gfun' => "$ucgpterm functionality", - 'gnde' => "$ucgpterm name, description and available functionality", - 'desc' => 'Description', - 'func' => 'Functionality', - 'gnam' => "$ucgpterm Name", - 'doyo' => "Do you want to assign different functionality ". - "to different $gpterm members?", + 'gdat' => "Group access start and end dates", + 'gnde' => "Group name, title and available collaborative tools", + 'desc' => 'Group Title', + 'func' => 'Collaborative Tools', + 'gnam' => 'Group Name', + 'lett' => 'Letters, numbers and underscore only', + 'doyo' => 'Different subsets of the chosen collaborative tools '. + 'for different group members?', + 'gran' => 'Granularity', + 'dquo' => 'Disk quota', ); my ($crsquota,$freespace,$maxposs) = &get_quota_constraints($action,$stored); - &topic_bar($r,$image,$lt{'gnde'}); - $r->print(' - - - - - - - - - - - -END + $r->print(&Apache::lonhtmlcommon::row_closure()); + + # Group Title + $r->print(&Apache::lonhtmlcommon::row_title($lt{'desc'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + ); + + # Collaborative Tools my $numitems = keys(%{$functions}); my $halfnum = int($numitems/2); my $remnum = $numitems%2; @@ -1243,66 +1673,80 @@ END $halfnum ++; } my @allfunctions = sort(keys (%{$functions})); - for (my $i=0; $i<$halfnum; $i++) { - $r->print(' - '); - } - $r->print(''); - for (my $j=$halfnum; $j<@allfunctions; $j++) { - $r->print(' - '); - } - if ($remnum) { - $r->print(''); + + $r->print(&Apache::lonhtmlcommon::row_title($lt{'func'}) + .'
    ' + .'' + .' ' + .'
    ' + .'
    '.$lt{'gnam'}.': -'); + $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'gnde'})); + + # Group Name + $r->print(&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'gnam'}) + ); if ($action eq 'create') { - $r->print(''); + $r->print('' + .' (' + .$lt{'lett'}.')' + ); } else { $r->print(''.$env{'form.groupname'}); } - $r->print(<<"END"); -
    $lt{'desc'}: -
    $lt{'func'}:  '. - '
        
    ' # FIXME Get rid of inflexible table (-> float) + ); + for (my $i=0; $i<@allfunctions; $i++) { + $r->print('' + ); + if ($i == $halfnum - 1) { + $r->print(''); + } } - $r->print(' - - - - -
    - -
    '.&mt('Granularity:').''.$lt{'doyo'}.'  '); + $r->print('
    ' + .&Apache::lonhtmlcommon::row_closure() + ); + + # Granularity + $r->print(&Apache::lonhtmlcommon::row_title($lt{'gran'}) + .$lt{'doyo'}.'
    ' + .' ' + ); if ($action eq 'modify') { - $r->print('  ('.&mt('Currently set to "[_1]"', - $$stored{'granularity'}).')'); + $r->print(' (' + .&mt('Currently set to [_1].' + ,'"'.&mt($$stored{'granularity'}).'"') + .')' + ); } - $r->print(' - - - - '.&mt('Disk quota: ').''); + $r->print(&Apache::lonhtmlcommon::row_closure()); + + # Disk Quota + $r->print(&Apache::lonhtmlcommon::row_title($lt{'dquo'})); if ($action eq 'create') { - $r->print(&mt('If you enable the file repository for the [_1], allocate a disk quota.',$gpterm)); + $r->print('' + .&mt('If you enable the group portfolio for the '.$gpterm + .', allocate a disk quota.') + .'' + ); } else { - $r->print(&mt('Quota allocated to file repository:')); + $r->print(&mt('Quota allocated to group portfolio:')); } - $r->print(' Mb'); + $r->print(' '.&mt('[_1] Mb','')); if ($action eq 'create') { - $r->print('
    '. - &mt('A total of [_1] Mb can be divided amongst all [_2]s in the '. - '[_3], and [_4] Mb are currently unallocated.',$crsquota, - $gpterm,lc($crstype),$freespace)); + $r->print('
    ' + .&mt('A total of [_1] Mb can be divided amongst all '.$gpterm.'s in the ' + .lc($crstype).', and [_2] Mb are currently unallocated.' + ,$crsquota,sprintf("%.2f",$freespace)) + ); } else { $r->print('  ('.&mt('The quota is currently [_1] Mb', $$stored{'quota'}).').'); - $r->print('
    '.&mt('The quota can be increased to [_1] Mb, '. - 'by adding all unallocated space for [_2]s in the [_3].', - $maxposs,$gpterm,lc($crstype))); + $r->print('
    ' + .&mt('The quota can be increased to [_1] Mb, ' + .'by adding all unallocated space for '.$gpterm.'s in the '.lc($crstype).'.' + ,sprintf("%.2f",$maxposs))); } - $r->print(' - - - -'); + $r->print(&Apache::lonhtmlcommon::row_closure(1)); + + $r->print(&Apache::lonhtmlcommon::end_pick_box()); + return; } @@ -1323,40 +1767,47 @@ sub get_quota_constraints { } sub membership_options { - my ($r,$action,$state,$sectioncount,$image,$gpterm,$ucgpterm) = @_; - my $crstype = &Apache::loncommon::course_type(); + my ($r,$cdom,$cnum,$action,$state,$sectioncount,$image,$gpterm,$ucgpterm,$crstype)=@_; my %lt = &Apache::lonlocal::texthash( - 'pipa' => 'Pick parameters to generate membership list', - 'gmem' => "$ucgpterm membership options", - 'picr' => 'Pick the criteria to use to build a list of '. - lc($crstype).' users from which you will select ', - 'meof' => "members of the new $gpterm.", - 'admg' => "additional members of the $gpterm.", - 'ifno' => "If you do not wish to add members when you first ". - "create the $gpterm, do not make any selections.", - 'asub' => "A subsequent step will also allow you to specify automatic adding/dropping of $gpterm members triggered by specified role and section changes.", + 'pipa' => 'Build a list of users for selection of group members', + 'gmem' => 'Group membership selection list criteria:', + 'picr' => 'Pick the criteria to use to build a list of course users from which you will select members of the new group.', + 'pica' => 'Pick the criteria to use to build a list of course users from which you will select additional members of the group.', + 'ifno' => 'If you do not wish to add members when you first create the group, there is no need to pick any criteria.', 'acty' => 'Access types', - 'coro' => $crstype.' roles', - 'cose' => $crstype.' sections', + 'coro' => 'Course roles', + 'cose' => 'Course sections', ); + if ($crstype eq 'Community') { + $lt{'picr'} = &mt('Pick the criteria to use to build a list of community participants from which you will select '); + $lt{'asub'} = &mt('A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified user role and section [_1]changes[_2] in the course.','',''); + $lt{'coro'} = &mt('Community roles'); + $lt{'cose'} = &mt('Community sections'); + } else { + $lt{'asub'} = &mt('A subsequent step will also allow you to specify automatic adding/dropping of group members triggered by specified user role and section [_1]changes[_2] in the course.','',''); + } my %status_types = ( active => &mt('Currently has access'), previous => &mt('Previously had access'), future => &mt('Will have future access'), ); - #FIXME need to plumb around for the various cr roles defined by the user - my @roles = ('st','cc','in','ta','ep'); + my @roles = ('st'); + if ($crstype eq 'Community') { + push(@roles,'co'); + } else { + push(@roles,'cc'); + } + push (@roles,('in','ta','ep','ad','cr')); my @sections = keys(%{$sectioncount}); - &topic_bar($r,$image,$lt{'pipa'}); - $r->print(' - '.$lt{'gmem'}.'
    '.$lt{'picr'}); + $r->print(&Apache::lonhtmlcommon::topic_bar($image,$lt{'pipa'}).' + '.$lt{'gmem'}.'
    '); if ($action eq 'create') { - $r->print($lt{'meof'}.'
    '.$lt{'ifno'}.'
    '.$lt{'asub'}); + $r->print($lt{'picr'}.'
    '.$lt{'ifno'}.'
    '.$lt{'asub'}); } else { - $r->print($lt{'admg'}); + $r->print($lt{'pica'}); } $r->print('
    @@ -1364,23 +1815,21 @@ sub membership_options { - '); - if (@sections >0) { - $r->print(' - '); - } - $r->print(' + + '); + } else { + @sections = ('all','none'); } - $r->print(' + $r->print('
    '.$lt{'acty'}.''.$lt{'coro'}.''.$lt{'cose'}.'
    '); + '.$lt{'coro'}.''.$lt{'cose'}.'
    '); $r->print(&Apache::lonhtmlcommon::status_select_row(\%status_types)); $r->print(''); - $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles)); + $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles,undef,undef,1,$cdom,$cnum)); if (@sections > 0) { @sections = sort {$a cmp $b} @sections; unshift(@sections,'none'); # Put 'no sections' next unshift(@sections,'all'); # Put 'all' at the front of the list - $r->print(''. - §ions_selection(\@sections,'sectionpick').''. + §ions_selection(\@sections,'sectionpick').'
    '); return; @@ -1395,7 +1844,7 @@ sub sections_selection { } foreach my $sec (@{$sections}) { if ($sec eq 'all') { - $section_sel .= ' '."\n"; + $section_sel .= ' '."\n"; } elsif ($sec eq 'none') { $section_sel .= ' '."\n"; } else { @@ -1403,7 +1852,7 @@ sub sections_selection { } } my $output = ' - '.$section_sel.' '; return $output; @@ -1411,9 +1860,7 @@ sub sections_selection { sub access_date_settings { my ($r,$action,$formname,$stored,$image,$gpterm,$ucgpterm) = @_; - my %lt = &Apache::lonlocal::texthash( - 'sten' => "Default start and end dates for $gpterm access", - ); + my $sten = &mt("Default start and end dates for $gpterm access"); my $starttime = time; my $endtime = time+(6*30*24*60*60); # 6 months from now, approx if ($action eq 'modify') { @@ -1423,8 +1870,7 @@ sub access_date_settings { } } my ($table) = &date_setting_table($starttime,$endtime,$formname); - &topic_bar($r,$image,$lt{'sten'}); - $r->print(' + $r->print(&Apache::lonhtmlcommon::topic_bar($image,$sten).' '.$table.' '); return; @@ -1477,7 +1923,8 @@ sub choose_members_form { } } &privilege_specificity($r,$action,$specimg,$tools,$stored,$toolprivs, - $fixedprivs,\@available,$formname,$gpterm,$ucgpterm); + $fixedprivs,\@available,$formname,$gpterm,$ucgpterm, + $functions,$crstype); my $newusers = &pick_new_members($r,$action,$formname,\@available,$idx, $stored,$memimg,$users,$userdata, $granularity,\%origmembers,$gpterm, @@ -1501,6 +1948,11 @@ sub display_navbuttons {    '); + } elsif ($prevtext) { + $r->print(' + +    '); } if ($next) { $r->print(' @@ -1527,16 +1979,16 @@ sub print_current_settings { $granularity,$quota,$available,$unavailable,$gpterm,$ucgpterm) = @_; my %lt = &Apache::lonlocal::texthash( - grna => "$ucgpterm Name", - desc => 'Description', - grfn => "$ucgpterm Functions", + grna => 'Group Name', + desc => 'Group Title', + grfn => "Collaborative Tools", gran => 'Granularity', quot => 'File quota', dfac => 'Default access dates', - ygrs => "Your $gpterm selections", - tfwa => "The following settings will apply to the $gpterm:", - difn => 'Different functionality
    for different members:', - stda => 'Start date', + ygrs => "Your group selections - ", + tfwa => "The following settings will apply to the group:", + difn => 'Different collaborative tools
    for different members:', + stda => 'Start date:', enda => 'End date:', ); my $showstart = &Apache::lonlocal::locallocaltime($startdate); @@ -1569,46 +2021,31 @@ sub print_current_settings { '.$description.' '); + if (@{$available} > 0) { - $r->print('Available: - '); - my $rowcell = int(@{$available}/2) + @{$available}%2; + $r->print(''.&mt('Available for assignment to members:').''); + $r->print(''); - } - } - $r->print(''); + $r->print('
  • '.&mt($$functions{$$available[$i]}).'
    • '); } - if ((@{$available} > 3) && (@{$available}%2)) { - $r->print(''); - } - $r->print('
    '.$$functions{$$available[$i]}. - '   

    '); + $r->print(''); } + if (@{$unavailable} > 0) { - $r->print('Unavailable: - '); - my $rowcell = int(@{$unavailable}/2) + @{$unavailable}%2; - for (my $j=0; $j<@{$unavailable}; $j++) { - if (@{$unavailable} > 3) { - if ($j==$rowcell) { - $r->print(''); - } - } - $r->print(''); - } - if ((@{$unavailable} > 3) && (@{$unavailable}%2)) { - $r->print(''); + $r->print(''.&mt('Unavailable for assignment:').''); + $r->print('
    '.$$functions{$$unavailable[$j]}. - '   
    '); + $r->print(''); } + + my $quota_text=&mt('[_1] Mb',$quota); + my $granu_text=&mt($granularity); $r->print(<<"END"); - $lt{'difn'} $granularity - $quota Mb + $lt{'difn'} $granu_text + $quota_text $lt{'stda'} $showstart
    $lt{'enda'} $showend @@ -1622,17 +2059,18 @@ sub pick_new_members { my ($r,$action,$formname,$available,$idx,$stored,$img,$users,$userdata, $granularity,$origmembers,$gpterm,$ucgpterm) = @_; my %lt = &Apache::lonlocal::texthash( - 'gpme' => "$ucgpterm membership", + 'gpme' => "Group membership", 'addm' => 'Add members', - 'setf' => 'Set functionality', - 'func' => 'Functionality', - 'nome' => 'No members to add at this time.', + 'setf' => 'Assign collaborative tools', + 'func' => 'Tools', + 'nome' => 'No members to add at this time, as there are no users '. + 'matching the specified type(s), role(s) and section(s).', 'nnew' => "There are no users to add as new members, as all users". - " matching the specified type(s), role(s), and/or ". - "section(s) are already affiliated with this $gpterm.", - 'yoma' => 'You may need to use the '."'".'modify existing, past or '. - 'future members'."'".' page if you need to re-enable '. - 'or activate access for previous or future members.', + " matching the specified type(s), role(s), and ". + "section(s) are already affiliated with this group.", + 'yoma' => "You may need to use the 'modify existing, past or ". + "future members' page if you need to re-enable ". + "or activate access for previous or future members.", ); my %members; my $totalusers = 0; @@ -1656,7 +2094,7 @@ sub pick_new_members { $r->print(&check_uncheck_tools($r,$available)); } } - &topic_bar($r,$img,$lt{'gpme'}); + $r->print(&Apache::lonhtmlcommon::topic_bar($img,$lt{'gpme'})); if (keys(%members) > 0) { $r->print(' @@ -1664,14 +2102,14 @@ sub pick_new_members { &check_uncheck_buttons($r,$formname,'member',$lt{'addm'}); if (@{$available} > 0 && $granularity eq 'Yes') { $r->print(''); } $r->print('
    -
    '.$lt{'setf'}.' - - '.$lt{'setf'}.' + +    - - +
    @@ -1694,13 +2132,13 @@ sub pick_new_members { if ($granularity eq 'Yes') { $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').'   - '.&mt('All:').' '); + '.&mt('All:').' '); foreach my $tool (@{$available}) { $r->print('   '); } - $r->print(''); + $r->print(''); } } my %Sortby = (); @@ -1734,7 +2172,7 @@ sub pick_new_members { ''.$id.''. ''.$section.''); if (@{$available} > 0) { - $r->print(''. + $r->print(''. '       '); foreach my $tool (@{$available}) { if ($granularity eq 'Yes') { @@ -1745,7 +2183,7 @@ sub pick_new_members { $tool.'" value="'.$user.'" />'.$tool.'   '); } } - $r->print(''); + $r->print(''); } $r->print(&Apache::loncommon::end_data_table_row()."\n"); } @@ -1763,39 +2201,43 @@ sub pick_new_members { sub privilege_specificity { my ($r,$action,$img,$tools,$stored,$toolprivs,$fixedprivs,$available, - $formname,$gpterm,$ucgpterm) = @_; + $formname,$gpterm,$ucgpterm,$functions,$crstype) = @_; my %lt = &Apache::lonlocal::texthash ( - 'uprv' => 'User privileges', - 'frty' => 'For each type of functionality you have chosen to include, '. - 'there is a set of standard privileges which apply to all '. - 'of those for whom the functionality is enabled.', - 'thar' => 'There are also additional privileges which can be set for '. - 'some, or all, members. Please choose one of the following:', - 'fort' => 'For the types of functionality you have chosen to include '. - 'there are no additional privileges which can be set for some '. - 'or all members.', - 'eaty' => 'Each of the types of functionality includes standard '. - 'privileges which apply to members with access to that '. - 'functionality, and may also include additional privileges '. + 'uprv' => 'User privileges for collaborative tools', + 'frty' => 'For each collaborative tool you have chosen to include, '. + 'there is a set of core privileges which all group members '. + 'assigned use of the tool will receive.', + 'thar' => 'For some tools there are also additional optional '. + 'privileges which can be set.', + 'plch' => 'Choose one of the following:', + 'fort' => 'For the collaborative tools you have chosen to include '. + 'only core privileges are available, '. + 'so there are no optional privileges to assign.', + 'eaty' => 'Each collaborative tool includes core '. + 'privileges assigned to all members with access to the '. + 'tool. Some tools may also feature additional privileges '. 'which can be set for specific members.', - 'cutg' => "Currently the $gpterm is configured ", - 'sdif' => "so different $gpterm members can receive different privileges.", - 'sall' => "so all $gpterm members will receive the same privileges.", - 'algm' => "All $gpterm members will receive the same privileges.", - 'smgp' => "Some $gpterm members will receive different privileges from ". - "others.", - 'thwi' => "These will be the privileges all $gpterm members receive, ". - "if you selected the first option above.", + 'cutg' => 'Currently the group is configured ', + 'sdif' => 'so different members can receive different optional privileges for a particular tool.', + 'sall' => 'so all members will receive the same optional privileges for a particular tool.', + 'algm' => 'All group members will receive the same privileges for any tool assigned to them, including the default set of optional privileges.', + 'smgp' => 'Different group members may receive different privileges from '. + 'others for the tools they have been assigned.', + 'thwi' => 'These will be the privileges all group members receive for a particular assigned tool, '. + 'if you selected the first option above.', 'thes' => "These will be the privileges given to members assigned ". - "in the future, including via automatic $gpterm assignment ". - "for specific sections/roles ", - 'asyo' => "As you have chosen not to include any functionality in the ". - "$gpterm, no default user privileges settings need to be set.", - 'plin' => 'Please indicate which optional privileges members '. - 'will receive by default.', + "in the future via automatic group assignment ". + "for users who receive specific sections/roles in the course ", + 'asyo' => "As you have chosen not to include any collaborative tools ". + "in the group, no default optional privileges need to be set.", + 'plin' => 'Indicate which optional privileges members '. + 'will receive by default for a specific tool.', 'oppr' => 'Optional privileges', 'defp' => 'The default privileges new members will receive are:', ); + if ($crstype eq 'Community') { + $lt{'thes'} = &mt('These will be the privileges given to members assigned in the future via automatic group assignment for users who receive specific sections/roles in the community '); + } my $totaloptionalprivs = 0; foreach my $tool (@{$tools}) { foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) { @@ -1804,9 +2246,9 @@ sub privilege_specificity { } } } - &topic_bar($r,$img,$lt{'uprv'}); + $r->print(&Apache::lonhtmlcommon::topic_bar($img,$lt{'uprv'})); if ((($action eq 'create') && (@{$available} > 0)) || - (($action eq 'modify') && ($formname eq 'change_settings'))) { + (($action eq 'modify') && ($formname eq 'change_settings'))) { my %specific = ( 'No' => 'checked="checked"', 'Yes' => '', @@ -1814,7 +2256,7 @@ sub privilege_specificity { if ($action eq 'create') { $r->print($lt{'frty'}.'
    '); if ($totaloptionalprivs) { - $r->print($lt{'thar'}); + $r->print($lt{'thar'}.'

    '.$lt{'plch'}); } else { $r->print($lt{'fort'}); } @@ -1830,16 +2272,16 @@ sub privilege_specificity { } if ($totaloptionalprivs) { $r->print(' -

    -
    -'); +
    +
    +

    '); } else { $r->print(''); } if ($totaloptionalprivs) { $r->print($lt{'plin'}); if ($action eq 'create') { - $r->print(' '.$lt{'thwi'}); + $r->print('
    '.$lt{'thwi'}); } $r->print('
    '.$lt{'thes'}); if ($action eq 'create') { @@ -1859,10 +2301,11 @@ sub privilege_specificity { $r->print($lt{'algm'}.'

    '); } &default_privileges($r,$action,$tools,$toolprivs,$fixedprivs, - $available); + $available,$functions); } else { if ($action eq 'create') { $r->print($lt{'asyo'}); + $r->print(''); } elsif ($action eq 'modify' && $formname eq 'pick_members') { my @defprivs; if (ref($$stored{'defpriv'}) eq 'ARRAY') { @@ -1882,17 +2325,21 @@ sub privilege_specificity { } sub default_privileges { - my ($r,$action,$tools,$toolprivs,$fixedprivs,$available) = @_; + my ($r,$action,$tools,$toolprivs,$fixedprivs,$available,$functions) = @_; my %lt = &Apache::lonlocal::texthash( 'addp' => 'Additional privileges', 'fixp' => 'Fixed privileges', 'oppr' => 'Optional privileges', - 'func' => 'Function', + 'func' => 'Collaborative Tool', ); $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_group_priv_box'). &Apache::lonhtmlcommon::row_title($lt{'func'},undef, - 'LC_groups_functionality')); - $r->print(join('',@{$tools})); + 'LC_groups_functionality')); + my @tableHeader; + if ((ref($functions) eq 'HASH') && (ref($tools) eq 'ARRAY')) { + @tableHeader = map { $functions->{$_}; } @{$tools}; + } + $r->print(join('', @tableHeader)); $r->print(&Apache::lonhtmlcommon::row_closure(1)); my $fixed = ''; my $dynamic = ''; @@ -1907,7 +2354,8 @@ sub default_privileges { if ($fixed ne '') { $fixed .= ''; } - $fixed .= ''.$$toolprivs{$tool}{$priv}.' '; + $fixed .= '' + .''.&mt($$toolprivs{$tool}{$priv}).' '; if ($action eq 'modify') { if (grep(/^$tool$/,@{$available})) { $fixed .= ''.&mt('(on)').' '; @@ -1915,21 +2363,21 @@ sub default_privileges { $fixed .= ''.&mt('(off)').' '; } } + $fixed .= ''; } else { $privcount++; if ($privcount == 3) { $dynamic .= ' '."\n"; } - $dynamic .= ''."\n"; + $dynamic .= ''."\n"; } } if ($privcount == 0) { - $dynamic .= 'None'."\n"; + $dynamic .= ''.&mt('None').''."\n"; } if ($privcount < 3) { - $dynamic .= ' -  '."\n"; + $dynamic .= ' '."\n"; } elsif ($privcount%2) { $dynamic = ' '."\n"; } @@ -1956,7 +2404,7 @@ sub display_defprivs { my $rowColor2 = "#eeeeee"; my %lt = &Apache::lonlocal::texthash( 'priv' => 'Privileges', - 'func' => 'Function', + 'func' => 'Collaborative Tool', ); $r->print(&Apache::lonhtmlcommon::start_pick_box()); $r->print(''); @@ -2044,15 +2492,20 @@ sub change_members_form { $r->print('
    '); - &topic_bar($r,1,$lt{'grse'}); + $r->print(&Apache::lonhtmlcommon::topic_bar(1,$lt{'grse'})); &print_current_settings($r,$action,$functions,$startdate,$enddate, $groupname,$description,$granularity,$quota, \@available,\@unavailable,$gpterm,$ucgpterm); - &topic_bar($r,2,$lt{'mogm'}); - ¤t_membership($r,$cdom,$cnum,$formname,$groupname,\@available, - \@unavailable,$fixedprivs,$granularity,$specificity); - &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, - $$states{$action}[$page+1],$nexttext); + $r->print(&Apache::lonhtmlcommon::topic_bar(2,$lt{'mogm'})); + my $numcurrent = ¤t_membership($r,$cdom,$cnum,$formname,$groupname, + \@available,\@unavailable,$fixedprivs, + $granularity,$specificity); + if ($numcurrent > 0) { + &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, + $$states{$action}[$page+1],$nexttext); + } else { + &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext); + } return; } @@ -2072,13 +2525,14 @@ sub current_membership { 'reen' => 'Re-enable', 'acti' => 'Activate', 'dele' => 'Delete', - 'curf' => 'Current Functionality', + 'curf' => 'Current Tool Set', 'chpr' => 'Change Privileges' ); my ($current,$num_items,$hastools,$addtools) = &Apache::longroup::group_memberlist($cdom,$cnum,$groupname,$fixedprivs, $available); - if (keys(%{$current}) > 0) { + my $numcurrent = scalar(keys(%{$current})); + if ($numcurrent > 0) { $r->print(' '); @@ -2100,15 +2554,15 @@ sub current_membership { $r->print(&check_uncheck_tools($r,$available)); $r->print(' '); } @@ -2135,7 +2589,7 @@ END $colspan++; } if ($addtools) { - $r->print(''); + $r->print(''); $colspan++; } $r->print(&Apache::loncommon::end_data_table_header_row()); @@ -2143,14 +2597,14 @@ END if ($granularity eq 'Yes') { $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense LC_data_table_highlight').' - '); + $r->print(''); } } my %Sortby = (); @@ -2178,25 +2632,25 @@ END $r->print(&Apache::loncommon::start_data_table_row('LC_data_table_dense').' '. @@ -2207,7 +2661,7 @@ END ''. ''); if ($hastools) { - $r->print(''); + $r->print(''); } if ($addtools) { $r->print(''); @@ -2248,8 +2702,10 @@ END } } $r->print(&Apache::loncommon::end_data_table()); + } else { + $r->print(&mt('There are no active, future or previous group members to modify.')); } - return; + return $numcurrent; } sub check_uncheck_buttons { @@ -2257,14 +2713,14 @@ sub check_uncheck_buttons { $r->print(' '); @@ -2290,7 +2746,7 @@ sub change_privs_form { } else { $nexttext = $$navbuttons{'mose'}; } - &topic_bar($r,3,&mt('Members to delete or expire')); + $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('Members to delete or expire'))); my $exp_or_del = 0; if (ref($$memchg{'deletion'}) eq 'ARRAY') { if (@{$$memchg{'deletion'}} > 0) { @@ -2318,7 +2774,7 @@ sub change_privs_form { $r->print($lt{'nome'}.'
    '); } - &topic_bar($r,4,&mt('[_1] member privileges',$ucgpterm)); + $r->print(&Apache::lonhtmlcommon::topic_bar(4,&mt('Setting optional privileges for specific group members'))); my $numchgs = &member_privileges_form($r,$action,$formname,$tools, $toolprivs,$fixedprivs,$userdata, @@ -2335,9 +2791,9 @@ sub change_privs_form { } sub add_members_form { - my ($r,$action,$formname,$page,$startdate,$enddate,$groupname, + my ($r,$cdom,$cnum,$action,$formname,$page,$startdate,$enddate,$groupname, $description,$granularity,$quota,$sectioncount,$tools,$functions, - $stored,$states,$navbuttons,$gpterm,$ucgpterm)=@_; + $stored,$states,$navbuttons,$gpterm,$ucgpterm,$crstype)=@_; $r->print('
    '); my @available = (); my @unavailable = (); @@ -2345,7 +2801,8 @@ sub add_members_form { &print_current_settings($r,$action,$functions,$startdate,$enddate, $groupname,$description,$granularity,$quota, \@available,\@unavailable,$gpterm,$ucgpterm); - &membership_options($r,$action,$formname,$sectioncount,1,$gpterm,$ucgpterm); + &membership_options($r,$cdom,$cnum,$action,$formname,$sectioncount,1,$gpterm, + $ucgpterm,$crstype); my $nexttext = $$navbuttons{'gtns'}; my $prevtext = $$navbuttons{'gtpp'}; &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, @@ -2374,20 +2831,18 @@ sub choose_privs_form { $nexttext = $$navbuttons{'adme'}; } - &topic_bar($r,6,&mt('[_1] member privileges',$ucgpterm)); + $r->print(&Apache::lonhtmlcommon::topic_bar(6,&mt('Setting optional privileges for specific group members'))); &member_privileges_form($r,$action,$formname,$tools,$toolprivs, $fixedprivs,$userdata,$usertools,$idx,undef, $states,$stored,$gpterm); if ($action eq 'create') { - if (keys(%{$sectioncount}) > 0) { - my $img1 = 7; - my $img2 = 8; - &mapping_options($r,$action,$formname,$page,$sectioncount, - $states,$stored,$navbuttons,$img1,$img2, - $gpterm,$ucgpterm,$crstype); - } + my $img1 = 7; + my $img2 = 8; + &mapping_options($r,$action,$formname,$page,$sectioncount, + $states,$stored,$navbuttons,$img1,$img2, + $gpterm,$ucgpterm,$crstype,$cdom,$cnum); } my $prevtext = $$navbuttons{'gtps'}; &display_navbuttons($r,$formname,$$states{$action}[$page-1],$prevtext, @@ -2458,21 +2913,25 @@ sub member_privileges_form { $usertools,$idx,$memchg,$states,$stored,$gpterm) = @_; my %lt = &Apache::lonlocal::texthash( 'addp' => 'Additional privileges', - 'fixp' => 'Fixed privileges', + 'fixp' => 'Core privileges', 'oppr' => 'Optional privileges', - 'func' => 'Function', - 'forf' => 'For the functionality you have chosen to include '. - 'there are no optional privileges to set besides '. - 'the standard privileges.', - 'algr' => "All $gpterm members will receive the same privileges.", - 'asno' => "As no $gpterm members are being added, ". - "there are no specific user privileges to set.", - 'asng' => "As no $gpterm tools will be made available to users, ". - "there are no specific user privileges to set.", - 'nogm' => "No $gpterm member privileges to display or set, ". - "as you have not indicated that you will be activating,". - " re-enabling, changing privileges, or adding/removing ". - "functionality for any current members ", + 'func' => 'Tool', + 'forf' => 'For the collaborative tools included for group '. + 'members being added or modified, '. + 'there are no optional privileges to set '. + 'for specific members.', + 'algr' => 'All new group members will receive the same privileges.', + 'ifex' => 'If previously expired members are being re-enabled, or '. + 'if access for future members is being activated now, '. + 'previously set privileges will be preserved.', + 'asno' => 'As no group members are being added, '. + 'there are no specific user privileges to set.', + 'asng' => 'As no group tools will be made available to users, '. + 'there are no specific user privileges to set.', + 'nogm' => 'No group member privileges to display or set, '. + 'as you have not indicated that you will be activating,'. + ' re-enabling, changing privileges, or adding/removing '. + 'tools for any current members.', 'full' => 'Fullname', 'user' => 'Username', 'doma' => 'Domain', @@ -2538,9 +2997,8 @@ sub member_privileges_form { foreach my $tool (@{$tools}) { if (@{$showboxes{$tool}} > 0) { $r->print(''); + $r->print('
    - -
    '.$lt{'curf'}.' - +
    '.$lt{'curf'}.' +    -
    -     +
    		'.&mt('Additional Functionality').''.&mt('Additional Tools').' '.&mt('All:'). + '.&mt('All:'). ' '); foreach my $tool (@{$available}) { $r->print('   '); } - $r->print('
    '); if ($$current{$user}{changestate} eq 'reenable') { - $r->print('
    '); + $lt{'reen'}.'
    '); } elsif ($$current{$user}{changestate} eq 'expire') { - $r->print('
    '); + $lt{'expi'}.'
    '); } elsif ($$current{$user}{changestate} eq 'activate') { - $r->print('
    '); + $lt{'acti'}.'
    '); } - $r->print(''); + $lt{'dele'}.''); if ($specificity eq 'Yes') { - $r->print('
    '); + ''); } $r->print('     		'.$start.''.$end.''. + $r->print(''. '      '); foreach my $tool (@{$$current{$user}{currtools}}) { if ($granularity eq 'Yes') { @@ -2223,23 +2677,23 @@ END } $r->print('   '); } - $r->print(''); if ($granularity eq 'Yes') { foreach my $tool (@{$$current{$user}{newtools}}) { - $r->print('   '); + '   '); } } else { foreach my $tool (@{$$current{$user}{newtools}}) { - $r->print('print(''.$tool. - '   '); + '   '); } } $r->print('
    - '.$title.' - - '.$title.' + +    - - +
    		'); - $r->print(''. - ''); + $r->print('
    '.&mt($tool).''); + $r->print('
    '. - $tool.'
    '); my $privcount = 0; foreach my $priv (@{$showboxes{$tool}}) { $privcount ++; @@ -2554,15 +3012,16 @@ sub member_privileges_form { } else { $r->print(''); if ($privcount < @{$showboxes{$tool}}) { if (@{$showboxes{$tool}} > 2) { @@ -2574,7 +3033,7 @@ sub member_privileges_form { } } } - $r->print('
    '); } - $r->print(qq| -
    $$toolprivs{$tool}{$priv} - - -   - -

    |); + $r->print( + '
    '.&mt($$toolprivs{$tool}{$priv}).'' +.'' +.' ' +.' ' +.'' +.'

    ' + ); $r->print('
    		 
     '); } } $r->print(''); @@ -2598,7 +3057,7 @@ END } } else { if (keys(%{$usertools}) > 0) { - $r->print($lt{'algr'}.'

    '); + $r->print($lt{'algr'}.'
    '.$lt{'ifex'}.'

    '); &display_defprivs($r,$tools,$toolprivs,\@defprivs); } else { $r->print($lt{'asno'}.'
    '); @@ -2674,7 +3133,7 @@ sub process_request { &process_membership($r,$cdom,$cnum,$action,$state,$groupname,$tools, $enddate,$startdate,$userdata,$idx,$toolprivs, $usertools,$specificity,\@defprivs,$memchg,$gpterm, - $ucgpterm); + $ucgpterm,$crstype); } return; } @@ -2706,11 +3165,19 @@ sub write_group_data { } if ($quota !~ /^\d*\.?\d*$/) { $quota = 0; - $r->print(&mt('The value you entered for the quota for the file repository in this [_1] contained invalid characters, so it has been set to 0 Mb. You can change this by modifying the [_1] settings.
    ',$gpterm)); + $r->print('
    ' + .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm + .' contained invalid characters, so it has been set to 0 Mb. You can change this by' + .' modifying the '.$gpterm.' settings.') + .'
    '); } if ($quota > $maxposs) { $quota = $maxposs; - $r->print(&mt('The value you entered for the quota for the file repository in this [_1] exceeded the maximum possible value, so it has been set to [_2] Mb (the maximum possible value).
    ',$gpterm,$maxposs)); + $r->print('
    ' + .&mt('The value you entered for the quota for the group portfolio in this '.$gpterm + .' exceeded the maximum possible value, so it has been set to [_1] Mb ' + .'(the maximum possible value).',sprintf("%.2f",$maxposs)) + .'
    '); } my %groupinfo = ( description => $esc_description, @@ -2775,12 +3242,89 @@ sub write_group_data { my $result = &add_group_folder($cdom,$cnum,$now,$groupname,$action, $description,$tools,\%groupinfo, $gpterm,$ucgpterm,$crstype); - if ($result ne 'ok') { - $r->print(&mt('A problem occurred when creating folders for the new [_1]. [_2].
    ',$gpterm,$result)); + if ($result eq 'ok') { + my $msg = &Apache::lonhtmlcommon::confirm_success(&mt($ucgpterm.' [_1] was created.',''.$groupname.'')); + $msg = &Apache::loncommon::confirmwrapper($msg); + $r->print($msg); + } else { + my $msg = &Apache::lonhtmlcommon::confirm_success(&mt('A problem occurred when creating folders for the new '.$gpterm.' [_1]:' + ,''.$groupname.'') + .'
    '.$result,1); + $msg = &Apache::loncommon::confirmwrapper($msg); + $r->print($msg); + } + } elsif ($action eq 'modify') { + my (@oldtools,@newtools); + if (ref($$stored{'tool'}) eq 'ARRAY') { + @oldtools = @{$$stored{'tool'}}; + } + if (ref($tools) eq 'ARRAY') { + @newtools = @{$tools}; + } + if (!grep(/^discussion$/,@oldtools) && + grep(/^discussion$/,@newtools)) { + my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/'; + my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence'; + my $navmap = Apache::lonnavmaps::navmap->new(); + my ($bbmapres,$error); + if (defined($navmap)) { + $bbmapres = $navmap->getResourceByUrl($boardsmap); + undef($navmap); + if (!$bbmapres) { + my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence'; + my $disctitle = &mt('Discussion Boards'); + my $outcome = &map_updater($cdom,$cnum,'group_boards_'. + $groupname.'.sequence','bbseq', + $disctitle,$grpmap); + my ($furl,$ferr) = + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + # modify parameter + if ($outcome eq 'ok') { + $navmap = Apache::lonnavmaps::navmap->new(); + if (defined($navmap)) { + my $parm_result = &parm_setter($navmap,$cdom,$boardsmap, + $groupname); + if ($parm_result) { + $error = &mt('An error occurred while setting parameters ' + .'for Discussion Boards folder: ' + .'[_1]',$parm_result); + } else { + $r->print('
    '. + &mt('Discussion Boards Folder created.') + .'
    '); + } + undef($navmap); + } else { + if ($crstype eq 'Community') { + $error = &mt("An error occurred while setting parameters '. + 'for Discussion Boards folder: '. + 'Could not retrieve community information"); + } else { + $error = &mt("An error occurred while setting parameters '. + 'for Discussion Boards folder: '. + 'Could not retrieve course information"); + } + } + } else { + $r->print($outcome); + } + } + } else { + $error = &mt("An error occurred while retrieving the contents of the group's folder.").'
    '; + if ($crstype eq 'Community') { + $error .= &mt("You need to re-initialize the community."); + + } else { + $error .= &mt("You need to re-initialize the course."); + } + } + if ($error ne '') { + $r->print('
    '.$error.'
    '); + } } - $r->print(&mt('[_1] [_2] was created.
    ',$ucgpterm,$groupname)); - } else { - $r->print(&mt('[_1] [_2] was updated.
    ',$ucgpterm,$groupname)); + my $message = &Apache::lonhtmlcommon::confirm_success(&mt($ucgpterm.' [_1] was updated.',''.$groupname.'')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } } else { my %actiontype = ( @@ -2790,8 +3334,10 @@ sub write_group_data { &Apache::lonnet::logthis("Failed to store $gpterm $groupname ". 'in '.lc($crstype).': '.$cnum. ' in domain: '.$cdom); - $r->print(&mt('An error occurred when [_1] the [_2]. '. - 'Please try again.',$actiontype{$action},$gpterm)); + $r->print('
    ' + .&mt('An error occurred when [_1] the '.$gpterm.'. ' + .'Please try again.',$actiontype{$action}) + .'
    '); } return $result; } @@ -2799,7 +3345,7 @@ sub write_group_data { sub process_membership { my ($r,$cdom,$cnum,$action,$state,$groupname,$tools,$enddate,$startdate, $userdata,$idx,$toolprivs,$usertools,$specificity,$defprivs,$memchg, - $gpterm,$ucgpterm)=@_; + $gpterm,$ucgpterm,$crstype)=@_; my %usersettings = (); my %added= (); my %failed = (); @@ -2810,6 +3356,7 @@ sub process_membership { my %curr_start = (); my %curr_end = (); my %tooltype = (); + my $context = 'processgroupmembership'; foreach my $tool (@{$tools}) { foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) { @@ -2879,7 +3426,7 @@ sub process_membership { $curr_privs{$user}; if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname, $user,$now,$savestart, - $curr_privs{$user}) eq 'ok') { + $curr_privs{$user},'',$context) eq 'ok') { push(@{$added{'expired'}},$user); $num_ok ++; } else { @@ -2890,7 +3437,7 @@ sub process_membership { foreach my $user (@deletion) { $usersettings{$groupname.':'.$user} = $now.':-1:'; if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname, - $user,$now,'-1','') + $user,$now,'-1','','',$context) eq 'ok') { push(@{$added{'deleted'}},$user); $num_ok ++; @@ -2944,7 +3491,7 @@ sub process_membership { $group_privs{$user}; if (&Apache::lonnet::modify_group_roles($cdom,$cnum,$groupname, $user,$end,$start, - $group_privs{$user}) eq 'ok') { + $group_privs{$user},'',$context) eq 'ok') { push(@{$added{$type}},$user); $num_ok ++; } else { @@ -2955,12 +3502,13 @@ sub process_membership { my $roster_result = &Apache::lonnet::modify_coursegroup_membership($cdom, $cnum,\%usersettings); if ($num_ok) { - foreach my $type (sort(keys(%added))) { - $r->print(&mt('The following users were successfully [_1]',$type)); + my $msgall =''; + foreach my $type (sort(keys(%added))) { + my $message = &mt('The following users were successfully [_1]',$type); if (!($type eq 'deleted' || $type eq 'expired')) { - $r->print(&mt(' with the following privileges')); + $message .= &mt(' with the following privileges'); } - $r->print(':
    '); + $message .= ':
    '; foreach my $user (@{$added{$type}}) { my $privlist = ''; if (!($type eq 'deleted' || $type eq 'expired')) { @@ -2976,48 +3524,73 @@ sub process_membership { } $privlist =~ s/, $//; } - $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.$privlist.'
    '); + $message .= $$userdata{$user}[$$idx{fullname}].' - '.$user.$privlist.'
    '; } - $r->print('
    '); + $message .= '
    '; + $message = &Apache::lonhtmlcommon::confirm_success($message); + $msgall .= $message; } + $msgall = &Apache::loncommon::confirmwrapper($msgall); + $r->print($msgall); } if ($num_fail) { foreach my $type (sort(keys(%failed))) { - $r->print(&mt('The following users could not be [_1], because an error occurred:
    ',$type)); + $r->print('
    ' + .&mt("The following users could not be $type, because an error occurred:") + .'
    '); foreach my $user (@{$failed{$type}}) { $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'
    '); } } $r->print('
    '); } - if (@unchanged > 0) { - $r->print(&mt('No change occurred for the following users:
    ')); - foreach my $user (sort(@unchanged)) { - $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'
    '); - } - $r->print('
    '); - } +# Is that really needed? +# +# if (@unchanged > 0) { +# $r->print(&mt('No change occurred for the following users:').'
    '); +# foreach my $user (sort(@unchanged)) { +# $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.'
    '); +# } +# $r->print('
    '); +# } if ($roster_result eq 'ok') { - $r->print('
    '.&mt('[_1] membership list updated.',$ucgpterm)); - $r->print('

    '.&mt("For full access to all of [_1]'s privileges, users will need to log out and log back in.",$groupname).'

    '); + $r->print('
    ' + .&mt($ucgpterm.' membership list updated.') + .'
    '); + $r->print('

    '); + if ($crstype eq 'Community') { + $r->print(&mt("Any currently logged in community users affected by the changes you made" + .' to group membership or privileges for the [_1] group will need to log out' + .' and log back in for their LON-CAPA sessions to reflect these changes.' + ,''.$groupname.'')); + + } else { + $r->print(&mt("Any currently logged in course users affected by the changes you made" + .' to group membership or privileges for the [_1] group will need to log out' + .' and log back in for their LON-CAPA sessions to reflect these changes.' + ,''.$groupname.'')); + } + $r->print('

    '); } else { - $r->print('
    '.&mt('An error occurred while updating the [_1] membership list -',$gpterm).$roster_result.'
    '); + $r->print('
    ' + .&mt("An error occurred while updating the $gpterm membership list:") + .'
    '.$roster_result + .'
    '); } return; } sub mapping_options { my ($r,$action,$formname,$page,$sectioncount,$states,$stored, - $navbuttons,$img1,$img2,$gpterm,$ucgpterm,$crstype) = @_; + $navbuttons,$img1,$img2,$gpterm,$ucgpterm,$crstype,$cdom,$cnum) = @_; my %lt = &Apache::lonlocal::texthash( 'auto' => "Settings for automatic $gpterm enrollment", 'gmma' => "$ucgpterm membership mapping to specific sections/roles", 'endi' => "Enable/disable automatic $gpterm enrollment for ". "users in specified roles and sections", - 'adds' => "If automatic $gpterm enrollment is enabled, when a user is assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.", + 'adds' => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.", 'drops' => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.", 'pirs' => "Pick roles and sections for automatic $gpterm enrollment", - 'curr' => 'Currently set to', 'on' => 'on', 'off' => 'off', 'auad' => "Automatically enable $gpterm membership when roles are added?", @@ -3025,7 +3598,8 @@ sub mapping_options { 'mapr' => "Mapping of roles and sections affected by automatic $gpterm enrollment/disenrollment follows scheme chosen below.", ); &automapping($r,$action,$stored,\%lt,$img1); - &mapping_settings($r,$sectioncount,\%lt,$stored,$img2,$crstype); + &mapping_settings($r,$sectioncount,\%lt,$stored,$img2,$crstype,$cdom,$cnum, + $action); return; } @@ -3039,35 +3613,36 @@ sub automapping { if (exists($$stored{'autodrop'})) { $drop = $$stored{'autodrop'}; } - &topic_bar($r,$image,$$lt{'endi'}); - $r->print(' + $r->print(&Apache::lonhtmlcommon::topic_bar($image,$$lt{'endi'}).' '.$$lt{'gmma'}.':
    '.$$lt{'adds'}.'
    '.$$lt{'drops'}.'

    - '.$$lt{'auad'}.':  - '); + '.$$lt{'auad'}.':  + '); if ($action eq 'modify') { - $r->print('    ('.$$lt{'curr'}.' '.$$lt{$add}.')'); + $r->print('    ('.&mt('Currently set to [_1].',''.$$lt{$add}.'').')'); } $r->print(' -
    - '.$$lt{'auex'}.':  - '); +
    + '.$$lt{'auex'}.':  + '); if ($action eq 'modify') { - $r->print('    ('.$$lt{'curr'}.' '.$$lt{$drop}.')'); + $r->print('    ('.&mt('Currently set to [_1].',''.$$lt{$drop}.'').')'); } - $r->print('

    '.$$lt{'mapr'}); + $r->print('

    '.$$lt{'mapr'}); } sub mapping_settings { - my ($r,$sectioncount,$lt,$stored,$image,$crstype) = @_; + my ($r,$sectioncount,$lt,$stored,$image,$crstype,$cdom,$cnum,$action) = @_; my @sections = keys(%{$sectioncount}); if (@sections > 0) { @sections = sort {$a cmp $b} @sections; unshift(@sections,'none'); # Put 'no sections' next unshift(@sections,'all'); # Put 'all' at the front of the list + } else { + @sections = ('all','none'); } - &topic_bar($r,$image,$$lt{'pirs'}); - my @roles = &standard_roles(); - my %customroles = &my_custom_roles(); + $r->print(&Apache::lonhtmlcommon::topic_bar($image,$$lt{'pirs'})); + my @roles = &standard_roles($crstype); + my %customroles = &Apache::lonhtmlcommon::course_custom_roles($cdom,$cnum); $r->print(&Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row()); $r->print(' @@ -3078,90 +3653,95 @@ sub mapping_settings { } $r->print(&Apache::loncommon::end_data_table_header_row()."\n"); foreach my $role (@roles) { - my $plrole=&Apache::lonnet::plaintext($role,$crstype); - my $sections_sel; - if (@sections > 0) { - if ($role eq 'cc') { - $sections_sel = ''. - &mt('all sections').''; - } else { - $sections_sel=''. - §ions_selection(\@sections,'sec_'.$role). - ''; - } - } - $r->print(&Apache::loncommon::start_data_table_row(). - ''.$plrole. - ''.$sections_sel. - &Apache::loncommon::end_data_table_row()); + my $roletitle=&Apache::lonnet::plaintext($role,$crstype); + $r->print(&print_autorole_item($role,$roletitle,\@sections)); } + my @customs; foreach my $role (sort(keys(%customroles))) { - my $sections_sel; - if (@sections > 0) { - $sections_sel = - ''.§ions_selection(\@sections,'sec_'.$role).''; - } - $r->print(&Apache::loncommon::start_data_table_row(). - ''.$role.''. - $sections_sel. - &Apache::loncommon::end_data_table_row()); + my ($roletitle) = ($role =~ m|^cr/[^/]+/[^/]+/(.+)$|); + push (@customs,$role); + $r->print(&print_autorole_item($role,$roletitle,\@sections)); + } + if ($action eq 'modify') { + foreach my $role (@{$$stored{'autorole'}}) { + if ((!grep(/^\Q$role\E$/,@customs)) && + (!grep(/^\Q$role\E$/,@roles))) { + my $roletitle; + if ($role =~ /^cr/) { + ($roletitle) = ($role =~ m|_([^_]+)$|); + } else { + $roletitle = &Apache::lonnet::plaintext($role,$crstype); + } + $r->print(&print_autorole_item($role,$roletitle,\@sections)); + } + } } $r->print(&Apache::loncommon::end_data_table()); return; } -sub standard_roles { - my @roles = ('cc','in','ta','ep','st'); - return @roles; -} - -sub my_custom_roles { - my %returnhash=(); - my %rolehash=&Apache::lonnet::dump('roles'); - foreach (keys %rolehash) { - if ($_=~/^rolesdef\_(\w+)$/) { - $returnhash{$1}=$1; +sub print_autorole_item { + my ($role,$roletitle,$sections) = @_; + my $sections_sel; + if (@{$sections} > 0) { + if (($role eq 'cc') || ($role eq 'co')) { + $sections_sel = ''. + &mt('all sections').''; + } else { + $sections_sel=''. + §ions_selection($sections,'sec_'.$role). + ''; } } - return %returnhash; + my $output = &Apache::loncommon::start_data_table_row(). + ''. + ''.$roletitle.''.$sections_sel. + &Apache::loncommon::end_data_table_row(); + return $output; +} + +sub standard_roles { + my ($crstype) = @_; + my @roles = qw(in ta ep ad st); + if ($crstype eq 'Community') { + unshift(@roles,'co'); + } else { + unshift(@roles,'cc'); + } + return @roles; } sub modify_menu { my ($r,$groupname,$page,$gpterm) = @_; my @menu = - ( - { text => "Modify default $gpterm settings", - help => 'Course_Modify_Group', - state => 'change_settings', - branch => 'settings', + ( { categorytitle =>'Group Actions', + items => [ + + { linktext => "Modify default $gpterm settings", + url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=change_settings&branch=settings', + icon => 'grp_settings.png', + alttext => "Modify default $gpterm settings", + permission => '1', + help => 'Course_Modify_Group', }, - { text => 'Modify access, tools and/or privileges for previous, '. - 'future, or current members', + { linktext => 'Modify access, tools and privileges for members', + url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=change_members&branch=members', + icon => 'grp_tools.png', + alttext => 'Modify access, tools and privileges for members', + permission => '1', help => 'Course_Modify_Group_Membership', - state => 'change_members', - branch => 'members', }, - { text => "Add member(s) to the $gpterm", + { linktext => "Add member(s) to the $gpterm", + url => '/adm/coursegroups?action=modify&refpage='.$env{'form.refpage'}.'&groupname='.$groupname.'&state=add_members&branch=adds', + icon => 'grp_add.png', + alttext => "Add member(s) to the $gpterm", + permission => '1', help => 'Course_Group_Add_Members', - state => 'add_members', - branch => 'adds', - }, - ); - my $menu_html = ''; - foreach my $menu_item (@menu) { - $menu_html .= - '

    '; - $menu_html.= &mt($menu_item->{'text'}).''; - if (exists($menu_item->{'help'})) { - $menu_html.= - &Apache::loncommon::help_open_topic($menu_item->{'help'}); - } - $menu_html.='

    '.$/; - } - $r->print($menu_html); + }]} + ); + $r->print(&Apache::lonhtmlcommon::generate_menu(@menu)); return; } @@ -3181,7 +3761,20 @@ sub member_privs_entries { '.$$userdata{$user}[$$idx{fullname}].' '.$uname.' '.$udom.' -
    Function
    Fixed
    Optional
    '); + + + + + + + + + + + +
    '. + &mt('Collaborative Tool').'
    '.&mt('Fixed').'
    '.&mt('Optional').'
    + '); foreach my $tool (@{$showtools}) { if (exists($$usertools{$user}{$tool})) { $r->print(''); @@ -3196,16 +3789,16 @@ sub member_privs_entries { if ($privcount == 3) { $dynamic .= ''; } - $dynamic .=''; + ''; } } - $r->print(''.$dynamic.'
    '.$tool.'
    '.$fixed.'
    '); + $r->print(''.$fixed.''.$dynamic.''); } else { $r->print('
    '.$tool.'
     
     
    '); } @@ -3231,17 +3824,19 @@ sub date_setting_table { 'startdate',$starttime); my $endform = &Apache::lonhtmlcommon::date_setter($formname, 'enddate',$endtime); - my $perpetual = - ''; - my $table = "\n". - ''. - ''. - ''."\n". - ''. - ''. - ''."\n". - "
    '.&mt('Start:').''.$startform.' 
    '.&mt('End:').''.$endform.''.$perpetual.'
    \n"; + my $perpetual = ' '; + my $table = &Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title(&mt('Start Date')) + .$startform + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title(&mt('End Date')) + .$endform + .$perpetual + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box(); return $table; } @@ -3249,52 +3844,72 @@ sub add_group_folder { my ($cdom,$cnum,$now,$groupname,$action,$description,$tools,$groupinfo, $gpterm,$ucgpterm,$crstype) = @_; if ($cdom eq '' || $cnum eq '') { - return &mt('Error: invalid course domain or number - group folder creation failed'); + my $error = ''; + if ($crstype eq 'Community') { + $error .= &mt("Error: invalid community domain or number - group folder creation failed."); + } else { + $error .= &mt("Error: invalid course domain or number - group folder creation failed."); + } + $error .= ''; + return $error; } - my ($outcome,$allgrpsmap,$grpmap,$boardsmap,$grppage); - my $navmap = Apache::lonnavmaps::navmap->new(); + my ($outcome,$allgrpsmap,$grpmap,$boardsmap,$grppage,$warning); my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/'; $allgrpsmap = $crspath.'group_allfolders.sequence'; - my $topmap = $navmap->getResourceByUrl($allgrpsmap); - undef($navmap); if ($action eq 'create') { - # check if group_allfolders.sequence exists. - if (!$topmap) { - my $grpstitle = &mt('[_1] [_2]s',$crstype,$ucgpterm); - my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'}; - $topmap_url =~ s|/+|/|g; - if ($topmap_url =~ m|^/uploaded|) { - $outcome = &map_updater($cdom,$cnum,'group_allfolders.sequence', - 'toplevelgroup',$grpstitle,$topmap_url); + if (&get_folder_lock($cdom,$cnum,'group_allfolders',$now) eq 'ok') { + # check if group_allfolders.sequence exists. + my $mapcontents = &Apache::lonnet::getfile($allgrpsmap); + if ($mapcontents eq '-1') { #file does not exist; + my $grpstitle = &mt("$crstype $ucgpterm".'s'); + my $topmap_url = '/'.$env{'course.'.$env{'request.course.id'}.'.url'}; + $topmap_url =~ s|/+|/|g; + if ($topmap_url =~ m|^/uploaded|) { + $outcome = &map_updater($cdom,$cnum,'group_allfolders.sequence', + 'toplevelgroup',$grpstitle,$topmap_url); + } else { + $outcome = '' + .&mt('Non-standard course - folder for all groups not added.') + .''; + } if ($outcome ne 'ok') { - return $outcome; + my $delresult = &release_folder_lock($cdom,$cnum,'group_allfolders'); + if ($delresult ne 'ok') { + $warning = $delresult; + } + return $outcome.$warning; } - } else { - $outcome = &mt('Non-standard course - folder for all groups not added.'); - return $outcome; } + my $delresult = &release_folder_lock($cdom,$cnum,'group_allfolders'); + if ($delresult ne 'ok') { + $warning = $delresult ; + } + } else { + $outcome = '' + .&mt('Could not obtain exclusive lock to check status of the folder for all groups. No group folder added.') + .''; + return $outcome; } - my $grpfolder = &mt('[_1] Folder -',$ucgpterm,).$description; + my $grpfolder = &mt($ucgpterm.' Folder - [_1]',$description); $grppage='/adm/'.$cdom.'/'.$cnum.'/'.$groupname.'/smppg'; - my $grptitle = &mt('Group homepage').' - '.$description; - my ($seqid,$discussions,$disctitle); + my $grptitle = &mt('Group homepage - [_1]',$description); + my ($discussions,$disctitle); my $outcome = &map_updater($cdom,$cnum,'group_folder_'.$groupname.'.sequence', 'grpseq',$grpfolder,$allgrpsmap,$grppage, $grptitle); if ($outcome ne 'ok') { - return $outcome; + return $outcome.$warning; } my $pageout = &create_homepage($cdom,$cnum,$groupname,$groupinfo, $tools,$gpterm,$ucgpterm,$now); # Link to folder for bulletin boards $grpmap = $crspath.'group_folder_'.$groupname.'.sequence'; if (grep/^discussion$/,@{$tools}) { - $seqid = $now + 1; $disctitle = &mt('Discussion Boards'); my $outcome = &map_updater($cdom,$cnum,'group_boards_'.$groupname. '.sequence','bbseq',$disctitle,$grpmap); if ($outcome ne 'ok') { - return $outcome; + return $outcome.$warning; } $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence'; } @@ -3302,13 +3917,22 @@ sub add_group_folder { #modify group folder if status of discussions tools is changed } my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - $navmap = Apache::lonnavmaps::navmap->new(); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (!defined($navmap)) { + $warning .= ''; + if ($crstype eq 'Community') { + $warning .= &mt("Error retrieving community contents"). + ' '.&mt("You need to re-initialize the community."); + } else { + $warning .= &mt("Error retrieving course contents"). + ' '.&mt("You need to re-initialize the course."); + } + $warning .= ''; + return $warning; + } # modify parameters my $parm_result; if ($action eq 'create') { - if ($allgrpsmap) { - $parm_result .= &parm_setter($navmap,$cdom,$allgrpsmap,$groupname); - } if ($grpmap) { $parm_result .= &parm_setter($navmap,$cdom,$grpmap,$groupname); } @@ -3319,8 +3943,42 @@ sub add_group_folder { $parm_result .= &parm_setter($navmap,$cdom,$boardsmap,$groupname); } } + undef($navmap); if ($parm_result) { - return $parm_result; + return $warning.$parm_result; + } else { + return 'ok'; + } +} + +sub get_folder_lock { + my ($cdom,$cnum,$folder_name,$now) = @_; + # get lock for folder being edited. + my $lockhash = { + $folder_name."\0".'locked_folder' => $now.':'.$env{'user.name'}. + ':'.$env{'user.domain'}, + }; + my $tries = 0; + my $gotlock = &Apache::lonnet::newput('coursegroups',$lockhash,$cdom,$cnum); + + while (($gotlock ne 'ok') && $tries <3) { + $tries ++; + sleep(1); + $gotlock = &Apache::lonnet::newput('coursegroups',$lockhash,$cdom,$cnum); + } + return $gotlock; +} + +sub release_folder_lock { + my ($cdom,$cnum,$folder_name) = @_; + # remove lock + my @del_lock = ($folder_name."\0".'locked_folder'); + my $dellockoutcome=&Apache::lonnet::del('coursegroups',\@del_lock,$cdom,$cnum); + if ($dellockoutcome ne 'ok') { + return ('
    ' + .&mt('Warning: failed to release lock for folder: [_1].',''.$folder_name.'') + .'
    ' + ); } else { return 'ok'; } @@ -3335,21 +3993,27 @@ sub map_updater { my $newmapurl=&Apache::lonnet::finishuserfileupload($cnum,$cdom,$itemname, $newfile); if ($newmapurl !~ m|^/uploaded|) { - $outcome = &mt('Error uploading new folder.')." ($newfile): $newmapurl".'
    '; + $outcome = '
    ' + .&mt('Error uploading new folder.')." ($newfile): $newmapurl" + .'
    '; return $outcome; - } - my ($errtext,$fatal)=&Apache::lonratedt::mapread($parentmap); + } + my ($errtext,$fatal)=&LONCAPA::map::mapread($parentmap); if ($fatal) { - $outcome = &mt('Error reading contents of parent folder')." ($parentmap): $errtext".'
    '; + $outcome = '
    ' + .&mt('Error reading contents of parent folder.')." ($parentmap): $errtext" + .'
    '; return $outcome; } else { - my $newidx=&Apache::lonratedt::getresidx($newmapurl); - $Apache::lonratedt::resources[$newidx] = $itemtitle.':'.$newmapurl. + my $newidx=&LONCAPA::map::getresidx($newmapurl); + $LONCAPA::map::resources[$newidx] = $itemtitle.':'.$newmapurl. ':false:normal:res'; - $Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; - my ($outtext,$errtext) = &Apache::lonratedt::storemap($parentmap,1); + $LONCAPA::map::order[1+$#LONCAPA::map::order]=$newidx; + my ($outtext,$errtext) = &LONCAPA::map::storemap($parentmap,1); if ($errtext) { - $outcome = &mt('Error storing updated parent folder')." ($parentmap): $errtext".'
    '; + $outcome = '
    ' + .&mt('Error saving updated parent folder.')." ($parentmap): $errtext" + .'
    '; return $outcome; } } @@ -3369,8 +4033,19 @@ sub new_map { } sub parm_setter { - my ($navmap,$cdom,$url,$groupname) = @_; - my $allresults; + my ($navmap,$cdom,$url,$groupname,$crstype) = @_; + if (!defined($navmap)) { + my $allresults; + if ($crstype eq 'Community') { + $allresults = &mt("Parameters not set for [_1] because the contents of the community could not be retrieved.",$url).' '. + &mt("You need to reinitialize the community."); + } else { + $allresults = &mt("Parameters not set for [_1] because the contents of the course could not be retrieved.",$url).' '. + &mt("You need to reinitialize the course."); + + } + return '
    '.$allresults.'
    '; + } my %hide_settings = ( 'course' => { 'num' => 13, @@ -3383,18 +4058,30 @@ sub parm_setter { }, ); my $res = $navmap->getResourceByUrl($url); - my $symb = $res->symb(); - foreach my $level (keys(%hide_settings)) { - my $parmresult = &Apache::lonparmset::storeparm_by_symb($symb, + my $allresults; + if ($res) { + my $symb = $res->symb(); + foreach my $level (keys(%hide_settings)) { + my $parmresult = + &Apache::lonparmset::storeparm_by_symb($symb, '0_hiddenresource', $hide_settings{$level}{'num'}, $hide_settings{$level}{'set'}, 'string_yesno',undef,$cdom, undef,undef, $hide_settings{$level}{'extra'}); - if ($parmresult) { - $allresults .= $level.': '.$parmresult; + if ($parmresult) { + $allresults .= $level.': '.$parmresult; + } } + } else { + $allresults = '
    '; + if ($crstype eq 'Community') { + $allresults .= &mt("Parameters not set for [_1] because the resource was not recognized as part of the community.",''.$url.''); + } else { + $allresults .= &mt('Parameters not set for [_1] because the resource was not recognized as part of the course.',''.$url.''); + } + $allresults .= '
    '; } return $allresults; } @@ -3458,7 +4145,12 @@ sub validate_groupname { my ($groupname,$action,$cdom,$cnum,$gpterm,$ucgpterm,$crstype) = @_; my %sectioncount = &Apache::loncommon::get_sections($cdom,$cnum); my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum); - + my %deleted_groups = &Apache::longroup::coursegroups($cdom,$cnum,undef, + 'deleted_groups'); + if (my $tmp = &Apache::lonnet::error(%deleted_groups)) { + undef(%deleted_groups); + &Apache::lonnet::logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom); + } my %lt = &Apache::lonlocal::texthash ( igna => "Invalid $gpterm name", tgne => "The $gpterm name entered ", @@ -3485,12 +4177,14 @@ sub validate_groupname { return $exitmsg.$lt{'cnnb'}.&mt('a section').$lt{'inth'}. '
    '.$lt{'grna'}; } - if ($action eq 'create' - && exists($curr_groups{$groupname})) { - - return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm). - $lt{'inth'}.'
    '.$lt{'grna'}; - + if ($action eq 'create') { + if (exists($curr_groups{$groupname})) { + return $exitmsg.$lt{'cnnb'}.&mt('an existing [_1]',$gpterm). + $lt{'inth'}.'.
    '.$lt{'grna'}; + } elsif (exists($deleted_groups{$groupname})) { + return $exitmsg.$lt{'cnnb'}.&mt('a [_1] which previously existed',$gpterm). + $lt{'inth'}.'.
    '.$lt{'grna'}; + } } elsif ($action eq 'modify') { unless(exists($curr_groups{$groupname})) { $earlyout = &mt('[_1] name:',$ucgpterm).' '.$groupname.$lt{'thgr'}. @@ -3501,18 +4195,6 @@ sub validate_groupname { return; } -sub topic_bar { - my ($r,$imgnum,$title) = @_; - $r->print(' -
    - '.&mt('Step [_1]',$imgnum). - '  - '.$title.' -
    -'); - return; -} - sub check_changes { my ($member_changes,$memchg) = @_; my %exclusions; @@ -3552,3 +4234,4 @@ sub check_changes { } 1; +