');
+ return;
+}
+
+sub groupsettings_options {
+ my ($r,$tabcol,$functions,$action,$formname,$stored,$image) = @_;
my %lt = &Apache::lonlocal::texthash(
- 'gmem' => 'Group membership options',
- 'picr' => 'Pick the criteria to use to build a list of course users '.
- 'from which you will select members of the new group',
'gdat' => 'Group open and close dates',
'sten' => 'Set a start date/time and end date/time for the group',
- 'acty' => 'Access types',
- 'coro' => 'Course roles',
- 'cose' => 'Course sections',
'gfun' => 'Group functionality',
+ 'gnde' => 'Group name, description and available functionality',
+ 'desc' => 'Description',
+ 'func' => 'Functionality',
+ 'gnam' => 'Group Name',
+ 'doyo' => 'Do you want to assign different functionality '.
+ 'to different group members?',
);
-
- my %status_types = (
- active => &mt('Currently has access'),
- previous => &mt('Previously had access'),
- future => &mt('Will have future access'),
- );
-
- my @roles = ('st','cc','in','ta','ep','cr');
-
- my $starttime = time;
- my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
- my ($start_table,$end_table) = &date_setting_table
- ($starttime,$endtime,$formname);
-
- my @sections = ();
- my $section_sel = '';
- my $numvisible = 4;
-
- @sections = sort {$a cmp $b} keys(%{$sectioncount});
- if (@sections > 0) {
- unshift(@sections,'_all'); # Put 'all' at the front of the list
- if (@sections < 4) {
- $numvisible = @sections;
- }
- foreach (@sections) {
- if ($_ eq '_all') {
- $section_sel .= ' all sections'."\n";
- } else {
- $section_sel .= ' '.$_."\n";
- }
- }
- }
-
- $r->print(<<"END");
-
-
-
-
-
-
-
- Group name, description
- and available functionality
-
END
my $numitems = keys(%{$functions});
my $halfnum = int($numitems/2);
@@ -696,7 +980,7 @@ END
if ($remnum) {
$halfnum ++;
}
- my @allfunctions = sort (keys (%{$functions}));
+ my @allfunctions = sort(keys (%{$functions}));
for (my $i=0; $i<$halfnum; $i++) {
$r->print('
'.
@@ -715,78 +999,75 @@ END
if ($remnum) {
$r->print('
');
}
- $r->print(<<"END");
+ $r->print('
-
+
Granularity:
-
Do you want to assign different functionality to different group members? Yes No
-
+
'.$lt{'doyo'}.' '.&mt('Yes').' '.&mt('No'));
+ if ($action eq 'modify') {
+ $r->print(' ('.&mt('Currently set to "[_1]"',
+ $$stored{'granularity'}).')');
+ }
+ $r->print('
+
+
-
-
-
-
-
-
-
-
- Start and end dates for group
- access
-
-
-
-
-
-
-
-
-
$start_table
-
-
-
-
-
-
-
$end_table
-
-
-
-
-
-
-
-
-
- Pick parameters to generate
- membership list
-
-
-
-
-
-
-
+');
+ return;
+}
+
+sub membership_options {
+ my ($r,$action,$state,$tabcol,$sectioncount,$image) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'pipa' => 'Pick parameters to generate membership list',
+ 'gmem' => 'Group membership options',
+ 'picr' => 'Pick the criteria to use to build a list of '.
+ 'course users from which you will select ',
+ 'meof' => 'members of the new group.',
+ 'adme' => 'additional members of the group.',
+ 'ifno' => 'If you do not wish to add members when you first '.
+ 'create the group, do not make any selections',
+ 'acty' => 'Access types',
+ 'coro' => 'Course roles',
+ 'cose' => 'Course sections',
+ );
+ my %status_types = (
+ active => &mt('Currently has access'),
+ previous => &mt('Previously had access'),
+ future => &mt('Will have future access'),
+ );
+
+ my @roles = ('st','cc','in','ta','ep','cr');
+
+ my @sections = keys(%{$sectioncount});
+
+ &topic_bar($r,$tabcol,$image,$lt{'pipa'});
+ $r->print('
');
if (@sections >0) {
- $r->print('
+ $r->print('
'.$lt{'cose'}.'
');
@@ -796,239 +1077,344 @@ END
$r->print('
');
$r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
if (@sections > 0) {
- $r->print('
-
-
-
-
');
+ @sections = sort {$a cmp $b} @sections;
+ unshift(@sections,'_all'); # Put 'all' at the front of the list
+ unshift(@sections,'_nosec'); # Put 'no sections' next
+ $r->print('
+
'.
+ §ions_selection(\@sections,'sectionpick').'
');
}
$r->print('
-
+ ');
+ return;
+}
+
+sub sections_selection {
+ my ($sections,$elementname) = @_;
+ my $section_sel;
+ my $numvisible = 4;
+ if (@{$sections} < 4) {
+ $numvisible = @{$sections};
+ }
+ foreach my $sec (@{$sections}) {
+ if ($sec eq '_all') {
+ $section_sel .= ' all sections'."\n";
+ } elsif ($sec eq '_nosec') {
+ $section_sel .= ' no section'."\n";
+ } else {
+ $section_sel .= ' '.$sec."\n";
+ }
+ }
+ my $output = '
+ ';
+ return $output;
+}
+
+sub access_date_settings {
+ my ($r,$tabcol,$action,$formname,$stored,$image) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'sten' => 'Default start and end dates for group access',
+ );
+ my $starttime = time;
+ my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
+ if ($action eq 'modify') {
+ $starttime = $$stored{'startdate'};
+ unless ($$stored{'enddate'} == 0) {
+ $endtime = $$stored{'enddate'};
+ }
+ }
+ my ($start_table,$end_table) = &date_setting_table
+ ($starttime,$endtime,$formname);
+ &topic_bar($r,$tabcol,$image,$lt{'sten'});
+ $r->print('
+
+
+
'.$start_table.'
+
-
-
-
-
-
-');
+
'.$end_table.'
+
');
return;
}
-sub second_creation_form {
- my ($r,$cdom,$cnum,$tabcol,$formname,$groupname,$description,$startdate,
- $enddate,$tools,$functions,$users,$userdata,$idx) = @_;
- my @regexps = ('user_','userpriv_');
+sub choose_members_form {
+ my ($r,$cdom,$cnum,$tabcol,$action,$formname,$page,$groupname,$description,
+ $granularity,$startdate,$enddate,$tools,$fixedprivs,$toolprivs,
+ $functions,$users,$userdata,$idx,$stored,$states,$navbuttons,
+ $rowColor1,$rowColor2) = @_;
+ my @regexps = ('user_','userpriv_','sec_');
+ my %origmembers;
$r->print(&Apache::lonhtmlcommon::echo_form_input(
- ['origin','action','state','member','specificity'],\@regexps));
- my %sectioncount = ();
- my $numsec = &Apache::loncommon::get_sections($cdom,$cnum,\%sectioncount);
- my %curr_groups;
- my $numgroups = &Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);
- my $earlyout;
- my $exitmsg = 'Invalid group name
The group name entered "'.
- $groupname.'" ';
- my $dupmsg = 'Group names and section names used in a course must be unique.';
- if ($groupname =~ /\W/) {
- $earlyout = $exitmsg.'is not a valid name. Group names may only contain letters, numbers or underscores';
- }
- if ($numsec) {
- if (exists($sectioncount{$groupname})) {
- $earlyout = $exitmsg.'can not be used as it is the name of a '.
- 'section in this course. '.$dupmsg;
- }
- }
- if ($numgroups) {
- if (exists($curr_groups{$groupname})) {
- $earlyout = $exitmsg.'can not be used as it is the name of an
- existing group in this course. '.$dupmsg;
- }
- }
- if ($earlyout) {
- $r->print('
');
- my @available = ();
- my @unavailable = ();
- foreach my $item (sort(keys(%{$functions}))) {
- if (grep/^$item$/,@{$tools}) {
- push(@available,$item);
- } else {
- push(@unavailable,$item);
- }
- }
- if (@available > 0) {
+ if (@{$available} > 0) {
$r->print('Available:
');
- my $rowcell = int(@available/2) + @available%2;
- for (my $i=0; $i<@available; $i++) {
- if (@available > 3) {
+ my $rowcell = int(@{$available}/2) + @{$available}%2;
+ for (my $i=0; $i<@{$available}; $i++) {
+ if (@{$available} > 3) {
if ($i==$rowcell) {
$r->print('
');
}
}
- $r->print('
'.$$functions{$available[$i]}.
+ $r->print('
'.$$functions{$$available[$i]}.
'
');
}
- if ((@available > 3) && (@available%2)) {
+ if ((@{$available} > 3) && (@{$available}%2)) {
$r->print('
');
}
$r->print('
');
}
- if (@unavailable > 0) {
+ if (@{$unavailable} > 0) {
$r->print('Unavailable:
');
- my $rowcell = int(@unavailable/2) + @unavailable%2;
- for (my $j=0; $j<@unavailable; $j++) {
- if (@unavailable > 3) {
+ my $rowcell = int(@{$unavailable}/2) + @{$unavailable}%2;
+ for (my $j=0; $j<@{$unavailable}; $j++) {
+ if (@{$unavailable} > 3) {
if ($j==$rowcell) {
$r->print('
');
}
}
- $r->print('
'.$$functions{$unavailable[$j]}.
+ $r->print('
'.$$functions{$$unavailable[$j]}.
'
');
}
- if ((@unavailable > 3) && (@unavailable%2)) {
+ if ((@{$unavailable} > 3) && (@{$unavailable}%2)) {
$r->print('
');
}
$r->print('
');
}
$r->print(<<"END");
-
Start date: $showstart
- End date: $showend
+
$lt{'difn'}
+ $granularity
+
$lt{'stda'} $showstart
+ $lt{'enda'} $showend
+
+
END
$r->print(&Apache::lonhtmlcommon::end_pick_box());
- my %members = ();
+ $r->print('
');
+ return;
+}
+
+sub pick_new_members {
+ my ($r,$action,$formname,$tabcol,$rowColor1,$rowColor2,$available,$idx,
+ $stored,$img,$users,$userdata,$granularity,$origmembers) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ 'gpme' => 'Group membership',
+ 'addm' => 'Add members',
+ 'setf' => 'Set functionality',
+ 'func' => 'Functionality',
+ 'nome' => 'No members to add at this time.',
+ '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 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;
+ my $newusers = 0;
foreach my $role (keys(%{$users})) {
foreach my $user (keys(%{$$users{$role}})) {
+ $totalusers ++;
+ if (ref($origmembers) eq 'HASH') {
+ if (exists($$origmembers{$user})) {
+ next;
+ }
+ }
unless (defined($members{$user})) {
@{$members{$user}} = @{$$userdata{$user}};
+ $newusers ++;
}
}
}
- $r->print('
');
+ }
+ return $newusers;
+}
+
+sub privilege_specificity {
+ my ($r,$tabcol,$rowColor1,$rowColor2,$action,$img,$tools,$stored,
+ $toolprivs,$fixedprivs,$available,$formname) = @_;
+ 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 '.
+ 'which can be set for specific members.',
+ 'cutg' => 'Currently the group is configured ',
+ 'sdif' => 'so different group members can receive different privileges.',
+ 'sall' => 'so all group members will receive the same privileges.',
+ 'algm' => 'All group members will receive the same privileges.',
+ 'smgp' => 'Some group members will receive different privileges from '.
+ 'others.',
+ 'thwi' => 'These will be the privileges all group members receive, '.
+ 'if you selected the first option above.',
+ 'thes' => 'These will be the privileges given to members assigned '.
+ 'in the future, including via automatic group assignment '.
+ 'for specific sections/roles ',
+ 'asyo' => 'As you have chosen not to include any functionality in the '.
+ 'group, no default user privileges settings need to be set.',
+ 'plin' => 'Please indicate which optional privileges members '.
+ 'will receive by default.',
+ 'oppr' => 'Optional privileges',
+ 'defp' => 'The default privileges new members will receive are:',
+ );
+ my $totaloptionalprivs = 0;
+ foreach my $tool (@{$tools}) {
+ foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) {
+ if (!exists($$fixedprivs{$tool}{$priv})) {
+ $totaloptionalprivs ++;
+ }
+ }
+ }
+ &topic_bar($r,$tabcol,$img,$lt{'uprv'});
+ $r->print('
+
- 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. There are also additional privileges which can be set for some, or all, members. Please choose one of the following:
- All group members will receive the same privileges. Some group members will receive different privileges from others.
-
+ '.$$lt{'auex'}.':
+ on off');
+ if ($action eq 'modify') {
+ $r->print(' ('.$$lt{'curr'}.' '.$$lt{$drop}.')');
+ }
+ $r->print('
+
+
+
+
+
+
+
+
'.$$lt{'mapr'}.'
+
+
+');
+}
+
+sub mapping_settings {
+ my ($r,$tabcol,$rowColor1,$rowColor2,$sectioncount,$lt,$stored,$image) = @_;
+ my @sections = keys(%{$sectioncount});
+ if (@sections > 0) {
+ @sections = sort {$a cmp $b} @sections;
+ unshift(@sections,'_nosec'); # Put 'no sections' next
+ unshift(@sections,'_all'); # Put 'all' at the front of the list
+ }
+ &topic_bar($r,$tabcol,$image,$$lt{'pirs'});
+ $r->print('
+
+
+
+');
+ my @roles = &standard_roles();
+ my %customroles = &my_custom_roles();
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print('
+
+
'.&mt('Active?').'
+
'.&mt('Role').'
');
+ if (@sections > 0) {
+ $r->print('
'.&mt('Sections').'
'."\n");
+ }
+ my $rowNum = 0;
+ my $rowColor;
+ foreach my $role (@roles) {
+ my $plrole=&Apache::lonnet::plaintext($role);
+ my $sections_sel;
+ if (@sections > 0) {
+ $sections_sel='
'.§ions_selection(\@sections,'sec_'.$role).
+ '
';
}
- my $roster_result = &Apache::lonnet::modify_coursegroup_membership(
- $cdom,$cnum,\%usersettings);
- $r->print('
-Group '.$groupname.' was created. ');
- if (@added > 0) {
- $r->print('Users were added with following privileges: ');
- foreach my $user (@added) {
- my @privs = split(/:/,$group_privs{$user});
- my $privlist= '';
- my $curr_tool = '';
- foreach my $priv (@privs) {
- unless ($curr_tool eq $tooltype{$priv}) {
- $curr_tool = $tooltype{$priv};
- $privlist .= ''.$curr_tool.': ';
- }
- $privlist .= $$toolprivs{$curr_tool}{$priv}.', ';
- }
- $privlist =~ s/, $//;
- $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.': '.$privlist.' ');
- }
- }
- if (@failed > 0) {
- $r->print('Addition of the following users was unsuccessful: ');
- foreach my $user (@failed) {
- $r->print($$userdata{$user}[$$idx{fullname}].' - '.$user.' ');
- }
+ if ($rowNum %2 == 1) {
+ $rowColor = $rowColor1;
+ } else {
+ $rowColor = $rowColor2;
}
- if ($roster_result eq 'ok') {
- $r->print(' Group membership list updated.');
+ $r->print('
'.$plrole.
+ '
'.$sections_sel.'
');
+ $rowNum ++;
+ }
+ foreach my $role (sort(keys(%customroles))) {
+ my $sections_sel;
+ if (@sections > 0) {
+ $sections_sel = '
'.§ions_selection(\@sections,'sec_'.$role).
+ '
';
+ }
+ if ($rowNum %2 == 1) {
+ $rowColor = $rowColor1;
} else {
- $r->print(' An error occurred while updating the group membership list -'.$roster_result.' ');
- }
- } else {
- &Apache::lonnet::logthis('Failed to create group '.$groupname.
- 'in course: '.$cnum.' in domain: '.$cdom);
+ $rowColor = $rowColor2;
+ }
+ $r->print('
'.$role.'
'.
+ $sections_sel.'
');
+ $rowNum ++;
+ }
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ return;
+}
- $r->print('An error occurred when creating the new group. '.
- 'Please try again.');
+sub standard_roles {
+ my @roles = ('st','ep','ta','in','cc');
+ return @roles;
+}
+
+sub my_custom_roles {
+ my %returnhash=();
+ my %rolehash=&Apache::lonnet::dump('roles');
+ foreach (keys %rolehash) {
+ if ($_=~/^rolesdef\_(\w+)$/) {
+ $returnhash{$1}=$1;
+ }
+ }
+ return %returnhash;
+}
+
+sub modify_menu {
+ my ($r,$groupname,$page) = @_;
+ my @menu =
+ (
+ { text => 'Modify default group settings',
+ help => 'Course_Modify_Group',
+ state => 'change_settings',
+ branch => 'settings',
+ },
+ { text => 'Modify access, tools and/or privileges for previous,future'.
+ 'or current members',
+ help => 'Course_Modify_Group_Membership',
+ state => 'change_members',
+ branch => 'members',
+ },
+ { text => 'Add member(s) to the group',
+ help => 'Course_Group_Add_Members',
+ state => 'add_members',
+ branch => 'adds',
+ },
+ );
+ my $menu_html = '';
+ foreach my $menu_item (@menu) {
+ $menu_html .=
+ '
'.$/;
}
+ $r->print($menu_html);
return;
}
sub member_privs_entries {
- my ($r,$tabcol,$rowColor1,$rowColor2,$members,$tools,$usertools,$toolprivs,
- $fixedprivs,$userdata,$idx) = @_;
+ my ($r,$tabcol,$rowColor1,$rowColor2,$usertools,$toolprivs,
+ $fixedprivs,$userdata,$idx,$showtools,$defprivs) = @_;
my $rowColor;
my $rowNum = 0;
- foreach my $member (@{$members}) {
- my ($uname,$udom) = split(/:/,$member);
+ foreach my $user (sort(keys(%{$usertools}))) {
+ my ($uname,$udom) = split(/:/,$user);
if ($rowNum %2 == 1) {
$rowColor = $rowColor1;
} else {
$rowColor = $rowColor2;
}
$r->print('
-
'.$$userdata{$member}[$$idx{fullname}].'
+
'.$$userdata{$user}[$$idx{fullname}].'
'.$uname.'
'.$udom.'
Function
Fixed
Optional
');
- foreach my $tool (@{$tools}) {
- if (exists($$usertools{$member}{$tool})) {
+ foreach my $tool (@{$showtools}) {
+ if (exists($$usertools{$user}{$tool})) {
$r->print('
'.$tool.'
');
my $privcount = 0;
my $fixed = '';
my $dynamic = '';
foreach my $priv (sort(keys(%{$$toolprivs{$tool}}))) {
if (exists($$fixedprivs{$tool}{$priv})) {
- $fixed .= ''.$$toolprivs{$tool}{$priv}.' ';
+ $fixed .= ''.$$toolprivs{$tool}{$priv}.' ';
} else {
$privcount ++;
if ($privcount == 3) {
$dynamic .= '
';
}
- $dynamic .= '
'.$$toolprivs{$tool}{$priv}.'
';
+ $dynamic .='
';
}
}
$r->print('
'.$fixed.'
'.$dynamic.'
');
} else {
- $r->print('
');
+ $r->print('
'.$tool.'
');
}
}
$rowNum ++;
}
}
-
sub get_dates_from_form {
my $startdate;
my $enddate;
@@ -1507,7 +2955,8 @@ sub get_dates_from_form {
$enddate = 0;
}
return ($startdate,$enddate);
-}
+}
+
sub date_setting_table {
my ($starttime,$endtime,$formname) = @_;
my $startform = &Apache::lonhtmlcommon::date_setter($formname,
@@ -1553,5 +3002,147 @@ sub create_homepage {
return $putresult;
}
+sub check_uncheck_tools {
+ my ($r,$available) = @_;
+ if (ref($available) eq 'ARRAY') {
+ $r->print('
+
+');
+ }
+ return;
+}
+
+sub validate_groupname {
+ my ($groupname,$action,$cdom,$cnum) = @_;
+ my %sectioncount;
+ my $numsec=&Apache::loncommon::get_sections($cdom,$cnum,\%sectioncount);
+ my %curr_groups;
+ my $numgroups=&Apache::loncommon::coursegroups(\%curr_groups,$cdom,$cnum);
+
+ my %lt = &Apache::lonlocal::texthash (
+ igna => 'Invalid group name',
+ tgne => 'The group name entered ',
+ grna => 'Group names and section names used in a course '.
+ 'must be unique.',
+ isno => 'is not a valid name.',
+ gnmo => 'Group names may only contain letters, numbers '.
+ 'or underscores.',
+ cnnb => 'can not be used as it is the name of ',
+ inth => ' in this course.',
+ thgr => '- does not correspond to the name of an existing'.
+ ' group ',
+ );
+
+ my $exitmsg = ''.$lt{'igna'}.'
+