|
@@ -121,82 +121,6 @@ $form->add_textfield('name', get_lang('GroupName'));
|
|
|
// Description
|
|
|
$form->addElement('textarea', 'description', get_lang('Description'), array ('cols' => 50, 'rows' => 6));
|
|
|
|
|
|
-// Tutors: this has been replaced with the new tutors code
|
|
|
-//$tutors = GroupManager :: get_all_tutors();
|
|
|
-//$possible_tutors[0] = get_lang('GroupNoTutor');
|
|
|
-//foreach ($tutors as $index => $tutor)
|
|
|
-//{
|
|
|
-// $possible_tutors[$tutor['user_id']] = api_get_person_name($tutor['lastname'], $tutor['firstname']);
|
|
|
-//}
|
|
|
-//$group = array ();
|
|
|
-//$group[] = & $form->createElement('select', 'tutor_id', null, $possible_tutors);
|
|
|
-//$group[] = & $form->createElement('static', null, null, ' <a href="../user/user.php">'.get_lang('AddTutors').'</a>');
|
|
|
-//$form->addGroup($group, 'tutor_group', get_lang('GroupTutor'), '', false);
|
|
|
-
|
|
|
-// Members per group
|
|
|
-$form->addElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'), MEMBER_PER_GROUP_NO_LIMIT);
|
|
|
-$group = array();
|
|
|
-$group[] = & $form->createElement('radio', 'max_member_no_limit', null, get_lang('MaximumOfParticipants'), 1);
|
|
|
-$group[] = & $form->createElement('text', 'max_member', null, array('size' => 2));
|
|
|
-$group[] = & $form->createElement('static', null, null, get_lang('GroupPlacesThis'));
|
|
|
-$form->addGroup($group, 'max_member_group', null, '', false);
|
|
|
-$form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callback', 'check_max_number_of_members');
|
|
|
-
|
|
|
-// Self registration
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1);
|
|
|
-$group[] = $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1);
|
|
|
-$form->addGroup($group, '', get_lang('GroupSelfRegistration'), '<div></div>', false);
|
|
|
-
|
|
|
-// Documents settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupDocument'), '<div></div>', false);
|
|
|
-
|
|
|
-// Work settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupWork'), '<div></div>', false);
|
|
|
-
|
|
|
-
|
|
|
-// Calendar settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupCalendar'), '<div></div>', false);
|
|
|
-
|
|
|
-// Announcements settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupAnnouncements'), '<div></div>', false);
|
|
|
-
|
|
|
-//Forum settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupForum'), '<div></div>', false);
|
|
|
-
|
|
|
-// Wiki settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'wiki_state', get_lang('GroupWiki'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('GroupWiki'), '<div></div>', false);
|
|
|
-
|
|
|
-// Chat settings
|
|
|
-$group = array();
|
|
|
-$group[] = $form->createElement('radio', 'chat_state', get_lang('Chat'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
-$group[] = $form->createElement('radio', 'chat_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
-$group[] = $form->createElement('radio', 'chat_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
-$form->addGroup($group, '', get_lang('Chat'), '<div></div>', false);
|
|
|
|
|
|
// Search Members of group
|
|
|
//$form = new FormValidator('search_member', 'get', 'group_edit', '', null, false);
|
|
@@ -208,30 +132,30 @@ $form->addGroup($group, '', get_lang('Chat'), '<div></div>', false);
|
|
|
// Getting all the users
|
|
|
/*
|
|
|
if (isset($_SESSION['id_session'])) {
|
|
|
- $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], true, $_SESSION['id_session']);
|
|
|
- $complete_user_list2 = CourseManager :: get_coach_list_from_course_code($_course['id'], $_SESSION['id_session']);
|
|
|
- $complete_user_list = array_merge($complete_user_list, $complete_user_list2);
|
|
|
-
|
|
|
+ $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'], true, $_SESSION['id_session']);
|
|
|
+ $complete_user_list2 = CourseManager :: get_coach_list_from_course_code($_course['id'], $_SESSION['id_session']);
|
|
|
+ $complete_user_list = array_merge($complete_user_list, $complete_user_list2);
|
|
|
+
|
|
|
} else {
|
|
|
- $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id']);
|
|
|
+ $complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id']);
|
|
|
}
|
|
|
|
|
|
foreach ($complete_user_list as $user_id => $o_course_user) {
|
|
|
- if ((isset ($_GET['keyword']) && search_members_keyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
|
|
|
- $groups_name = GroupManager :: get_user_group_name($user_id);
|
|
|
-
|
|
|
- if ($is_western_name_order) {
|
|
|
- $temp[] = $o_course_user['firstname'];
|
|
|
- $temp[] = $o_course_user['lastname'];
|
|
|
- } else {
|
|
|
- $temp[] = $o_course_user['lastname'];
|
|
|
- $temp[] = $o_course_user['firstname'];
|
|
|
- }
|
|
|
-
|
|
|
- $temp[] = $o_course_user['role'];
|
|
|
- $temp[] = implode(', ', $groups_name); //Group
|
|
|
- $temp[] = $o_course_user['official_code'];
|
|
|
- }
|
|
|
+ if ((isset ($_GET['keyword']) && search_members_keyword($o_course_user['firstname'], $o_course_user['lastname'], $o_course_user['username'], $o_course_user['official_code'], $_GET['keyword'])) || !isset($_GET['keyword']) || empty($_GET['keyword'])) {
|
|
|
+ $groups_name = GroupManager :: get_user_group_name($user_id);
|
|
|
+
|
|
|
+ if ($is_western_name_order) {
|
|
|
+ $temp[] = $o_course_user['firstname'];
|
|
|
+ $temp[] = $o_course_user['lastname'];
|
|
|
+ } else {
|
|
|
+ $temp[] = $o_course_user['lastname'];
|
|
|
+ $temp[] = $o_course_user['firstname'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $temp[] = $o_course_user['role'];
|
|
|
+ $temp[] = implode(', ', $groups_name); //Group
|
|
|
+ $temp[] = $o_course_user['official_code'];
|
|
|
+ }
|
|
|
}*/
|
|
|
$complete_user_list = GroupManager :: fill_groups_list($current_group['id']);
|
|
|
usort($complete_user_list, 'sort_users');
|
|
@@ -245,8 +169,8 @@ $group_tutor_list = GroupManager :: get_subscribed_tutors($current_group['id']);
|
|
|
$selected_users = array();
|
|
|
$selected_tutors = array();
|
|
|
foreach ($group_tutor_list as $index => $user) {
|
|
|
- //$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], .$user['lastname']);
|
|
|
- $selected_tutors[] = $user['user_id'];
|
|
|
+ //$possible_users[$user['user_id']] = api_get_person_name($user['firstname'], .$user['lastname']);
|
|
|
+ $selected_tutors[] = $user['user_id'];
|
|
|
}
|
|
|
|
|
|
$group_tutors_element = $form->addElement('advmultiselect', 'group_tutors', get_lang('GroupTutors'), $possible_users, 'style="width: 280px;"');
|
|
@@ -299,6 +223,86 @@ $group_members_element->setButtonAttributes('add', array('class' => 'arrowr'));
|
|
|
$group_members_element->setButtonAttributes('remove', array('class' => 'arrowl'));
|
|
|
$form->addFormRule('check_group_members');
|
|
|
|
|
|
+
|
|
|
+// Tutors: this has been replaced with the new tutors code
|
|
|
+//$tutors = GroupManager :: get_all_tutors();
|
|
|
+//$possible_tutors[0] = get_lang('GroupNoTutor');
|
|
|
+//foreach ($tutors as $index => $tutor)
|
|
|
+//{
|
|
|
+// $possible_tutors[$tutor['user_id']] = api_get_person_name($tutor['lastname'], $tutor['firstname']);
|
|
|
+//}
|
|
|
+//$group = array ();
|
|
|
+//$group[] = & $form->createElement('select', 'tutor_id', null, $possible_tutors);
|
|
|
+//$group[] = & $form->createElement('static', null, null, ' <a href="../user/user.php">'.get_lang('AddTutors').'</a>');
|
|
|
+//$form->addGroup($group, 'tutor_group', get_lang('GroupTutor'), '', false);
|
|
|
+
|
|
|
+// Members per group
|
|
|
+$form->addElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'), MEMBER_PER_GROUP_NO_LIMIT);
|
|
|
+$group = array();
|
|
|
+$group[] = & $form->createElement('radio', 'max_member_no_limit', null, get_lang('MaximumOfParticipants'), 1);
|
|
|
+$group[] = & $form->createElement('text', 'max_member', null, array('size' => 2));
|
|
|
+$group[] = & $form->createElement('static', null, null, get_lang('GroupPlacesThis'));
|
|
|
+$form->addGroup($group, 'max_member_group', null, '', false);
|
|
|
+$form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callback', 'check_max_number_of_members');
|
|
|
+
|
|
|
+// Self registration
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1);
|
|
|
+$group[] = $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1);
|
|
|
+$form->addGroup($group, '', get_lang('GroupSelfRegistration'), '<div></div>', false);
|
|
|
+
|
|
|
+// Documents settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupDocument'), '<div></div>', false);
|
|
|
+
|
|
|
+// Work settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupWork'), '<div></div>', false);
|
|
|
+
|
|
|
+
|
|
|
+// Calendar settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupCalendar'), '<div></div>', false);
|
|
|
+
|
|
|
+// Announcements settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupAnnouncements'), '<div></div>', false);
|
|
|
+
|
|
|
+//Forum settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupForum'), '<div></div>', false);
|
|
|
+
|
|
|
+// Wiki settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'wiki_state', get_lang('GroupWiki'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('GroupWiki'), '<div></div>', false);
|
|
|
+
|
|
|
+// Chat settings
|
|
|
+$group = array();
|
|
|
+$group[] = $form->createElement('radio', 'chat_state', get_lang('Chat'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE);
|
|
|
+$group[] = $form->createElement('radio', 'chat_state', null, get_lang('Public'), TOOL_PUBLIC);
|
|
|
+$group[] = $form->createElement('radio', 'chat_state', null, get_lang('Private'), TOOL_PRIVATE);
|
|
|
+$form->addGroup($group, '', get_lang('Chat'), '<div></div>', false);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
// submit button
|
|
|
$form->addElement('style_submit_button', 'submit', get_lang('PropModify'), 'class="save"');
|
|
|
|