-
-
-showGroupTypeSetting = true;
-// Action handling: Adding a note
-if ($allowEdit && 'delete' === $action && is_numeric($_GET['id'])) {
- $res = $usergroup->delete_user_rel_group($_GET['user_id'], $_GET['id']);
- Display::addFlash(Display::return_message(get_lang('Deleted'), 'confirmation'));
- header('Location: '.api_get_self().'?id='.$id);
- exit;
+
+echo '
';
+
+if ($canViewFromCourse && !$allowEdit) {
+ echo Display::return_message(
+ get_lang('You can view the members of this class from the course, but you cannot edit the class.'),
+ 'info'
+ );
}
$usergroup->displayToolBarUserGroupUsers();
+echo '
';
+
Display::display_footer();
diff --git a/public/main/inc/ajax/model.ajax.php b/public/main/inc/ajax/model.ajax.php
index ac2d7035f33..bf7ca586718 100644
--- a/public/main/inc/ajax/model.ajax.php
+++ b/public/main/inc/ajax/model.ajax.php
@@ -62,7 +62,6 @@
'get_course_announcements',
'course_log_events',
'get_learning_path_calendars',
- 'get_usergroups_users',
'get_calendar_users',
'get_exercise_categories',
'get_usergroups_teacher',
@@ -91,19 +90,54 @@
if (!(api_is_drh() || api_is_student_boss() || api_is_platform_admin())) {
api_not_allowed(true);
}
+} elseif ('get_usergroups_users' === $action) {
+ api_block_anonymous_users();
+
+ $usergroupId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+ $usergroupAjax = new UserGroupModel();
+ $userGroupInfoAjax = $usergroupAjax->get($usergroupId);
+
+ if (empty($userGroupInfoAjax)) {
+ api_not_allowed(true);
+ }
+
+ $courseInfoAjax = api_get_course_info();
+ $sessionIdAjax = api_get_session_id();
+ $courseIdAjax = !empty($courseInfoAjax) ? (int) $courseInfoAjax['real_id'] : 0;
+ $canViewUsergroupFromCourse = false;
+
+ if (!empty($courseInfoAjax) && api_is_allowed_to_edit()) {
+ if ($sessionIdAjax > 0) {
+ $table = Database::get_main_table(TABLE_USERGROUP_REL_SESSION);
+ $sql = "SELECT session_id
+ FROM $table
+ WHERE usergroup_id = $usergroupId AND session_id = $sessionIdAjax
+ LIMIT 1";
+ $result = Database::query($sql);
+ $canViewUsergroupFromCourse = Database::num_rows($result) > 0;
+ } else {
+ $table = Database::get_main_table(TABLE_USERGROUP_REL_COURSE);
+ $sql = "SELECT course_id
+ FROM $table
+ WHERE usergroup_id = $usergroupId AND course_id = $courseIdAjax
+ LIMIT 1";
+ $result = Database::query($sql);
+ $canViewUsergroupFromCourse = Database::num_rows($result) > 0;
+ }
+ }
+
+ if (!$canViewUsergroupFromCourse) {
+ $usergroupAjax->protectScript($userGroupInfoAjax, true, true);
+ }
} elseif (in_array($action, $courseActions, true)) {
- // Must be in a course context.
api_protect_course_script();
- // In course context, require edit rights (teacher/coach/course admin).
- // Some actions later check api_is_teacher() explicitly; keep this generic guard.
if (!api_is_allowed_to_edit(null, true)) {
api_not_allowed(true);
}
} elseif (in_array($action, $adminActions, true)) {
api_protect_admin_script(true);
} else {
- // Unknown / not whitelisted actions => block by default.
api_protect_admin_script(true);
}
@@ -360,10 +394,18 @@ function getWhereClause($col, $oper, $val)
$count = $calendarPlugin->getUsersPerCalendarCount($id);
break;
case 'get_usergroups_users':
- $usergroup = new UserGroupModel();
- $usergroup->protectScript(null, true, true);
- $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
- $count = $usergroup->getUserGroupUsers($id, true);
+ $usergroup = isset($usergroupAjax) && $usergroupAjax instanceof UserGroupModel
+ ? $usergroupAjax
+ : new UserGroupModel();
+
+ $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
+
+ $count = (int) $usergroup->getUserGroupUsers($id, true);
+
+ if (0 === $count) {
+ $members = $usergroup->get_users_by_usergroup($id);
+ $count = is_array($members) ? count($members) : 0;
+ }
break;
case 'get_learning_path_calendars':
$calendarPlugin = LearningCalendarPlugin::create();
@@ -1138,7 +1180,13 @@ function getWhereClause($col, $oper, $val)
$result = $calendarPlugin->getUsersPerCalendar($id);
break;
case 'get_usergroups_users':
+ $usergroup = isset($usergroupAjax) && $usergroupAjax instanceof UserGroupModel
+ ? $usergroupAjax
+ : new UserGroupModel();
+
+ $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
$columns = ['title', 'actions'];
+
if ('true' === api_get_plugin_setting('learning_calendar', 'enabled')) {
$columns = [
'title',
@@ -1151,7 +1199,91 @@ function getWhereClause($col, $oper, $val)
'calendar_id',
];
}
+
$result = $usergroup->getUserGroupUsers($id, false, $start, $limit);
+
+ if (empty($result)) {
+ $members = $usergroup->get_users_by_usergroup($id);
+ $members = is_array($members) ? $members : [];
+
+ $fallbackResult = [];
+ $position = 0;
+
+ foreach ($members as $memberKey => $member) {
+ $userId = 0;
+ $fullName = '';
+
+ if (is_array($member)) {
+ if (!empty($member['user_id'])) {
+ $userId = (int) $member['user_id'];
+ } elseif (!empty($member['id_user'])) {
+ $userId = (int) $member['id_user'];
+ } elseif (!empty($member['id'])) {
+ $userId = (int) $member['id'];
+ }
+
+ $fullName = trim($member['complete_name'] ?? '');
+ if (empty($fullName)) {
+ $firstName = trim($member['firstname'] ?? '');
+ $lastName = trim($member['lastname'] ?? '');
+ $fullName = trim($firstName.' '.$lastName);
+ }
+
+ if (empty($fullName)) {
+ $fullName = trim($member['username'] ?? '');
+ }
+ } elseif (is_numeric($member)) {
+ $userId = (int) $member;
+ } elseif (is_string($member)) {
+ $fullName = trim($member);
+ }
+
+ // Important: preserve user id when it comes as the array key.
+ if ($userId <= 0 && is_numeric($memberKey) && (int) $memberKey > 0) {
+ $userId = (int) $memberKey;
+ }
+
+ if ($userId > 0) {
+ $userInfo = api_get_user_info($userId);
+
+ if (empty($fullName)) {
+ $fullName = trim($userInfo['complete_name'] ?? '');
+ if (empty($fullName)) {
+ $firstName = trim($userInfo['firstname'] ?? '');
+ $lastName = trim($userInfo['lastname'] ?? '');
+ $fullName = trim($firstName.' '.$lastName);
+ }
+ if (empty($fullName)) {
+ $fullName = $userInfo['username'] ?? '';
+ }
+ }
+ }
+
+ if (empty($fullName)) {
+ $fullName = $userId > 0 ? 'User #'.$userId : 'User '.($position + 1);
+ }
+
+ $row = [
+ 'id' => $userId > 0 ? $userId : 'member_'.$position,
+ 'title' => $fullName,
+ 'actions' => '',
+ ];
+
+ if ('true' === api_get_plugin_setting('learning_calendar', 'enabled')) {
+ $row['calendar'] = '';
+ $row['gradebook_items'] = '';
+ $row['time_spent'] = '';
+ $row['lp_day_completed'] = '';
+ $row['days_diff'] = '';
+ $row['calendar_id'] = 0;
+ }
+
+ $fallbackResult[] = $row;
+ $position++;
+ }
+
+ $result = array_slice($fallbackResult, $start, $limit);
+ }
break;
case 'get_learning_path_calendars':
$columns = ['title', 'total_hours', 'minutes_per_day', 'actions'];
diff --git a/public/main/user/class.php b/public/main/user/class.php
index 881728dad13..9fc01415dfc 100644
--- a/public/main/user/class.php
+++ b/public/main/user/class.php
@@ -26,11 +26,21 @@
$groupFilter = isset($_GET['group_filter']) ? (int) $_GET['group_filter'] : 0;
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : '';
+$isRegisteredView = 'registered' === $type;
+
+$infoMessage = $isRegisteredView
+ ? 'Information: This list shows the classes already linked to this course. Use the add icon above to browse available classes.'
+ : 'Information: This list shows the classes that are not yet linked to this course. Use the add action in the detail column to link a class to this course.';
+
+$emptyRecordsMessage = $isRegisteredView
+ ? 'No classes are currently linked to this course.'
+ : 'No available classes were found for this course.';
+
$htmlHeadXtra[] = '
';
@@ -42,12 +52,24 @@
$sessionId = api_get_session_id();
if (api_is_allowed_to_edit()) {
- if ('registered' === $type) {
+ if ($isRegisteredView) {
$actionsLeft .= '
'.
- Display::getMdiIcon(ActionIcon::ADD, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Add classes to a course')).'';
+ Display::getMdiIcon(
+ ActionIcon::ADD,
+ 'ch-tool-icon',
+ null,
+ ICON_SIZE_MEDIUM,
+ 'Browse available classes'
+ ).'';
} else {
$actionsLeft .= '
'.
- Display::getMdiIcon(ActionIcon::BACK, 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Classes')).'';
+ Display::getMdiIcon(
+ ActionIcon::BACK,
+ 'ch-tool-icon',
+ null,
+ ICON_SIZE_MEDIUM,
+ 'Back to linked classes'
+ ).'';
$form = new FormValidator(
'groups',
@@ -79,9 +101,10 @@
$actions = Display::toolbarAction('actions-class', [$actionsLeft, $actionsRight]);
$action = isset($_GET['action']) ? $_GET['action'] : null;
+
switch ($action) {
case 'add_class_to_course':
- $id = $_GET['id'];
+ $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
if (!empty($id) && 0 == $sessionId) {
$usergroup->subscribe_courses_to_usergroup(
$id,
@@ -91,16 +114,17 @@
Display::addFlash(Display::return_message(get_lang('Added')));
header('Location: class.php?'.api_get_cidreq().'&type=registered');
exit;
- } elseif (0 != $sessionId) {
- /* To suscribe session*/
+ } elseif (!empty($id) && 0 != $sessionId) {
+ // Subscribe the class to the current session.
$usergroup->subscribe_sessions_to_usergroup($id, [$sessionId]);
Display::addFlash(Display::return_message(get_lang('Added')));
header('Location: class.php?'.api_get_cidreq().'&type=registered');
exit;
}
break;
+
case 'remove_class_from_course':
- $id = $_GET['id'];
+ $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
if (!empty($id)) {
$usergroup->unsubscribe_courses_from_usergroup(
$id,
@@ -112,10 +136,10 @@
}
}
-// jqgrid will use this URL to do the selects
+// jqGrid will use this URL to load the class list.
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_usergroups_teacher&type='.$type.'&group_filter='.$groupFilter.'&keyword='.$keyword.'&'.api_get_cidreq();
-// The order is important you need to check the the $column variable in the model.ajax.php file
+// The order is important; it must match the response in model.ajax.php.
$columns = [
get_lang('Name'),
get_lang('Users'),
@@ -124,64 +148,160 @@
get_lang('Detail'),
];
-// Column config
+// Use proportional widths so the grid can stretch naturally.
$columnModel = [
[
'name' => 'name',
'index' => 'name',
'align' => 'left',
+ 'width' => '34',
],
[
'name' => 'users',
'index' => 'users',
'align' => 'left',
+ 'width' => '12',
],
[
'name' => 'status',
'index' => 'status',
'align' => 'left',
+ 'width' => '16',
],
[
'name' => 'group_type',
'index' => 'group_type',
'align' => 'center',
+ 'width' => '14',
],
[
'name' => 'actions',
'index' => 'actions',
'align' => 'center',
'sortable' => 'false',
+ 'width' => '24',
],
];
-// Autowidth
+
$extraParams['autowidth'] = 'true';
-// height auto
$extraParams['height'] = 'auto';
+$extraParams['shrinkToFit'] = true;
+$extraParams['forceFit'] = true;
+$extraParams['viewrecords'] = true;
+$extraParams['emptyrecords'] = get_lang($emptyRecordsMessage);
Display::display_header($tool_name, 'User');
?>
-
+
+
+
';
+
echo $actions;
echo UserManager::getUserSubscriptionTab(4);
-echo Display::return_message(get_lang('Information: The list of classes below contains the list of classes you have already registered in your course. If this list is empty, use the + green above to add classes.'));
+echo Display::return_message(get_lang($infoMessage));
$usergroup->display_teacher_view();
+
+echo '