| '.get_lang('Exercices').' | -'.get_lang('Attempts').' | +'.get_lang('Attempts').' | '.get_lang('BestAttempt').' | '.get_lang('Ranking').' | '.get_lang('BestResultInCourse').' | -'.get_lang('Statistics').' '.Display :: return_icon('info3.gif', get_lang('OnlyBestResultsPerStudent'), array('align' => 'absmiddle', 'hspace' => '3px')).' | +'.get_lang('Statistics').' '.Display :: return_icon('info3.gif', get_lang('OnlyBestResultsPerStudent'), array('align' => 'absmiddle', 'hspace' => '3px')).' |
|---|---|---|---|---|---|---|---|
| '.get_lang('NoEx').' | |||||||
'; //echo '
'; var_dump($my_exercise_result, $exercise_result,$x_axis);
-
+
$cache = new pCache();
// Dataset definition
@@ -2866,7 +2931,7 @@ class Tracking {
$data_set->AddPoint($my_final_array,"Serie2");
//$data_set->AddPoint($x_axis,"Serie3");
$data_set->AddAllSeries();
-
+
// Initialise the graph
$main_width = 80;
@@ -3020,7 +3085,7 @@ class Tracking {
//SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0
$main_graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_ADDALLSTART0, 150,150,150,TRUE,0,1,TRUE);
-
+
$main_graph->drawGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
@@ -3090,7 +3155,7 @@ class TrackingCourseLog {
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-
+
$session_id = intval($session_id);
$sql = "SELECT
@@ -3101,8 +3166,8 @@ class TrackingCourseLog {
insert_date as col5,
visibility as col6
FROM $table_item_property track_resource, $table_user user
- WHERE track_resource.c_id = $course_id AND
- track_resource.insert_user_id = user.user_id AND
+ WHERE track_resource.c_id = $course_id AND
+ track_resource.insert_user_id = user.user_id AND
id_session = $session_id ";
if (isset($_GET['keyword'])) {
@@ -3156,7 +3221,7 @@ class TrackingCourseLog {
if (!empty($recorset)) {
$obj = Database::fetch_object($recorset);
-
+
$name_session = '';
$coach_name = '';
if (!empty($obj)) {
@@ -3501,7 +3566,7 @@ class TrackingCourseLog {
$user_ids = intval($user_ids);
$condition_user = " WHERE user.user_id = $user_ids ";
}
-
+
if (!empty($_GET['user_keyword'])) {
$keyword = trim(Database::escape_string($_GET['user_keyword']));
$condition_user .= " AND (user.firstname LIKE '%".$keyword."%' OR user.lastname LIKE '%".$keyword."%' OR user.username LIKE '%".$keyword."%' OR user.email LIKE '%".$keyword."%' ) ";
@@ -3523,7 +3588,7 @@ class TrackingCourseLog {
if (!in_array($direction, array('ASC','DESC'))) {
$direction = 'ASC';
}
-
+
$column = intval($column);
if ($is_western_name_order) {
@@ -3545,28 +3610,28 @@ class TrackingCourseLog {
$users = array ();
$t = time();
$row = array();
-
+
$course_info = api_get_course_info($course_code);
-
+
$total_surveys = 0;
-
+
$total_exercises = get_all_exercises($course_info, $session_id);
-
+
if (empty($session_id)) {
$survey_user_list = array();
$survey_list = survey_manager::get_surveys($course_code, $session_id);
-
+
$total_surveys = count($survey_list);
$survey_data = array();
foreach ($survey_list as $survey) {
$user_list = survey_manager::get_people_who_filled_survey($survey['survey_id'], false, $course_info['real_id']);
-
+
foreach ($user_list as $user_id) {
isset($survey_user_list[$user_id]) ? $survey_user_list[$user_id]++ : $survey_user_list[$user_id] = 1;
}
}
}
-
+
while ($user = Database::fetch_array($res, 'ASSOC')) {
$user['official_code'] = $user['col0'];
if ($is_western_name_order) {
@@ -3578,7 +3643,7 @@ class TrackingCourseLog {
}
$user['username'] = $user['col3'];
$user['time'] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user['user_id'], $course_code, $session_id));
-
+
$avg_student_score = Tracking::get_avg_student_score($user['user_id'], $course_code, array(), $session_id);
$avg_student_progress = Tracking::get_avg_student_progress($user['user_id'], $course_code, array(), $session_id);
@@ -3586,20 +3651,20 @@ class TrackingCourseLog {
$avg_student_progress=0;
}
$user['average_progress'] = $avg_student_progress.'%';
-
- $total_user_exercise = Tracking::get_exercise_student_progress($total_exercises, $user['user_id'], $course_code, $session_id);
+
+ $total_user_exercise = Tracking::get_exercise_student_progress($total_exercises, $user['user_id'], $course_code, $session_id);
$user['exercise_progress'] = $total_user_exercise;
-
+
$total_user_exercise = Tracking::get_exercise_student_average_best_attempt($total_exercises, $user['user_id'], $course_code, $session_id);
- $user['exercise_average_best_attempt'] = $total_user_exercise;
-
+ $user['exercise_average_best_attempt'] = $total_user_exercise;
+
if (is_numeric($avg_student_score)) {
$user['student_score'] = $avg_student_score.'%';
} else {
$user['student_score'] = $avg_student_score;
}
-
+
$user['count_assignments'] = Tracking::count_student_assignments($user['user_id'], $course_code, $session_id);
$user['count_messages'] = Tracking::count_student_messages($user['user_id'], $course_code, $session_id);
$user['first_connection'] = Tracking::get_first_connection_date_on_the_course($user['user_id'], $course_code, $session_id);
@@ -3607,7 +3672,7 @@ class TrackingCourseLog {
// we need to display an additional profile field
$user['additional'] = '';
-
+
if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
if (isset($additional_user_profile_info[$user['user_id']]) && is_array($additional_user_profile_info[$user['user_id']])) {
$user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
@@ -3617,16 +3682,16 @@ class TrackingCourseLog {
if (empty($session_id)) {
$user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
}
-
+
$user['link'] = '.'2rightarrow.gif)
- ';
foreach ($productions as $file) {
@@ -1353,7 +1353,7 @@ class UserManager {
$sqlf = "SELECT * FROM $t_uf WHERE 1 = 1 ";
if (!$all_visibility) {
$sqlf .= " AND field_visible = 1 ";
- }
+ }
if (!is_null($field_filter)) {
$field_filter = intval($field_filter);
$sqlf .= " AND field_filter = $field_filter ";
@@ -1678,10 +1678,10 @@ class UserManager {
$sql .= " WHERE field_filter = $field_filter ";
}
}
-
+
$sql .= " ORDER BY f.field_order";
-
+
$res = Database::query($sql);
if (Database::num_rows($res) > 0) {
while ($row = Database::fetch_array($res)) {
@@ -1925,9 +1925,9 @@ class UserManager {
public static function get_sessions_by_category ($user_id, $fill_first = false, $is_time_over = false, $sort_by_session_name = false) {
// Database Table Definitions
$tbl_session_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
- $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+ $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-
+
if ($user_id != strval(intval($user_id))) return array();
$categories = array();
@@ -1935,7 +1935,7 @@ class UserManager {
if ($fill_first) {
$categories[0] = array();
}
-
+
// Get the list of sessions where the user is subscribed as student
$condition_date_end = "";
@@ -1945,9 +1945,9 @@ class UserManager {
$condition_date_end = " AND (date_end >= CURDATE() OR date_end = '0000-00-00') ";
}
- $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name
- FROM $tbl_session_user, $tbl_session
- WHERE id_session=id AND id_user=$user_id $condition_date_end
+ $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name
+ FROM $tbl_session_user, $tbl_session
+ WHERE id_session=id AND id_user=$user_id $condition_date_end
ORDER BY session_category_id, date_start, date_end";
$result = Database::query($sessions_sql);
if (Database::num_rows($result) > 0) {
@@ -1957,16 +1957,16 @@ class UserManager {
}
}
- // Get the list of sessions where the user is subscribed as coach in a
+ // Get the list of sessions where the user is subscribed as coach in a
// course, from table session_rel_course_rel_user
- $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name
- FROM $tbl_session as session INNER JOIN $tbl_session_course_user as session_rel_course_user
- ON session_rel_course_user.id_session = session.id AND
- session_rel_course_user.id_user = $user_id AND
- session_rel_course_user.status = 2 $condition_date_end
+ $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name
+ FROM $tbl_session as session INNER JOIN $tbl_session_course_user as session_rel_course_user
+ ON session_rel_course_user.id_session = session.id AND
+ session_rel_course_user.id_user = $user_id AND
+ session_rel_course_user.status = 2 $condition_date_end
ORDER BY session_category_id, date_start, date_end";
-
+
$result = Database::query($sessions_sql);
if (Database::num_rows($result)>0) {
while ($row = Database::fetch_array($result)) {
@@ -1976,8 +1976,8 @@ class UserManager {
}
// Get the list of sessions where the user is subscribed as a session coach
- $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name FROM $tbl_session as session
- WHERE session.id_coach = $user_id $condition_date_end
+ $sessions_sql = "SELECT DISTINCT id, session_category_id, session.name FROM $tbl_session as session
+ WHERE session.id_coach = $user_id $condition_date_end
ORDER BY session_category_id, date_start, date_end";
$result = Database::query($sessions_sql);
@@ -1987,23 +1987,23 @@ class UserManager {
$names[$row['id']] = $row['name'];
}
}
-
+
if ($sort_by_session_name) {
// reorder sessions alphabetically inside categories
if (!empty($categories)) {
foreach ($categories as $cat_id => $category) {
// inside each category, prepare a new empty array to sort sessions
- $new_cat = array();
+ $new_cat = array();
if (is_array($category) && !empty($category)) {
foreach ($category as $session) {
$new_cat[$names[$session]] = $session;
}
- uksort($new_cat, 'strnatcmp');
+ uksort($new_cat, 'strnatcmp');
$categories[$cat_id] = $new_cat;
- }
+ }
}
}
- }
+ }
return $categories;
}
@@ -2019,7 +2019,7 @@ class UserManager {
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
- $tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+ $tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
if ($user_id != strval(intval($user_id))) return array();
@@ -2039,14 +2039,14 @@ class UserManager {
//Courses in which we suscribed out of any session
$tbl_user_course_category = Database :: get_user_personal_table(TABLE_USER_COURSE_CATEGORY);
- $personal_course_list_sql = "SELECT course.code, course_rel_user.status course_rel_status, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
+ $personal_course_list_sql = "SELECT course.code, course_rel_user.status course_rel_status, course_rel_user.sort sort, course_rel_user.user_course_cat user_course_cat
FROM ".$tbl_course_user." course_rel_user
LEFT JOIN ".$tbl_course." course
ON course.code = course_rel_user.course_code
LEFT JOIN ".$tbl_user_course_category." user_course_category
ON course_rel_user.user_course_cat = user_course_category.id
$join_access_url
- WHERE course_rel_user.user_id = '".$user_id."' AND
+ WHERE course_rel_user.user_id = '".$user_id."' AND
course_rel_user.relation_type <> ".COURSE_RELATION_TYPE_RRHH." $where_access_url
ORDER BY user_course_category.sort, course_rel_user.sort, course.title ASC";
@@ -2064,9 +2064,9 @@ class UserManager {
// get the list of sessions where the user is subscribed as student
$sessions_sql = "SELECT DISTINCT id, name, date_start, date_end
FROM $tbl_session_user, $tbl_session
- WHERE id_session=id AND
- id_user=$user_id AND
- relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
+ WHERE id_session=id AND
+ id_user=$user_id AND
+ relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
(date_start <= CURDATE() AND date_end >= CURDATE() OR date_start='0000-00-00')
ORDER BY date_start, date_end, name";
$result = Database::query($sessions_sql);
@@ -2075,11 +2075,11 @@ class UserManager {
// get the list of sessions where the user is subscribed as student where visibility = SESSION_VISIBLE_READ_ONLY = 1 SESSION_VISIBLE = 2
$sessions_out_date_sql = "SELECT DISTINCT id, name, date_start, date_end
FROM $tbl_session_user, $tbl_session
- WHERE id_session=id AND id_user=$user_id AND
+ WHERE id_session=id AND id_user=$user_id AND
relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
(date_end <= CURDATE() AND date_end<>'0000-00-00') AND (visibility = ".SESSION_VISIBLE_READ_ONLY." || visibility = ".SESSION_VISIBLE.")
ORDER BY date_start, date_end, name";
-
+
$result_out_date = Database::query($sessions_out_date_sql);
$sessions_out_date = Database::store_result($result_out_date, 'ASSOC');
$sessions = array_merge($sessions , $sessions_out_date);
@@ -2092,7 +2092,7 @@ class UserManager {
AND session_rel_course_user.id_user = $user_id AND session_rel_course_user.status = 2
WHERE (
CURDATE() >= DATE_SUB(date_start, INTERVAL nb_days_access_before_beginning DAY) AND
- CURDATE() <= ADDDATE(date_end, INTERVAL nb_days_access_after_end DAY) OR
+ CURDATE() <= ADDDATE(date_end, INTERVAL nb_days_access_after_end DAY) OR
date_start='0000-00-00'
)
ORDER BY date_start, date_end, name";
@@ -2116,8 +2116,8 @@ class UserManager {
if (api_is_allowed_to_create_course()) {
foreach($sessions as $enreg) {
$id_session = $enreg['id'];
- $personal_course_list_sql = "SELECT DISTINCT course.code k, course.title i,
- ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort,
+ $personal_course_list_sql = "SELECT DISTINCT course.code k, course.title i,
+ ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort,
category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
FROM $tbl_session_course_user as session_course_user
INNER JOIN $tbl_course AS course
@@ -2132,7 +2132,7 @@ class UserManager {
$course_list_sql_result = Database::query($personal_course_list_sql);
- while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) {
+ while ($result_row = Database::fetch_array($course_list_sql_result, 'ASSOC')) {
$result_row['course_info'] = api_get_course_info($result_row['code']);
$key = $result_row['id_session'].' - '.$result_row['code'];
$personal_course_list[$key] = $result_row;
@@ -2143,7 +2143,7 @@ class UserManager {
foreach ($sessions as $enreg) {
$id_session = $enreg['id'];
// this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not
- $personal_course_list_sql = "SELECT DISTINCT course.code k, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email,
+ $personal_course_list_sql = "SELECT DISTINCT course.code k, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email,
course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, " .
"IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5')
FROM $tbl_session_course_user as session_course_user
@@ -2172,15 +2172,25 @@ class UserManager {
*/
public static function get_courses_list_by_session($user_id, $session_id) {
// Database Table Definitions
- $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+ $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$user_id = intval($user_id);
$session_id = intval($session_id);
//we filter the courses from the URL
$join_access_url=$where_access_url='';
+
+ if (api_get_multiple_access_url()) {
+ $access_url_id = api_get_current_access_url_id();
+ if ($access_url_id != -1) {
+ $tbl_url_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
+ $join_access_url= " , $tbl_url_session url_rel_session ";
+ $where_access_url=" AND access_url_id = $access_url_id AND url_rel_session.session_id = $session_id ";
+ }
+ }
// variable initialisation
+ $personal_course_list_sql = '';
$personal_course_list = array();
$courses = array();
@@ -2188,11 +2198,11 @@ class UserManager {
$personal_course_list_sql = "SELECT DISTINCT scu.course_code as code FROM $tbl_session_course_user as scu $join_access_url
WHERE scu.id_user = $user_id AND scu.id_session = $session_id $where_access_url
ORDER BY code";
-
+
$course_list_sql_result = Database::query($personal_course_list_sql);
if (Database::num_rows($course_list_sql_result) > 0) {
- while ($result_row = Database::fetch_array($course_list_sql_result)) {
+ while ($result_row = Database::fetch_array($course_list_sql_result)) {
$result_row['status'] = 5;
if (!in_array($result_row['code'], $courses)) {
$personal_course_list[] = $result_row;
@@ -2205,7 +2215,7 @@ class UserManager {
$personal_course_list_sql = "SELECT DISTINCT scu.course_code as code FROM $tbl_session_course_user as scu, $tbl_session as s $join_access_url
WHERE s.id = $session_id AND scu.id_session = s.id AND ((scu.id_user=$user_id AND scu.status=2) OR s.id_coach = $user_id)
$where_access_url
- ORDER BY code";
+ ORDER BY code";
$course_list_sql_result = Database::query($personal_course_list_sql);
if (Database::num_rows($course_list_sql_result)>0) {
@@ -2218,14 +2228,14 @@ class UserManager {
}
}
}
-
+
if (api_is_drh()) {
- $session_list = SessionManager::get_sessions_followed_by_drh($user_id);
+ $session_list = SessionManager::get_sessions_followed_by_drh($user_id);
$session_list = array_keys($session_list);
- if (in_array($session_id, $session_list)) {
- $course_list = SessionManager::get_course_list_by_session_id($session_id);
+ if (in_array($session_id, $session_list)) {
+ $course_list = SessionManager::get_course_list_by_session_id($session_id);
if (!empty($course_list)) {
- foreach ($course_list as $course) {
+ foreach ($course_list as $course) {
$personal_course_list[] = $course;
}
}
@@ -2463,10 +2473,10 @@ class UserManager {
* @todo move this function somewhere else image.lib?
* @return obj image object
*/
- public static function resize_picture($file, $max_size_for_picture) {
+ public static function resize_picture($file, $max_size_for_picture) {
$temp = null;
if (file_exists($file)) {
- $temp = new Image($file);
+ $temp = new Image($file);
$image_size = $temp->get_image_size($file);
$width = $image_size['width'];
$height = $image_size['height'];
@@ -2476,13 +2486,13 @@ class UserManager {
$new_height = round($height * ($max_size_for_picture / $width));
$temp->resize($max_size_for_picture, $new_height, 0);
}
- } else { // height > $width
+ } else { // height > $width
if ($height >= $max_size_for_picture) {
// scale width
$new_width = round($width * ($max_size_for_picture / $height));
$temp->resize($new_width, $max_size_for_picture, 0);
}
- }
+ }
}
return $temp;
}
@@ -2522,22 +2532,22 @@ class UserManager {
$image_array_sys = self::get_user_picture_path_by_id($user_id, 'system', false, true);
$image_array = self::get_user_picture_path_by_id($user_id, 'web', false, true);
-
+
$file = $image_array_sys['dir'].$size_picture.$picture_file;
-
+
if (file_exists($file)) {
$picture['file'] = $image_array['dir'].$size_picture.$picture_file;
$picture['style'] = '';
if ($height > 0) {
$dimension = api_getimagesize($picture['file']);
$margin = (($height - $dimension['width']) / 2);
-
+
//@ todo the padding-top should not be here
- $picture['style'] = ' style="padding-top:'.$margin.'px; width:'.$dimension['width'].'px; height:'.$dimension['height'].'px;" ';
+ $picture['style'] = ' style="padding-top:'.$margin.'px; width:'.$dimension['width'].'px; height:'.$dimension['height'].'px;" ';
$picture['original_height'] = $dimension['width'];
$picture['original_width'] = $dimension['height'];
}
- } else {
+ } else {
$file = $image_array_sys['dir'].$picture_file;
if (file_exists($file) && !is_dir($file)) {
$picture['file'] = $image_array['dir'].$picture_file;
@@ -2875,8 +2885,8 @@ class UserManager {
UserManager::add_tag($tags,$user_id, $field_id);
}
return true;
- }
-
+ }
+
/**
* Returns a list of all admninistrators
* @author jmontoya
@@ -2932,17 +2942,17 @@ class UserManager {
if (Database::num_rows($result) > 0) {
while ($row = Database::fetch_array($result,'ASSOC')) {
if (isset($return[$row['user_id']]) && !empty($return[$row['user_id']]['tag'])) {
- $row['tag'] = $return[$row['user_id']]['tag'].' '.Display::url($row['tag'] , api_get_path(WEB_PATH).'main/social/search.php?q='.$row['tag'] , array('class'=>'tag'));
+ $row['tag'] = $return[$row['user_id']]['tag'].' '.Display::url($row['tag'] , api_get_path(WEB_PATH).'main/social/search.php?q='.$row['tag'] , array('class'=>'tag'));
} else {
$row['tag'] = Display::url($row['tag'], api_get_path(WEB_PATH).'main/social/search.php?q='.$row['tag'], array('class'=>'tag'));
}
- $return[$row['user_id']] = $row;
+ $return[$row['user_id']] = $row;
}
}
$keyword = $tag;
$sql = "SELECT u.user_id, u.username, firstname, lastname, email, picture_uri FROM $user_table u";
-
+
if (api_get_multiple_access_url()) {
$access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
@@ -2996,12 +3006,12 @@ class UserManager {
*/
public static function get_search_form($query) {
return '
-
','id',$student_id ,':',$last_login_date,'
'; + Display :: display_normal_message(get_lang('UserDeleted')); + //avec validation: + // $result .= ''.Display::return_icon('delete.gif', get_lang('Delete')).''; + echo '','id',$student_id ,':',$last_login_date,'
'; } } } @@ -3490,28 +3500,28 @@ class UserManager { } return false; } - + function set_extra_fields_in_form($form, $extra_data, $form_name, $admin_permissions = false) { $user_id = intval($user_id); - + // EXTRA FIELDS $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC'); $jquery_ready_content = null; - + foreach ($extra as $field_details) { - + if (!$admin_permissions) { if ($field_details[6] == 0) { continue; } } - + switch($field_details[2]) { case self::USER_FIELD_TYPE_TEXT: $form->addElement('text', 'extra_'.$field_details[1], $field_details[3], array('size' => 40)); $form->applyFilter('extra_'.$field_details[1], 'stripslashes'); $form->applyFilter('extra_'.$field_details[1], 'trim'); - + if (!$admin_permissions) { if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); } @@ -3540,7 +3550,7 @@ class UserManager { $get_lang_variables = false; if (in_array($field_details[1], array('mail_notify_message','mail_notify_invitation', 'mail_notify_group_message'))) { $get_lang_variables = true; - } + } $options = array(); foreach($field_details[9] as $option_id => $option_details) { //$options[$option_details[1]] = $option_details[2]; @@ -3600,7 +3610,7 @@ class UserManager { $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1], '', $values[0], ''); $group[] =& HTML_QuickForm::createElement('select', 'extra_'.$field_details[1].'*', '', $values['*'], ''); $form->addGroup($group, 'extra_'.$field_details[1], $field_details[3], ' '); - + if (!$admin_permissions) { if ($field_details[7] == 0) $form->freeze('extra_'.$field_details[1]); } @@ -3679,7 +3689,7 @@ EOF; $return['jquery_ready_content'] = $jquery_ready_content; return $return; } - + function get_user_field_types() { $types = array(); $types[self::USER_FIELD_TYPE_TEXT] = get_lang('FieldTypeText'); @@ -3703,7 +3713,7 @@ EOF; if (!self::is_admin($user_id)) { $sql = "INSERT INTO $table_admin SET user_id = '".$user_id."'"; Database::query($sql); - } + } } function remove_user_admin($user_id) { diff --git a/main/install/db_main.sql b/main/install/db_main.sql index d707c0bfa5..874e06973e 100644 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -714,6 +714,7 @@ VALUES ('extendedprofile_registrationrequired', 'mydiplomas', 'checkbox','User','false', 'ExtendedProfileRegistrationRequiredTitle','ExtendedProfileRegistrationRequiredComment', NULL, 'MyDiplomas', 0), ('extendedprofile_registrationrequired', 'myteach', 'checkbox','User','false', 'ExtendedProfileRegistrationRequiredTitle','ExtendedProfileRegistrationRequiredComment', NULL, 'MyTeach', 0), ('extendedprofile_registrationrequired', 'mypersonalopenarea', 'checkbox','User','false', 'ExtendedProfileRegistrationRequiredTitle','ExtendedProfileRegistrationRequiredComment', NULL, 'MyPersonalOpenArea', 0), +('ldap_description', NULL, 'radio', 'LDAP', NULL, 'LdapDescriptionTitle', 'LdapDescriptionComment', NULL, NULL, 0), ('registration','phone','textfield','User','false','RegistrationRequiredFormsTitle','RegistrationRequiredFormsComment',NULL,'Phone', 0), ('add_users_by_coach',NULL,'radio','Session','false','AddUsersByCoachTitle','AddUsersByCoachComment',NULL,NULL, 0), ('extend_rights_for_coach',NULL,'radio','Security','false','ExtendRightsForCoachTitle','ExtendRightsForCoachComment',NULL,NULL, 0), @@ -1209,7 +1210,7 @@ VALUES ('platform_unsubscribe_allowed', 'false', 'No'), ('activate_email_template', 'true', 'Yes'), ('activate_email_template', 'false', 'No'), -('enable_iframe_inclusion', 'true', 'Yes'), + ('enable_iframe_inclusion', 'true', 'Yes'), ('enable_iframe_inclusion', 'false', 'No'), ('show_hot_courses', 'true', 'Yes'), ('show_hot_courses', 'false', 'No'), @@ -1539,6 +1540,14 @@ CREATE TABLE IF NOT EXISTS access_url_rel_course ( PRIMARY KEY (access_url_id, course_code) ); + +DROP TABLE IF EXISTS access_url_rel_session; +CREATE TABLE IF NOT EXISTS access_url_rel_session ( + access_url_id int unsigned NOT NULL, + session_id int unsigned NOT NULL, + PRIMARY KEY (access_url_id, session_id) +); + -- -- Table structure for table sys_calendar -- diff --git a/main/mySpace/index.php b/main/mySpace/index.php index e913ac2c18..6f4ff15703 100644 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -120,15 +120,15 @@ global $_configuration; if (api_is_allowed_to_create_course() || api_is_drh()) { } -if ($is_platform_admin) { +if ($is_platform_admin) { if ($view == 'admin') { $title = get_lang('CoachList'); $menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32), api_get_self().'?view=teacher'); - $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), api_get_self().'?view=admin'); - $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); - $menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php'); - } else { - $menu_items[] = Display::return_icon('teacher_na.png', get_lang('TeacherInterface'), array(), 32); + $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), api_get_self().'?view=admin'); + $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); + $menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php'); + } else { + $menu_items[] = Display::return_icon('teacher_na.png', get_lang('TeacherInterface'), array(), 32); $menu_items[] = Display::url(Display::return_icon('star.png', get_lang('AdminInterface'), array(), 32), api_get_self().'?view=admin'); $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php'); $menu_items[] = Display::url(Display::return_icon('statistics.png', get_lang('CurrentCoursesReport'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/current_courses.php'); @@ -147,47 +147,47 @@ echo '';
echo '';
-if ($display == 'useroverview' || $display == 'sessionoverview' || $display == 'courseoverview') {
+if ($display == 'useroverview' || $display == 'sessionoverview' || $display == 'courseoverview') {
echo '';
echo Display::return_icon("export_csv.png", get_lang('ExportAsCSV'),array(), 32);
- echo '';
+ echo '';
}
echo ''.Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'';
echo '';
-
+
if (!empty($session_id)) {
echo ''.Display::return_icon('back.png', get_lang('Back'),'',ICON_SIZE_MEDIUM).'';
} else {
echo Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
-}
+}
// Actions menu
$nb_menu_items = count($menu_items);
if (empty($session_id)) {
if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) {
- echo $item;
+ echo $item;
}
}
-}
+}
echo '
';
if (empty($session_id)) {
-
+
//Getting courses followed by a coach (No session courses)
- $courses = CourseManager::get_course_list_as_coach($user_id, false);
-
+ $courses = CourseManager::get_course_list_as_coach($user_id, false);
+
if (isset($courses[0])) {
- $courses = $courses[0];
+ $courses = $courses[0];
}
-
+
//Getting students from courses and courses in sessions (For show the total students that the user follows)
$students = CourseManager::get_user_list_from_courses_as_coach($user_id);
-
+
// Sessions for the coach
- $sessions = Tracking::get_sessions_coached_by_user($user_id);
-
- //If is drh
+ $sessions = Tracking::get_sessions_coached_by_user($user_id);
+
+ //If is drh
if ($is_drh) {
// get data for human resources manager
$students = array_keys(UserManager::get_users_followed_by_drh($user_id, STUDENT));
@@ -196,25 +196,25 @@ if (empty($session_id)) {
$courses[$course['code']] = $course['code'];
}
}
-
-
+
+
//Courses for the user
$count_courses = count($courses);
-
+
//Sessions for the user
$count_sessions = count($sessions);
-
- //Students
+
+ //Students
$nb_students = count($students);
-
-
+
+
$total_time_spent = 0;
$total_courses = 0;
$avg_total_progress = 0;
$avg_results_to_exercises = 0;
$nb_inactive_students = 0;
$nb_posts = $nb_assignments = 0;
-
+
if (!empty($students))
foreach ($students as $student_id) {
// inactive students
@@ -226,7 +226,7 @@ if (empty($session_id)) {
} else {
$nb_inactive_students++;
}
-
+
$total_time_spent += Tracking :: get_time_spent_on_the_platform($student_id);
$total_courses += Tracking :: count_course_per_student($student_id);
$avg_student_progress = $avg_student_score = 0;
@@ -238,10 +238,10 @@ if (empty($session_id)) {
$nb_assignments += Tracking :: count_student_assignments($student_id, $course_code);
$avg_student_progress += Tracking :: get_avg_student_progress($student_id, $course_code);
$myavg_temp = Tracking :: get_avg_student_score($student_id, $course_code);
-
+
if (is_numeric($myavg_temp))
$avg_student_score += $myavg_temp;
-
+
if ($nb_posts !== null && $nb_assignments !== null && $avg_student_progress !== null && $avg_student_score !== null) {
//if one of these scores is null, it means that we had a problem connecting to the right database, so don't count it in
$nb_courses_student++;
@@ -251,16 +251,16 @@ if (empty($session_id)) {
// average progress of the student
$avg_student_progress = $nb_courses_student ?$avg_student_progress / $nb_courses_student:0;
$avg_total_progress += $avg_student_progress;
-
+
// average test results of the student
$avg_student_score = $avg_student_score?$avg_student_score / $nb_courses_student:0;
$avg_results_to_exercises += $avg_student_score;
}
if ($nb_students > 0 && $view != 'admin') {
-
+
echo Display::page_subheader('.'students.gif)
'.get_lang('Students').' ('.$nb_students.')');
-
+
// average progress
$avg_total_progress = $avg_total_progress / $nb_students;
// average results to the tests
@@ -273,7 +273,7 @@ if (empty($session_id)) {
$nb_assignments = $nb_assignments / $nb_students;
// average posts
$nb_posts = $nb_posts / $nb_students;
-
+
if ($export_csv) {
//csv part
$csv_content[] = array(get_lang('Students', ''));
@@ -288,7 +288,7 @@ if (empty($session_id)) {
} else {
// html part
echo '
-
+
';
}
- /* End session overview */
+ /* End session overview */
$table -> display();
}
}
if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') {
-
+
echo ''.get_lang('DisplayCoaches').' | ';
echo ''.get_lang('DisplayUserOverview').'';
if ($display == 'useroverview') {
echo ' ( '.get_lang('ExportUserOverviewOptions').' )';
}
echo ' | '.get_lang('DisplaySessionOverview').'';
- echo ' | '.get_lang('DisplayCourseOverview').'';
- echo ' | '.get_lang('LPQuestionListResults').'';
+ echo ' | '.get_lang('DisplayCourseOverview').'';
+ echo ' | '.get_lang('LPQuestionListResults').'';
echo ' | '.get_lang('LPExerciseResultsBySession').'';
-
-
+
+
echo '
'; if ($display === 'useroverview') { MySpace::display_tracking_user_overview(); @@ -589,6 +589,16 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { WHERE scu.id_user=user_id AND scu.status=2 AND login_user_id=user_id GROUP BY user_id "; + if ($_configuration['multiple_access_urls']) { + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sqlCoachs = "SELECT DISTINCT scu.id_user as id_coach, user_id, lastname, firstname, MAX(login_date) as login_date + FROM $tbl_user, $tbl_session_course_user scu, $tbl_track_login , $tbl_session_rel_access_url session_rel_url + WHERE scu.id_user=user_id AND scu.status=2 AND login_user_id=user_id AND access_url_id = $access_url_id AND session_rel_url.session_id=id_session + GROUP BY user_id "; + } + } if (!empty($order[$tracking_column])) { $sqlCoachs .= "ORDER BY ".$order[$tracking_column]." ".$tracking_direction; } @@ -606,6 +616,18 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { GROUP BY user_id ORDER BY login_date '.$tracking_direction; + if ($_configuration['multiple_access_urls']) { + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sql_session_coach = 'SELECT session.id_coach, user_id, lastname, firstname, MAX(login_date) as login_date + FROM '.$tbl_user.','.$tbl_sessions.' as session,'.$tbl_track_login.' , '.$tbl_session_rel_access_url.' as session_rel_url + WHERE id_coach=user_id AND login_user_id=user_id AND access_url_id = '.$access_url_id.' AND session_rel_url.session_id=session.id + GROUP BY user_id + ORDER BY login_date '.$tracking_direction; + } + } + $result_sessions_coach = Database::query($sql_session_coach); $total_no_coaches += Database::num_rows($result_sessions_coach); while ($coach = Database::fetch_array($result_sessions_coach)) {
| '.get_lang('InactivesStudents').' | @@ -322,7 +322,7 @@ if (empty($session_id)) { '.get_lang('SeeStudentList').'
| '.get_lang('NbActiveSessions').' | @@ -499,28 +499,28 @@ if (api_is_allowed_to_create_course() && $view == 'teacher') {'.get_lang('NbCoursesPerSession').' | '.(is_null($nb_courses_per_session) ? '' : $nb_courses_per_session).' |
'; if ($display === 'useroverview') { MySpace::display_tracking_user_overview(); @@ -589,6 +589,16 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { WHERE scu.id_user=user_id AND scu.status=2 AND login_user_id=user_id GROUP BY user_id "; + if ($_configuration['multiple_access_urls']) { + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sqlCoachs = "SELECT DISTINCT scu.id_user as id_coach, user_id, lastname, firstname, MAX(login_date) as login_date + FROM $tbl_user, $tbl_session_course_user scu, $tbl_track_login , $tbl_session_rel_access_url session_rel_url + WHERE scu.id_user=user_id AND scu.status=2 AND login_user_id=user_id AND access_url_id = $access_url_id AND session_rel_url.session_id=id_session + GROUP BY user_id "; + } + } if (!empty($order[$tracking_column])) { $sqlCoachs .= "ORDER BY ".$order[$tracking_column]." ".$tracking_direction; } @@ -606,6 +616,18 @@ if ($is_platform_admin && $view == 'admin' && $display != 'yourstudents') { GROUP BY user_id ORDER BY login_date '.$tracking_direction; + if ($_configuration['multiple_access_urls']) { + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sql_session_coach = 'SELECT session.id_coach, user_id, lastname, firstname, MAX(login_date) as login_date + FROM '.$tbl_user.','.$tbl_sessions.' as session,'.$tbl_track_login.' , '.$tbl_session_rel_access_url.' as session_rel_url + WHERE id_coach=user_id AND login_user_id=user_id AND access_url_id = '.$access_url_id.' AND session_rel_url.session_id=session.id + GROUP BY user_id + ORDER BY login_date '.$tracking_direction; + } + } + $result_sessions_coach = Database::query($sql_session_coach); $total_no_coaches += Database::num_rows($result_sessions_coach); while ($coach = Database::fetch_array($result_sessions_coach)) {