Minor - format code , remove unused code

pull/2487/head
jmontoyaa 9 years ago
parent 5a446ee948
commit 3a9c18e342
  1. 3
      main/group/member_settings.php
  2. 34
      main/inc/lib/groupmanager.lib.php

@ -113,8 +113,6 @@ function check_group_members($value)
return true;
}
/* MAIN CODE */
$htmlHeadXtra[] = '<script>
$(document).ready( function() {
$("#max_member").on("focus", function() {
@ -128,7 +126,6 @@ $form = new FormValidator('group_edit', 'post', api_get_self().'?'.api_get_cidre
$form->addElement('hidden', 'action');
$form->addElement('hidden', 'max_student', $current_group['max_student']);
$complete_user_list = GroupManager::fill_groups_list($current_group['iid']);
$subscribedTutors = GroupManager::getTutors($current_group['iid']);
if ($subscribedTutors) {
$subscribedTutors = array_column($subscribedTutors, 'user_id');

@ -2080,36 +2080,12 @@ class GroupManager
$categoryId = $category['id'];
}
$group_table = Database::get_course_table(TABLE_GROUP);
$group_user_table = Database::get_course_table(TABLE_GROUP_USER);
$session_id = api_get_session_id();
$complete_user_list = CourseManager::get_real_and_linked_user_list($_course['code'], true, $session_id);
$course_id = api_get_course_int_id();
/*
* Retrieve all the groups where enrollment is still allowed
* (reverse) ordered by the number of place available
*/
$sql = "SELECT g.id gid, count(ug.user_id) count_users, g.max_student
FROM $group_table g
LEFT JOIN $group_user_table ug
ON g.iid = ug.group_id
WHERE
g.c_id = $course_id AND
ug.c_id = $course_id AND
g.iid = $groupId
GROUP BY (g.iid)";
$sql_result = Database::query($sql);
$group_available_place = array();
while ($group = Database::fetch_array($sql_result, 'ASSOC')) {
if (!empty($group['max_student'])) {
$places = intval($group['max_student'] - $group['count_users']);
} else {
$places = self::MEMBER_PER_GROUP_NO_LIMIT;
}
$group_available_place[$group['gid']] = $places;
}
$complete_user_list = CourseManager::get_real_and_linked_user_list(
$_course['code'],
true,
$session_id
);
/*
* Retrieve course users (reverse) ordered by the number

Loading…
Cancel
Save