diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php
index 401a6e06d7..6bedab43e6 100755
--- a/main/admin/resume_session.php
+++ b/main/admin/resume_session.php
@@ -13,13 +13,13 @@ require_once '../inc/global.inc.php';
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
-$id_session = isset($_GET['id_session']) ? $_GET['id_session'] : null;
+$sessionId = isset($_GET['id_session']) ? $_GET['id_session'] : null;
-if (empty($id_session)) {
+if (empty($sessionId)) {
api_not_allowed(true);
}
-SessionManager::protect_session_edit($id_session);
+SessionManager::protect_session_edit($sessionId);
$tool_name = get_lang('SessionOverview');
@@ -55,7 +55,7 @@ $sql = 'SELECT
FROM '.$tbl_session.'
LEFT JOIN '.$tbl_user.'
ON id_coach = user_id
- WHERE '.$tbl_session.'.id='.$id_session;
+ WHERE '.$tbl_session.'.id='.$sessionId;
$rs = Database::query($sql);
$session = Database::store_result($rs);
@@ -78,13 +78,13 @@ $url_id = api_get_current_access_url_id();
switch ($action) {
case 'move_up':
- SessionManager::moveUp($id_session, $_GET['course_code']);
- header('Location: resume_session.php?id_session='.$id_session);
+ SessionManager::moveUp($sessionId, $_GET['course_code']);
+ header('Location: resume_session.php?id_session='.$sessionId);
exit;
break;
case 'move_down':
- SessionManager::moveDown($id_session, $_GET['course_code']);
- header('Location: resume_session.php?id_session='.$id_session);
+ SessionManager::moveDown($sessionId, $_GET['course_code']);
+ header('Location: resume_session.php?id_session='.$sessionId);
exit;
break;
case 'add_user_to_url':
@@ -107,21 +107,21 @@ switch ($action) {
// forcing the escape_string
$courseInfo = api_get_course_info($courseCode);
SessionManager::unsubscribe_course_from_session(
- $id_session,
+ $sessionId,
$courseInfo['real_id']
);
}
}
if (!empty($_GET['class'])) {
- Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$id_session' AND class_id=".Database::escape_string($_GET['class']));
+ Database::query("DELETE FROM $tbl_session_rel_class WHERE session_id='$sessionId' AND class_id=".Database::escape_string($_GET['class']));
$nbr_affected_rows=Database::affected_rows();
- Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$id_session'");
+ Database::query("UPDATE $tbl_session SET nbr_classes=nbr_classes-$nbr_affected_rows WHERE id='$sessionId'");
}
if (!empty($_GET['user'])) {
SessionManager::unsubscribe_user_from_session(
- $id_session,
+ $sessionId,
$_GET['user']
);
}
@@ -143,7 +143,7 @@ echo Display::page_header(
$url = Display::url(
Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
- "session_edit.php?page=resume_session.php&id=$id_session"
+ "session_edit.php?page=resume_session.php&id=$sessionId"
);
echo Display::page_subheader(get_lang('GeneralProperties').$url);
@@ -224,7 +224,7 @@ if ($multiple_url_is_on) {
echo 'URL';
echo '';
echo '';
- $url_list = UrlManager::get_access_url_from_session($id_session);
+ $url_list = UrlManager::get_access_url_from_session($sessionId);
foreach ($url_list as $url_data) {
echo $url_data['url'].'
';
}
@@ -232,7 +232,7 @@ if ($multiple_url_is_on) {
}
if (SessionManager::durationPerUserIsEnabled()) {
- $sessionInfo = api_get_session_info($id_session);
+ $sessionInfo = api_get_session_info($sessionId);
echo ' | | ';
echo get_lang('Duration');
echo ' | ';
@@ -250,7 +250,7 @@ if (SessionManager::durationPerUserIsEnabled()) {
$url = Display::url(
Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
- "add_courses_to_session.php?page=resume_session.php&id_session=$id_session"
+ "add_courses_to_session.php?page=resume_session.php&id_session=$sessionId"
);
echo Display::page_subheader(get_lang('CourseList').$url);
@@ -281,7 +281,7 @@ if ($session['nbr_courses'] == 0) {
FROM $tbl_course, $tbl_session_rel_course
WHERE
course_code = code AND
- id_session='$id_session'
+ id_session='$sessionId'
$orderBy";
$result = Database::query($sql);
@@ -298,7 +298,7 @@ if ($session['nbr_courses'] == 0) {
srcru.id_session = sru.id_session AND
srcru.course_code = '".Database::escape_string($course['code'])."' AND
sru.relation_type <> ".SESSION_RELATION_TYPE_RRHH." AND
- srcru.id_session = '".intval($id_session)."'";
+ srcru.id_session = '".intval($sessionId)."'";
$rs = Database::query($sql);
$course['nbr_users'] = Database::result($rs, 0, 0);
@@ -309,7 +309,7 @@ if ($session['nbr_courses'] == 0) {
FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
WHERE
session_rcru.id_user = user.user_id AND
- session_rcru.id_session = '".intval($id_session)."' AND
+ session_rcru.id_session = '".intval($sessionId)."' AND
session_rcru.course_code ='".Database::escape_string($course['code'])."' AND
session_rcru.status=2";
$rs = Database::query($sql);
@@ -333,7 +333,7 @@ if ($session['nbr_courses'] == 0) {
if (SessionManager::orderCourseIsEnabled()) {
$upIcon = 'up.png';
- $urlUp = api_get_self().'?id_session='.$id_session.'&course_code='.$course['code'].'&action=move_up';
+ $urlUp = api_get_self().'?id_session='.$sessionId.'&course_code='.$course['code'].'&action=move_up';
if ($count == 0) {
$upIcon = 'up_na.png';
@@ -346,7 +346,7 @@ if ($session['nbr_courses'] == 0) {
);
$downIcon = 'down.png';
- $downUrl = api_get_self().'?id_session='.$id_session.'&course_code='.$course['code'].'&action=move_down';
+ $downUrl = api_get_self().'?id_session='.$sessionId.'&course_code='.$course['code'].'&action=move_down';
if ($count +1 == count($courses)) {
$downIcon = 'down_na.png';
@@ -363,18 +363,17 @@ if ($session['nbr_courses'] == 0) {
//hide_course_breadcrumb the parameter has been added to hide the name of the course, that appeared in the default $interbreadcrumb
echo '
- | '.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),' |
+ '.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$sessionId),' |
'.$coach.' |
'.$course['nbr_users'].' |
- '.Display::return_icon('course_home.gif', get_lang('Course')).'
+ '.Display::return_icon('course_home.gif', get_lang('Course')).'
'.$orderButtons.'
- '.Display::return_icon('user.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'
- '.Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), null, ICON_SIZE_SMALL).'
- '.Display::return_icon('statistics.gif', get_lang('Tracking')).'
- '.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'
- '.Display::return_icon('delete.png', get_lang('Delete')).'
-
+ '.Display::return_icon('user.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'
+ '.Display::return_icon('import_csv.png', get_lang('ImportUsersToACourse'), null, ICON_SIZE_SMALL).'
+ '.Display::return_icon('statistics.gif', get_lang('Tracking')).'
+ '.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'
+ '.Display::return_icon('delete.png', get_lang('Delete')).'
|
';
$count++;
@@ -388,96 +387,97 @@ if ($session['nbr_courses'] == 0) {
$url = Display::url(
Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
- "add_users_to_session.php?page=resume_session.php&id_session=$id_session"
+ "add_users_to_session.php?page=resume_session.php&id_session=$sessionId"
);
$url .= Display::url(
Display::return_icon('import_csv.png', get_lang('ImportUsers'), array(), ICON_SIZE_SMALL),
- "session_user_import.php?id_session=$id_session"
+ "session_user_import.php?id_session=$sessionId"
);
echo Display::page_subheader(get_lang('UserList').$url);
-?>
-
-
-
- |
-
- |
-
-
- |
-
-
- '.get_lang('NoUsersForThisSession').' |
- ';
-} else {
- $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
-
- if ($multiple_url_is_on) {
- $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
- FROM $tbl_user u
- INNER JOIN $tbl_session_rel_user su
- ON u.user_id = su.id_user AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
- LEFT OUTER JOIN $table_access_url_user uu ON (uu.user_id = u.user_id)
- WHERE su.id_session = $id_session AND (access_url_id = $url_id OR access_url_id is null )
- $order_clause";
- } else {
- $sql = "SELECT u.user_id, lastname, firstname, username
- FROM $tbl_user u
- INNER JOIN $tbl_session_rel_user su
- ON u.user_id = su.id_user AND su.relation_type<>".SESSION_RELATION_TYPE_RRHH."
- AND su.id_session = ".$id_session.$order_clause;
- }
+$userList = SessionManager::get_users_by_session($sessionId);
- $result = Database::query($sql);
- $users = Database::store_result($result);
- $orig_param = '&origin=resume_session&id_session='.$id_session; // change breadcrumb in destination page
- foreach ($users as $user){
- $user_link = '';
- if (!empty($user['user_id'])) {
- $user_link = ''.api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')';
- }
+if (!empty($userList)) {
+ $table = new HTML_Table(array('class' => 'data_table'));
+
+ $table->setHeaderContents(0, 0, get_lang('User'));
+ $table->setHeaderContents(0, 1, get_lang('Status'));
+ $table->setHeaderContents(0, 2, get_lang('Actions'));
+
+ $row = 1;
+ foreach ($userList as $user) {
+ $userId = $user['user_id'];
+ $userInfo = api_get_user_info($userId);
+
+ $userLink = ''.
+ api_htmlentities($userInfo['complete_name_with_username']).'';
+
+ $reportingLink = Display::url(
+ Display::return_icon('statistics.gif', get_lang('Reporting')),
+ api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?student='.$user['user_id'].''.$orig_param
+ );
- $link_to_add_user_in_url = '';
+ $courseUserLink = Display::url(
+ Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')),
+ api_get_path(WEB_CODE_PATH).'admin/session_course_user.php?id_user='.$user['user_id'].'&id_session='.$sessionId
+ );
+ $removeLink = Display::url(
+ Display::return_icon('delete.png', get_lang('Delete')),
+ api_get_self().'?id_session='.$sessionId.'&action=delete&user='.$user['user_id'],
+ array('onclick' => "javascript:if(!confirm(\''.get_lang('ConfirmYourChoice').'\')) return false;")
+ );
+
+ $addUserToUrlLink= '';
if ($multiple_url_is_on) {
if ($user['access_url_id'] != $url_id) {
- $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_SMALL);
- $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), ICON_SIZE_SMALL);
- $link_to_add_user_in_url = ''.$add.'';
+ $userLink .= ' '.Display::return_icon(
+ 'warning.png',
+ get_lang('UserNotAddedInURL'),
+ array(),
+ ICON_SIZE_SMALL
+ );
+ $add = Display::return_icon(
+ 'add.png',
+ get_lang('AddUsersToURL'),
+ array(),
+ ICON_SIZE_SMALL
+ );
+ $addUserToUrlLink = ''.$add.'';
}
}
$editUrl = null;
if (SessionManager::durationPerUserIsEnabled()) {
if (isset($sessionInfo['duration']) && !empty($sessionInfo['duration'])) {
- $editUrl = api_get_path(WEB_CODE_PATH) . 'admin/session_user_edit.php?session_id=' . $id_session . '&user_id=' . $user['user_id'];
+ $editUrl = api_get_path(WEB_CODE_PATH) . 'admin/session_user_edit.php?session_id=' . $sessionId . '&user_id=' . $userId;
$editUrl = Display::url(
Display::return_icon('agenda.png', get_lang('SessionDurationEdit')),
$editUrl
);
}
}
- echo '
- |
- '.$user_link.'
- |
-
- '.$editUrl.'
- '.Display::return_icon('statistics.gif', get_lang('Reporting')).'
- '.Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')).'
- '.Display::return_icon('delete.png', get_lang('Delete')).'
- '.$link_to_add_user_in_url.'
-
- |
-
';
- }
+
+ $table->setCellContents($row, 0, $userLink);
+ $link = $reportingLink.$courseUserLink.$removeLink.$addUserToUrlLink.$editUrl;
+ switch ($user['relation_type']) {
+ case 1:
+ $status = get_lang('Drh');
+ $link = Display::url(
+ Display::return_icon('edit.png', get_lang('Edit')),
+ api_get_path(WEB_CODE_PATH).'admin/dashboard_add_sessions_to_user.php?user='.$userId
+ );
+ break;
+ default:
+ $status = get_lang('Student');
+ }
+
+ $table->setCellContents($row, 1, $status);
+ $table->setCellContents($row, 2, $link);
+ $row++;
+ }
+ $table->display();
}
-?>
-
-