diff --git a/main/inc/lib/text.lib.php b/main/inc/lib/text.lib.php index 114ff98099..c3a8fb0cec 100644 --- a/main/inc/lib/text.lib.php +++ b/main/inc/lib/text.lib.php @@ -396,10 +396,8 @@ function domesticate($input) { * transformation if it already contains some "\\1://\\2", $string); - $string = eregi_replace("([a-z0-9_.-]+@[a-z0-9.-]+)", "\\1", $string); - } - return $string; +function make_clickable($text) { + $regex = '/(\S+@\S+\.\S+)/i'; + $replace = "$1"; + $result = preg_replace($regex, $replace, $text); + return preg_replace('@(https?://([-\w\.]+[-\w])+(:\d+)?(/([\w/_\.#-]*(\?\S+)?[^\.\s])?)?)@', '$1', $result); } /** @@ -431,38 +425,6 @@ function make_clickable($string) { * @version March 2OO6 */ function text_filter($input, $filter = true) { - - //$input = stripslashes($input); - - if ($filter) { - // *** parse [tex]...[/tex] tags *** // - // which will return techexplorer or image html depending on the capabilities of the - // browser of the user (using some javascript that checks if the browser has the TechExplorer plugin installed or not) - //$input = _text_parse_tex($input); - // *** parse [teximage]...[/teximage] tags *** // - // these force the gif rendering of LaTeX using the mimetex gif renderer - //$input=_text_parse_tex_image($input); - // *** parse [texexplorer]...[/texexplorer] tags *** // - // these force the texeplorer LaTeX notation - //$input = _text_parse_texexplorer($input); - // *** Censor Words *** // - // censor words. This function removes certain words by [censored] - // this can be usefull when the campus is open to the world. - // $input=text_censor_words($input); - // *** parse [?]...[/?] tags *** // - // for the glossary tool - //$input = _text_parse_glossary($input); - // parse [wiki]...[/wiki] tags - // this is for the coolwiki plugin. - // $input=text_parse_wiki($input); - // parse [tool]...[/tool] tags - // this parse function adds a link to a certain tool - // $input=text_parse_tool($input); - // parse [user]...[/user] tags - // parse [email]...[/email] tags - // parse [code]...[/code] tags - } - return $input; } @@ -476,17 +438,12 @@ function text_filter($input, $filter = true) { * @version June 2004 */ function _text_parse_tex($textext) { - //$textext = str_replace(array ("[tex]", "[/tex]"), array ('[*****]', '[/*****]'), $textext); - //$textext = stripslashes($texttext); - $input_array = preg_split("/(\[tex]|\[\/tex])/", $textext, -1, PREG_SPLIT_DELIM_CAPTURE); - foreach ($input_array as $key => $value) { if ($key > 0 && $input_array[$key - 1] == '[tex]' AND $input_array[$key + 1] == '[/tex]') { $input_array[$key] = latex_gif_renderer($value); unset($input_array[$key - 1]); unset($input_array[$key + 1]); - //echo 'LaTeX:
'; } } @@ -511,7 +468,6 @@ function _text_parse_tool($input) { // An array with all the valid tools $tools[] = array(TOOL_ANNOUNCEMENT, 'announcements/announcements.php'); $tools[] = array(TOOL_CALENDAR_EVENT, 'calendar/agenda.php'); - // Check if the name between the [tool] [/tool] tags is a valid one } @@ -664,12 +620,12 @@ function _text_parse_texexplorer($textext) { } /** - * This function splits the string into words and then joins them back together again one by one. - * Example: "Test example of a long string" - * substrwords(5) = Test ... * - * @param string + * This function splits the string into words and then joins them back together again one by one. + * Example: "Test example of a long string" + * substrwords(5) = Test ... * + * @param string * @param int the max number of character - * @param string how the string will be end + * @param string how the string will be end * @return a reduce string */ function substrwords($text, $maxchar, $end = '...') { diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index ed46cbd94d..0cd736ccfd 100644 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -10,7 +10,7 @@ /** * Code */ -define('SESSION_LINK_TARGET','_self'); +define('SESSION_LINK_TARGET', '_self'); require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.lib.php'; //require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php'; moved to autoload @@ -20,19 +20,80 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php'; * Class * @package chamilo.library */ -class Tracking { +class Tracking +{ - /** - * Calculates the time spent on the platform by a user - * @param int User id - * @param string type of time filter: 'last_week' or 'custom' - * @param strgin start date date('Y-m-d H:i:s') + public static function get_group_reporting($course_id, $group_id = null, $type = 'all', $start = 0, $limit = 1000, $sidx = 1, $sord = 'desc', $where_condition = array()) + { + if (empty($course_id)) { + return null; + } + $course_info = api_get_course_info_by_id($course_id); + $table_group = Database :: get_course_table(TABLE_GROUP); + $course_id = intval($course_id); + + $select = ' * '; + if ($type == 'count') { + $select = ' count(id) as count '; + } + + $default_where = array('c_id = ? ' => array($course_id)); + + $result = Database::select($select, $table_group, array( + 'limit' => " $start, $limit", + 'where' => $default_where, + 'order' => "$sidx $sord") + ); + + if ($type == 'count') { + return $result[0]['count']; + } + $parsed_result = array(); + if (!empty($result)) { + foreach ($result as $group) { + $users = GroupManager::get_users($group['id'], true); + + $time = null; + $avg_student_score = 0; + $avg_student_progress = 0; + $work = null; + $messages = null; + + foreach ($users as $user_data) { + $time += Tracking::get_time_spent_on_the_course($user_data['user_id'], $course_info['code'], 0); + $avg_student_score += Tracking::get_avg_student_score($user_data['user_id'], $course_info['code'], array(), 0); + $avg_student_progress += Tracking::get_avg_student_progress($user_data['user_id'], $course_info['code'], array(), 0); + $work += Tracking::count_student_assignments($user_data['user_id'], $course_info['code'], 0); + $messages += Tracking::count_student_messages($user_data['user_id'], $course_info['code'], 0); + } + + $group_item = array( + 'id' => $group['id'], + 'name' => $group['name'], + 'time' => api_time_to_hms($time), + 'progress' => $avg_student_progress, + 'score' => $avg_student_score, + 'works' => $work, + 'messages' => $messages, + ); + $parsed_result[] = $group_item; + } + } + return $parsed_result; + } + + /** + * Calculates the time spent on the platform by a user + * @param int User id + * @param string type of time filter: 'last_week' or 'custom' + * @param strgin start date date('Y-m-d H:i:s') * @param strgin end date date('Y-m-d H:i:s') - * @return timestamp $nb_seconds - */ - public static function get_time_spent_on_the_platform($user_id, $time_filter = 'last_7_days', $start_date = null, $end_date = null) { - $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); - $condition_time = null; + * @return timestamp $nb_seconds + */ + public static function get_time_spent_on_the_platform($user_id, $time_filter = 'last_7_days', $start_date = null, $end_date = null) + { + $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); + $condition_time = null; if (empty($time_filter)) { $time_filter = 'last_7_days'; } @@ -48,209 +109,208 @@ class Tracking { $new_date = strtotime('-30 day'); $new_date = api_get_utc_datetime($new_date); $condition_time = ' AND (login_date >= "'.$new_date.'" AND logout_date <= "'.$today.'") '; - break; + break; case 'custom': $start_date = Database::escape_string($start_date); $end_date = Database::escape_string($end_date); - if (!empty($start_date) && !empty($end_date)) { + if (!empty($start_date) && !empty($end_date)) { $condition_time = ' AND (login_date >= "'.$start_date.'" AND logout_date <= "'.$end_date.'" ) '; } else { - if (!empty($start_date)) { + if (!empty($start_date)) { $condition_time = ' AND (login_date >= "'.$start_date.'" ) '; } - if (!empty($end_date)) { + if (!empty($end_date)) { $condition_time = ' AND (logout_date <= "'.$end_date.'" ) '; } } break; } - $sql = 'SELECT login_date, logout_date FROM '.$tbl_track_login.' + $sql = 'SELECT login_date, logout_date FROM '.$tbl_track_login.' WHERE login_user_id = '.intval($user_id).$condition_time; - $rs = Database::query($sql); - - $nb_seconds = 0; - - $wrong_logout_dates = false; - - while ($a_connections = Database::fetch_array($rs)) { - - $s_login_date = $a_connections["login_date"]; - $s_logout_date = $a_connections["logout_date"]; - - $i_timestamp_login_date = strtotime($s_login_date); - $i_timestamp_logout_date = strtotime($s_logout_date); - - if ($i_timestamp_logout_date > 0) { - // @TODO YW 20110708: for some reason the result here is often - // negative, resulting in a negative time total. Considering the - // logout_date is > 0, this can only mean that the database - // contains items where the login_date is higher (=later) than - // the logout date for a specific connexion. This has to be - // analyzed and fixed. Also see the get_time_spent_on_the_course - // for SQL summing. - $nb_seconds += abs($i_timestamp_logout_date - $i_timestamp_login_date); - } else { // there are wrong datas in db, then we can't give a wrong time - $wrong_logout_dates = true; - } - - } - - if($nb_seconds>0 || !$wrong_logout_dates) - { - return $nb_seconds; - } - else - { - return -1; //-1 means we have wrong datas in the db - } - } - - /** - * Calculates the time spent on the course - * @param integer User id - * @param string Course code - * @param int Session id (optional) - * @return timestamp Time in seconds - */ - public static function get_time_spent_on_the_course($user_id, $course_code, $session_id = 0) { - // protect datas - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - $tbl_track_course = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); - - $condition_user = ""; - if (is_array($user_id)) { - $user_id = array_map('intval', $user_id); - $condition_user = " AND user_id IN (".implode(',',$user_id).") "; - } else { - $user_id = intval($user_id); - $condition_user = " AND user_id = '$user_id' "; - } - - $sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds + $rs = Database::query($sql); + + $nb_seconds = 0; + + $wrong_logout_dates = false; + + while ($a_connections = Database::fetch_array($rs)) { + + $s_login_date = $a_connections["login_date"]; + $s_logout_date = $a_connections["logout_date"]; + + $i_timestamp_login_date = strtotime($s_login_date); + $i_timestamp_logout_date = strtotime($s_logout_date); + + if ($i_timestamp_logout_date > 0) { + // @TODO YW 20110708: for some reason the result here is often + // negative, resulting in a negative time total. Considering the + // logout_date is > 0, this can only mean that the database + // contains items where the login_date is higher (=later) than + // the logout date for a specific connexion. This has to be + // analyzed and fixed. Also see the get_time_spent_on_the_course + // for SQL summing. + $nb_seconds += abs($i_timestamp_logout_date - $i_timestamp_login_date); + } else { // there are wrong datas in db, then we can't give a wrong time + $wrong_logout_dates = true; + } + } + + if ($nb_seconds > 0 || !$wrong_logout_dates) { + return $nb_seconds; + } else { + return -1; //-1 means we have wrong datas in the db + } + } + + /** + * Calculates the time spent on the course + * @param integer User id + * @param string Course code + * @param int Session id (optional) + * @return timestamp Time in seconds + */ + public static function get_time_spent_on_the_course($user_id, $course_code, $session_id = 0) + { + // protect datas + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + $tbl_track_course = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + + $condition_user = ""; + if (is_array($user_id)) { + $user_id = array_map('intval', $user_id); + $condition_user = " AND user_id IN (".implode(',', $user_id).") "; + } else { + $user_id = intval($user_id); + $condition_user = " AND user_id = '$user_id' "; + } + + $sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds FROM $tbl_track_course WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) AND course_code='$course_code' AND session_id = '$session_id' $condition_user"; $rs = Database::query($sql); - $row = Database::fetch_array($rs); - return $row['nb_seconds']; - } - - /** - * Get first connection date for a student - * @param int Student id - * @return string|bool Date format long without day or false if there are no connections - */ - public static function get_first_connection_date($student_id) { - $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); - $sql = 'SELECT login_date FROM ' . $tbl_track_login . ' - WHERE login_user_id = ' . intval($student_id) . ' + $row = Database::fetch_array($rs); + return $row['nb_seconds']; + } + + /** + * Get first connection date for a student + * @param int Student id + * @return string|bool Date format long without day or false if there are no connections + */ + public static function get_first_connection_date($student_id) + { + $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); + $sql = 'SELECT login_date FROM '.$tbl_track_login.' + WHERE login_user_id = '.intval($student_id).' ORDER BY login_date ASC LIMIT 0,1'; - $rs = Database::query($sql); - if(Database::num_rows($rs)>0) { - if ($first_login_date = Database::result($rs, 0, 0)) { - return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); - } - } - return false; - } - - - /** - * Get las connection date for a student - * @param int Student id - * @param bool Show a warning message (optional) - * @param bool True for returning results in timestamp (optional) - * @return string|int|bool Date format long without day, false if there are no connections or timestamp if parameter $return_timestamp is true - */ - public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) { - $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); - $sql = 'SELECT login_date FROM ' . $tbl_track_login . ' - WHERE login_user_id = ' . intval($student_id) . ' + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + if ($first_login_date = Database::result($rs, 0, 0)) { + return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT, date_default_timezone_get()); + } + } + return false; + } + + /** + * Get las connection date for a student + * @param int Student id + * @param bool Show a warning message (optional) + * @param bool True for returning results in timestamp (optional) + * @return string|int|bool Date format long without day, false if there are no connections or timestamp if parameter $return_timestamp is true + */ + public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) + { + $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LOGIN); + $sql = 'SELECT login_date FROM '.$tbl_track_login.' + WHERE login_user_id = '.intval($student_id).' ORDER BY login_date DESC LIMIT 0,1'; - $rs = Database::query($sql); - if(Database::num_rows($rs)>0) { - if ($last_login_date = Database::result($rs, 0, 0)) { - $last_login_date = api_get_local_time($last_login_date); - if ($return_timestamp) { - return api_strtotime($last_login_date,'UTC'); - } else { - if (!$warning_message) { - return api_format_date($last_login_date, DATE_FORMAT_SHORT); - } else { - $timestamp = api_strtotime($last_login_date,'UTC'); - $currentTimestamp = time(); - - //If the last connection is > than 7 days, the text is red - //345600 = 7 days in seconds - if ($currentTimestamp - $timestamp > 604800) { - return '' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . ''; - } else { - return api_format_date($last_login_date, DATE_FORMAT_SHORT); - } - } - } - } - } - return false; - } - - - /** - * Get first user's connection date on the course - * @param int User id - * @param string Course code - * @param int Session id (optional, default=0) - * @return string|bool Date with format long without day or false if there is no date - */ - public static function get_first_connection_date_on_the_course($student_id, $course_code, $session_id = 0, $convert_date = true) { - - // protect data - $student_id = intval($student_id); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); - $sql = 'SELECT login_course_date FROM '.$tbl_track_login.' + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + if ($last_login_date = Database::result($rs, 0, 0)) { + $last_login_date = api_get_local_time($last_login_date); + if ($return_timestamp) { + return api_strtotime($last_login_date, 'UTC'); + } else { + if (!$warning_message) { + return api_format_date($last_login_date, DATE_FORMAT_SHORT); + } else { + $timestamp = api_strtotime($last_login_date, 'UTC'); + $currentTimestamp = time(); + + //If the last connection is > than 7 days, the text is red + //345600 = 7 days in seconds + if ($currentTimestamp - $timestamp > 604800) { + return ''.api_format_date($last_login_date, DATE_FORMAT_SHORT).''; + } else { + return api_format_date($last_login_date, DATE_FORMAT_SHORT); + } + } + } + } + } + return false; + } + + /** + * Get first user's connection date on the course + * @param int User id + * @param string Course code + * @param int Session id (optional, default=0) + * @return string|bool Date with format long without day or false if there is no date + */ + public static function get_first_connection_date_on_the_course($student_id, $course_code, $session_id = 0, $convert_date = true) + { + + // protect data + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + $sql = 'SELECT login_course_date FROM '.$tbl_track_login.' WHERE user_id = '.$student_id.' AND course_code = "'.$course_code.'" AND session_id = '.$session_id.' ORDER BY login_course_date ASC LIMIT 0,1'; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - if ($first_login_date = Database::result($rs, 0, 0)) { - if ($convert_date) { - return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT); - } else { - return $first_login_date; - } - } - } - return false; - } - - /** - * Get last user's connection date on the course - * @param int User id - * @param string Course code - * @param int Session id (optional, default=0) - * @return string|bool Date with format long without day or false if there is no date - */ - public static function get_last_connection_date_on_the_course($student_id, $course_code, $session_id = 0, $convert_date = true) { - - // protect data - $student_id = intval($student_id); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - $tbl_track_e_course_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); - $sql = 'SELECT login_course_date + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + if ($first_login_date = Database::result($rs, 0, 0)) { + if ($convert_date) { + return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT); + } else { + return $first_login_date; + } + } + } + return false; + } + + /** + * Get last user's connection date on the course + * @param int User id + * @param string Course code + * @param int Session id (optional, default=0) + * @return string|bool Date with format long without day or false if there is no date + */ + public static function get_last_connection_date_on_the_course($student_id, $course_code, $session_id = 0, $convert_date = true) + { + + // protect data + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + $tbl_track_e_course_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + $sql = 'SELECT login_course_date FROM '.$tbl_track_e_course_access.' WHERE user_id = '.$student_id.' AND course_code = "'.$course_code.'" AND @@ -258,9 +318,9 @@ class Tracking { ORDER BY login_course_date DESC LIMIT 0,1'; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - if ($last_login_date = Database::result($rs, 0, 0)) { + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + if ($last_login_date = Database::result($rs, 0, 0)) { if (empty($last_login_date) || $last_login_date == '0000-00-00 00:00:00') { return false; } @@ -268,153 +328,156 @@ class Tracking { //see #5736 $last_login_date_timestamp = api_strtotime($last_login_date); - $now = time(); - //If the last connection is > than 7 days, the text is red - //345600 = 7 days in seconds - if ($now - $last_login_date_timestamp > 604800) { - if ($convert_date) { + $now = time(); + //If the last connection is > than 7 days, the text is red + //345600 = 7 days in seconds + if ($now - $last_login_date_timestamp > 604800) { + if ($convert_date) { $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); - $icon = api_is_allowed_to_edit() ? ' ': null; - return $icon. Display::label($last_login_date, 'warning'); - } else { - return $last_login_date; - } - } else { - if ($convert_date) { - return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); - } else { - return $last_login_date; - } - } - } - } - return false; - } - - /** - * Get count of the connections to the course during a specified period - * @param string Course code - * @param int Session id (optional) - * @param int Datetime from which to collect data (defaults to 0) - * @param int Datetime to which to collect data (defaults to now) - * @return int count connections - */ - public static function get_course_connections_count($course_code, $session_id = 0, $start = 0, $stop = null) { - - // protect data - $month_filter = ''; - if ($start < 0) { - $start = 0; - } - if (!isset($stop) or ($stop < 0)) { - $stop = api_get_utc_datetime(); - } - $month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' "; - - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - $count = 0; - - $tbl_track_e_course_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); - $sql = "SELECT count(*) as count_connections FROM $tbl_track_e_course_access WHERE course_code = '$course_code' AND session_id = $session_id $month_filter"; - $rs = Database::query($sql); - if (Database::num_rows($rs)>0) { - $row = Database::fetch_object($rs); - $count = $row->count_connections; - } - return $count; - } - - /** - * Get count courses per student - * @param int Student id - * @param bool Include sessions (optional) - * @return int count courses - */ - public static function count_course_per_student($user_id, $include_sessions = true) { - - $user_id = intval($user_id); - $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); - $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - - $sql = 'SELECT DISTINCT course_code - FROM ' . $tbl_course_rel_user . ' - WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH; - $rs = Database::query($sql); - $nb_courses = Database::num_rows($rs); - - if ($include_sessions) { - $sql = 'SELECT DISTINCT course_code - FROM ' . $tbl_session_course_rel_user . ' - WHERE id_user = ' . $user_id; - $rs = Database::query($sql); - $nb_courses += Database::num_rows($rs); - } - - return $nb_courses; - } - - /** - * Gets the score average from all tests in a course by student - * - * @param mixed Student(s) id - * @param string Course code - * @param int Exercise id (optional), filtered by exercise - * @param int Session id (optional), if param $session_id is null it'll return results including sessions, 0 = session is not filtered - * @return string value (number %) Which represents a round integer about the score average. - */ - public static function get_avg_student_exercise_score($student_id, $course_code, $exercise_id = 0, $session_id = null) { - $course_info = api_get_course_info($course_code); - - if (!empty($course_info)) { - // table definition - $tbl_course_quiz = Database::get_course_table(TABLE_QUIZ_TEST); - $tbl_stats_exercise = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); - - // Compose a filter based on optional exercise given - $condition_quiz = ""; - if (!empty($exercise_id)) { - $exercise_id = intval($exercise_id); - $condition_quiz =" AND id = $exercise_id "; - } - - // Compose a filter based on optional session id given - $condition_session = ""; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = " AND session_id = $session_id "; - } - $sql = "SELECT count(id) FROM $tbl_course_quiz + $icon = api_is_allowed_to_edit() ? ' ' : null; + return $icon.Display::label($last_login_date, 'warning'); + } else { + return $last_login_date; + } + } else { + if ($convert_date) { + return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); + } else { + return $last_login_date; + } + } + } + } + return false; + } + + /** + * Get count of the connections to the course during a specified period + * @param string Course code + * @param int Session id (optional) + * @param int Datetime from which to collect data (defaults to 0) + * @param int Datetime to which to collect data (defaults to now) + * @return int count connections + */ + public static function get_course_connections_count($course_code, $session_id = 0, $start = 0, $stop = null) + { + + // protect data + $month_filter = ''; + if ($start < 0) { + $start = 0; + } + if (!isset($stop) or ($stop < 0)) { + $stop = api_get_utc_datetime(); + } + $month_filter = " AND login_course_date > '$start' AND login_course_date < '$stop' "; + + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + $count = 0; + + $tbl_track_e_course_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + $sql = "SELECT count(*) as count_connections FROM $tbl_track_e_course_access WHERE course_code = '$course_code' AND session_id = $session_id $month_filter"; + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + $row = Database::fetch_object($rs); + $count = $row->count_connections; + } + return $count; + } + + /** + * Get count courses per student + * @param int Student id + * @param bool Include sessions (optional) + * @return int count courses + */ + public static function count_course_per_student($user_id, $include_sessions = true) + { + + $user_id = intval($user_id); + $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); + $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + + $sql = 'SELECT DISTINCT course_code + FROM '.$tbl_course_rel_user.' + WHERE user_id = '.$user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH; + $rs = Database::query($sql); + $nb_courses = Database::num_rows($rs); + + if ($include_sessions) { + $sql = 'SELECT DISTINCT course_code + FROM '.$tbl_session_course_rel_user.' + WHERE id_user = '.$user_id; + $rs = Database::query($sql); + $nb_courses += Database::num_rows($rs); + } + + return $nb_courses; + } + + /** + * Gets the score average from all tests in a course by student + * + * @param mixed Student(s) id + * @param string Course code + * @param int Exercise id (optional), filtered by exercise + * @param int Session id (optional), if param $session_id is null it'll return results including sessions, 0 = session is not filtered + * @return string value (number %) Which represents a round integer about the score average. + */ + public static function get_avg_student_exercise_score($student_id, $course_code, $exercise_id = 0, $session_id = null) + { + $course_info = api_get_course_info($course_code); + + if (!empty($course_info)) { + // table definition + $tbl_course_quiz = Database::get_course_table(TABLE_QUIZ_TEST); + $tbl_stats_exercise = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); + + // Compose a filter based on optional exercise given + $condition_quiz = ""; + if (!empty($exercise_id)) { + $exercise_id = intval($exercise_id); + $condition_quiz = " AND id = $exercise_id "; + } + + // Compose a filter based on optional session id given + $condition_session = ""; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = " AND session_id = $session_id "; + } + $sql = "SELECT count(id) FROM $tbl_course_quiz WHERE c_id = {$course_info['real_id']} AND active <> -1 $condition_quiz "; - $count_quiz = Database::fetch_row(Database::query($sql)); - - if (!empty($count_quiz[0]) && !empty($student_id)) { - $condition_user = ""; - if (is_array($student_id)) { - $condition_user = " AND exe_user_id IN (".implode(',',$student_id).") "; - } else { - $condition_user = " AND exe_user_id = '$student_id' "; - } - - if (empty($exercise_id)) { - $sql = "SELECT id FROM $tbl_course_quiz + $count_quiz = Database::fetch_row(Database::query($sql)); + + if (!empty($count_quiz[0]) && !empty($student_id)) { + $condition_user = ""; + if (is_array($student_id)) { + $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") "; + } else { + $condition_user = " AND exe_user_id = '$student_id' "; + } + + if (empty($exercise_id)) { + $sql = "SELECT id FROM $tbl_course_quiz WHERE c_id = {$course_info['real_id']} AND active <> -1 $condition_quiz"; $result = Database::query($sql); $exercise_list = array(); - $exercise_id = null; + $exercise_id = null; if (Database::num_rows($result)) { while ($row = Database::fetch_array($result)) { $exercise_list[] = $row['id']; } } if (!empty($exercise_list)) { - $exercise_id = implode("','",$exercise_list); + $exercise_id = implode("','", $exercise_list); } - } + } - $count_quiz = Database::fetch_row(Database::query($sql)); + $count_quiz = Database::fetch_row(Database::query($sql)); - $sql = "SELECT SUM(exe_result/exe_weighting*100) as avg_score, COUNT(*) as num_attempts + $sql = "SELECT SUM(exe_result/exe_weighting*100) as avg_score, COUNT(*) as num_attempts FROM $tbl_stats_exercise WHERE exe_exo_id IN ('".$exercise_id."') $condition_user AND @@ -424,50 +487,52 @@ class Tracking { orig_lp_item_id = 0 $condition_session ORDER BY exe_date DESC"; - $res = Database::query($sql); - $row = Database::fetch_array($res); - $quiz_avg_score = 0; - - if (!empty($row['avg_score'])) { - $quiz_avg_score = round($row['avg_score'],2); - } - - if(!empty($row['num_attempts'])) { - $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2); - } - if (is_array($student_id)) { - $quiz_avg_score = round($quiz_avg_score / count($student_id), 2); - } - return $quiz_avg_score; - } - } - return null; - } - - - /** - * Get count student's exercise COMPLETED attempts - * @param int Student id - * @param string Course code - * @param int Exercise id - * @param int Learning path id (optional), for showing attempts inside a learning path $lp_id and $lp_item_id params are required. - * @param int Learning path item id (optional), for showing attempts inside a learning path $lp_id and $lp_item_id params are required. - * @return int count of attempts - */ - public static function count_student_exercise_attempts($student_id, $course_code, $exercise_id, $lp_id = 0, $lp_item_id = 0, $session_id = 0) { - $course_code = Database::escape_string($course_code); - $student_id = intval($student_id); - $exercise_id = intval($exercise_id); - $session_id = intval($session_id); - $count_attempts = 0; - - if (!empty($lp_id)) $lp_id = intval($lp_id); - if (!empty($lp_item_id)) $lp_id = intval($lp_item_id); - - - $tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); - - $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercices AS ex + $res = Database::query($sql); + $row = Database::fetch_array($res); + $quiz_avg_score = 0; + + if (!empty($row['avg_score'])) { + $quiz_avg_score = round($row['avg_score'], 2); + } + + if (!empty($row['num_attempts'])) { + $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2); + } + if (is_array($student_id)) { + $quiz_avg_score = round($quiz_avg_score / count($student_id), 2); + } + return $quiz_avg_score; + } + } + return null; + } + + /** + * Get count student's exercise COMPLETED attempts + * @param int Student id + * @param string Course code + * @param int Exercise id + * @param int Learning path id (optional), for showing attempts inside a learning path $lp_id and $lp_item_id params are required. + * @param int Learning path item id (optional), for showing attempts inside a learning path $lp_id and $lp_item_id params are required. + * @return int count of attempts + */ + public static function count_student_exercise_attempts($student_id, $course_code, $exercise_id, $lp_id = 0, $lp_item_id = 0, $session_id = 0) + { + $course_code = Database::escape_string($course_code); + $student_id = intval($student_id); + $exercise_id = intval($exercise_id); + $session_id = intval($session_id); + $count_attempts = 0; + + if (!empty($lp_id)) + $lp_id = intval($lp_id); + if (!empty($lp_item_id)) + $lp_id = intval($lp_item_id); + + + $tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); + + $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercices AS ex WHERE ex.exe_cours_id = '$course_code' AND ex.exe_exo_id = $exercise_id AND status = '' @@ -476,24 +541,24 @@ class Tracking { AND exe_user_id= $student_id AND session_id = $session_id "; - $rs = Database::query($sql); - $row = Database::fetch_row($rs); - $count_attempts = $row[0]; + $rs = Database::query($sql); + $row = Database::fetch_row($rs); + $count_attempts = $row[0]; - return $count_attempts; - } + return $count_attempts; + } /** * Get count student's exercise progress * @param int user id * @param string course code * @param int session id - */ - - static function get_exercise_student_progress($exercise_list, $user_id, $course_code, $session_id) { - $course_code = Database::escape_string($course_code); - $user_id = intval($user_id); - $session_id = intval($session_id); + */ + static function get_exercise_student_progress($exercise_list, $user_id, $course_code, $session_id) + { + $course_code = Database::escape_string($course_code); + $user_id = intval($user_id); + $session_id = intval($session_id); if (empty($exercise_list)) { return '0%'; @@ -515,243 +580,249 @@ class Tracking { $row = Database::fetch_row($rs); $count = $row[0]; } - $count = ($count != 0 ) ? 100*round(intval($count)/count($exercise_list), 2) .'%' : '0%'; + $count = ($count != 0 ) ? 100 * round(intval($count) / count($exercise_list), 2).'%' : '0%'; return $count; } - - static function get_exercise_student_average_best_attempt($exercise_list, $user_id, $course_code, $session_id) { + static function get_exercise_student_average_best_attempt($exercise_list, $user_id, $course_code, $session_id) + { $result = 0; if (!empty($exercise_list)) { foreach ($exercise_list as $exercise_data) { $exercise_id = $exercise_data['id']; - $best_attempt = get_best_attempt_exercise_results_per_user($user_id, $exercise_id , $course_code, $session_id); + $best_attempt = get_best_attempt_exercise_results_per_user($user_id, $exercise_id, $course_code, $session_id); if (!empty($best_attempt)) { - $result += $best_attempt['exe_result']/$best_attempt['exe_weighting']; + $result += $best_attempt['exe_result'] / $best_attempt['exe_weighting']; } } - $result = $result/ count($exercise_list); - $result = round($result, 2)*100; + $result = $result / count($exercise_list); + $result = round($result, 2) * 100; } return $result.'%'; - } - /** - * Returns the average student progress in the learning paths of the given - * course. - * @param int/array Student id(s) - * @param string Course code - * @param array Limit average to listed lp ids - * @param int Session id (optional), if parameter $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @param bool Will return an array of the type: [sum_of_progresses, number] if it is set to true - * @return double Average progress of the user in this course - */ - public static function get_avg_student_progress($student_id, $course_code, $lp_ids = array(), $session_id = null, $return_array = false) { - - // get the informations of the course - $course_info = api_get_course_info($course_code); - if (!empty($course_info)) { - // table definition - $tbl_course_lp_view = Database :: get_course_table(TABLE_LP_VIEW); - $tbl_course_lp = Database :: get_course_table(TABLE_LP_MAIN); - - // Compose a filter based on optional learning paths list given - $condition_lp = ""; - - if (!empty($lp_ids)) { - if (count($lp_ids) > 0) { - $condition_lp =" AND id IN(".implode(',',$lp_ids).") "; - } - } - $session_id = intval($session_id); - $sql = "SELECT id FROM $tbl_course_lp lp WHERE c_id = {$course_info['real_id']} $condition_lp"; - $res_count_lp = Database::query($sql); - // count the number of learning paths - $lp_id = array(); - while ($row_lp = Database::fetch_array($res_count_lp,'ASSOC')) { - $lp_id[] = $row_lp['id']; - } - $count_lp = count($lp_id); - - $avg_progress = 0; - //if there is at least one learning path and one student - if ($count_lp>0 && !empty($student_id)) { - $condition_user = ""; - if (is_array($student_id)) { - array_walk($student_id,'intval'); - $condition_user = " lp_view.user_id IN (".implode(',',$student_id).") AND "; - } else { - $student_id = intval($student_id); - $condition_user = " lp_view.user_id = '$student_id' AND "; - } - // Get last view for each student (in case of multi-attempt) - // Also filter on LPs of this session + /** + * Returns the average student progress in the learning paths of the given + * course. + * @param int/array Student id(s) + * @param string Course code + * @param array Limit average to listed lp ids + * @param int Session id (optional), if parameter $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @param bool Will return an array of the type: [sum_of_progresses, number] if it is set to true + * @return double Average progress of the user in this course + */ + public static function get_avg_student_progress($student_id, $course_code, $lp_ids = array(), $session_id = null, $return_array = false) + { + + // get the informations of the course + $course_info = api_get_course_info($course_code); + if (!empty($course_info)) { + // table definition + $tbl_course_lp_view = Database :: get_course_table(TABLE_LP_VIEW); + $tbl_course_lp = Database :: get_course_table(TABLE_LP_MAIN); + + // Compose a filter based on optional learning paths list given + $condition_lp = ""; + + if (!empty($lp_ids)) { + if (count($lp_ids) > 0) { + $condition_lp = " AND id IN(".implode(',', $lp_ids).") "; + } + } + $session_id = intval($session_id); + $sql = "SELECT id FROM $tbl_course_lp lp WHERE c_id = {$course_info['real_id']} $condition_lp"; + $res_count_lp = Database::query($sql); + // count the number of learning paths + $lp_id = array(); + while ($row_lp = Database::fetch_array($res_count_lp, 'ASSOC')) { + $lp_id[] = $row_lp['id']; + } + $count_lp = count($lp_id); + + $avg_progress = 0; + //if there is at least one learning path and one student + if ($count_lp > 0 && !empty($student_id)) { + $condition_user = ""; + if (is_array($student_id)) { + array_walk($student_id, 'intval'); + $condition_user = " lp_view.user_id IN (".implode(',', $student_id).") AND "; + } else { + $student_id = intval($student_id); + $condition_user = " lp_view.user_id = '$student_id' AND "; + } + // Get last view for each student (in case of multi-attempt) + // Also filter on LPs of this session $sql_maxes = "SELECT MAX(view_count), progress FROM $tbl_course_lp_view lp_view WHERE c_id = {$course_info['real_id']} AND $condition_user session_id = $session_id AND - lp_view.lp_id IN (".implode(',',$lp_id).") + lp_view.lp_id IN (".implode(',', $lp_id).") GROUP BY lp_id, user_id"; - $res_maxes = Database::query($sql_maxes); - $sum = 0; - while ($row_maxes = Database::fetch_array($res_maxes)) { - $sum += $row_maxes[1]; - } - // average progress = total sum divided by the number of views - // summed up. - $number_items = count($lp_id); - if ($number_items == 0) { - return 0; //not necessary to return something else if there is no view - } - if (!$return_array) { - $avg_progress = round($sum / $number_items, 1); - return $avg_progress; - } else { - return array($sum, $number_items); - } - } - } - return null; - } - - - /** - * This function gets: - * 1. The score average from all SCORM Test items in all LP in a course-> All the answers / All the max scores. - * 2. The score average from all Tests (quiz) in all LP in a course-> All the answers / All the max scores. - * 3. And finally it will return the average between 1. and 2. - * @todo improve performance, when loading 1500 users with 20 lps the script dies - * This function does not take the results of a Test out of a LP - * - * @param mixed Array of user ids or an user id - * @param string Course code - * @param array List of LP ids - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @param bool Returns an array of the type [sum_score, num_score] if set to true - * @param bool get only the latest attempts or ALL attempts - * @return string Value (number %) Which represents a round integer explain in got in 3. - */ - public static function get_avg_student_score($student_id, $course_code, $lp_ids = array(), $session_id = null, $return_array = false, $get_only_latest_attempt_results = false) { - $debug = false; - if (empty($lp_ids)) { - $debug = false; - } - - if ($debug) echo '

Tracking::get_avg_student_score

'; - // get global tables names - $tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); - $tbl_stats_attempts = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); - - $course = api_get_course_info($course_code); - - if (!empty($course)) { - - // get course tables names - $tbl_quiz_questions = Database :: get_course_table(TABLE_QUIZ_QUESTION); - $lp_table = Database :: get_course_table(TABLE_LP_MAIN); - $lp_item_table = Database :: get_course_table(TABLE_LP_ITEM); - $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW); - $lp_item_view_table = Database :: get_course_table(TABLE_LP_ITEM_VIEW); - - $course_id = $course['real_id']; - - // Compose a filter based on optional learning paths list given - - $condition_lp = ""; - if (count($lp_ids) > 0) { - $condition_lp =" AND id IN(".implode(',',$lp_ids).") "; - } - - // Compose a filter based on optional session id - $condition_session = ""; - - $session_id = intval($session_id); - - if (count($lp_ids) > 0) { - $condition_session = " AND session_id = $session_id "; - } else { - $condition_session = " WHERE session_id = $session_id "; - } - - // Check the real number of LPs corresponding to the filter in the - // database (and if no list was given, get them all) - - if (empty($session_id)) { - $sql = "SELECT DISTINCT(id), use_max_score FROM $lp_table WHERE c_id = $course_id AND session_id = 0 $condition_lp "; - } else { - $sql = "SELECT DISTINCT(id), use_max_score FROM $lp_table WHERE c_id = $course_id $condition_lp "; - } - - $res_row_lp = Database::query($sql); - $count_row_lp = Database::num_rows($res_row_lp); - - $lp_list = $use_max_score = array(); - while ($row_lp = Database::fetch_array($res_row_lp)) { - $lp_list[] = $row_lp['id']; - $use_max_score[$row_lp['id']] = $row_lp['use_max_score']; - } - - if ($debug) { - echo 'Use max score or not list '; var_dump($use_max_score); - } - - // Init local variables that will be used through the calculation - $progress = 0; - - // prepare filter on users - $condition_user1 = ""; - - if (is_array($student_id)) { - array_walk($student_id, 'intval'); - $condition_user1 =" AND user_id IN (".implode(',', $student_id).") "; - } else { - $condition_user1 =" AND user_id = $student_id "; - } - - if ($count_row_lp > 0 && !empty($student_id)) { - - // Getting latest LP result for a student - //@todo problem when a course have more than 1500 users - $sql = "SELECT MAX(view_count) as vc, id, progress, lp_id, user_id FROM $lp_view_table + + $res_maxes = Database::query($sql_maxes); + $sum = 0; + while ($row_maxes = Database::fetch_array($res_maxes)) { + $sum += $row_maxes[1]; + } + // average progress = total sum divided by the number of views + // summed up. + $number_items = count($lp_id); + + if ($number_items == 0) { + return 0; //not necessary to return something else if there is no view + } + if (!$return_array) { + $avg_progress = round($sum / $number_items, 1); + return $avg_progress; + } else { + return array($sum, $number_items); + } + } + } + return null; + } + + /** + * This function gets: + * 1. The score average from all SCORM Test items in all LP in a course-> All the answers / All the max scores. + * 2. The score average from all Tests (quiz) in all LP in a course-> All the answers / All the max scores. + * 3. And finally it will return the average between 1. and 2. + * @todo improve performance, when loading 1500 users with 20 lps the script dies + * This function does not take the results of a Test out of a LP + * + * @param mixed Array of user ids or an user id + * @param string Course code + * @param array List of LP ids + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @param bool Returns an array of the type [sum_score, num_score] if set to true + * @param bool get only the latest attempts or ALL attempts + * @return string Value (number %) Which represents a round integer explain in got in 3. + */ + public static function get_avg_student_score($student_id, $course_code, $lp_ids = array(), $session_id = null, $return_array = false, $get_only_latest_attempt_results = false) + { + $debug = false; + if (empty($lp_ids)) { + $debug = false; + } + + if ($debug) + echo '

Tracking::get_avg_student_score

'; + // get global tables names + $tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES); + $tbl_stats_attempts = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ATTEMPT); + + $course = api_get_course_info($course_code); + + if (!empty($course)) { + + // get course tables names + $tbl_quiz_questions = Database :: get_course_table(TABLE_QUIZ_QUESTION); + $lp_table = Database :: get_course_table(TABLE_LP_MAIN); + $lp_item_table = Database :: get_course_table(TABLE_LP_ITEM); + $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW); + $lp_item_view_table = Database :: get_course_table(TABLE_LP_ITEM_VIEW); + + $course_id = $course['real_id']; + + // Compose a filter based on optional learning paths list given + + $condition_lp = ""; + if (count($lp_ids) > 0) { + $condition_lp = " AND id IN(".implode(',', $lp_ids).") "; + } + + // Compose a filter based on optional session id + $condition_session = ""; + + $session_id = intval($session_id); + + if (count($lp_ids) > 0) { + $condition_session = " AND session_id = $session_id "; + } else { + $condition_session = " WHERE session_id = $session_id "; + } + + // Check the real number of LPs corresponding to the filter in the + // database (and if no list was given, get them all) + + if (empty($session_id)) { + $sql = "SELECT DISTINCT(id), use_max_score FROM $lp_table WHERE c_id = $course_id AND session_id = 0 $condition_lp "; + } else { + $sql = "SELECT DISTINCT(id), use_max_score FROM $lp_table WHERE c_id = $course_id $condition_lp "; + } + + $res_row_lp = Database::query($sql); + $count_row_lp = Database::num_rows($res_row_lp); + + $lp_list = $use_max_score = array(); + while ($row_lp = Database::fetch_array($res_row_lp)) { + $lp_list[] = $row_lp['id']; + $use_max_score[$row_lp['id']] = $row_lp['use_max_score']; + } + + if ($debug) { + echo 'Use max score or not list '; + var_dump($use_max_score); + } + + // Init local variables that will be used through the calculation + $progress = 0; + + // prepare filter on users + $condition_user1 = ""; + + if (is_array($student_id)) { + array_walk($student_id, 'intval'); + $condition_user1 = " AND user_id IN (".implode(',', $student_id).") "; + } else { + $condition_user1 = " AND user_id = $student_id "; + } + + if ($count_row_lp > 0 && !empty($student_id)) { + + // Getting latest LP result for a student + //@todo problem when a course have more than 1500 users + $sql = "SELECT MAX(view_count) as vc, id, progress, lp_id, user_id FROM $lp_view_table WHERE c_id = $course_id AND - lp_id IN (".implode(',',$lp_list).") + lp_id IN (".implode(',', $lp_list).") $condition_user1 AND session_id = $session_id GROUP BY lp_id, user_id"; - if ($debug) echo $sql; - $rs_last_lp_view_id = Database::query($sql); - - $global_result = 0; - - if (Database::num_rows($rs_last_lp_view_id) > 0) { - // Cycle through each line of the results (grouped by lp_id, user_id) - while ($row_lp_view = Database::fetch_array($rs_last_lp_view_id)) { - $count_items = 0; - $lp_partial_total = 0; - - $list = array(); - $lp_view_id = $row_lp_view['id']; - $progress = $row_lp_view['progress']; - $lp_id = $row_lp_view['lp_id']; - $user_id = $row_lp_view['user_id']; - if ($debug) echo '

LP id '.$lp_id.'

'; - - if ($get_only_latest_attempt_results) { - //Getting lp_items done by the user - $sql = "SELECT DISTINCT lp_item_id + if ($debug) + echo $sql; + $rs_last_lp_view_id = Database::query($sql); + + $global_result = 0; + + if (Database::num_rows($rs_last_lp_view_id) > 0) { + // Cycle through each line of the results (grouped by lp_id, user_id) + while ($row_lp_view = Database::fetch_array($rs_last_lp_view_id)) { + $count_items = 0; + $lp_partial_total = 0; + + $list = array(); + $lp_view_id = $row_lp_view['id']; + $progress = $row_lp_view['progress']; + $lp_id = $row_lp_view['lp_id']; + $user_id = $row_lp_view['user_id']; + if ($debug) + echo '

LP id '.$lp_id.'

'; + + if ($get_only_latest_attempt_results) { + //Getting lp_items done by the user + $sql = "SELECT DISTINCT lp_item_id FROM $lp_item_view_table WHERE c_id = $course_id AND lp_view_id = $lp_view_id ORDER BY lp_item_id"; - $res_lp_item = Database::query($sql); + $res_lp_item = Database::query($sql); - while ($row_lp_item = Database::fetch_array($res_lp_item,'ASSOC')) { - $my_lp_item_id = $row_lp_item['lp_item_id']; + while ($row_lp_item = Database::fetch_array($res_lp_item, 'ASSOC')) { + $my_lp_item_id = $row_lp_item['lp_item_id']; - //Getting the most recent attempt - $sql = "SELECT lp_iv.id as lp_item_view_id, + //Getting the most recent attempt + $sql = "SELECT lp_iv.id as lp_item_view_id, lp_iv.score as score, lp_i.max_score, lp_iv.max_score as max_score_item_view, @@ -768,15 +839,15 @@ class Tracking { lp_view_id = $lp_view_id ORDER BY view_count DESC LIMIT 1"; - $res_lp_item_result = Database::query($sql); - while ($row_max_score = Database::fetch_array($res_lp_item_result,'ASSOC')) { - $list[]= $row_max_score; - } - } - } else { - // For the currently analysed view, get the score and - // max_score of each item if it is a sco or a TOOL_QUIZ - $sql_max_score = "SELECT lp_iv.id as lp_item_view_id, + $res_lp_item_result = Database::query($sql); + while ($row_max_score = Database::fetch_array($res_lp_item_result, 'ASSOC')) { + $list[] = $row_max_score; + } + } + } else { + // For the currently analysed view, get the score and + // max_score of each item if it is a sco or a TOOL_QUIZ + $sql_max_score = "SELECT lp_iv.id as lp_item_view_id, lp_iv.score as score, lp_i.max_score, lp_iv.max_score as max_score_item_view, @@ -790,53 +861,56 @@ class Tracking { lp_i.c_id = $course_id AND (lp_i.item_type='sco' OR lp_i.item_type='".TOOL_QUIZ."') WHERE lp_view_id = $lp_view_id "; - if ($debug) echo $sql_max_score.'
'; - - $res_max_score = Database::query($sql_max_score); - - while ($row_max_score = Database::fetch_array($res_max_score,'ASSOC')) { - $list[]= $row_max_score; - } - } - - // Go through each scorable element of this view - - $score_of_scorm_calculate = 0; - - foreach ($list as $row_max_score) { - $max_score = $row_max_score['max_score']; //Came from the original lp_item - $max_score_item_view = $row_max_score['max_score_item_view']; //Came from the lp_item_view - $score = $row_max_score['score']; - - if ($debug) echo '

Item Type: ' .$row_max_score['item_type'].'

'; - - if ($row_max_score['item_type'] == 'sco') { - //var_dump($row_max_score); - // Check if it is sco (easier to get max_score) - //when there's no max score, we assume 100 as the max score, as the SCORM 1.2 says that the value should always be between 0 and 100. - if ($max_score == 0 || is_null($max_score) || $max_score == '') { - //Chamilo style - if ($use_max_score[$lp_id]) { - $max_score = 100; - } else { - //Overwrites max score = 100 to use the one that came in the lp_item_view see BT#1613 - $max_score = $max_score_item_view; - } - } - //Avoid division by zero errors - if (!empty($max_score)) { - $lp_partial_total += $score/$max_score; - } - if ($debug) echo '$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'
'; - } else { - // Case of a TOOL_QUIZ element - $item_id = $row_max_score['iid']; - $item_path = $row_max_score['path']; - $lp_item_view_id = $row_max_score['lp_item_view_id']; - - // Get last attempt to this exercise through - // the current lp for the current user - $sql_last_attempt = "SELECT exe_id FROM $tbl_stats_exercices WHERE + if ($debug) + echo $sql_max_score.'
'; + + $res_max_score = Database::query($sql_max_score); + + while ($row_max_score = Database::fetch_array($res_max_score, 'ASSOC')) { + $list[] = $row_max_score; + } + } + + // Go through each scorable element of this view + + $score_of_scorm_calculate = 0; + + foreach ($list as $row_max_score) { + $max_score = $row_max_score['max_score']; //Came from the original lp_item + $max_score_item_view = $row_max_score['max_score_item_view']; //Came from the lp_item_view + $score = $row_max_score['score']; + + if ($debug) + echo '

Item Type: '.$row_max_score['item_type'].'

'; + + if ($row_max_score['item_type'] == 'sco') { + //var_dump($row_max_score); + // Check if it is sco (easier to get max_score) + //when there's no max score, we assume 100 as the max score, as the SCORM 1.2 says that the value should always be between 0 and 100. + if ($max_score == 0 || is_null($max_score) || $max_score == '') { + //Chamilo style + if ($use_max_score[$lp_id]) { + $max_score = 100; + } else { + //Overwrites max score = 100 to use the one that came in the lp_item_view see BT#1613 + $max_score = $max_score_item_view; + } + } + //Avoid division by zero errors + if (!empty($max_score)) { + $lp_partial_total += $score / $max_score; + } + if ($debug) + echo '$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'
'; + } else { + // Case of a TOOL_QUIZ element + $item_id = $row_max_score['iid']; + $item_path = $row_max_score['path']; + $lp_item_view_id = $row_max_score['lp_item_view_id']; + + // Get last attempt to this exercise through + // the current lp for the current user + $sql_last_attempt = "SELECT exe_id FROM $tbl_stats_exercices WHERE exe_exo_id = '$item_path' AND exe_user_id = $user_id AND orig_lp_item_id = $item_id AND @@ -844,156 +918,170 @@ class Tracking { exe_cours_id = '$course_code' AND session_id = $session_id ORDER BY exe_date DESC LIMIT 1"; - if ($debug) echo $sql_last_attempt .'
'; - $result_last_attempt = Database::query($sql_last_attempt); - $num = Database :: num_rows($result_last_attempt); - if ($num > 0 ) { - $id_last_attempt = Database :: result($result_last_attempt, 0, 0); - if ($debug) echo $id_last_attempt.'
'; - /* if (in_array($id_last_attempt, $exe_list)) { - continue; - }*/ - //$exe_list[] = $id_last_attempt; - //echo $id_last_attempt .'
'; - - // Within the last attempt number tracking, get the sum of - // the max_scores of all questions that it was - // made of (we need to make this call dynamic because of random questions selection) - $sql = "SELECT SUM(t.ponderation) as maxscore FROM + if ($debug) + echo $sql_last_attempt.'
'; + $result_last_attempt = Database::query($sql_last_attempt); + $num = Database :: num_rows($result_last_attempt); + if ($num > 0) { + $id_last_attempt = Database :: result($result_last_attempt, 0, 0); + if ($debug) + echo $id_last_attempt.'
'; + /* if (in_array($id_last_attempt, $exe_list)) { + continue; + } */ + //$exe_list[] = $id_last_attempt; + //echo $id_last_attempt .'
'; + // Within the last attempt number tracking, get the sum of + // the max_scores of all questions that it was + // made of (we need to make this call dynamic because of random questions selection) + $sql = "SELECT SUM(t.ponderation) as maxscore FROM ( SELECT DISTINCT question_id, marks, ponderation FROM $tbl_stats_attempts AS at INNER JOIN $tbl_quiz_questions AS q ON (q.id = at.question_id) WHERE exe_id ='$id_last_attempt' AND q.c_id = $course_id ) AS t"; - if ($debug) echo '$sql: '.$sql.'
'; - $res_max_score_bis = Database::query($sql); - $row_max_score_bis = Database::fetch_array($res_max_score_bis); - - if (!empty($row_max_score_bis['maxscore'])) { - $max_score = $row_max_score_bis['maxscore']; - } - if (!empty($max_score) && floatval($max_score) > 0) { - $lp_partial_total += $score/$max_score; - } - if ($debug) echo '$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'
'; - } - } - - if (in_array($row_max_score['item_type'], array('quiz','sco'))) { - // Normal way - if ($use_max_score[$lp_id]) { - $count_items++; - } else { - if ($max_score != '') { - $count_items++; - } - } - if ($debug) echo '$count_items: '.$count_items; - } - } //end for - - $score_of_scorm_calculate += $count_items?(($lp_partial_total/$count_items)*100):0; - - if ($debug) echo '

$count_items '.$count_items.'

'; - if ($debug) echo '

$score_of_scorm_calculate '.$score_of_scorm_calculate.'

'; - - // var_dump($score_of_scorm_calculate); - $global_result += $score_of_scorm_calculate; - if ($debug) echo '

$global_result '.$global_result.'

'; - } // end while - } - - $lp_with_quiz = 0; - if ($debug) var_dump($lp_list); - foreach ($lp_list as $lp_id) { - //Check if LP have a score we asume that all SCO have an score - $sql = "SELECT count(id) as count FROM $lp_item_table + if ($debug) + echo '$sql: '.$sql.'
'; + $res_max_score_bis = Database::query($sql); + $row_max_score_bis = Database::fetch_array($res_max_score_bis); + + if (!empty($row_max_score_bis['maxscore'])) { + $max_score = $row_max_score_bis['maxscore']; + } + if (!empty($max_score) && floatval($max_score) > 0) { + $lp_partial_total += $score / $max_score; + } + if ($debug) + echo '$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'
'; + } + } + + if (in_array($row_max_score['item_type'], array('quiz', 'sco'))) { + // Normal way + if ($use_max_score[$lp_id]) { + $count_items++; + } else { + if ($max_score != '') { + $count_items++; + } + } + if ($debug) + echo '$count_items: '.$count_items; + } + } //end for + + $score_of_scorm_calculate += $count_items ? (($lp_partial_total / $count_items) * 100) : 0; + + if ($debug) + echo '

$count_items '.$count_items.'

'; + if ($debug) + echo '

$score_of_scorm_calculate '.$score_of_scorm_calculate.'

'; + + // var_dump($score_of_scorm_calculate); + $global_result += $score_of_scorm_calculate; + if ($debug) + echo '

$global_result '.$global_result.'

'; + } // end while + } + + $lp_with_quiz = 0; + if ($debug) + var_dump($lp_list); + foreach ($lp_list as $lp_id) { + //Check if LP have a score we asume that all SCO have an score + $sql = "SELECT count(id) as count FROM $lp_item_table WHERE c_id = $course_id AND (item_type = 'quiz' OR item_type = 'sco') AND lp_id = ".$lp_id; - if ($debug) echo $sql; - $result_have_quiz = Database::query($sql); - - if (Database::num_rows($result_have_quiz) > 0 ) { - $row = Database::fetch_array($result_have_quiz,'ASSOC'); - if (is_numeric($row['count']) && $row['count'] != 0) { - $lp_with_quiz ++; - } - } - } - - if ($debug) echo '

$lp_with_quiz '.$lp_with_quiz.'

'; - if ($debug) echo '

Final return

'; - - if ($lp_with_quiz != 0 ) { - if (!$return_array) { - $score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2); - if ($debug) var_dump($score_of_scorm_calculate); - if (empty($lp_ids)) { - //$score_of_scorm_calculate = round($score_of_scorm_calculate/count($lp_list),2); - if ($debug) echo '

All lps fix: '.$score_of_scorm_calculate.'

'; - } - return $score_of_scorm_calculate; - } else { - if ($debug) var_dump($global_result, $lp_with_quiz); - return array($global_result, $lp_with_quiz); - } - } else { - return '-'; - } - } - } - return null; - } - - - /** - * This function gets time spent in learning path for a student inside a course - * @param int|array Student id(s) - * @param string Course code - * @param array Limit average to listed lp ids - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return int Total time - */ - public static function get_time_spent_in_lp($student_id, $course_code, $lp_ids = array(), $session_id = null) { - - $course = CourseManager :: get_course_information($course_code); - $student_id = intval($student_id); - $total_time = 0; - - if (!empty($course)) { - - $lp_table = Database :: get_course_table(TABLE_LP_MAIN); - $t_lpv = Database :: get_course_table(TABLE_LP_VIEW); - $t_lpiv = Database :: get_course_table(TABLE_LP_ITEM_VIEW); - - $course_id = $course['real_id']; - - // Compose a filter based on optional learning paths list given - $condition_lp = ""; - if(count($lp_ids) > 0) { - $condition_lp =" AND id IN(".implode(',',$lp_ids).") "; - } - - // Compose a filter based on optional session id - $condition_session = ""; - $session_id = intval($session_id); - - - if (isset($session_id)) { - $condition_session = " AND session_id = $session_id "; - } - - // Check the real number of LPs corresponding to the filter in the - // database (and if no list was given, get them all) - //$res_row_lp = Database::query("SELECT DISTINCT(id) FROM $lp_table $condition_lp $condition_session"); - $res_row_lp = Database::query("SELECT DISTINCT(id) FROM $lp_table WHERE c_id = $course_id $condition_lp"); - $count_row_lp = Database::num_rows($res_row_lp); - - // calculates time - if ($count_row_lp > 0) { - while ($row_lp = Database::fetch_array($res_row_lp)) { - $lp_id = intval($row_lp['id']); - $sql = 'SELECT SUM(total_time) + if ($debug) + echo $sql; + $result_have_quiz = Database::query($sql); + + if (Database::num_rows($result_have_quiz) > 0) { + $row = Database::fetch_array($result_have_quiz, 'ASSOC'); + if (is_numeric($row['count']) && $row['count'] != 0) { + $lp_with_quiz++; + } + } + } + + if ($debug) + echo '

$lp_with_quiz '.$lp_with_quiz.'

'; + if ($debug) + echo '

Final return

'; + + if ($lp_with_quiz != 0) { + if (!$return_array) { + $score_of_scorm_calculate = round(($global_result / $lp_with_quiz), 2); + if ($debug) + var_dump($score_of_scorm_calculate); + if (empty($lp_ids)) { + //$score_of_scorm_calculate = round($score_of_scorm_calculate/count($lp_list),2); + if ($debug) + echo '

All lps fix: '.$score_of_scorm_calculate.'

'; + } + return $score_of_scorm_calculate; + } else { + if ($debug) + var_dump($global_result, $lp_with_quiz); + return array($global_result, $lp_with_quiz); + } + } else { + return '-'; + } + } + } + return null; + } + + /** + * This function gets time spent in learning path for a student inside a course + * @param int|array Student id(s) + * @param string Course code + * @param array Limit average to listed lp ids + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return int Total time + */ + public static function get_time_spent_in_lp($student_id, $course_code, $lp_ids = array(), $session_id = null) + { + + $course = CourseManager :: get_course_information($course_code); + $student_id = intval($student_id); + $total_time = 0; + + if (!empty($course)) { + + $lp_table = Database :: get_course_table(TABLE_LP_MAIN); + $t_lpv = Database :: get_course_table(TABLE_LP_VIEW); + $t_lpiv = Database :: get_course_table(TABLE_LP_ITEM_VIEW); + + $course_id = $course['real_id']; + + // Compose a filter based on optional learning paths list given + $condition_lp = ""; + if (count($lp_ids) > 0) { + $condition_lp = " AND id IN(".implode(',', $lp_ids).") "; + } + + // Compose a filter based on optional session id + $condition_session = ""; + $session_id = intval($session_id); + + + if (isset($session_id)) { + $condition_session = " AND session_id = $session_id "; + } + + // Check the real number of LPs corresponding to the filter in the + // database (and if no list was given, get them all) + //$res_row_lp = Database::query("SELECT DISTINCT(id) FROM $lp_table $condition_lp $condition_session"); + $res_row_lp = Database::query("SELECT DISTINCT(id) FROM $lp_table WHERE c_id = $course_id $condition_lp"); + $count_row_lp = Database::num_rows($res_row_lp); + + // calculates time + if ($count_row_lp > 0) { + while ($row_lp = Database::fetch_array($res_row_lp)) { + $lp_id = intval($row_lp['id']); + $sql = 'SELECT SUM(total_time) FROM '.$t_lpiv.' AS item_view INNER JOIN '.$t_lpv.' AS view ON item_view.lp_view_id = view.id @@ -1004,48 +1092,49 @@ class Tracking { AND view.user_id = '.$student_id.' AND session_id = '.$session_id; - $rs = Database::query($sql); - if (Database :: num_rows($rs) > 0) { - $total_time += Database :: result($rs, 0, 0); - } - } - } - } - return $total_time; - } - - /** - * This function gets last connection time to one learning path - * @param int|array Student id(s) - * @param string Course code - * @param int Learning path id - * @return int Total time - */ - public static function get_last_connection_time_in_lp($student_id, $course_code, $lp_id, $session_id = 0) { - $course = CourseManager :: get_course_information($course_code); - $student_id = intval($student_id); - $lp_id = intval($lp_id); - $last_time = 0; - $session_id = intval($session_id); - - if (!empty($course)) { - - $course_id = $course['real_id']; - - $lp_table = Database :: get_course_table(TABLE_LP_MAIN); - $t_lpv = Database :: get_course_table(TABLE_LP_VIEW); - $t_lpiv = Database :: get_course_table(TABLE_LP_ITEM_VIEW); - - // Check the real number of LPs corresponding to the filter in the - // database (and if no list was given, get them all) - $res_row_lp = Database::query("SELECT id FROM $lp_table WHERE c_id = $course_id AND id = $lp_id "); - $count_row_lp = Database::num_rows($res_row_lp); - - // calculates last connection time - if ($count_row_lp > 0) { - $sql = 'SELECT MAX(start_time) - FROM ' . $t_lpiv . ' AS item_view - INNER JOIN ' . $t_lpv . ' AS view + $rs = Database::query($sql); + if (Database :: num_rows($rs) > 0) { + $total_time += Database :: result($rs, 0, 0); + } + } + } + } + return $total_time; + } + + /** + * This function gets last connection time to one learning path + * @param int|array Student id(s) + * @param string Course code + * @param int Learning path id + * @return int Total time + */ + public static function get_last_connection_time_in_lp($student_id, $course_code, $lp_id, $session_id = 0) + { + $course = CourseManager :: get_course_information($course_code); + $student_id = intval($student_id); + $lp_id = intval($lp_id); + $last_time = 0; + $session_id = intval($session_id); + + if (!empty($course)) { + + $course_id = $course['real_id']; + + $lp_table = Database :: get_course_table(TABLE_LP_MAIN); + $t_lpv = Database :: get_course_table(TABLE_LP_VIEW); + $t_lpiv = Database :: get_course_table(TABLE_LP_ITEM_VIEW); + + // Check the real number of LPs corresponding to the filter in the + // database (and if no list was given, get them all) + $res_row_lp = Database::query("SELECT id FROM $lp_table WHERE c_id = $course_id AND id = $lp_id "); + $count_row_lp = Database::num_rows($res_row_lp); + + // calculates last connection time + if ($count_row_lp > 0) { + $sql = 'SELECT MAX(start_time) + FROM '.$t_lpiv.' AS item_view + INNER JOIN '.$t_lpv.' AS view ON item_view.lp_view_id = view.id WHERE item_view.c_id = '.$course_id.' AND @@ -1053,279 +1142,282 @@ class Tracking { view.lp_id = '.$lp_id.' AND view.user_id = '.$student_id.' AND view.session_id = '.$session_id; - $rs = Database::query($sql); - if (Database :: num_rows($rs) > 0) { - $last_time = Database :: result($rs, 0, 0); - } - } - } - return $last_time; - } - - /** - * gets the list of students followed by coach - * @param int Coach id - * @return array List of students - */ - public static function get_student_followed_by_coach($coach_id) { - $coach_id = intval($coach_id); - - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); - $tbl_session_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER); - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - - $a_students = array (); - - // At first, courses where $coach_id is coach of the course // - $sql = 'SELECT id_session, course_code FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id.' AND status=2'; - - if (api_is_multiple_url_enabled()) { - $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 = 'SELECT scu.id_session, scu.course_code - FROM ' . $tbl_session_course_user . ' scu INNER JOIN '.$tbl_session_rel_access_url.' sru - ON (scu.id_session=sru.session_id) - WHERE scu.id_user=' . $coach_id.' AND scu.status=2 AND sru.access_url_id = '.$access_url_id; - } - } - - $result = Database::query($sql); - - while ($a_courses = Database::fetch_array($result)) { - - $course_code = $a_courses["course_code"]; - $id_session = $a_courses["id_session"]; + $rs = Database::query($sql); + if (Database :: num_rows($rs) > 0) { + $last_time = Database :: result($rs, 0, 0); + } + } + } + return $last_time; + } - $sql = "SELECT distinct srcru.id_user - FROM $tbl_session_course_user AS srcru, $tbl_session_user sru - WHERE srcru.id_user = sru.id_user AND sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND srcru.id_session = sru.id_session AND srcru.course_code='$course_code' AND srcru.id_session='$id_session'"; + /** + * gets the list of students followed by coach + * @param int Coach id + * @return array List of students + */ + public static function get_student_followed_by_coach($coach_id) + { + $coach_id = intval($coach_id); - $rs = Database::query($sql); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); + $tbl_session_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER); + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - while ($row = Database::fetch_array($rs)) { - $a_students[$row['id_user']] = $row['id_user']; - } - } + $a_students = array(); - // Then, courses where $coach_id is coach of the session // + // At first, courses where $coach_id is coach of the course // + $sql = 'SELECT id_session, course_code FROM '.$tbl_session_course_user.' WHERE id_user='.$coach_id.' AND status=2'; - $sql = 'SELECT session_course_user.id_user - FROM ' . $tbl_session_course_user . ' as session_course_user + if (api_is_multiple_url_enabled()) { + $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 = 'SELECT scu.id_session, scu.course_code + FROM '.$tbl_session_course_user.' scu INNER JOIN '.$tbl_session_rel_access_url.' sru + ON (scu.id_session=sru.session_id) + WHERE scu.id_user='.$coach_id.' AND scu.status=2 AND sru.access_url_id = '.$access_url_id; + } + } + + $result = Database::query($sql); + + while ($a_courses = Database::fetch_array($result)) { + + $course_code = $a_courses["course_code"]; + $id_session = $a_courses["id_session"]; + + $sql = "SELECT distinct srcru.id_user + FROM $tbl_session_course_user AS srcru, $tbl_session_user sru + WHERE srcru.id_user = sru.id_user AND sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND srcru.id_session = sru.id_session AND srcru.course_code='$course_code' AND srcru.id_session='$id_session'"; + + $rs = Database::query($sql); + + while ($row = Database::fetch_array($rs)) { + $a_students[$row['id_user']] = $row['id_user']; + } + } + + // Then, courses where $coach_id is coach of the session // + + $sql = 'SELECT session_course_user.id_user + FROM '.$tbl_session_course_user.' as session_course_user INNER JOIN '.$tbl_session_user.' sru ON session_course_user.id_user = sru.id_user AND session_course_user.id_session = sru.id_session - INNER JOIN ' . $tbl_session_course . ' as session_course + INNER JOIN '.$tbl_session_course.' as session_course ON session_course.course_code = session_course_user.course_code AND session_course_user.id_session = session_course.id_session - INNER JOIN ' . $tbl_session . ' as session + INNER JOIN '.$tbl_session.' as session ON session.id = session_course.id_session - AND session.id_coach = ' . $coach_id; - if (api_is_multiple_url_enabled()) { - $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 = 'SELECT session_course_user.id_user - FROM ' . $tbl_session_course_user . ' as session_course_user + AND session.id_coach = '.$coach_id; + if (api_is_multiple_url_enabled()) { + $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 = 'SELECT session_course_user.id_user + FROM '.$tbl_session_course_user.' as session_course_user INNER JOIN '.$tbl_session_user.' sru ON session_course_user.id_user = sru.id_user AND session_course_user.id_session = sru.id_session - INNER JOIN ' . $tbl_session_course . ' as session_course + INNER JOIN '.$tbl_session_course.' as session_course ON session_course.course_code = session_course_user.course_code AND session_course_user.id_session = session_course.id_session - INNER JOIN ' . $tbl_session . ' as session + INNER JOIN '.$tbl_session.' as session ON session.id = session_course.id_session - AND session.id_coach = ' . $coach_id.' + AND session.id_coach = '.$coach_id.' INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url ON session.id = session_rel_url.session_id WHERE access_url_id = '.$access_url_id; - } - } + } + } - $result = Database::query($sql); - while ($row = Database::fetch_array($result)) { - $a_students[$row['id_user']] = $row['id_user']; - } - return $a_students; - } + $result = Database::query($sql); + while ($row = Database::fetch_array($result)) { + $a_students[$row['id_user']] = $row['id_user']; + } + return $a_students; + } - /** - * Get student followed by a coach inside a session - * @param int Session id - * @param int Coach id - * @return array students list - */ - public static function get_student_followed_by_coach_in_a_session($id_session, $coach_id) { + /** + * Get student followed by a coach inside a session + * @param int Session id + * @param int Coach id + * @return array students list + */ + public static function get_student_followed_by_coach_in_a_session($id_session, $coach_id) + { - $coach_id = intval($coach_id); + $coach_id = intval($coach_id); - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - $a_students = array (); + $a_students = array(); - // At first, courses where $coach_id is coach of the course // + // At first, courses where $coach_id is coach of the course // - $sql = 'SELECT course_code FROM ' . $tbl_session_course_user . ' WHERE id_session="' . $id_session . '" AND id_user=' . $coach_id.' AND status=2'; + $sql = 'SELECT course_code FROM '.$tbl_session_course_user.' WHERE id_session="'.$id_session.'" AND id_user='.$coach_id.' AND status=2'; - $result = Database::query($sql); + $result = Database::query($sql); - while ($a_courses = Database::fetch_array($result)) { - $course_code = $a_courses["course_code"]; + while ($a_courses = Database::fetch_array($result)) { + $course_code = $a_courses["course_code"]; - $sql = "SELECT distinct srcru.id_user + $sql = "SELECT distinct srcru.id_user FROM $tbl_session_course_user AS srcru - WHERE course_code='$course_code' and id_session = '" . $id_session . "'"; - - $rs = Database::query($sql); - - while ($row = Database::fetch_array($rs)) { - $a_students[$row['id_user']] = $row['id_user']; - } - } - - // Then, courses where $coach_id is coach of the session // - - $dsl_session_coach = 'SELECT id_coach FROM ' . $tbl_session . ' WHERE id="' . $id_session . '" AND id_coach="' . $coach_id . '"'; - $result = Database::query($dsl_session_coach); - //He is the session_coach so we select all the users in the session - if (Database::num_rows($result) > 0) { - $sql = 'SELECT DISTINCT srcru.id_user FROM ' . $tbl_session_course_user . ' AS srcru WHERE id_session="' . $id_session . '"'; - $result = Database::query($sql); - while ($row = Database::fetch_array($result)) { - $a_students[$row['id_user']] = $row['id_user']; - } - } - return $a_students; - } - - /** - * Check if a coach is allowed to follow a student - * @param int Coach id - * @param int Student id - * @return bool - */ - public static function is_allowed_to_coach_student($coach_id, $student_id) { - $coach_id = intval($coach_id); - $student_id = intval($student_id); - - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - - // At first, courses where $coach_id is coach of the course // - - $sql = 'SELECT 1 FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id .' AND status=2'; - $result = Database::query($sql); - if (Database::num_rows($result) > 0) { - return true; - } - - // Then, courses where $coach_id is coach of the session - - $sql = 'SELECT session_course_user.id_user - FROM ' . $tbl_session_course_user . ' as session_course_user - INNER JOIN ' . $tbl_session_course . ' as session_course + WHERE course_code='$course_code' and id_session = '".$id_session."'"; + + $rs = Database::query($sql); + + while ($row = Database::fetch_array($rs)) { + $a_students[$row['id_user']] = $row['id_user']; + } + } + + // Then, courses where $coach_id is coach of the session // + + $dsl_session_coach = 'SELECT id_coach FROM '.$tbl_session.' WHERE id="'.$id_session.'" AND id_coach="'.$coach_id.'"'; + $result = Database::query($dsl_session_coach); + //He is the session_coach so we select all the users in the session + if (Database::num_rows($result) > 0) { + $sql = 'SELECT DISTINCT srcru.id_user FROM '.$tbl_session_course_user.' AS srcru WHERE id_session="'.$id_session.'"'; + $result = Database::query($sql); + while ($row = Database::fetch_array($result)) { + $a_students[$row['id_user']] = $row['id_user']; + } + } + return $a_students; + } + + /** + * Check if a coach is allowed to follow a student + * @param int Coach id + * @param int Student id + * @return bool + */ + public static function is_allowed_to_coach_student($coach_id, $student_id) + { + $coach_id = intval($coach_id); + $student_id = intval($student_id); + + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + + // At first, courses where $coach_id is coach of the course // + + $sql = 'SELECT 1 FROM '.$tbl_session_course_user.' WHERE id_user='.$coach_id.' AND status=2'; + $result = Database::query($sql); + if (Database::num_rows($result) > 0) { + return true; + } + + // Then, courses where $coach_id is coach of the session + + $sql = 'SELECT session_course_user.id_user + FROM '.$tbl_session_course_user.' as session_course_user + INNER JOIN '.$tbl_session_course.' as session_course ON session_course.course_code = session_course_user.course_code - INNER JOIN ' . $tbl_session . ' as session + INNER JOIN '.$tbl_session.' as session ON session.id = session_course.id_session - AND session.id_coach = ' . $coach_id . ' - WHERE id_user = ' . $student_id; - $result = Database::query($sql); - if (Database::num_rows($result) > 0) { - return true; - } + AND session.id_coach = '.$coach_id.' + WHERE id_user = '.$student_id; + $result = Database::query($sql); + if (Database::num_rows($result) > 0) { + return true; + } - return false; + return false; + } + + /** + * Get courses followed by coach + * @param int Coach id + * @param int Session id (optional) + * @return array Courses list + */ + public static function get_courses_followed_by_coach($coach_id, $id_session = '') + { - } + $coach_id = intval($coach_id); + if (!empty($id_session)) + $id_session = intval($id_session); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); - /** - * Get courses followed by coach - * @param int Coach id - * @param int Session id (optional) - * @return array Courses list - */ - public static function get_courses_followed_by_coach($coach_id, $id_session = '') { + // At first, courses where $coach_id is coach of the course - $coach_id = intval($coach_id); - if (!empty ($id_session)) - $id_session = intval($id_session); + $sql = 'SELECT DISTINCT course_code FROM '.$tbl_session_course_user.' WHERE id_user='.$coach_id.' AND status=2'; - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); + global $_configuration; + if (api_is_multiple_url_enabled()) { + $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sql = 'SELECT DISTINCT scu.course_code FROM '.$tbl_session_course_user.' scu INNER JOIN '.$tbl_course_rel_access_url.' cru + ON (scu.course_code = cru.course_code) + WHERE scu.id_user='.$coach_id.' AND scu.status=2 AND cru.access_url_id = '.$access_url_id; + } + } - // At first, courses where $coach_id is coach of the course + if (!empty($id_session)) + $sql .= ' AND id_session='.$id_session; + $result = Database::query($sql); + while ($row = Database::fetch_array($result)) { + $a_courses[$row['course_code']] = $row['course_code']; + } - $sql = 'SELECT DISTINCT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user=' . $coach_id.' AND status=2'; + // Then, courses where $coach_id is coach of the session - global $_configuration; - if (api_is_multiple_url_enabled()) { - $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); - $access_url_id = api_get_current_access_url_id(); - if ($access_url_id != -1){ - $sql = 'SELECT DISTINCT scu.course_code FROM ' . $tbl_session_course_user . ' scu INNER JOIN '.$tbl_course_rel_access_url.' cru - ON (scu.course_code = cru.course_code) - WHERE scu.id_user=' . $coach_id.' AND scu.status=2 AND cru.access_url_id = '.$access_url_id; - } - } - - if (!empty ($id_session)) - $sql .= ' AND id_session=' . $id_session; - $result = Database::query($sql); - while ($row = Database::fetch_array($result)) { - $a_courses[$row['course_code']] = $row['course_code']; - } - - // Then, courses where $coach_id is coach of the session - - $sql = 'SELECT DISTINCT session_course.course_code - FROM ' . $tbl_session_course . ' as session_course - INNER JOIN ' . $tbl_session . ' as session + $sql = 'SELECT DISTINCT session_course.course_code + FROM '.$tbl_session_course.' as session_course + INNER JOIN '.$tbl_session.' as session ON session.id = session_course.id_session - AND session.id_coach = ' . $coach_id . ' - INNER JOIN ' . $tbl_course . ' as course + AND session.id_coach = '.$coach_id.' + INNER JOIN '.$tbl_course.' as course ON course.code = session_course.course_code'; - if (api_is_multiple_url_enabled()) { - $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); - $access_url_id = api_get_current_access_url_id(); - if ($access_url_id != -1){ - $sql = 'SELECT DISTINCT session_course.course_code - FROM ' . $tbl_session_course . ' as session_course - INNER JOIN ' . $tbl_session . ' as session + if (api_is_multiple_url_enabled()) { + $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); + $access_url_id = api_get_current_access_url_id(); + if ($access_url_id != -1) { + $sql = 'SELECT DISTINCT session_course.course_code + FROM '.$tbl_session_course.' as session_course + INNER JOIN '.$tbl_session.' as session ON session.id = session_course.id_session - AND session.id_coach = ' . $coach_id . ' - INNER JOIN ' . $tbl_course . ' as course + AND session.id_coach = '.$coach_id.' + INNER JOIN '.$tbl_course.' as course ON course.code = session_course.course_code INNER JOIN '.$tbl_course_rel_access_url.' course_rel_url ON (session_course.course_code = course_rel_url.course_code)'; - } - } + } + } - if (!empty ($id_session)) { - $sql .= ' WHERE session_course.id_session=' . $id_session; + if (!empty($id_session)) { + $sql .= ' WHERE session_course.id_session='.$id_session; if (api_is_multiple_url_enabled()) - $sql .= ' AND access_url_id = '.$access_url_id; - } else { + $sql .= ' AND access_url_id = '.$access_url_id; + } else { if (api_is_multiple_url_enabled()) - $sql .= ' WHERE access_url_id = '.$access_url_id; - } - - $result = Database::query($sql); - while ($row = Database::fetch_array($result)) { - $a_courses[$row['course_code']] = $row['course_code']; - } - - return $a_courses; - } - - /** - * Get sessions coached by user - * @param int Coach id - * @return array Sessions list - */ - public static function get_sessions_coached_by_user($coach_id) { + $sql .= ' WHERE access_url_id = '.$access_url_id; + } + + $result = Database::query($sql); + while ($row = Database::fetch_array($result)) { + $a_courses[$row['course_code']] = $row['course_code']; + } + + return $a_courses; + } + + /** + * Get sessions coached by user + * @param int Coach id + * @return array Sessions list + */ + public static function get_sessions_coached_by_user($coach_id) + { // table definition $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); @@ -1336,18 +1428,18 @@ class Tracking { // session where we are general coach $sql = 'SELECT DISTINCT id, name, date_start, date_end - FROM ' . $tbl_session . ' - WHERE id_coach=' . $coach_id; + FROM '.$tbl_session.' + WHERE id_coach='.$coach_id; global $_configuration; if (api_is_multiple_url_enabled()) { - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $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){ + if ($access_url_id != -1) { $sql = 'SELECT DISTINCT id, name, date_start, date_end - FROM ' . $tbl_session . ' session INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url + FROM '.$tbl_session.' session INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url ON (session.id = session_rel_url.session_id) - WHERE id_coach=' . $coach_id.' AND access_url_id = '.$access_url_id; + WHERE id_coach='.$coach_id.' AND access_url_id = '.$access_url_id; } } @@ -1356,121 +1448,118 @@ class Tracking { $a_sessions[$row["id"]] = $row; } - // session where we are coach of a course + // session where we are coach of a course $sql = 'SELECT DISTINCT session.id, session.name, session.date_start, session.date_end - FROM ' . $tbl_session . ' as session - INNER JOIN ' . $tbl_session_course_user . ' as session_course_user + FROM '.$tbl_session.' as session + INNER JOIN '.$tbl_session_course_user.' as session_course_user ON session.id = session_course_user.id_session - AND session_course_user.id_user=' . $coach_id.' AND session_course_user.status=2'; + AND session_course_user.id_user='.$coach_id.' AND session_course_user.status=2'; global $_configuration; if (api_is_multiple_url_enabled()) { - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + $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){ + if ($access_url_id != -1) { $sql = 'SELECT DISTINCT session.id, session.name, session.date_start, session.date_end - FROM ' . $tbl_session . ' as session - INNER JOIN ' . $tbl_session_course_user . ' as session_course_user - ON session.id = session_course_user.id_session AND session_course_user.id_user=' . $coach_id.' AND session_course_user.status=2 + FROM '.$tbl_session.' as session + INNER JOIN '.$tbl_session_course_user.' as session_course_user + ON session.id = session_course_user.id_session AND session_course_user.id_user='.$coach_id.' AND session_course_user.status=2 INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url ON (session.id = session_rel_url.session_id) WHERE access_url_id = '.$access_url_id; } } - $rs = Database::query($sql); - while ($row = Database::fetch_array($rs)) { - $a_sessions[$row["id"]] = $row; - } - if (is_array($a_sessions)) { - foreach ($a_sessions as & $session) { - if ($session['date_start'] == '0000-00-00') { - $session['status'] = get_lang('SessionActive'); - } - else { - $date_start = explode('-', $session['date_start']); - $time_start = mktime(0, 0, 0, $date_start[1], $date_start[2], $date_start[0]); - $date_end = explode('-', $session['date_end']); - $time_end = mktime(0, 0, 0, $date_end[1], $date_end[2], $date_end[0]); - if ($time_start < time() && time() < $time_end) { - $session['status'] = get_lang('SessionActive'); - } - else{ - if (time() < $time_start) { - $session['status'] = get_lang('SessionFuture'); - } - else{ - if (time() > $time_end) { - $session['status'] = get_lang('SessionPast'); - } - } - } - } - } - } + $rs = Database::query($sql); + while ($row = Database::fetch_array($rs)) { + $a_sessions[$row["id"]] = $row; + } + if (is_array($a_sessions)) { + foreach ($a_sessions as & $session) { + if ($session['date_start'] == '0000-00-00') { + $session['status'] = get_lang('SessionActive'); + } else { + $date_start = explode('-', $session['date_start']); + $time_start = mktime(0, 0, 0, $date_start[1], $date_start[2], $date_start[0]); + $date_end = explode('-', $session['date_end']); + $time_end = mktime(0, 0, 0, $date_end[1], $date_end[2], $date_end[0]); + if ($time_start < time() && time() < $time_end) { + $session['status'] = get_lang('SessionActive'); + } else { + if (time() < $time_start) { + $session['status'] = get_lang('SessionFuture'); + } else { + if (time() > $time_end) { + $session['status'] = get_lang('SessionPast'); + } + } + } + } + } + } return $a_sessions; + } + + /** + * Get courses list from a session + * @param int Session id + * @return array Courses list + */ + public static function get_courses_list_from_session($session_id) + { + //protect datas + $session_id = intval($session_id); - } - - /** - * Get courses list from a session - * @param int Session id - * @return array Courses list - */ - public static function get_courses_list_from_session($session_id) { - //protect datas - $session_id = intval($session_id); - - // table definition - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); - - $sql = 'SELECT DISTINCT course_code - FROM ' . $tbl_session_course . ' - WHERE id_session=' . $session_id; - - $rs = Database::query($sql); - $a_courses = array (); - while ($row = Database::fetch_array($rs)) { - $a_courses[$row['course_code']] = $row; - } - return $a_courses; - } - - /** - * Count the number of documents that an user has uploaded to a course - * @param int|array Student id(s) - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) return count of assignments including sessions, 0 = session is not filtered - * @return int Number of documents - */ - - public static function count_student_uploaded_documents($student_id, $course_code, $session_id = null){ - // protect datas - $course_code = Database::escape_string($course_code); - // get the informations of the course - $a_course = CourseManager :: get_course_information($course_code); - if (!empty($a_course)) { - // table definition - $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); - $tbl_document = Database :: get_course_table(TABLE_DOCUMENT); - - $course_id = $a_course['real_id']; - - $condition_user = ""; - if (is_array($student_id)) { - $condition_user = " AND ip.insert_user_id IN (".implode(',',$student_id).") "; - } else { - $condition_user = " AND ip.insert_user_id = '$student_id' "; - } - - $condition_session = ""; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = " AND pub.session_id = $session_id "; - } - - $sql = "SELECT count(ip.tool) + // table definition + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE); + + $sql = 'SELECT DISTINCT course_code + FROM '.$tbl_session_course.' + WHERE id_session='.$session_id; + + $rs = Database::query($sql); + $a_courses = array(); + while ($row = Database::fetch_array($rs)) { + $a_courses[$row['course_code']] = $row; + } + return $a_courses; + } + + /** + * Count the number of documents that an user has uploaded to a course + * @param int|array Student id(s) + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) return count of assignments including sessions, 0 = session is not filtered + * @return int Number of documents + */ + public static function count_student_uploaded_documents($student_id, $course_code, $session_id = null) + { + // protect datas + $course_code = Database::escape_string($course_code); + // get the informations of the course + $a_course = CourseManager :: get_course_information($course_code); + if (!empty($a_course)) { + // table definition + $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); + $tbl_document = Database :: get_course_table(TABLE_DOCUMENT); + + $course_id = $a_course['real_id']; + + $condition_user = ""; + if (is_array($student_id)) { + $condition_user = " AND ip.insert_user_id IN (".implode(',', $student_id).") "; + } else { + $condition_user = " AND ip.insert_user_id = '$student_id' "; + } + + $condition_session = ""; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = " AND pub.session_id = $session_id "; + } + + $sql = "SELECT count(ip.tool) FROM $tbl_item_property ip INNER JOIN $tbl_document pub ON ip.ref = pub.id WHERE ip.c_id = $course_id AND @@ -1478,1119 +1567,1162 @@ class Tracking { pub.filetype ='file' AND ip.tool = 'document' $condition_user $condition_session "; - $rs = Database::query($sql); - $row = Database::fetch_row($rs); - return $row[0]; - } - return null; - } - - - /** - * Count assignments per student - * @param int|array Student id(s) - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) return count of assignments including sessions, 0 = session is not filtered - * @return int Count of assignments - */ - public static function count_student_assignments($student_id, $course_code, $session_id = null) { - // protect datas - $course_code = Database::escape_string($course_code); - // get the informations of the course - $a_course = CourseManager :: get_course_information($course_code); - if (!empty($a_course)) { - // table definition - $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); - $tbl_student_publication = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); - - $course_id = $a_course['real_id']; - - $condition_user = ""; - if (is_array($student_id)) { - $condition_user = " AND ip.insert_user_id IN (".implode(',',$student_id).") "; - } else { - $condition_user = " AND ip.insert_user_id = '$student_id' "; - } - - $condition_session = ""; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = " AND pub.session_id = $session_id "; - } - - $sql = "SELECT count(ip.tool) + $rs = Database::query($sql); + $row = Database::fetch_row($rs); + return $row[0]; + } + return null; + } + + /** + * Count assignments per student + * @param int|array Student id(s) + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) return count of assignments including sessions, 0 = session is not filtered + * @return int Count of assignments + */ + public static function count_student_assignments($student_id, $course_code, $session_id = null) + { + // protect datas + $course_code = Database::escape_string($course_code); + // get the informations of the course + $a_course = CourseManager :: get_course_information($course_code); + if (!empty($a_course)) { + // table definition + $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); + $tbl_student_publication = Database :: get_course_table(TABLE_STUDENT_PUBLICATION); + + $course_id = $a_course['real_id']; + + $condition_user = ""; + if (is_array($student_id)) { + $condition_user = " AND ip.insert_user_id IN (".implode(',', $student_id).") "; + } else { + $condition_user = " AND ip.insert_user_id = '$student_id' "; + } + + $condition_session = ""; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = " AND pub.session_id = $session_id "; + } + + $sql = "SELECT count(ip.tool) FROM $tbl_item_property ip INNER JOIN $tbl_student_publication pub ON ip.ref = pub.id WHERE ip.c_id = $course_id AND pub.c_id = $course_id AND ip.tool='work' $condition_user $condition_session "; - $rs = Database::query($sql); - $row = Database::fetch_row($rs); - return $row[0]; - } - return null; - } - - - /** - * Count messages per student inside forum tool - * @param int Student id - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) return count of messages including sessions, 0 = session is not filtered - * @return int Count of messages - */ - public static function count_student_messages($student_id, $course_code, $session_id = null) { - - // protect datas - $student_id = intval($student_id); - $course_code = addslashes($course_code); - - // get the informations of the course - $a_course = CourseManager :: get_course_information($course_code); - - if (!empty($a_course)) { - - // table definition - $tbl_forum_post = Database :: get_course_table(TABLE_FORUM_POST); - $tbl_forum = Database :: get_course_table(TABLE_FORUM); - - $course_id = $a_course['real_id']; - - $condition_user = ""; - if (is_array($student_id)) { - $condition_user = " AND post.poster_id IN (".implode(',',$student_id).") "; - } else { - $condition_user = " AND post.poster_id = '$student_id' "; - } - - $condition_session = ""; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = " AND forum.session_id = $session_id"; - } - - $sql = "SELECT 1 FROM $tbl_forum_post post INNER JOIN $tbl_forum forum + $rs = Database::query($sql); + $row = Database::fetch_row($rs); + return $row[0]; + } + return null; + } + + /** + * Count messages per student inside forum tool + * @param int Student id + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) return count of messages including sessions, 0 = session is not filtered + * @return int Count of messages + */ + public static function count_student_messages($student_id, $course_code, $session_id = null) + { + + // protect datas + $student_id = intval($student_id); + $course_code = addslashes($course_code); + + // get the informations of the course + $a_course = CourseManager :: get_course_information($course_code); + + if (!empty($a_course)) { + + // table definition + $tbl_forum_post = Database :: get_course_table(TABLE_FORUM_POST); + $tbl_forum = Database :: get_course_table(TABLE_FORUM); + + $course_id = $a_course['real_id']; + + $condition_user = ""; + if (is_array($student_id)) { + $condition_user = " AND post.poster_id IN (".implode(',', $student_id).") "; + } else { + $condition_user = " AND post.poster_id = '$student_id' "; + } + + $condition_session = ""; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = " AND forum.session_id = $session_id"; + } + + $sql = "SELECT 1 FROM $tbl_forum_post post INNER JOIN $tbl_forum forum ON forum.forum_id = post.forum_id WHERE post.c_id = $course_id AND forum.c_id = $course_id $condition_user $condition_session "; - $rs = Database::query($sql); - return Database::num_rows($rs); - } else { - return null; - } - } - - /** - * This function counts the number of post by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return int The number of post by course - */ - public static function count_number_of_posts_by_course($course_code, $session_id = null) { - //protect data - $course_code = Database::escape_string($course_code); - // get the informations of the course - $a_course = CourseManager :: get_course_information($course_code); - $count = 0; - if (!empty($a_course)) { - $tbl_posts = Database :: get_course_table(TABLE_FORUM_POST); - $tbl_forums = Database :: get_course_table(TABLE_FORUM); - - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' AND f.session_id = '. $session_id; - } - - $course_id = $a_course['real_id']; - - $sql = "SELECT count(*) FROM $tbl_posts p INNER JOIN $tbl_forums f + $rs = Database::query($sql); + return Database::num_rows($rs); + } else { + return null; + } + } + + /** + * This function counts the number of post by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return int The number of post by course + */ + public static function count_number_of_posts_by_course($course_code, $session_id = null, $user_list = array()) + { + //protect data + $course_code = Database::escape_string($course_code); + // get the informations of the course + $a_course = CourseManager :: get_course_information($course_code); + $count = 0; + + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND poster_id IN ('".implode("', '", $user_list)."')"; + } + + if (!empty($a_course)) { + $tbl_posts = Database :: get_course_table(TABLE_FORUM_POST); + $tbl_forums = Database :: get_course_table(TABLE_FORUM); + + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' AND f.session_id = '.$session_id; + } + + $course_id = $a_course['real_id']; + + $sql = "SELECT count(*) FROM $tbl_posts p INNER JOIN $tbl_forums f ON f.forum_id = p.forum_id WHERE p.c_id = $course_id AND f.c_id = $course_id $condition_session + $user_condition "; - $result = Database::query($sql); - $row = Database::fetch_row($result); - $count = $row[0]; - return $count; - } else { - return null; - } - } - - /** - * This function counts the number of threads by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return int The number of threads by course - */ - public static function count_number_of_threads_by_course($course_code, $session_id = null) { - $course_info = api_get_course_info($course_code); - if (empty($course_info)) { - return null; - } - $course_id = $course_info['real_id']; + $result = Database::query($sql); + $row = Database::fetch_row($result); + $count = $row[0]; + return $count; + } else { + return null; + } + } - $count = 0; + /** + * This function counts the number of threads by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return int The number of threads by course + */ + public static function count_number_of_threads_by_course($course_code, $session_id = null, $user_list = array()) + { + $course_info = api_get_course_info($course_code); + if (empty($course_info)) { + return null; + } + $course_id = $course_info['real_id']; - $tbl_threads = Database :: get_course_table(TABLE_FORUM_THREAD); - $tbl_forums = Database :: get_course_table(TABLE_FORUM); - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' AND f.session_id = '. $session_id; - } + $count = 0; - $sql = "SELECT count(*) FROM $tbl_threads t INNER JOIN $tbl_forums f ON f.forum_id = t.forum_id - WHERE t.c_id = $course_id AND f.c_id = $course_id $condition_session "; - $result = Database::query($sql); - if (Database::num_rows($result)) { - $row = Database::fetch_row($result); - $count = $row[0]; - return $count; - } else { - return null; - } - } - - /** - * This function counts the number of forums by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return int The number of forums by course - */ - public static function count_number_of_forums_by_course($course_code, $session_id = null) { - $course_info = api_get_course_info($course_code); - if (empty($course_info)) { - return null; - } - $course_id = $course_info['real_id']; + $tbl_threads = Database :: get_course_table(TABLE_FORUM_THREAD); + $tbl_forums = Database :: get_course_table(TABLE_FORUM); - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' session_id = '. $session_id; - } + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' AND f.session_id = '.$session_id; + } - $tbl_forums = Database :: get_course_table(TABLE_FORUM); - $sql = "SELECT count(*) FROM $tbl_forums WHERE c_id = $course_id AND $condition_session"; - $result = Database::query($sql); - if (Database::num_rows($result)) { - $row = Database::fetch_row($result); - $count = $row[0]; - return $count; - } else { - return null; - } - } - - /** - * This function counts the chat last connections by course in x days - * @param string Course code - * @param int Last x days - * @param int Session id (optional) - * @return int Chat last connections by course in x days - */ - public static function chat_connections_during_last_x_days_by_course($course_code,$last_days, $session_id = 0) { - $course_info = api_get_course_info($course_code); - if (empty($course_info)) { - return null; - } - $course_id = $course_info['real_id']; - - //protect data - $last_days = intval($last_days); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - $count = 0; - - $tbl_stats_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS); - - $sql = "SELECT count(*) FROM $tbl_stats_access WHERE DATE_SUB(NOW(),INTERVAL $last_days DAY) <= access_date - AND access_cours_code = '$course_code' AND access_tool='".TOOL_CHAT."' AND access_session_id='$session_id' "; - $result = Database::query($sql); - if (Database::num_rows($result)) { - $row = Database::fetch_row($result); - $count = $row[0]; - return $count; - } else { - return null; - } - } - - /** - * This function gets the last student's connection in chat - * @param int Student id - * @param string Course code - * @param int Session id (optional) - * @return string datetime formatted without day (e.g: February 23, 2010 10:20:50 ) - */ - public static function chat_last_connection($student_id, $course_code, $session_id = 0) { - - //protect datas - $student_id = intval($student_id); - $course_code= Database::escape_string($course_code); - $session_id = intval($session_id); - $date_time = ''; - - // table definition - $tbl_stats_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); - $sql = "SELECT access_date FROM $tbl_stats_access + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND thread_poster_id IN ('".implode("', '", $user_list)."')"; + } + + $sql = "SELECT count(*) FROM $tbl_threads t INNER JOIN $tbl_forums f ON f.forum_id = t.forum_id + WHERE t.c_id = $course_id AND f.c_id = $course_id $condition_session $user_condition "; + $result = Database::query($sql); + if (Database::num_rows($result)) { + $row = Database::fetch_row($result); + $count = $row[0]; + return $count; + } else { + return null; + } + } + + /** + * This function counts the number of forums by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return int The number of forums by course + */ + public static function count_number_of_forums_by_course($course_code, $session_id = null, $user_list = array()) + { + $course_info = api_get_course_info($course_code); + if (empty($course_info)) { + return null; + } + $course_id = $course_info['real_id']; + + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' session_id = '.$session_id; + } + + $tbl_forums = Database :: get_course_table(TABLE_FORUM); + $sql = "SELECT count(*) FROM $tbl_forums WHERE c_id = $course_id AND $condition_session"; + $result = Database::query($sql); + if (Database::num_rows($result)) { + $row = Database::fetch_row($result); + $count = $row[0]; + return $count; + } else { + return null; + } + } + + /** + * This function counts the chat last connections by course in x days + * @param string Course code + * @param int Last x days + * @param int Session id (optional) + * @return int Chat last connections by course in x days + */ + public static function chat_connections_during_last_x_days_by_course($course_code, $last_days, $session_id = 0, $user_list = array()) + { + $course_info = api_get_course_info($course_code); + if (empty($course_info)) { + return null; + } + + //protect data + $last_days = intval($last_days); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + $count = 0; + + + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND access_user_id IN ('".implode("', '", $user_list)."')"; + } + + $tbl_stats_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS); + + $sql = "SELECT count(*) FROM $tbl_stats_access WHERE DATE_SUB(NOW(),INTERVAL $last_days DAY) <= access_date + AND access_cours_code = '$course_code' AND access_tool='".TOOL_CHAT."' AND access_session_id='$session_id' $user_condition "; + $result = Database::query($sql); + if (Database::num_rows($result)) { + $row = Database::fetch_row($result); + $count = $row[0]; + return $count; + } else { + return null; + } + } + + /** + * This function gets the last student's connection in chat + * @param int Student id + * @param string Course code + * @param int Session id (optional) + * @return string datetime formatted without day (e.g: February 23, 2010 10:20:50 ) + */ + public static function chat_last_connection($student_id, $course_code, $session_id = 0) + { + + //protect datas + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + $date_time = ''; + + // table definition + $tbl_stats_access = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); + $sql = "SELECT access_date FROM $tbl_stats_access WHERE access_tool='".TOOL_CHAT."' AND access_user_id='$student_id' AND access_cours_code = '$course_code' AND access_session_id = '$session_id' ORDER BY access_date DESC limit 1"; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - $row = Database::fetch_array($rs); - $date_time = api_convert_and_format_date($row['access_date'], null, date_default_timezone_get()); - } - return $date_time; - } - - /** - * Get count student's visited links - * @param int Student id - * @param string Course code - * @param int Session id (optional) - * @return int count of visited links - */ - public static function count_student_visited_links($student_id, $course_code, $session_id = 0) { - - // protect datas - $student_id = intval($student_id); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - // table definition - $tbl_stats_links = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LINKS); - - $sql = 'SELECT 1 + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + $row = Database::fetch_array($rs); + $date_time = api_convert_and_format_date($row['access_date'], null, date_default_timezone_get()); + } + return $date_time; + } + + /** + * Get count student's visited links + * @param int Student id + * @param string Course code + * @param int Session id (optional) + * @return int count of visited links + */ + public static function count_student_visited_links($student_id, $course_code, $session_id = 0) + { + + // protect datas + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + // table definition + $tbl_stats_links = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_LINKS); + + $sql = 'SELECT 1 FROM '.$tbl_stats_links.' WHERE links_user_id= '.$student_id.' AND links_cours_id = "'.$course_code.'" AND links_session_id = '.$session_id.' '; - $rs = Database::query($sql); - return Database::num_rows($rs); - } - - /** - * Get count student downloaded documents - * @param int Student id - * @param string Course code - * @param int Session id (optional) - * @return int Count downloaded documents - */ - public static function count_student_downloaded_documents($student_id, $course_code, $session_id = 0) { - // protect datas - $student_id = intval($student_id); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - - // table definition - $tbl_stats_documents = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); - - $sql = 'SELECT 1 - FROM ' . $tbl_stats_documents . ' + $rs = Database::query($sql); + return Database::num_rows($rs); + } + + /** + * Get count student downloaded documents + * @param int Student id + * @param string Course code + * @param int Session id (optional) + * @return int Count downloaded documents + */ + public static function count_student_downloaded_documents($student_id, $course_code, $session_id = 0) + { + // protect datas + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + + // table definition + $tbl_stats_documents = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); + + $sql = 'SELECT 1 + FROM '.$tbl_stats_documents.' WHERE down_user_id = '.$student_id.' AND down_cours_id = "'.$course_code.'" AND down_session_id = '.$session_id.' '; - $rs = Database::query($sql); - return Database::num_rows($rs); - } - - /** - * Get course list inside a session from a student - * @param int Student id - * @param int Session id (optional) - * @return array Courses list - */ - public static function get_course_list_in_session_from_student($user_id, $id_session = 0) { - $user_id = intval($user_id); - $id_session = intval($id_session); - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $sql = 'SELECT course_code FROM ' . $tbl_session_course_user . ' WHERE id_user="' . $user_id . '" AND id_session="' . $id_session . '"'; - $result = Database::query($sql); - $a_courses = array (); - while ($row = Database::fetch_array($result)) { - $a_courses[$row['course_code']] = $row['course_code']; - } - return $a_courses; - } - - /** - * Get inactives students in course - * @param string Course code - * @param string Since login course date (optional, default = 'never') - * @param int Session id (optional) - * @return array Inactives users - */ - public static function get_inactives_students_in_course($course_code, $since = 'never', $session_id=0) { - $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $table_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); - $inner = ''; - if($session_id!=0) - { - $inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user + $rs = Database::query($sql); + return Database::num_rows($rs); + } + + /** + * Get course list inside a session from a student + * @param int Student id + * @param int Session id (optional) + * @return array Courses list + */ + public static function get_course_list_in_session_from_student($user_id, $id_session = 0) + { + $user_id = intval($user_id); + $id_session = intval($id_session); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $sql = 'SELECT course_code FROM '.$tbl_session_course_user.' WHERE id_user="'.$user_id.'" AND id_session="'.$id_session.'"'; + $result = Database::query($sql); + $a_courses = array(); + while ($row = Database::fetch_array($result)) { + $a_courses[$row['course_code']] = $row['course_code']; + } + return $a_courses; + } + + /** + * Get inactives students in course + * @param string Course code + * @param string Since login course date (optional, default = 'never') + * @param int Session id (optional) + * @return array Inactives users + */ + public static function get_inactives_students_in_course($course_code, $since = 'never', $session_id = 0) + { + $tbl_track_login = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $table_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); + $inner = ''; + if ($session_id != 0) { + $inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user ON stats_login.course_code = session_course_user.course_code AND session_course_user.id_session = '.intval($session_id).' AND session_course_user.id_user = stats_login.user_id '; - } - $sql = 'SELECT user_id, MAX(login_course_date) max_date FROM'.$tbl_track_login.' stats_login'.$inner.' + } + $sql = 'SELECT user_id, MAX(login_course_date) max_date FROM'.$tbl_track_login.' stats_login'.$inner.' GROUP BY user_id HAVING DATE_SUB( NOW(), INTERVAL '.$since.' DAY) > max_date '; - //HAVING DATE_ADD(max_date, INTERVAL '.$since.' DAY) < NOW() '; + //HAVING DATE_ADD(max_date, INTERVAL '.$since.' DAY) < NOW() '; - if ($since == 'never') { - $sql = 'SELECT course_user.user_id FROM '.$table_course_rel_user.' course_user - LEFT JOIN '. $tbl_track_login.' stats_login + if ($since == 'never') { + $sql = 'SELECT course_user.user_id FROM '.$table_course_rel_user.' course_user + LEFT JOIN '.$tbl_track_login.' stats_login ON course_user.user_id = stats_login.user_id AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' '. - $inner.' + $inner.' WHERE course_user.course_code = \''.Database::escape_string($course_code).'\' AND stats_login.login_course_date IS NULL GROUP BY course_user.user_id'; - } - $rs = Database::query($sql); - $inactive_users = array(); - while($user = Database::fetch_array($rs)) - { - $inactive_users[] = $user['user_id']; - } - return $inactive_users; - } - - /** - * Get count login per student - * @param int Student id - * @param string Course code - * @param int Session id (optional) - * @return int count login - */ - public static function count_login_per_student($student_id, $course_code, $session_id = 0) { - $student_id = intval($student_id); - $course_code = Database::escape_string($course_code); - $session_id = intval($session_id); - $tbl_course_rel_user = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS); - - $sql = 'SELECT '.$student_id.' - FROM ' . $tbl_course_rel_user . ' - WHERE access_user_id=' . $student_id . ' - AND access_cours_code="' . $course_code . '" AND access_session_id = "'.$session_id.'" '; - - $rs = Database::query($sql); - $nb_login = Database::num_rows($rs); - - return $nb_login; - } - - - /** - * Get students followed by a human resources manager - * @param int Drh id - * @return array Student list - */ - public static function get_student_followed_by_drh($hr_dept_id) { - - $hr_dept_id = intval($hr_dept_id); - $a_students = array(); - - $tbl_organism = Database :: get_main_table(TABLE_MAIN_ORGANISM); - $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); - - $sql = 'SELECT DISTINCT user_id FROM '.$tbl_user.' as user - WHERE hr_dept_id='.$hr_dept_id; - $rs = Database::query($sql); - - while($user = Database :: fetch_array($rs)) - { - $a_students[$user['user_id']] = $user['user_id']; - } - - return $a_students; - } - - /** - * Gets the average of test and scorm inside a learning path - * @param int User id - * @param string Course id - * @return float average of test - * @author isaac flores paz - * @deprecated get_avg_student_score should be use - */ - public static function get_average_test_scorm_and_lp ($user_id, $course_id) { - - //the score inside the Reporting table - $course_info = api_get_course_info($course_id); - $course_id = $course_info['real_id']; - - $lp_table = Database :: get_course_table(TABLE_LP_MAIN); - $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW); - $lp_item_view_table = Database :: get_course_table(TABLE_LP_ITEM_VIEW); - $lp_item_table = Database :: get_course_table(TABLE_LP_ITEM); - - $sql_type = "SELECT id, lp_type FROM $lp_table WHERE c_id = $course_id"; - $rs_type=Database::query($sql_type); - $average_data=0; - $count_loop=0; - $lp_list = array(); - while ($row_type = Database::fetch_array($rs_type)) { - $lp_list[] = $row_type['id']; - if ($row_type['lp_type']==1) { - //lp chamilo - - $sql = "SELECT id FROM $lp_view_table WHERE c_id = $course_id AND user_id = '".intval($user_id)."' and lp_id='".$row_type['id']."'"; - $rs_last_lp_view_id = Database::query($sql); - $lp_view_id = intval(Database::result($rs_last_lp_view_id,0,'id')); - - $sql_list_view="SELECT li.max_score,lv.user_id,liw.score,(liw.score/li.max_score) as sum_data - FROM $lp_item_table li INNER JOIN $lp_view_table lv - ON li.lp_id=lv.lp_id INNER JOIN $lp_item_view_table liw ON liw.lp_item_id=li.id - WHERE li.c_id = $course_id AND - liw.c_id = $course_id AND - lv.c_id = $course_id AND - lv.user_id= $user_id AND li.item_type = 'quiz' AND liw.lp_view_id= $lp_view_id"; - $sum=0; - $tot=0; - $rs_list_view1=Database::query($sql_list_view); - while ($row_list_view=Database::fetch_array($rs_list_view1)) { - $sum=$sum+$row_list_view['sum_data']; - $tot++; - } - if ($tot==0) { - $tot=1; - } - $average_data1=$sum/$tot; - - $sql_list_view=''; - $rs_last_lp_view_id=''; - - } elseif ($row_type['lp_type']==2) { - //lp scorm - $sql = "SELECT id FROM $lp_view_table WHERE c_id = $course_id AND user_id = '".intval($user_id)."' and lp_id='".$row_type['id']."'"; - $rs_last_lp_view_id = Database::query($sql); - $lp_view_id = intval(Database::result($rs_last_lp_view_id,0,'id')); - - $sql_list_view = "SELECT li.max_score,lv.user_id,liw.score,((liw.score/li.max_score)*100) as sum_data - FROM $lp_item_table li INNER JOIN $lp_view_table lv - ON li.lp_id=lv.lp_id INNER JOIN $lp_item_view_table liw ON liw.lp_item_id=li.id + } + $rs = Database::query($sql); + $inactive_users = array(); + while ($user = Database::fetch_array($rs)) { + $inactive_users[] = $user['user_id']; + } + return $inactive_users; + } + + /** + * Get count login per student + * @param int Student id + * @param string Course code + * @param int Session id (optional) + * @return int count login + */ + public static function count_login_per_student($student_id, $course_code, $session_id = 0) + { + $student_id = intval($student_id); + $course_code = Database::escape_string($course_code); + $session_id = intval($session_id); + $tbl_course_rel_user = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS); + + $sql = 'SELECT '.$student_id.' + FROM '.$tbl_course_rel_user.' + WHERE access_user_id='.$student_id.' + AND access_cours_code="'.$course_code.'" AND access_session_id = "'.$session_id.'" '; + + $rs = Database::query($sql); + $nb_login = Database::num_rows($rs); + + return $nb_login; + } + + /** + * Get students followed by a human resources manager + * @param int Drh id + * @return array Student list + */ + public static function get_student_followed_by_drh($hr_dept_id) + { + + $hr_dept_id = intval($hr_dept_id); + $a_students = array(); + + $tbl_organism = Database :: get_main_table(TABLE_MAIN_ORGANISM); + $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); + + $sql = 'SELECT DISTINCT user_id FROM '.$tbl_user.' as user + WHERE hr_dept_id='.$hr_dept_id; + $rs = Database::query($sql); + + while ($user = Database :: fetch_array($rs)) { + $a_students[$user['user_id']] = $user['user_id']; + } + + return $a_students; + } + + /** + * Gets the average of test and scorm inside a learning path + * @param int User id + * @param string Course id + * @return float average of test + * @author isaac flores paz + * @deprecated get_avg_student_score should be use + */ + public static function get_average_test_scorm_and_lp($user_id, $course_id) + { + + //the score inside the Reporting table + $course_info = api_get_course_info($course_id); + $course_id = $course_info['real_id']; + + $lp_table = Database :: get_course_table(TABLE_LP_MAIN); + $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW); + $lp_item_view_table = Database :: get_course_table(TABLE_LP_ITEM_VIEW); + $lp_item_table = Database :: get_course_table(TABLE_LP_ITEM); + + $sql_type = "SELECT id, lp_type FROM $lp_table WHERE c_id = $course_id"; + $rs_type = Database::query($sql_type); + $average_data = 0; + $count_loop = 0; + $lp_list = array(); + while ($row_type = Database::fetch_array($rs_type)) { + $lp_list[] = $row_type['id']; + if ($row_type['lp_type'] == 1) { + //lp chamilo + + $sql = "SELECT id FROM $lp_view_table WHERE c_id = $course_id AND user_id = '".intval($user_id)."' and lp_id='".$row_type['id']."'"; + $rs_last_lp_view_id = Database::query($sql); + $lp_view_id = intval(Database::result($rs_last_lp_view_id, 0, 'id')); + + $sql_list_view = "SELECT li.max_score,lv.user_id,liw.score,(liw.score/li.max_score) as sum_data + FROM $lp_item_table li INNER JOIN $lp_view_table lv + ON li.lp_id=lv.lp_id INNER JOIN $lp_item_view_table liw ON liw.lp_item_id=li.id + WHERE li.c_id = $course_id AND + liw.c_id = $course_id AND + lv.c_id = $course_id AND + lv.user_id= $user_id AND li.item_type = 'quiz' AND liw.lp_view_id= $lp_view_id"; + $sum = 0; + $tot = 0; + $rs_list_view1 = Database::query($sql_list_view); + while ($row_list_view = Database::fetch_array($rs_list_view1)) { + $sum = $sum + $row_list_view['sum_data']; + $tot++; + } + if ($tot == 0) { + $tot = 1; + } + $average_data1 = $sum / $tot; + + $sql_list_view = ''; + $rs_last_lp_view_id = ''; + } elseif ($row_type['lp_type'] == 2) { + //lp scorm + $sql = "SELECT id FROM $lp_view_table WHERE c_id = $course_id AND user_id = '".intval($user_id)."' and lp_id='".$row_type['id']."'"; + $rs_last_lp_view_id = Database::query($sql); + $lp_view_id = intval(Database::result($rs_last_lp_view_id, 0, 'id')); + + $sql_list_view = "SELECT li.max_score,lv.user_id,liw.score,((liw.score/li.max_score)*100) as sum_data + FROM $lp_item_table li INNER JOIN $lp_view_table lv + ON li.lp_id=lv.lp_id INNER JOIN $lp_item_view_table liw ON liw.lp_item_id=li.id WHERE li.c_id = $course_id AND liw.c_id = $course_id AND lv.c_id = $course_id AND lv.user_id= $user_id AND (li.item_type = 'sco' OR li.item_type='quiz') AND liw.lp_view_id = $lp_view_id"; - $tot=0; - $sum=0; - - $rs_list_view2=Database::query($sql_list_view); - while ($row_list_view=Database::fetch_array($rs_list_view2)) { - $sum=$sum+$row_list_view['sum_data']; - $tot++; - } - if ($tot==0) { - $tot=1; - } - $average_data2=$sum/$tot; - } - $average_data_sum=$average_data_sum+$average_data1+$average_data2; - $average_data2=0; - $average_data1=0; - $count_loop++; - } - - //We only count the LP that have an exercise to get the average - $lp_with_quiz = 0; - foreach($lp_list as $lp_id) { - - //check if LP have a score - $sql = "SELECT count(id) as count FROM $lp_item_table + $tot = 0; + $sum = 0; + + $rs_list_view2 = Database::query($sql_list_view); + while ($row_list_view = Database::fetch_array($rs_list_view2)) { + $sum = $sum + $row_list_view['sum_data']; + $tot++; + } + if ($tot == 0) { + $tot = 1; + } + $average_data2 = $sum / $tot; + } + $average_data_sum = $average_data_sum + $average_data1 + $average_data2; + $average_data2 = 0; + $average_data1 = 0; + $count_loop++; + } + + //We only count the LP that have an exercise to get the average + $lp_with_quiz = 0; + foreach ($lp_list as $lp_id) { + + //check if LP have a score + $sql = "SELECT count(id) as count FROM $lp_item_table WHERE c_id = $course_id AND item_type = 'quiz' AND lp_id = ".$lp_id." "; - $result_have_quiz = Database::query($sql); - - if (Database::num_rows($result_have_quiz) > 0 ) { - $row = Database::fetch_array($result_have_quiz,'ASSOC'); - if (is_numeric($row['count']) && $row['count'] != 0) { - $lp_with_quiz++; - } - } - } - - if ($lp_with_quiz > 0) { - $avg_student_score = round(($average_data_sum / $lp_with_quiz * 100), 2); - } - return $avg_student_score; - } - - /** - * get count clicks about tools most used by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return array tools data - */ - public static function get_tools_most_used_by_course($course_code, $session_id = null) { - //protect data - $course_code = Database::escape_string($course_code); - $data = array(); - $TABLETRACK_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' AND access_session_id = '. $session_id; - } - $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool ) as count_access_tool + $result_have_quiz = Database::query($sql); + + if (Database::num_rows($result_have_quiz) > 0) { + $row = Database::fetch_array($result_have_quiz, 'ASSOC'); + if (is_numeric($row['count']) && $row['count'] != 0) { + $lp_with_quiz++; + } + } + } + + if ($lp_with_quiz > 0) { + $avg_student_score = round(($average_data_sum / $lp_with_quiz * 100), 2); + } + return $avg_student_score; + } + + /** + * get count clicks about tools most used by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return array tools data + */ + public static function get_tools_most_used_by_course($course_code, $session_id = null, $user_list = array()) + { + //protect data + $course_code = Database::escape_string($course_code); + $data = array(); + $TABLETRACK_ACCESS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LASTACCESS); + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' AND access_session_id = '.$session_id; + } + + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND access_user_id IN ('".implode("', '", $user_list)."')"; + } + + $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool ) as count_access_tool FROM $TABLETRACK_ACCESS - WHERE access_tool IS NOT NULL AND access_tool != '' AND access_cours_code = '$course_code' $condition_session + WHERE access_tool IS NOT NULL AND access_tool != '' AND access_cours_code = '$course_code' $condition_session $user_condition GROUP BY access_tool ORDER BY count_access_tool DESC LIMIT 0, 3"; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs)) { - $data[] = $row; - } - } - return $data; - } - - /** - * get documents most downloaded by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @param int Limit (optional, default = 0, 0 = without limit) - * @return array documents downloaded - */ - public static function get_documents_most_downloaded_by_course($course_code, $session_id = null, $limit = 0) { - - //protect data - $course_code = Database::escape_string($course_code); - $data = array(); - - $TABLETRACK_DOWNLOADS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' AND down_session_id = '. $session_id; - } - $sql = "SELECT down_doc_path, COUNT(DISTINCT down_user_id), COUNT(down_doc_path) as count_down + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + while ($row = Database::fetch_array($rs)) { + $data[] = $row; + } + } + return $data; + } + + /** + * get documents most downloaded by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @param int Limit (optional, default = 0, 0 = without limit) + * @return array documents downloaded + */ + public static function get_documents_most_downloaded_by_course($course_code, $session_id = null, $limit = 0, $user_list = array()) + { + + //protect data + $course_code = Database::escape_string($course_code); + $data = array(); + + $TABLETRACK_DOWNLOADS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' AND down_session_id = '.$session_id; + } + + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND down_user_id IN ('".implode("', '", $user_list)."')"; + } + + $sql = "SELECT down_doc_path, COUNT(DISTINCT down_user_id), COUNT(down_doc_path) as count_down FROM $TABLETRACK_DOWNLOADS WHERE down_cours_id = '$course_code' - $condition_session + $condition_session $user_condition GROUP BY down_doc_path ORDER BY count_down DESC LIMIT 0, $limit"; - $rs = Database::query($sql); - - if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs)) { - $data[] = $row; - } - } - return $data; - } - - /** - * get links most visited by course - * @param string Course code - * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered - * @return array links most visited - */ - public static function get_links_most_visited_by_course($course_code, $session_id = null) { - - //protect data - $course_code = Database::escape_string($course_code); - $course_info = api_get_course_info($course_code); - - $course_id = $course_info['real_id']; - - $data = array(); - - $TABLETRACK_LINKS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LINKS); - $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); - - $condition_session = ''; - if (isset($session_id)) { - $session_id = intval($session_id); - $condition_session = ' AND cl.session_id = '.$session_id; - } - - $sql = "SELECT cl.title, cl.url,count(DISTINCT sl.links_user_id), count(cl.title) as count_visits + $rs = Database::query($sql); + + if (Database::num_rows($rs) > 0) { + while ($row = Database::fetch_array($rs)) { + $data[] = $row; + } + } + return $data; + } + + /** + * get links most visited by course + * @param string Course code + * @param int Session id (optional), if param $session_id is null(default) it'll return results including sessions, 0 = session is not filtered + * @return array links most visited + */ + public static function get_links_most_visited_by_course($course_code, $session_id = null, $user_list = array()) + { + $course_code = Database::escape_string($course_code); + $course_info = api_get_course_info($course_code); + $course_id = $course_info['real_id']; + + $data = array(); + $TABLETRACK_LINKS = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_LINKS); + $TABLECOURSE_LINKS = Database::get_course_table(TABLE_LINK); + + $condition_session = ''; + if (isset($session_id)) { + $session_id = intval($session_id); + $condition_session = ' AND cl.session_id = '.$session_id; + } + + $user_condition = null; + if (!empty($user_list)) { + $user_condition = "AND links_user_id IN ('".implode("', '", $user_list)."')"; + } + + $sql = "SELECT cl.title, cl.url, count(DISTINCT sl.links_user_id), count(cl.title) as count_visits FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl WHERE cl.c_id = $course_id AND sl.links_link_id = cl.id AND sl.links_cours_id = '$course_code' - $condition_session + $condition_session $user_condition GROUP BY cl.title, cl.url ORDER BY count_visits DESC LIMIT 0, 3"; - $rs = Database::query($sql); - if (Database::num_rows($rs) > 0) { - while ($row = Database::fetch_array($rs)) { - $data[] = $row; - } - } - return $data; - } - - /** - * Shows the user progress (when clicking in the Progress tab) - * @param int user id - * @return string html code - */ - static function show_user_progress($user_id, $session_id = 0, $extra_params = '', $show_courses = true) { - global $_configuration; - $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); - $tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); - $tbl_access_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); - $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); - $tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); - - $user_id = intval($user_id); - - // get course list - if (api_is_multiple_url_enabled()) { - $sql = 'SELECT cu.course_code as code, title + + $rs = Database::query($sql); + if (Database::num_rows($rs) > 0) { + while ($row = Database::fetch_array($rs)) { + $data[] = $row; + } + } + return $data; + } + + /** + * Shows the user progress (when clicking in the Progress tab) + * @param int user id + * @return string html code + */ + static function show_user_progress($user_id, $session_id = 0, $extra_params = '', $show_courses = true) + { + global $_configuration; + $tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE); + $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + $tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); + $tbl_access_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); + $tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); + $tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); + + $user_id = intval($user_id); + + // get course list + if (api_is_multiple_url_enabled()) { + $sql = 'SELECT cu.course_code as code, title FROM '.$tbl_course_user.' cu INNER JOIN '.$tbl_access_rel_course.' a ON(a.course_code = cu.course_code) INNER JOIN '.$tbl_course.' c ON( cu.course_code = c.code) WHERE user_id='.$user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' AND access_url_id = '.api_get_current_access_url_id().' ORDER BY title '; - } else { - $sql = 'SELECT course_code as code, title FROM '.$tbl_course_user.' u INNER JOIN '.$tbl_course.' c ON(course_code = c.code) + } else { + $sql = 'SELECT course_code as code, title FROM '.$tbl_course_user.' u INNER JOIN '.$tbl_course.' c ON(course_code = c.code) WHERE u.user_id='.$user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' ORDER BY title '; - } + } - $rs = Database::query($sql); - $courses = $course_in_session = $temp_course_in_session = array(); - while($row = Database :: fetch_array($rs, 'ASSOC')) { - $courses[$row['code']] = $row['title']; - } + $rs = Database::query($sql); + $courses = $course_in_session = $temp_course_in_session = array(); + while ($row = Database :: fetch_array($rs, 'ASSOC')) { + $courses[$row['code']] = $row['title']; + } - // Get the list of sessions where the user is subscribed as student - if (api_is_multiple_url_enabled()) { - $sql = 'SELECT DISTINCT cu.course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a ON(a.session_id = cu.id_session) INNER JOIN '.$tbl_session.' s ON(s.id = a.session_id) + // Get the list of sessions where the user is subscribed as student + if (api_is_multiple_url_enabled()) { + $sql = 'SELECT DISTINCT cu.course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a ON(a.session_id = cu.id_session) INNER JOIN '.$tbl_session.' s ON(s.id = a.session_id) WHERE id_user='.$user_id.' AND access_url_id = '.api_get_current_access_url_id().' ORDER BY name '; - } else { - $sql = 'SELECT DISTINCT course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' u INNER JOIN '.$tbl_session.' s ON(s.id = u.id_session) + } else { + $sql = 'SELECT DISTINCT course_code, id_session as session_id, name FROM '.$tbl_session_course_user.' u INNER JOIN '.$tbl_session.' s ON(s.id = u.id_session) WHERE id_user='.$user_id.' ORDER BY name '; - } - - $rs = Database::query($sql); - $simple_session_array = array(); - while ($row = Database :: fetch_array($rs)) { - $course_info = CourseManager::get_course_information($row['course_code']); - $temp_course_in_session[$row['session_id']]['course_list'][$course_info['id']] = $course_info; - $temp_course_in_session[$row['session_id']]['name'] = $row['name']; - $simple_session_array[$row['session_id']] = $row['name']; - } - foreach($simple_session_array as $my_session_id => $session_name) { - $course_list = $temp_course_in_session[$my_session_id]['course_list']; - $my_course_data = array(); - foreach ($course_list as $course_data) { - $my_course_data[$course_data['id']] = $course_data['title']; - } - $my_course_data = utf8_sort($my_course_data); - $final_course_data = array(); - - foreach($my_course_data as $course_id => $value) { - $final_course_data[$course_id] = $course_list[$course_id]; - } - $course_in_session[$my_session_id]['course_list'] = $final_course_data; - $course_in_session[$my_session_id]['name'] = $session_name; - } - - $html = ''; - - // Course list - - if ($show_courses) { - if (!empty($courses)) { - $html .= Display::page_subheader(Display::return_icon('course.png', get_lang('MyCourses'), array(), ICON_SIZE_SMALL).' '.get_lang('MyCourses')); - $html .= ''; - $html .= ' - '.Display::tag('th', get_lang('Course'), array('width'=>'300px')).' - '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).' - '.Display::tag('th', get_lang('Progress'), array('class'=>'head')).' - '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')),array('class'=>'head')).' - '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' - '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' + } + + $rs = Database::query($sql); + $simple_session_array = array(); + while ($row = Database :: fetch_array($rs)) { + $course_info = CourseManager::get_course_information($row['course_code']); + $temp_course_in_session[$row['session_id']]['course_list'][$course_info['id']] = $course_info; + $temp_course_in_session[$row['session_id']]['name'] = $row['name']; + $simple_session_array[$row['session_id']] = $row['name']; + } + foreach ($simple_session_array as $my_session_id => $session_name) { + $course_list = $temp_course_in_session[$my_session_id]['course_list']; + $my_course_data = array(); + foreach ($course_list as $course_data) { + $my_course_data[$course_data['id']] = $course_data['title']; + } + $my_course_data = utf8_sort($my_course_data); + $final_course_data = array(); + + foreach ($my_course_data as $course_id => $value) { + $final_course_data[$course_id] = $course_list[$course_id]; + } + $course_in_session[$my_session_id]['course_list'] = $final_course_data; + $course_in_session[$my_session_id]['name'] = $session_name; + } + + $html = ''; + + // Course list + + if ($show_courses) { + if (!empty($courses)) { + $html .= Display::page_subheader(Display::return_icon('course.png', get_lang('MyCourses'), array(), ICON_SIZE_SMALL).' '.get_lang('MyCourses')); + $html .= '
'; + $html .= ' + '.Display::tag('th', get_lang('Course'), array('width' => '300px')).' + '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Progress'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class' => 'head')).' + '.Display::tag('th', get_lang('LastConnexion'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Details'), array('class' => 'head')).' '; - foreach ($courses as $course_code => $course_title) { - $weighting = 0; + foreach ($courses as $course_code => $course_title) { + $weighting = 0; - $total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $course_code); - $time = api_time_to_hms($total_time_login); - $progress = Tracking :: get_avg_student_progress($user_id, $course_code); - $percentage_score = Tracking :: get_avg_student_score($user_id, $course_code, array()); - $last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $course_code); + $total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $course_code); + $time = api_time_to_hms($total_time_login); + $progress = Tracking :: get_avg_student_progress($user_id, $course_code); + $percentage_score = Tracking :: get_avg_student_score($user_id, $course_code, array()); + $last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $course_code); - if (is_null($progress)) { - $progress = '0%'; - } else { - $progress = $progress.'%'; + if (is_null($progress)) { + $progress = '0%'; + } else { + $progress = $progress.'%'; + } + + if ($course_code == $_GET['course'] && empty($_GET['session_id'])) { + $html .= ''; + } else { + $html .= ''; + } + $url = api_get_course_url($course_code, $session_id); + $course_url = Display::url($course_title, $url, array('target' => SESSION_LINK_TARGET)); + $html .= ''; + + $html .= ''; + $html .= ''; + + $html .= ''; + $html .= ''; + $html .= ''; + } + $html .= '
'.$course_url.''.$time.''.$progress.''; + if (is_numeric($percentage_score)) { + $html .= $percentage_score.'%'; + } else { + $html .= '0%'; + } + $html .= ''.$last_connection.''; + if ($course_code == $_GET['course'] && empty($_GET['session_id'])) { + $html .= ''; + $html .= Display::return_icon('2rightarrow_na.gif', get_lang('Details')); + } else { + $html .= ''; + $html .= Display::return_icon('2rightarrow.gif', get_lang('Details')); + } + $html .= ''; + $html .= '
'; + } + } + + // Session list + if (!empty($course_in_session)) { + $main_session_graph = ''; + + if (!isset($_GET['session_id']) && !isset($_GET['course'])) { + + //Load graphics only when calling to an specific session + $session_graph = array(); + + $all_exercise_graph_name_list = array(); + $my_results = array(); + $all_exercise_graph_list = array(); + + $all_exercise_start_time = array(); + + foreach ($course_in_session as $my_session_id => $session_data) { + + $course_list = $session_data['course_list']; + $session_name = $session_data['name']; + + $user_count = count(SessionManager::get_users_by_session($my_session_id)); + + $exercise_graph_name_list = array(); + //$user_results = array(); + $exercise_graph_list = array(); + + foreach ($course_list as $course_data) { + + $exercise_list = get_all_exercises($course_data, $my_session_id); + + foreach ($exercise_list as $exercise_data) { + $exercise_obj = new Exercise($course_data['id']); + $exercise_obj->read($exercise_data['id']); + //Exercise is not necessary to be visible to show results check the result_disable configuration instead + //$visible_return = $exercise_obj->is_visible(); + + if ($exercise_data['results_disabled'] == 0 || $exercise_data['results_disabled'] == 2) { + //if ($visible_return['value'] == true) { + $best_average = intval(get_best_average_score_by_exercise($exercise_data['id'], $course_data['code'], $my_session_id, $user_count)); + $exercise_graph_list[] = $best_average; + $all_exercise_graph_list[] = $best_average; + + $user_result_data = get_best_attempt_by_user(api_get_user_id(), $exercise_data['id'], $course_data['code'], $my_session_id); + $score = 0; + if (!empty($user_result_data['exe_weighting']) && intval($user_result_data['exe_weighting']) != 0) { + $score = intval($user_result_data['exe_result'] / $user_result_data['exe_weighting'] * 100); + } + //$user_results[] = $score; + $time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0; + $all_exercise_start_time[] = $time; + $my_results[] = $score; + if (count($exercise_list) <= 10) { + $title = cut($course_data['title'], 30)." \n ".cut($exercise_data['title'], 30); + $exercise_graph_name_list[] = $title; + $all_exercise_graph_name_list[] = $title; + } else { + // if there are more than 10 results, space becomes difficult to find, so only show the title of the exercise, not the tool + $title = cut($exercise_data['title'], 30); + $exercise_graph_name_list[] = $title; + $all_exercise_graph_name_list[] = $title; + } + } } + } + } + + //Complete graph + if (!empty($my_results) && !empty($all_exercise_graph_list)) { + asort($all_exercise_start_time); - if ($course_code == $_GET['course'] && empty($_GET['session_id'])) { - $html .= ''; - } else { - $html .= ''; - } - $url = api_get_course_url($course_code, $session_id); - $course_url = Display::url($course_title, $url, array('target'=>SESSION_LINK_TARGET)); - $html .= ''.$course_url.''; - - $html .= ''.$time.''; - $html .= ''.$progress.''; - - $html .= ''; - if (is_numeric($percentage_score)) { - $html .= $percentage_score.'%'; - } else { - $html .= '0%'; - } - $html .= ''; - $html .= ''.$last_connection.''; - $html .= ''; - if ($course_code == $_GET['course'] && empty($_GET['session_id'])) { - $html .= ''; - $html .= Display::return_icon('2rightarrow_na.gif', get_lang('Details')); - } else { - $html .= ''; - $html .= Display::return_icon('2rightarrow.gif', get_lang('Details')); - } - $html .= ''; - $html .= ''; - } - $html .= ''; - } - } - - // Session list - if (!empty($course_in_session)) { - $main_session_graph = ''; - - if (!isset($_GET['session_id']) && !isset($_GET['course'])) { - - //Load graphics only when calling to an specific session - $session_graph = array(); - - $all_exercise_graph_name_list = array(); - $my_results = array(); - $all_exercise_graph_list = array(); - - $all_exercise_start_time = array(); - - foreach ($course_in_session as $my_session_id => $session_data) { - - $course_list = $session_data['course_list']; - $session_name = $session_data['name']; - - $user_count = count(SessionManager::get_users_by_session($my_session_id)); - - $exercise_graph_name_list = array(); - //$user_results = array(); - $exercise_graph_list = array(); - - foreach ($course_list as $course_data) { - - $exercise_list = get_all_exercises($course_data, $my_session_id); - - foreach ($exercise_list as $exercise_data) { - $exercise_obj = new Exercise($course_data['id']); - $exercise_obj->read($exercise_data['id']); - //Exercise is not necessary to be visible to show results check the result_disable configuration instead - //$visible_return = $exercise_obj->is_visible(); - - if ($exercise_data['results_disabled'] == 0 || $exercise_data['results_disabled'] == 2) { - //if ($visible_return['value'] == true) { - $best_average = intval(get_best_average_score_by_exercise($exercise_data['id'], $course_data['code'], $my_session_id, $user_count)); - $exercise_graph_list[] = $best_average; - $all_exercise_graph_list[] = $best_average; - - $user_result_data = get_best_attempt_by_user(api_get_user_id(), $exercise_data['id'], $course_data['code'], $my_session_id); - $score = 0; - if (!empty($user_result_data['exe_weighting']) && intval($user_result_data['exe_weighting']) != 0) { - $score = intval($user_result_data['exe_result']/$user_result_data['exe_weighting'] * 100); - } - //$user_results[] = $score; - $time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0; - $all_exercise_start_time[] = $time; - $my_results[] = $score; - if (count($exercise_list)<=10) { - $title = cut($course_data['title'], 30)." \n ".cut($exercise_data['title'], 30); - $exercise_graph_name_list[]= $title; - $all_exercise_graph_name_list[] = $title; - } else { - // if there are more than 10 results, space becomes difficult to find, so only show the title of the exercise, not the tool - $title = cut($exercise_data['title'], 30); - $exercise_graph_name_list[]= $title; - $all_exercise_graph_name_list[]= $title; - } - } - } - } - } - - //Complete graph - if (!empty($my_results) && !empty($all_exercise_graph_list)) { - asort($all_exercise_start_time); - - //Fix exams order - $final_all_exercise_graph_name_list = array(); - $my_results_final = array(); - $final_all_exercise_graph_list = array(); - - foreach ($all_exercise_start_time as $key => $time) { - $label_time = ''; - if (!empty($time)) { - $label_time = date('d-m-y', $time); - //$label_time = api_format_date($time, DATE_FORMAT_NUMBER); - } - $final_all_exercise_graph_name_list[] = $all_exercise_graph_name_list[$key].' '.$label_time; - $my_results_final[] = $my_results[$key]; - $final_all_exercise_graph_list[] = $all_exercise_graph_list[$key]; - } - //var_dump($final_all_exercise_graph_name_list, $final_all_user_results, $final_all_exercise_graph_list); - $main_session_graph = self::generate_session_exercise_graph($final_all_exercise_graph_name_list, $my_results_final, $final_all_exercise_graph_list); - } - } - - - $html .= Display::page_subheader(Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL).' '.get_lang('Sessions')); - - $html .= ''; - //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' - $html .= ' - '.Display::tag('th', get_lang('Session'), array('width'=>'300px')).' - '.Display::tag('th', get_lang('PublishedExercises'), array('width'=>'300px')).' - '.Display::tag('th', get_lang('NewExercises'), array('class'=>'head')).' - '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).' - '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' + //Fix exams order + $final_all_exercise_graph_name_list = array(); + $my_results_final = array(); + $final_all_exercise_graph_list = array(); + + foreach ($all_exercise_start_time as $key => $time) { + $label_time = ''; + if (!empty($time)) { + $label_time = date('d-m-y', $time); + //$label_time = api_format_date($time, DATE_FORMAT_NUMBER); + } + $final_all_exercise_graph_name_list[] = $all_exercise_graph_name_list[$key].' '.$label_time; + $my_results_final[] = $my_results[$key]; + $final_all_exercise_graph_list[] = $all_exercise_graph_list[$key]; + } + //var_dump($final_all_exercise_graph_name_list, $final_all_user_results, $final_all_exercise_graph_list); + $main_session_graph = self::generate_session_exercise_graph($final_all_exercise_graph_name_list, $my_results_final, $final_all_exercise_graph_list); + } + } + + + $html .= Display::page_subheader(Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL).' '.get_lang('Sessions')); + + $html .= '
'; + //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' + $html .= ' + '.Display::tag('th', get_lang('Session'), array('width' => '300px')).' + '.Display::tag('th', get_lang('PublishedExercises'), array('width' => '300px')).' + '.Display::tag('th', get_lang('NewExercises'), array('class' => 'head')).' + '.Display::tag('th', get_lang('AverageExerciseResult'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Details'), array('class' => 'head')).' '; - foreach ($course_in_session as $my_session_id => $session_data) { - $course_list = $session_data['course_list']; - $session_name = $session_data['name']; - - if (isset($session_id) && !empty($session_id)) { - if ($session_id != $my_session_id) { - continue; - } - } - - $all_exercises = 0; - $all_unanswered_exercises_by_user = 0; - $all_average = 0; - - $stats_array = array(); - - foreach($course_list as $course_data) { - //All exercises in the course @todo change for a real count - $exercises = get_all_exercises($course_data, $my_session_id); - $count_exercises = 0; - if (is_array($exercises) && !empty($exercises)) { - $count_exercises = count($exercises); - } - - //Count of user results - //$done_exercises = get_count_exercises_attempted_by_course($course_data['code'], $my_session_id); - $done_exercises = null; - - $answered_exercises = 0; - if (!empty($exercises)) { - foreach($exercises as $exercise_item) { - $attempts = count_exercise_attempts_by_user(api_get_user_id(), $exercise_item['id'], $course_data['code'], $my_session_id); - if ($attempts > 1) { - $answered_exercises++; - } - } - } - - //Average - $average = get_average_score_by_course($course_data['code'], $my_session_id); - - $all_exercises += $count_exercises; - - $all_unanswered_exercises_by_user += $count_exercises - $answered_exercises; - //$all_done_exercise += $done_exercises; - $all_average += $average; - //$stats_array[$course_data['code']] = array('exercises'=>$count_exercises, 'unanswered_exercises_by_user'=>$answered_exercises,'done_exercises'=>$done_exercises, 'average'=>$average); - } - - $all_average = $all_average / count($course_list); - - if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) { - $html .= ''; - } else { - $html .= ''; - } - $url = api_get_path(WEB_CODE_PATH)."session/?session_id={$my_session_id}"; - - $html .= Display::tag('td', Display::url($session_name, $url, array('target'=>SESSION_LINK_TARGET))); - $html .= Display::tag('td', $all_exercises); - $html .= Display::tag('td', $all_unanswered_exercises_by_user); - - //$html .= Display::tag('td', $all_done_exercise); - $html .= Display::tag('td', convert_to_percentage($all_average)); - - if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) { - $icon = Display::url(Display::return_icon('2rightarrow_na.gif', get_lang('Details')), '?session_id='.$my_session_id); - } else { - $icon = Display::url(Display::return_icon('2rightarrow.gif', get_lang('Details')), '?session_id='.$my_session_id); - } - $html .= Display::tag('td', $icon); - $html .= ''; - } - $html .= '

'; - $html .= Display::div($main_session_graph, array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') ); - - //Checking selected session - - if (isset($_GET['session_id'])) { - $session_id_from_get = intval($_GET['session_id']); - - $session_data = $course_in_session[$session_id_from_get]; - $course_list = $session_data['course_list']; - - $html .= Display::tag('h3',$session_data['name'].' - '.get_lang('CourseList')); - - $html .= ''; - //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' - $html .= ' + foreach ($course_in_session as $my_session_id => $session_data) { + $course_list = $session_data['course_list']; + $session_name = $session_data['name']; + + if (isset($session_id) && !empty($session_id)) { + if ($session_id != $my_session_id) { + continue; + } + } + + $all_exercises = 0; + $all_unanswered_exercises_by_user = 0; + $all_average = 0; + + $stats_array = array(); + + foreach ($course_list as $course_data) { + //All exercises in the course @todo change for a real count + $exercises = get_all_exercises($course_data, $my_session_id); + $count_exercises = 0; + if (is_array($exercises) && !empty($exercises)) { + $count_exercises = count($exercises); + } + + //Count of user results + //$done_exercises = get_count_exercises_attempted_by_course($course_data['code'], $my_session_id); + $done_exercises = null; + + $answered_exercises = 0; + if (!empty($exercises)) { + foreach ($exercises as $exercise_item) { + $attempts = count_exercise_attempts_by_user(api_get_user_id(), $exercise_item['id'], $course_data['code'], $my_session_id); + if ($attempts > 1) { + $answered_exercises++; + } + } + } + + //Average + $average = get_average_score_by_course($course_data['code'], $my_session_id); + + $all_exercises += $count_exercises; + + $all_unanswered_exercises_by_user += $count_exercises - $answered_exercises; + //$all_done_exercise += $done_exercises; + $all_average += $average; + //$stats_array[$course_data['code']] = array('exercises'=>$count_exercises, 'unanswered_exercises_by_user'=>$answered_exercises,'done_exercises'=>$done_exercises, 'average'=>$average); + } + + $all_average = $all_average / count($course_list); + + if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) { + $html .= ''; + } else { + $html .= ''; + } + $url = api_get_path(WEB_CODE_PATH)."session/?session_id={$my_session_id}"; + + $html .= Display::tag('td', Display::url($session_name, $url, array('target' => SESSION_LINK_TARGET))); + $html .= Display::tag('td', $all_exercises); + $html .= Display::tag('td', $all_unanswered_exercises_by_user); + + //$html .= Display::tag('td', $all_done_exercise); + $html .= Display::tag('td', convert_to_percentage($all_average)); + + if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) { + $icon = Display::url(Display::return_icon('2rightarrow_na.gif', get_lang('Details')), '?session_id='.$my_session_id); + } else { + $icon = Display::url(Display::return_icon('2rightarrow.gif', get_lang('Details')), '?session_id='.$my_session_id); + } + $html .= Display::tag('td', $icon); + $html .= ''; + } + $html .= '

'; + $html .= Display::div($main_session_graph, array('id' => 'session_graph', 'class' => 'chart-session', 'style' => 'position:relative; text-align: center;')); + + //Checking selected session + + if (isset($_GET['session_id'])) { + $session_id_from_get = intval($_GET['session_id']); + + $session_data = $course_in_session[$session_id_from_get]; + $course_list = $session_data['course_list']; + + $html .= Display::tag('h3', $session_data['name'].' - '.get_lang('CourseList')); + + $html .= ''; + //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' + $html .= ' - '.Display::tag('th', get_lang('PublishedExercises'), array('class'=>'head')).' - '.Display::tag('th', get_lang('NewExercises'), array('class'=>'head')).' - '.Display::tag('th', get_lang('MyAverage'), array('class'=>'head')).' - '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).' - '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).' - '.Display::tag('th', get_lang('LPProgress') , array('class'=>'head')).' - '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).' - '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' - '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' + '.Display::tag('th', get_lang('PublishedExercises'), array('class' => 'head')).' + '.Display::tag('th', get_lang('NewExercises'), array('class' => 'head')).' + '.Display::tag('th', get_lang('MyAverage'), array('class' => 'head')).' + '.Display::tag('th', get_lang('AverageExerciseResult'), array('class' => 'head')).' + '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class' => 'head')).' + '.Display::tag('th', get_lang('LPProgress'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class' => 'head')).' + '.Display::tag('th', get_lang('LastConnexion'), array('class' => 'head')).' + '.Display::tag('th', get_lang('Details'), array('class' => 'head')).' '; - foreach ($course_list as $course_data) { - $course_code = $course_data['code']; - $course_title = $course_data['title']; - - //All exercises in the course @todo change for a real count - $exercises = get_all_exercises($course_data, $session_id_from_get); - $count_exercises = 0; - if (!empty($exercises)) { - $count_exercises = count($exercises); - } - //Count of user results - //$done_exercises = get_best_exercise_results_by_course($course_code, $session_id_from_get); - - //From course exercises NOT from LP exercises!!! - //$done_exercises = get_count_exercises_attempted_by_course($course_code, $session_id_from_get); - $answered_exercises = 0; - foreach($exercises as $exercise_item) { - $attempts = count_exercise_attempts_by_user(api_get_user_id(), $exercise_item['id'], $course_code, $session_id_from_get); - if ($attempts > 1) { - $answered_exercises++; - } - } - - $unanswered_exercises = $count_exercises - $answered_exercises; - - //Average - $average = get_average_score_by_course($course_code, $session_id_from_get); - $my_average = get_average_score_by_course_by_user(api_get_user_id(), $course_code, $session_id_from_get); - - $stats_array[$course_code] = array( 'exercises' => $count_exercises, - 'unanswered_exercises_by_user' => $unanswered_exercises, - 'done_exercises' => $done_exercises, - 'average' => $average, - 'my_average' => $my_average); - - $weighting = 0; - $last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $course_code, $session_id_from_get); - $progress = Tracking :: get_avg_student_progress($user_id, $course_code,array(), $session_id_from_get); - $total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $course_code, $session_id_from_get); - $time = api_time_to_hms($total_time_login); - $percentage_score = Tracking :: get_avg_student_score($user_id, $course_code, array(), $session_id_from_get); - - if ($course_code == $_GET['course'] && $_GET['session_id'] == $session_id_from_get) { - $html .= ''; - } else { - $html .= ''; - } - - $url = api_get_course_url($course_code, $session_id_from_get); - $course_url = Display::url($course_title, $url, array('target'=>SESSION_LINK_TARGET)); - - $html .= Display::tag('td', $course_url); - $html .= Display::tag('td', $stats_array[$course_code]['exercises']); - $html .= Display::tag('td', $stats_array[$course_code]['unanswered_exercises_by_user']); - //$html .= Display::tag('td', $stats_array[$course_code]['done_exercises']); - $html .= Display::tag('td', convert_to_percentage($stats_array[$course_code]['my_average'])); - - $html .= Display::tag('td', $stats_array[$course_code]['average'] == 0 ? '-' : '('.convert_to_percentage($stats_array[$course_code]['average']).')'); - $html .= Display::tag('td', $time, array('align'=>'center')); - - if (is_numeric($progress)) { - $progress = $progress.'%'; - } else { - $progress = '0%'; - } - //Progress - $html .= Display::tag('td', $progress, array('align'=>'center')); - if (is_numeric($percentage_score)) { - $percentage_score = $percentage_score.'%'; - } else { - $percentage_score = '0%'; - } - //Score - $html .= Display::tag('td', $percentage_score, array('align'=>'center')); - $html .= Display::tag('td', $last_connection, array('align'=>'center')); - - if ($course_code == $_GET['course'] && $_GET['session_id'] == $session_id_from_get) { - $details = ''; - $details .=Display::return_icon('2rightarrow_na.gif', get_lang('Details')); - } else { - $details = ''; - $details .=Display::return_icon('2rightarrow.gif', get_lang('Details')); - } - $details .= ''; - $html .= Display::tag('td', $details, array('align'=>'center')); - $html .= ''; - } - $html .= '
'.get_lang('Course').'
'; - - if (!empty($session_graph[$session_id_from_get])) { - //$html .= Display::div($session_graph[$session_id_from_get], array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') ); - } - } - } - return $html; - } - - /** - * Shows the user detail progress (when clicking in the details link) - * @param int user id - * @param string course code - * @param int session id - * @return string html code - */ - static function show_course_detail($user_id, $course_code, $session_id) { - $html = ''; - if (isset($course_code)) { - - $user_id = intval($user_id); - $session_id = intval($session_id); - $course = Database::escape_string($course_code); - $course_info = CourseManager::get_course_information($course); - - //$course_id = $course_info['real_id']; - //$session_name = api_get_session_name($session_id); - - $html .= Display::page_subheader($course_info['title']); - - $html .= ''; - - //Course details - $html .= ' + foreach ($course_list as $course_data) { + $course_code = $course_data['code']; + $course_title = $course_data['title']; + + //All exercises in the course @todo change for a real count + $exercises = get_all_exercises($course_data, $session_id_from_get); + $count_exercises = 0; + if (!empty($exercises)) { + $count_exercises = count($exercises); + } + //Count of user results + //$done_exercises = get_best_exercise_results_by_course($course_code, $session_id_from_get); + //From course exercises NOT from LP exercises!!! + //$done_exercises = get_count_exercises_attempted_by_course($course_code, $session_id_from_get); + $answered_exercises = 0; + foreach ($exercises as $exercise_item) { + $attempts = count_exercise_attempts_by_user(api_get_user_id(), $exercise_item['id'], $course_code, $session_id_from_get); + if ($attempts > 1) { + $answered_exercises++; + } + } + + $unanswered_exercises = $count_exercises - $answered_exercises; + + //Average + $average = get_average_score_by_course($course_code, $session_id_from_get); + $my_average = get_average_score_by_course_by_user(api_get_user_id(), $course_code, $session_id_from_get); + + $stats_array[$course_code] = array('exercises' => $count_exercises, + 'unanswered_exercises_by_user' => $unanswered_exercises, + 'done_exercises' => $done_exercises, + 'average' => $average, + 'my_average' => $my_average); + + $weighting = 0; + $last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $course_code, $session_id_from_get); + $progress = Tracking :: get_avg_student_progress($user_id, $course_code, array(), $session_id_from_get); + $total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $course_code, $session_id_from_get); + $time = api_time_to_hms($total_time_login); + $percentage_score = Tracking :: get_avg_student_score($user_id, $course_code, array(), $session_id_from_get); + + if ($course_code == $_GET['course'] && $_GET['session_id'] == $session_id_from_get) { + $html .= ''; + } else { + $html .= ''; + } + + $url = api_get_course_url($course_code, $session_id_from_get); + $course_url = Display::url($course_title, $url, array('target' => SESSION_LINK_TARGET)); + + $html .= Display::tag('td', $course_url); + $html .= Display::tag('td', $stats_array[$course_code]['exercises']); + $html .= Display::tag('td', $stats_array[$course_code]['unanswered_exercises_by_user']); + //$html .= Display::tag('td', $stats_array[$course_code]['done_exercises']); + $html .= Display::tag('td', convert_to_percentage($stats_array[$course_code]['my_average'])); + + $html .= Display::tag('td', $stats_array[$course_code]['average'] == 0 ? '-' : '('.convert_to_percentage($stats_array[$course_code]['average']).')'); + $html .= Display::tag('td', $time, array('align' => 'center')); + + if (is_numeric($progress)) { + $progress = $progress.'%'; + } else { + $progress = '0%'; + } + //Progress + $html .= Display::tag('td', $progress, array('align' => 'center')); + if (is_numeric($percentage_score)) { + $percentage_score = $percentage_score.'%'; + } else { + $percentage_score = '0%'; + } + //Score + $html .= Display::tag('td', $percentage_score, array('align' => 'center')); + $html .= Display::tag('td', $last_connection, array('align' => 'center')); + + if ($course_code == $_GET['course'] && $_GET['session_id'] == $session_id_from_get) { + $details = ''; + $details .=Display::return_icon('2rightarrow_na.gif', get_lang('Details')); + } else { + $details = ''; + $details .=Display::return_icon('2rightarrow.gif', get_lang('Details')); + } + $details .= ''; + $html .= Display::tag('td', $details, array('align' => 'center')); + $html .= ''; + } + $html .= '
'; + + if (!empty($session_graph[$session_id_from_get])) { + //$html .= Display::div($session_graph[$session_id_from_get], array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') ); + } + } + } + return $html; + } + + /** + * Shows the user detail progress (when clicking in the details link) + * @param int user id + * @param string course code + * @param int session id + * @return string html code + */ + static function show_course_detail($user_id, $course_code, $session_id) + { + $html = ''; + if (isset($course_code)) { + + $user_id = intval($user_id); + $session_id = intval($session_id); + $course = Database::escape_string($course_code); + $course_info = CourseManager::get_course_information($course); + + //$course_id = $course_info['real_id']; + //$session_name = api_get_session_name($session_id); + + $html .= Display::page_subheader($course_info['title']); + + $html .= ''; + + //Course details + $html .= ' @@ -2599,572 +2731,573 @@ class Tracking { '; - if (empty($session_id)) { - $user_list = CourseManager::get_user_list_from_course_code($course, $session_id, null, null, STUDENT); - } else { - $user_list = CourseManager::get_user_list_from_course_code($course, $session_id, null, null, 0); + if (empty($session_id)) { + $user_list = CourseManager::get_user_list_from_course_code($course, $session_id, null, null, STUDENT); + } else { + $user_list = CourseManager::get_user_list_from_course_code($course, $session_id, null, null, 0); + } + + //$exercise_list = get_all_exercises($course_info, $session_id, true); + // Show exercise results of invisible exercises? see BT#4091 + $exercise_list = get_all_exercises($course_info, $session_id, false); + + $to_graph_exercise_result = array(); + + if (!empty($exercise_list)) { + $score = $weighting = $exe_id = 0; + foreach ($exercise_list as $exercices) { + + $exercise_obj = new Exercise($course_info['real_id']); + $exercise_obj->read($exercices['id']); + $visible_return = $exercise_obj->is_visible(); + + + $score = $weighting = $attempts = 0; + + //Getting count of attempts by user + $attempts = count_exercise_attempts_by_user(api_get_user_id(), $exercices['id'], $course_info['code'], $session_id); + + $html .= ''; + $url = api_get_path(WEB_CODE_PATH)."exercice/overview.php?cidReq={$course_info['code']}&id_session=$session_id&exerciseId={$exercices['id']}"; + + if ($visible_return['value'] == true) { + $exercices['title'] = Display::url($exercices['title'], $url, array('target' => SESSION_LINK_TARGET)); + } + + $html .= Display::tag('td', $exercices['title']); + + //Exercise configuration show results or show only score + if ($exercices['results_disabled'] == 0 || $exercices['results_disabled'] == 2) { + //For graphics + $best_exercise_stats = get_best_exercise_results_by_user($exercices['id'], $course_info['code'], $session_id); + $to_graph_exercise_result[$exercices['id']] = array('title' => $exercices['title'], 'data' => $best_exercise_stats); + + $latest_attempt_url = ''; + $best_score = $position = $percentage_score_result = '-'; + $graph = $normal_graph = null; + + //Getting best results + $best_score_data = get_best_attempt_in_course($exercices['id'], $course_info['code'], $session_id); + $best_score = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']); + + if ($attempts > 0) { + $exercise_stat = get_best_attempt_by_user(api_get_user_id(), $exercices['id'], $course_info['code'], $session_id); + if (!empty($exercise_stat)) { + + //Always getting the BEST attempt + $score = $exercise_stat['exe_result']; + $weighting = $exercise_stat['exe_weighting']; + $exe_id = $exercise_stat['exe_id']; + + $latest_attempt_url .= api_get_path(WEB_CODE_PATH).'exercice/result.php?id='.$exe_id.'&cidReq='.$course_info['code'].'&show_headers=1&id_session='.$session_id; + $percentage_score_result = Display::url(show_score($score, $weighting), $latest_attempt_url); + $my_score = 0; + if (!empty($weighting) && intval($weighting) != 0) { + $my_score = $score / $weighting; + } + //@todo this function slows the page + $position = get_exercise_result_ranking($my_score, $exe_id, $exercices['id'], $course_info['code'], $session_id, $user_list); + + $graph = self::generate_exercise_result_thumbnail_graph($to_graph_exercise_result[$exercices['id']]); + $normal_graph = self::generate_exercise_result_graph($to_graph_exercise_result[$exercices['id']]); + } + } + + $html .= Display::div($normal_graph, array('id' => 'main_graph_'.$exercices['id'], 'class' => 'dialog', 'style' => 'display:none')); + + if (empty($graph)) { + $graph = '-'; + } else { + $graph = Display::url($graph, '#', array('id' => $exercices['id'], 'class' => 'opener')); + } + + $html .= Display::tag('td', $attempts, array('align' => 'center')); + $html .= Display::tag('td', $percentage_score_result, array('align' => 'center')); + $html .= Display::tag('td', $position, array('align' => 'center')); + $html .= Display::tag('td', $best_score, array('align' => 'center')); + $html .= Display::tag('td', $graph, array('align' => 'center')); + //$html .= Display::tag('td', $latest_attempt_url, array('align'=>'center', 'width'=>'25')); + } else { + // Exercise configuration NO results + $html .= Display::tag('td', $attempts, array('align' => 'center')); + $html .= Display::tag('td', '-', array('align' => 'center')); + $html .= Display::tag('td', '-', array('align' => 'center')); + $html .= Display::tag('td', '-', array('align' => 'center')); + $html .= Display::tag('td', '-', array('align' => 'center')); + } + $html .= ''; } + } else { + $html .= ''; + } + $html .= '
'.get_lang('Exercices').' '.get_lang('Attempts').' '.get_lang('BestAttempt').''.get_lang('Statistics').' '.Display :: return_icon('info3.gif', get_lang('OnlyBestResultsPerStudent'), array('align' => 'absmiddle', 'hspace' => '3px')).'
'.get_lang('NoEx').'
'; + + + //LP table results + $html .=''; + $html .= Display::tag('th', get_lang('Learnpaths'), array('class' => 'head', 'style' => 'color:#000')); + $html .= Display::tag('th', get_lang('LatencyTimeSpent'), array('class' => 'head', 'style' => 'color:#000')); + $html .= Display::tag('th', get_lang('Progress'), array('class' => 'head', 'style' => 'color:#000')); + $html .= Display::tag('th', get_lang('Score'), array('class' => 'head', 'style' => 'color:#000')); + $html .= Display::tag('th', get_lang('LastConnexion'), array('class' => 'head', 'style' => 'color:#000')); + $html .= ''; + + $list = new LearnpathList(api_get_user_id(), $course_info['code'], $session_id, 'publicated_on ASC', true); + $lp_list = $list->get_flat_list(); + + if (!empty($lp_list) > 0) { + foreach ($lp_list as $lp_id => $learnpath) { + + $progress = Tracking::get_avg_student_progress($user_id, $course, array($lp_id), $session_id); + $last_connection_in_lp = Tracking::get_last_connection_time_in_lp($user_id, $course, $lp_id, $session_id); + $time_spent_in_lp = Tracking::get_time_spent_in_lp($user_id, $course, array($lp_id), $session_id); + $percentage_score = Tracking::get_avg_student_score($user_id, $course, array($lp_id), $session_id); + if (is_numeric($percentage_score)) { + $percentage_score = $percentage_score.'%'; + } else { + $percentage_score = '0%'; + } - //$exercise_list = get_all_exercises($course_info, $session_id, true); - // Show exercise results of invisible exercises? see BT#4091 - $exercise_list = get_all_exercises($course_info, $session_id, false); + $time_spent_in_lp = api_time_to_hms($time_spent_in_lp); - $to_graph_exercise_result = array(); + $html .= ''; + $url = api_get_path(WEB_CODE_PATH)."newscorm/lp_controller.php?cidReq={$course_code}&id_session=$session_id&lp_id=$lp_id&action=view"; + $html .= Display::tag('td', Display::url($learnpath['lp_name'], $url, array('target' => SESSION_LINK_TARGET))); + $html .= Display::tag('td', $time_spent_in_lp, array('align' => 'center')); + if (is_numeric($progress)) { + $progress = $progress.'%'; + } + $html .= Display::tag('td', $progress, array('align' => 'center')); + $html .= Display::tag('td', $percentage_score); + + $last_connection = '-'; + if (!empty($last_connection_in_lp)) { + $last_connection = api_convert_and_format_date($last_connection_in_lp, DATE_TIME_FORMAT_LONG); + } + $html .= Display::tag('td', $last_connection, array('align' => 'center', 'width' => '180px')); + $html .= ""; + } + } else { + $html .= ' + + '; + } + $html .='
+ '.get_lang('NoLearnpath').' +
'; + } + return $html; + } + + /** + * Generates an histogram + * + * @param array list of exercise names + * @param array my results 0 to 100 + * @param array average scores 0-100 + */ + static function generate_session_exercise_graph($names, $my_results, $average) + { + require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php'; + require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php'; + require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php'; + + $cache = new pCache(); + + // Dataset definition + $data_set = new pData(); + + // Dataset definition + $data_set->AddPoint($average, "Serie1"); + $data_set->AddPoint($my_results, "Serie2"); + $data_set->AddPoint($names, "Serie3"); + $data_set->AddAllSeries(); + $data_set->SetAbsciseLabelSerie('Serie3'); + $data_set->SetSerieName(get_lang('AverageScore'), "Serie1"); + $data_set->SetSerieName(get_lang('MyResults'), "Serie2"); + + //$data_set->SetYAxisName(get_lang("Percentage")); + + $data_set->SetYAxisUnit("%"); + + // Initialise the graph + $main_width = 860; + $main_height = 500; + $y_label_angle = 50; + $data_set->RemoveSerie("Serie3"); + $graph = new pChart($main_width, $main_height); + //See 3.2 BT#2797 + $graph->setFixedScale(0, 100); + + $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8); + $graph->setGraphArea(65, 50, $main_width - 20, $main_height - 140); + + $graph->drawFilledRoundedRectangle(7, 7, $main_width - 7, $main_height - 7, 5, 240, 240, 240); + $graph->drawRoundedRectangle(5, 5, $main_width - 5, $main_height - 5, 5, 230, 230, 230); + $graph->drawGraphArea(255, 255, 255, TRUE); + + //SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0, SCALE_ADDALL + $graph->drawScale($data_set->GetData(), $data_set->GetDataDescription(), SCALE_NORMAL, 150, 150, 150, TRUE, $y_label_angle, 1, TRUE); + $graph->drawGrid(4, TRUE, 230, 230, 230, 70); + + // Draw the 0 line + $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 6); + $graph->drawTreshold(0, 143, 55, 72, TRUE, TRUE); + + // Draw the cubic curve graph + $graph->drawLineGraph($data_set->GetData(), $data_set->GetDataDescription()); + $graph->drawPlotGraph($data_set->GetData(), $data_set->GetDataDescription(), 1, 1, 230, 255, 255); + + // Finish the graph + $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 10); + $graph->drawLegend($main_width - 150, 70, $data_set->GetDataDescription(), 255, 255, 255); + + $graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 11); + $graph->drawTitle(50, 30, get_lang('ExercisesInTimeProgressChart'), 50, 50, 50, $main_width - 110, true); + + // $main_graph = new pChart($main_width,$main_height); + + $graph_id = 'generate_session_exercise_graph'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id(); + if ($cache->IsInCache($graph_id, $data_set->GetData())) { + //if (0) { + //if we already created the img + //echo 'in cache'; + $img_file = $cache->GetHash($graph_id, $data_set->GetData()); + } else { + $cache->WriteToCache($graph_id, $data_set->GetData(), $graph); + ob_start(); + $graph->Stroke(); + ob_end_clean(); + $img_file = $cache->GetHash($graph_id, $data_set->GetData()); + } + $html = ''; + return $html; + } + + /** + * + * Returns a thumbnail of the function generate_exercise_result_graph + * @param array attempts + + */ + static function generate_exercise_result_thumbnail_graph($attempts) + { + require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php'; + require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php'; + require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php'; + + $exercise_title = $attempts['title']; + $attempts = $attempts['data']; + $my_exercise_result_array = $exercise_result = array(); + if (empty($attempts)) { + return null; + } + + foreach ($attempts as $attempt) { + if (api_get_user_id() == $attempt['exe_user_id']) { + if ($attempt['exe_weighting'] != 0) { + $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting']; + } + } else { + if ($attempt['exe_weighting'] != 0) { + $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting']; + } + } + } + + //Getting best result + rsort($my_exercise_result_array); + $my_exercise_result = 0; + if (isset($my_exercise_result_array[0])) { + $my_exercise_result = $my_exercise_result_array[0] * 100; + } + + //var_dump($exercise_result, $my_exercise_result); + + $max = 100; + $pieces = 5; + $part = round($max / $pieces); + $x_axis = array(); + $final_array = array(); + $my_final_array = array(); + + for ($i = 1; $i <= $pieces; $i++) { + $sum = 1; + if ($i == 1) { + $sum = 0; + } + $min = ($i - 1) * $part + $sum; + $max = ($i) * $part; + $x_axis[] = $min." - ".$max; + $count = 0; + foreach ($exercise_result as $result) { + $percentage = $result * 100; + //echo $percentage.' - '.$min.' - '.$max."
"; + if ($percentage >= $min && $percentage <= $max) { + //echo ' is > '; + $count++; + } + } + //echo '
'; + $final_array[] = $count; + + if ($my_exercise_result >= $min && $my_exercise_result <= $max) { + $my_final_array[] = 1; + } else { + $my_final_array[] = 0; + } + } + + //var_dump($my_final_array, $final_array); exit; + //Fix to remove the data of the user with my data + + for ($i = 0; $i <= count($my_final_array); $i++) { + if (!empty($my_final_array[$i])) { + $my_final_array[$i] = $final_array[$i] + 1; //Add my result + $final_array[$i] = 0; + } + } + //var_dump($my_final_array, $final_array); echo '
'; + //echo '
'; var_dump($my_exercise_result, $exercise_result,$x_axis);
+
+        $cache = new pCache();
+
+        // Dataset definition
+        $data_set = new pData();
+        $data_set->AddPoint($final_array, "Serie1");
+        $data_set->AddPoint($my_final_array, "Serie2");
+        //$data_set->AddPoint($x_axis,"Serie3");
+        $data_set->AddAllSeries();
+
+        // Initialise the graph
+
+        $main_width = 80;
+        $main_height = 35;
+
+        $thumbnail_graph = new pChart($main_width, $main_height);
+
+        $thumbnail_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
+        //$thumbnail_graph->setGraphArea(50,30,680,200);
+        $thumbnail_graph->drawFilledRoundedRectangle(2, 2, $main_width - 2, $main_height - 2, 2, 230, 230, 230);
+        $thumbnail_graph->setGraphArea(5, 5, $main_width - 5, $main_height - 5);
+        $thumbnail_graph->drawGraphArea(255, 255, 255);
+
+        //SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0
+        $thumbnail_graph->drawScale($data_set->GetData(), $data_set->GetDataDescription(), SCALE_ADDALLSTART0, 150, 150, 150, FALSE, 0, 1, TRUE);
+
+        $thumbnail_graph->drawOverlayBarGraph($data_set->GetData(), $data_set->GetDataDescription(), 100);
+
+        // Finish the graph
+        $graph_id = 'thumbnail_exercise_result_graph_'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
+
+        if ($cache->IsInCache($graph_id, $data_set->GetData())) {
+            //if (0) {
+            //if we already created the img
+            //echo 'in cache';
+            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+        } else {
+            $cache->WriteToCache($graph_id, $data_set->GetData(), $thumbnail_graph);
+            ob_start();
+            $thumbnail_graph->Stroke();
+            ob_end_clean();
+            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+        }
+        $html = '';
+        return $html;
+    }
+
+    /**
+     * Generates a big graph with the number of best results
+     * @param	array
+     */
+    static function generate_exercise_result_graph($attempts)
+    {
+
+        require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
+        require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
+        require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
+
+        $exercise_title = strip_tags($attempts['title']);
+        $attempts = $attempts['data'];
+        $my_exercise_result_array = $exercise_result = array();
+        if (empty($attempts)) {
+            return null;
+        }
+        foreach ($attempts as $attempt) {
+            if (api_get_user_id() == $attempt['exe_user_id']) {
+                if ($attempt['exe_weighting'] != 0) {
+                    $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting'];
+                }
+            } else {
+                if ($attempt['exe_weighting'] != 0) {
+                    $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting'];
+                }
+            }
+        }
 
-				if (!empty($exercise_list)) {
-					$score = $weighting = $exe_id = 0;
-					foreach ($exercise_list as $exercices) {
+        //Getting best result
+        rsort($my_exercise_result_array);
+        $my_exercise_result = 0;
+        if (isset($my_exercise_result_array[0])) {
+            $my_exercise_result = $my_exercise_result_array[0] * 100;
+        }
 
-                        $exercise_obj = new Exercise($course_info['real_id']);
-                        $exercise_obj->read($exercices['id']);
-                        $visible_return = $exercise_obj->is_visible();
+        //var_dump($exercise_result, $my_exercise_result);
 
+        $max = 100;
+        $pieces = 5;
+        $part = round($max / $pieces);
+        $x_axis = array();
+        $final_array = array();
+        $my_final_array = array();
 
-						$score = $weighting = $attempts = 0;
+        for ($i = 1; $i <= $pieces; $i++) {
+            $sum = 1;
+            if ($i == 1) {
+                $sum = 0;
+            }
+            $min = ($i - 1) * $part + $sum;
+            $max = ($i) * $part;
+            $x_axis[] = $min." - ".$max;
+            $count = 0;
+            foreach ($exercise_result as $result) {
+                $percentage = $result * 100;
+                //echo $percentage.' - '.$min.' - '.$max."
";
+                if ($percentage >= $min && $percentage <= $max) {
+                    //echo ' is > ';
+                    $count++;
+                }
+            }
+            //echo '
';
+            $final_array[] = $count;
 
-						//Getting count of attempts by user
-						$attempts      = count_exercise_attempts_by_user(api_get_user_id(), $exercices['id'], $course_info['code'], $session_id);
+            if ($my_exercise_result >= $min && $my_exercise_result <= $max) {
+                $my_final_array[] = 1;
+            } else {
+                $my_final_array[] = 0;
+            }
+        }
 
-						$html .= '';
-						$url = api_get_path(WEB_CODE_PATH)."exercice/overview.php?cidReq={$course_info['code']}&id_session=$session_id&exerciseId={$exercices['id']}";
+        //var_dump($my_final_array, $final_array); exit;
+        //Fix to remove the data of the user with my data
 
-                        if ($visible_return['value'] == true) {
-                            $exercices['title'] = Display::url($exercices['title'], $url, array('target'=>SESSION_LINK_TARGET));
-                        }
+        for ($i = 0; $i <= count($my_final_array); $i++) {
+            if (!empty($my_final_array[$i])) {
+                $my_final_array[$i] = $final_array[$i] + 1; //Add my result
+                $final_array[$i] = 0;
+            }
+        }
+        //var_dump($my_final_array, $final_array); echo '
';
+        //echo '
'; var_dump($my_exercise_result, $exercise_result,$x_axis);
+
+        $cache = new pCache();
+
+        // Dataset definition
+        $data_set = new pData();
+        $data_set->AddPoint($final_array, "Serie1");
+        $data_set->AddPoint($my_final_array, "Serie2");
+        $data_set->AddPoint($x_axis, "Serie3");
+        $data_set->AddAllSeries();
+
+        $data_set->SetAbsciseLabelSerie('Serie3');
+        $data_set->SetSerieName(get_lang('Score'), "Serie1");
+        $data_set->SetSerieName(get_lang('MyResults'), "Serie2");
+
+        $data_set->SetXAxisName(get_lang("Score"));
+
+        // Initialise the graph
+        $main_width = 500;
+        $main_height = 250;
+
+        $main_graph = new pChart($main_width, $main_height);
+
+        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
+        $main_graph->setGraphArea(50, 30, $main_width - 20, $main_height - 50);
+
+        $main_graph->drawFilledRoundedRectangle(10, 10, $main_width - 10, $main_height - 10, 5, 240, 240, 240);
+        $main_graph->drawRoundedRectangle(7, 7, $main_width - 7, $main_height - 7, 5, 230, 230, 230);
+
+        $main_graph->drawGraphArea(255, 255, 255, TRUE);
+
+        //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
+        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 6);
+        //  $main_graph->drawTreshold(0,143,55,72,TRUE,TRUE);
+        // Draw the bar graph
+        $data_set->RemoveSerie("Serie3");
+
+        //$main_graph->drawBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
+        //$main_graph->drawStackedBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
+        $main_graph->drawOverlayBarGraph($data_set->GetData(), $data_set->GetDataDescription(), 100);
+
+        // Finish the graph
+        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
+        $main_graph->drawLegend($main_width - 120, $main_height - 100, $data_set->GetDataDescription(), 255, 255, 255);
+        $main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
+        $main_graph->drawTitle(180, 22, $exercise_title, 50, 50, 50);
+        $graph_id = 'exercise_result_graph'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
+        if ($cache->IsInCache($graph_id, $data_set->GetData())) {
+            //if (0) {
+            //if we already created the img
+            //echo 'in cache';
+            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+        } else {
+            $cache->WriteToCache($graph_id, $data_set->GetData(), $main_graph);
+            ob_start();
+            $main_graph->Stroke();
+            ob_end_clean();
+            $img_file = $cache->GetHash($graph_id, $data_set->GetData());
+        }
+        $html = '';
+        return $html;
+    }
 
-						$html .= Display::tag('td', $exercices['title']);
-
-						//Exercise configuration show results or show only score
-						if ($exercices['results_disabled'] == 0 || $exercices['results_disabled'] == 2) {
-                            //For graphics
-                            $best_exercise_stats = get_best_exercise_results_by_user($exercices['id'], $course_info['code'], $session_id);
-                            $to_graph_exercise_result[$exercices['id']] = array('title'=>$exercices['title'], 'data'=>$best_exercise_stats);
-
-							$latest_attempt_url = '';
-							$best_score = $position = $percentage_score_result  = '-';
-							$graph = $normal_graph = null;
-
-							//Getting best results
-							$best_score_data = get_best_attempt_in_course($exercices['id'], $course_info['code'], $session_id);
-							$best_score      = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);
-
-							if ($attempts > 0) {
-								$exercise_stat = get_best_attempt_by_user(api_get_user_id(), $exercices['id'], $course_info['code'], $session_id);
-								if (!empty($exercise_stat)) {
-
-									//Always getting the BEST attempt
-									$score          = $exercise_stat['exe_result'];
-									$weighting      = $exercise_stat['exe_weighting'];
-									$exe_id         = $exercise_stat['exe_id'];
-
-                                    $latest_attempt_url .= api_get_path(WEB_CODE_PATH).'exercice/result.php?id='.$exe_id.'&cidReq='.$course_info['code'].'&show_headers=1&id_session='.$session_id;
-									$percentage_score_result = Display::url(show_score($score, $weighting), $latest_attempt_url);
-									$my_score = 0;
-									if (!empty($weighting) && intval($weighting) != 0) {
-										$my_score = $score/$weighting;
-									}
-                                //@todo this function slows the page
-									$position = get_exercise_result_ranking($my_score, $exe_id, $exercices['id'], $course_info['code'], $session_id, $user_list);
-
-									$graph         = self::generate_exercise_result_thumbnail_graph($to_graph_exercise_result[$exercices['id']]);
-									$normal_graph  = self::generate_exercise_result_graph($to_graph_exercise_result[$exercices['id']]);
-								}
-							}
-
-							$html .= Display::div($normal_graph, array('id'=>'main_graph_'.$exercices['id'],'class'=>'dialog', 'style'=>'display:none') );
-
-							if (empty($graph)) {
-								$graph = '-';
-							} else {
-								$graph = Display::url($graph, '#', array('id'=>$exercices['id'], 'class'=>'opener'));
-							}
-
-							$html .= Display::tag('td', $attempts,                 array('align'=>'center'));
-							$html .= Display::tag('td', $percentage_score_result,  array('align'=>'center'));
-							$html .= Display::tag('td', $position,                 array('align'=>'center'));
-							$html .= Display::tag('td', $best_score,               array('align'=>'center'));
-							$html .= Display::tag('td', $graph,                    array('align'=>'center'));
-							//$html .= Display::tag('td', $latest_attempt_url,       array('align'=>'center', 'width'=>'25'));
-
-						} else {
-							// Exercise configuration NO results
-							$html .= Display::tag('td', $attempts,    array('align'=>'center'));
-							$html .= Display::tag('td', '-',          array('align'=>'center'));
-							$html .= Display::tag('td', '-',          array('align'=>'center'));
-							$html .= Display::tag('td', '-',          array('align'=>'center'));
-							$html .= Display::tag('td', '-',          array('align'=>'center'));
-						}
-						$html .= '';
-					}
-				} else {
-					$html .= ''.get_lang('NoEx').'';
-				}
-				$html .= '';
-
-
-				//LP table results
-                $html .='';
-				$html .= Display::tag('th', get_lang('Learnpaths'),         array('class'=>'head', 'style'=>'color:#000'));
-				$html .= Display::tag('th', get_lang('LatencyTimeSpent'),   array('class'=>'head', 'style'=>'color:#000'));
-				$html .= Display::tag('th', get_lang('Progress'),           array('class'=>'head', 'style'=>'color:#000'));
-				$html .= Display::tag('th', get_lang('Score'),              array('class'=>'head', 'style'=>'color:#000'));
-				$html .= Display::tag('th', get_lang('LastConnexion'),      array('class'=>'head', 'style'=>'color:#000'));
-				$html .= '';
-
-                $list = new LearnpathList(api_get_user_id(), $course_info['code'], $session_id, 'publicated_on ASC', true);
-                $lp_list        = $list->get_flat_list();
-
-				if (!empty($lp_list) > 0) {
-					foreach($lp_list as $lp_id => $learnpath) {
-
-						$progress               = Tracking::get_avg_student_progress($user_id, $course, array($lp_id), $session_id);
-						$last_connection_in_lp  = Tracking::get_last_connection_time_in_lp($user_id, $course, $lp_id, $session_id);
-						$time_spent_in_lp       = Tracking::get_time_spent_in_lp($user_id, $course, array($lp_id), $session_id);
-						$percentage_score 		= Tracking::get_avg_student_score($user_id, $course, array($lp_id), $session_id);
-						if (is_numeric($percentage_score)) {
-							$percentage_score = $percentage_score.'%';
-						} else {
-							$percentage_score = '0%';
-						}
-
-						$time_spent_in_lp       = api_time_to_hms($time_spent_in_lp);
-
-						$html .= '';
-						$url = api_get_path(WEB_CODE_PATH)."newscorm/lp_controller.php?cidReq={$course_code}&id_session=$session_id&lp_id=$lp_id&action=view";
-						$html .= Display::tag('td', Display::url($learnpath['lp_name'], $url, array('target'=>SESSION_LINK_TARGET)));
-						$html .= Display::tag('td', $time_spent_in_lp, array('align'=>'center'));
-						if (is_numeric($progress)) {
-							$progress = $progress.'%';
-						}
-						$html .= Display::tag('td', $progress, array('align'=>'center'));
-						$html .= Display::tag('td', $percentage_score);
-
-						$last_connection = '-';
-						if (!empty($last_connection_in_lp)) {
-							$last_connection = api_convert_and_format_date($last_connection_in_lp, DATE_TIME_FORMAT_LONG);
-						}
-						$html .= Display::tag('td', $last_connection, array('align'=>'center','width'=>'180px'));
-						$html .= "";
-					}
-				} else {
-					$html .= '
-                          	
-						  ';
-				}
-				$html .='

-                            	'.get_lang('NoLearnpath').'
-							
';
-			}
-			return $html;
-		}
-
-		/**
-		 * Generates an histogram
-		 *
-		 * @param 	array	list of exercise names
-		 * @param 	array	my results 0 to 100
-		 * @param 	array	average scores 0-100
-		 */
-		static function generate_session_exercise_graph($names, $my_results, $average) {
-			require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
-
-			$cache = new pCache();
-
-			// Dataset definition
-			$data_set = new pData();
-
-			// Dataset definition
-			$data_set->AddPoint($average,	 "Serie1");
-			$data_set->AddPoint($my_results, "Serie2");
-			$data_set->AddPoint($names,		 "Serie3");
-			$data_set->AddAllSeries();
-			$data_set->SetAbsciseLabelSerie('Serie3');
-			$data_set->SetSerieName(get_lang('AverageScore'),"Serie1");
-			$data_set->SetSerieName(get_lang('MyResults'),	 "Serie2");
-
-			//$data_set->SetYAxisName(get_lang("Percentage"));
-
-			$data_set->SetYAxisUnit("%");
-
-			// Initialise the graph
-			$main_width    = 860;
-			$main_height   = 500;
-			$y_label_angle = 50;
-			$data_set->RemoveSerie("Serie3");
-			$graph = new pChart($main_width, $main_height);
-			//See 3.2 BT#2797
-			$graph->setFixedScale(0,100);
-
-			$graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-			$graph->setGraphArea(65,50,$main_width-20, $main_height-140);
-
-			$graph->drawFilledRoundedRectangle(7,7,$main_width-7,$main_height-7,5,240,240,240);
-			$graph->drawRoundedRectangle(5,5,$main_width-5,$main_height -5,5,230,230,230);
-			$graph->drawGraphArea(255,255,255,TRUE);
-
-			//SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0, SCALE_ADDALL
-			$graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_NORMAL ,150,150,150,TRUE,$y_label_angle,1, TRUE);
-			$graph->drawGrid(4,TRUE,230,230,230,70);
-
-			// Draw the 0 line
-			$graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',6);
-			$graph->drawTreshold(0,143,55,72,TRUE,TRUE);
-
-			// Draw the cubic curve graph
-			$graph->drawLineGraph($data_set->GetData(),$data_set->GetDataDescription());
-			$graph->drawPlotGraph($data_set->GetData(),$data_set->GetDataDescription(),1,1,230,255,255);
-
-			// Finish the graph
-			$graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',10);
-			$graph->drawLegend($main_width - 150,70,$data_set->GetDataDescription(),255,255,255);
-
-			$graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',11);
-			$graph->drawTitle(50, 30, get_lang('ExercisesInTimeProgressChart'), 50,50,50,$main_width-110, true);
-
-			// $main_graph = new pChart($main_width,$main_height);
-
-			$graph_id = 'generate_session_exercise_graph'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
-			if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-			//if (0) {
-				//if we already created the img
-				//echo 'in cache';
-				$img_file = $cache->GetHash($graph_id,$data_set->GetData());
-			} else {
-				$cache->WriteToCache($graph_id, $data_set->GetData(), $graph);
-				ob_start();
-				$graph->Stroke();
-				ob_end_clean();
-				$img_file = $cache->GetHash($graph_id, $data_set->GetData());
-			}
-			$html = '';
-			return $html;
-		}
-
-		/**
-		 *
-		 * Returns a thumbnail of the function generate_exercise_result_graph
-		 * @param 	array attempts
-
-		 */
-		static function generate_exercise_result_thumbnail_graph($attempts) {
-			require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
-
-			$exercise_title = $attempts['title'];
-			$attempts       = $attempts['data'];
-			$my_exercise_result_array = $exercise_result = array();
-			if (empty($attempts)) {
-				return null;
-			}
-
-			foreach ($attempts as $attempt) {
-				if (api_get_user_id() == $attempt['exe_user_id']) {
-					if ($attempt['exe_weighting'] != 0 ) {
-						$my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting'];
-					}
-				} else {
-					if ($attempt['exe_weighting'] != 0 ) {
-						$exercise_result[]=  $attempt['exe_result']/$attempt['exe_weighting'];
-					}
-				}
-			}
-
-			//Getting best result
-			rsort($my_exercise_result_array);
-			$my_exercise_result = 0;
-			if (isset($my_exercise_result_array[0])) {
-				$my_exercise_result = $my_exercise_result_array[0] *100;
-			}
-
-			//var_dump($exercise_result, $my_exercise_result);
-
-			$max     = 100;
-			$pieces  = 5 ;
-			$part    = round($max / $pieces);
-			$x_axis = array();
-			$final_array = array();
-			$my_final_array = array();
-
-			for ($i=1; $i <=$pieces; $i++) {
-				$sum = 1;
-				if ($i == 1) {
-					$sum = 0;
-				}
-				$min = ($i-1)*$part + $sum;
-				$max = ($i)*$part;
-				$x_axis[]= $min." - ".$max;
-				$count = 0;
-				foreach($exercise_result as $result) {
-					$percentage = $result*100;
-					//echo $percentage.' - '.$min.' - '.$max."
";
-					if ($percentage >= $min && $percentage <= $max) {
-						//echo ' is > ';
-						$count++;
-					}
-				}
-				//echo '
';
-				$final_array[]= $count;
-
-				if ($my_exercise_result >= $min && $my_exercise_result <= $max) {
-					$my_final_array[] = 1;
-				} else {
-					$my_final_array[] = 0;
-				}
-			}
-
-			//var_dump($my_final_array, $final_array); exit;
-
-			//Fix to remove the data of the user with my data
-
-			for($i = 0; $i<=count($my_final_array); $i++) {
-				if (!empty($my_final_array[$i])) {
-					$my_final_array[$i] =  $final_array[$i] + 1; //Add my result
-					$final_array[$i] = 0;
-				}
-			}
-			//var_dump($my_final_array, $final_array); echo '
';
-
-			//echo '
'; var_dump($my_exercise_result, $exercise_result,$x_axis);
-
-			$cache = new pCache();
-
-			// Dataset definition
-			$data_set = new pData();
-			$data_set->AddPoint($final_array,"Serie1");
-			$data_set->AddPoint($my_final_array,"Serie2");
-			//$data_set->AddPoint($x_axis,"Serie3");
-			$data_set->AddAllSeries();
-
-			// Initialise the graph
-
-			$main_width  = 80;
-			$main_height = 35;
-
-			$thumbnail_graph = new pChart($main_width, $main_height);
-
-			$thumbnail_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-			//$thumbnail_graph->setGraphArea(50,30,680,200);
-			$thumbnail_graph->drawFilledRoundedRectangle(2,2,$main_width-2,$main_height-2,2,230,230,230);
-			$thumbnail_graph->setGraphArea(5,5,$main_width-5,$main_height-5);
-			$thumbnail_graph->drawGraphArea(255,255,255);
-
-			//SCALE_NORMAL, SCALE_START0, SCALE_ADDALLSTART0
-			$thumbnail_graph->drawScale($data_set->GetData(),$data_set->GetDataDescription(),SCALE_ADDALLSTART0, 150,150,150,FALSE,0,1,TRUE);
-
-			$thumbnail_graph->drawOverlayBarGraph($data_set->GetData(),$data_set->GetDataDescription(), 100);
-
-			// Finish the graph
-			$graph_id = 'thumbnail_exercise_result_graph_'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
-
-			if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-				//if (0) {
-				//if we already created the img
-				//echo 'in cache';
-				$img_file = $cache->GetHash($graph_id,$data_set->GetData());
-			} else {
-				$cache->WriteToCache($graph_id, $data_set->GetData(), $thumbnail_graph);
-				ob_start();
-				$thumbnail_graph->Stroke();
-				ob_end_clean();
-				$img_file = $cache->GetHash($graph_id, $data_set->GetData());
-			}
-			$html = '';
-			return $html;
-		}
-
-		/**
-		 * Generates a big graph with the number of best results
-		 * @param	array
-		 */
-		static function generate_exercise_result_graph($attempts) {
-
-			require_once api_get_path(LIBRARY_PATH).'pchart/pData.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pChart.class.php';
-			require_once api_get_path(LIBRARY_PATH).'pchart/pCache.class.php';
-
-			$exercise_title = strip_tags($attempts['title']);
-			$attempts       = $attempts['data'];
-			$my_exercise_result_array = $exercise_result = array();
-			if (empty($attempts)) {
-				return null;
-			}
-			foreach ($attempts as $attempt) {
-				if (api_get_user_id() == $attempt['exe_user_id']) {
-					if ($attempt['exe_weighting'] != 0 ) {
-						$my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting'];
-					}
-				} else {
-					if ($attempt['exe_weighting'] != 0 ) {
-						$exercise_result[]=  $attempt['exe_result']/$attempt['exe_weighting'];
-					}
-				}
-			}
-
-			//Getting best result
-			rsort($my_exercise_result_array);
-			$my_exercise_result = 0;
-			if (isset($my_exercise_result_array[0])) {
-				$my_exercise_result = $my_exercise_result_array[0] *100;
-			}
-
-			//var_dump($exercise_result, $my_exercise_result);
-
-			$max = 100;
-			$pieces = 5 ;
-			$part = round($max / $pieces);
-			$x_axis = array();
-			$final_array = array();
-			$my_final_array = array();
-
-			for ($i=1; $i <=$pieces; $i++) {
-				$sum = 1;
-				if ($i == 1) {
-					$sum = 0;
-				}
-				$min = ($i-1)*$part + $sum;
-				$max = ($i)*$part;
-				$x_axis[]= $min." - ".$max;
-				$count = 0;
-				foreach($exercise_result as $result) {
-					$percentage = $result*100;
-					//echo $percentage.' - '.$min.' - '.$max."
";
-					if ($percentage >= $min && $percentage <= $max) {
-						//echo ' is > ';
-						$count++;
-					}
-				}
-				//echo '
';
-				$final_array[]= $count;
-
-				if ($my_exercise_result >= $min && $my_exercise_result <= $max) {
-					$my_final_array[] = 1;
-				} else {
-					$my_final_array[] = 0;
-				}
-			}
-
-			//var_dump($my_final_array, $final_array); exit;
-
-			//Fix to remove the data of the user with my data
-
-			for($i = 0; $i<=count($my_final_array); $i++) {
-				if (!empty($my_final_array[$i])) {
-					$my_final_array[$i] =  $final_array[$i] + 1; //Add my result
-					$final_array[$i] = 0;
-				}
-			}
-			//var_dump($my_final_array, $final_array); echo '
';
-
-			//echo '
'; var_dump($my_exercise_result, $exercise_result,$x_axis);
-
-			$cache = new pCache();
-
-			// Dataset definition
-			$data_set = new pData();
-			$data_set->AddPoint($final_array,"Serie1");
-			$data_set->AddPoint($my_final_array,"Serie2");
-			$data_set->AddPoint($x_axis,"Serie3");
-			$data_set->AddAllSeries();
-
-			$data_set->SetAbsciseLabelSerie('Serie3');
-			$data_set->SetSerieName(get_lang('Score'),"Serie1");
-			$data_set->SetSerieName(get_lang('MyResults'),"Serie2");
-
-			$data_set->SetXAxisName(get_lang("Score"));
-
-			// Initialise the graph
-			$main_width  = 500;
-			$main_height = 250;
-
-			$main_graph = new pChart($main_width,$main_height);
-
-			$main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-			$main_graph->setGraphArea(50,30, $main_width -20,$main_height -50);
-
-			$main_graph->drawFilledRoundedRectangle(10,10, $main_width- 10,$main_height -10,5,240,240,240);
-			$main_graph->drawRoundedRectangle(7,7,$main_width - 7,$main_height  - 7,5,230,230,230);
-
-			$main_graph->drawGraphArea(255,255,255,TRUE);
-
-			//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
-			$main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',6);
-			//  $main_graph->drawTreshold(0,143,55,72,TRUE,TRUE);
-
-			// Draw the bar graph
-			$data_set->RemoveSerie("Serie3");
-
-			//$main_graph->drawBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
-
-			//$main_graph->drawStackedBarGraph($data_set->GetData(),$data_set->GetDataDescription(),TRUE);
-			$main_graph->drawOverlayBarGraph($data_set->GetData(),$data_set->GetDataDescription(), 100);
-
-			// Finish the graph
-			$main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-			$main_graph->drawLegend($main_width - 120,$main_height -100,$data_set->GetDataDescription(),255,255,255);
-			$main_graph->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf',8);
-			$main_graph->drawTitle(180,22,$exercise_title,50,50,50);
-			$graph_id = 'exercise_result_graph'.Security::remove_XSS($_GET['course']).'-'.intval($_GET['session_id']).'-'.api_get_user_id();
-			if ($cache->IsInCache($graph_id, $data_set->GetData())) {
-				//if (0) {
-				//if we already created the img
-				//echo 'in cache';
-				$img_file = $cache->GetHash($graph_id,$data_set->GetData());
-			} else {
-				$cache->WriteToCache($graph_id, $data_set->GetData(), $main_graph);
-				ob_start();
-				$main_graph->Stroke();
-				ob_end_clean();
-				$img_file = $cache->GetHash($graph_id, $data_set->GetData());
-			}
-			$html = '';
-			return $html;
-		}
 }
+
 /**
  * @package chamilo.tracking
  */
-class TrackingCourseLog {
+class TrackingCourseLog
+{
 
-	function count_item_resources() {
-		global $session_id;
+    function count_item_resources()
+    {
+        global $session_id;
         $course_id = api_get_course_int_id();
 
-		$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-		$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
-		$sql = "SELECT count(tool) AS total_number_of_items 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 id_session = $session_id ";
+        $sql = "SELECT count(tool) AS total_number_of_items 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 id_session = $session_id ";
 
-		if (isset($_GET['keyword'])) {
-			$keyword = Database::escape_string(trim($_GET['keyword']));
-			$sql .= " AND (user.username LIKE '%".$keyword."%' OR lastedit_type LIKE '%".$keyword."%' OR tool LIKE '%".$keyword."%')";
-		}
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (user.username LIKE '%".$keyword."%' OR lastedit_type LIKE '%".$keyword."%' OR tool LIKE '%".$keyword."%')";
+        }
 
-		$sql .= " AND tool IN ('document', 'learnpath', 'quiz', 'glossary', 'link', 'course_description', 'announcement', 'thematic', 'thematic_advance', 'thematic_plan')";
-		$res = Database::query($sql);
-		$obj = Database::fetch_object($res);
-		return $obj->total_number_of_items;
-	}
+        $sql .= " AND tool IN ('document', 'learnpath', 'quiz', 'glossary', 'link', 'course_description', 'announcement', 'thematic', 'thematic_advance', 'thematic_plan')";
+        $res = Database::query($sql);
+        $obj = Database::fetch_object($res);
+        return $obj->total_number_of_items;
+    }
 
-	function get_item_resources_data($from, $number_of_items, $column, $direction) {
-		global $dateTimeFormatLong, $session_id;
+    function get_item_resources_data($from, $number_of_items, $column, $direction)
+    {
+        global $dateTimeFormatLong, $session_id;
         $course_id = api_get_course_int_id();
 
-		$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);
+        $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);
+        $session_id = intval($session_id);
 
-		$sql = "SELECT
+        $sql = "SELECT
                     tool as col0,
                     lastedit_type as col1,
                     ref as ref,
@@ -3177,426 +3310,435 @@ class TrackingCourseLog {
                         track_resource.insert_user_id = user.user_id AND
                         id_session = $session_id ";
 
-		if (isset($_GET['keyword'])) {
-			$keyword = Database::escape_string(trim($_GET['keyword']));
-			$sql .= " AND (user.username LIKE '%".$keyword."%' OR lastedit_type LIKE '%".$keyword."%' OR tool LIKE '%".$keyword."%') ";
-		}
-
-		$sql .= " AND tool IN ('document', 'learnpath', 'quiz', 'glossary', 'link', 'course_description', 'announcement', 'thematic', 'thematic_advance', 'thematic_plan')";
-
-		if ($column == 0) {
-			$column = '0';
-		}
-		if ($column != '' && $direction != '') {
-			if ($column != 2 && $column != 4) {
-				$sql .= " ORDER BY col$column $direction";
-			}
-		} else {
-			$sql .= " ORDER BY col5 DESC ";
-		}
-
-		$sql .= " LIMIT $from, $number_of_items ";
-
-		$res = Database::query($sql);
-		$resources = array ();
-		$thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
-		while ($row = Database::fetch_array($res)) {
-			$ref = $row['ref'];
-			$table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
-			$table_tool = Database :: get_course_table($table_name['table_name']);
-
-			$id = $table_name['id_tool'];
-			$recorset = false;
-
-			if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
-				$tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
-				$sql = "SELECT thematic_id FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-				$rs_thematic  = Database::query($sql);
-				if (Database::num_rows($rs_thematic)) {
-					$row_thematic = Database::fetch_array($rs_thematic);
-					$thematic_id = $row_thematic['thematic_id'];
-
-					$query = "SELECT session.id, session.name, user.username FROM $tbl_thematic t, $table_session session, $table_user user" .
-	                        " WHERE t.c_id = $course_id AND t.session_id = session.id AND session.id_coach = user.user_id AND t.id = $thematic_id";
-					$recorset = Database::query($query);
-				}
-			} else {
-				$query = "SELECT session.id, session.name, user.username FROM $table_tool tool, $table_session session, $table_user user
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (user.username LIKE '%".$keyword."%' OR lastedit_type LIKE '%".$keyword."%' OR tool LIKE '%".$keyword."%') ";
+        }
+
+        $sql .= " AND tool IN ('document', 'learnpath', 'quiz', 'glossary', 'link', 'course_description', 'announcement', 'thematic', 'thematic_advance', 'thematic_plan')";
+
+        if ($column == 0) {
+            $column = '0';
+        }
+        if ($column != '' && $direction != '') {
+            if ($column != 2 && $column != 4) {
+                $sql .= " ORDER BY col$column $direction";
+            }
+        } else {
+            $sql .= " ORDER BY col5 DESC ";
+        }
+
+        $sql .= " LIMIT $from, $number_of_items ";
+
+        $res = Database::query($sql);
+        $resources = array();
+        $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
+        while ($row = Database::fetch_array($res)) {
+            $ref = $row['ref'];
+            $table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
+            $table_tool = Database :: get_course_table($table_name['table_name']);
+
+            $id = $table_name['id_tool'];
+            $recorset = false;
+
+            if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
+                $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
+                $sql = "SELECT thematic_id FROM $table_tool WHERE c_id = $course_id AND id = $ref";
+                $rs_thematic = Database::query($sql);
+                if (Database::num_rows($rs_thematic)) {
+                    $row_thematic = Database::fetch_array($rs_thematic);
+                    $thematic_id = $row_thematic['thematic_id'];
+
+                    $query = "SELECT session.id, session.name, user.username FROM $tbl_thematic t, $table_session session, $table_user user".
+                        " WHERE t.c_id = $course_id AND t.session_id = session.id AND session.id_coach = user.user_id AND t.id = $thematic_id";
+                    $recorset = Database::query($query);
+                }
+            } else {
+                $query = "SELECT session.id, session.name, user.username FROM $table_tool tool, $table_session session, $table_user user
 				          WHERE tool.c_id = $course_id AND tool.session_id = session.id AND session.id_coach = user.user_id AND tool.$id = $ref";
-				$recorset = Database::query($query);
-			}
-
-			if (!empty($recorset)) {
-				$obj = Database::fetch_object($recorset);
-
-				$name_session = '';
-				$coach_name = '';
-				if (!empty($obj)) {
-					$name_session = $obj->name;
-					$coach_name   = $obj->username;
-				}
-
-				$url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
-				$row[0] = '';
-				if ($row['col6'] != 2) {
-					if (in_array($row['col0'], $thematic_tools)) {
-
-						$exp_thematic_tool = explode('_', $row['col0']);
-						$thematic_tool_title = '';
-						if (is_array($exp_thematic_tool)) {
-							foreach ($exp_thematic_tool as $exp) {
-								$thematic_tool_title .= api_ucfirst($exp);
-							}
-						} else {
-							$thematic_tool_title = api_ucfirst($row['col0']);
-						}
-
-						$row[0] = ''.get_lang($thematic_tool_title).'';
-					} else {
-						$row[0] = ''.get_lang('Tool'.api_ucfirst($row['col0'])).'';
-					}
-				} else {
-					$row[0] = api_ucfirst($row['col0']);
-				}
-				$row[1] = get_lang($row[1]);
-    			$row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
-    			$row[5] = '';
-				//@todo Improve this code please
-				switch ($table_name['table_name']) {
-					case 'document' :
-						$query_document = "SELECT tool.title as title FROM $table_tool tool WHERE c_id = $course_id AND id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
-
-						break;
-					case 'announcement':
-						$query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
-						break;
-					case 'glossary':
-						$query_document = "SELECT name FROM $table_tool WHERE c_id = $course_id AND glossary_id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->name;
-						break;
-					case 'lp':
-						$query_document = "SELECT name FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->name;
-						break;
-					case 'quiz':
-						$query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
-						break;
-
-					case 'course_description':
-						$query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-						$rs_document = Database::query($query_document);
-						$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->title;
-						break;
-
-					case 'thematic':
-						$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-						if (Database::num_rows($rs) > 0) {
-							$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-						}
-						break;
-					case 'thematic_advance':
-						$rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-						if (Database::num_rows($rs) > 0) {
-							$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->content;
-						}
-						break;
-					case 'thematic_plan':
-						$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-						if (Database::num_rows($rs) > 0) {
-							$obj = Database::fetch_object($rs);
-    						$row[5] = $obj->title;
-						}
-						break;
-
-					default:
-						break;
-				}
-
-				$row2 = $name_session;
-				if (!empty($coach_name)) {
-					$row2 .= '
'.get_lang('Coach').': '.$coach_name;
-				}
-				$row[2] = $row2;
-                        if (!empty($row['col3'])) {
-                            $row['col3'] = Display::url($row['col3'],api_get_path(WEB_CODE_PATH).'user/userInfo.php?'.api_get_cidreq().'&origin=tracking&uInfo='.$row['user_id']);
-                            $row[3] = $row['col3'];
-
-                            $ip = TrackingUserLog::get_ip_from_user_event($row['user_id'], $row['col5'], true);
-                            if (empty($ip)) {
-                                $ip = get_lang('Unknown');
+                $recorset = Database::query($query);
+            }
+
+            if (!empty($recorset)) {
+                $obj = Database::fetch_object($recorset);
+
+                $name_session = '';
+                $coach_name = '';
+                if (!empty($obj)) {
+                    $name_session = $obj->name;
+                    $coach_name = $obj->username;
+                }
+
+                $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
+                $row[0] = '';
+                if ($row['col6'] != 2) {
+                    if (in_array($row['col0'], $thematic_tools)) {
+
+                        $exp_thematic_tool = explode('_', $row['col0']);
+                        $thematic_tool_title = '';
+                        if (is_array($exp_thematic_tool)) {
+                            foreach ($exp_thematic_tool as $exp) {
+                                $thematic_tool_title .= api_ucfirst($exp);
                             }
-                            $row[4] = $ip;
+                        } else {
+                            $thematic_tool_title = api_ucfirst($row['col0']);
+                        }
+
+                        $row[0] = ''.get_lang($thematic_tool_title).'';
+                    } else {
+                        $row[0] = ''.get_lang('Tool'.api_ucfirst($row['col0'])).'';
+                    }
+                } else {
+                    $row[0] = api_ucfirst($row['col0']);
+                }
+                $row[1] = get_lang($row[1]);
+                $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
+                $row[5] = '';
+                //@todo Improve this code please
+                switch ($table_name['table_name']) {
+                    case 'document' :
+                        $query_document = "SELECT tool.title as title FROM $table_tool tool WHERE c_id = $course_id AND id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
+
+                        break;
+                    case 'announcement':
+                        $query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
+                        break;
+                    case 'glossary':
+                        $query_document = "SELECT name FROM $table_tool WHERE c_id = $course_id AND glossary_id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->name;
+                        break;
+                    case 'lp':
+                        $query_document = "SELECT name FROM $table_tool WHERE c_id = $course_id AND id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->name;
+                        break;
+                    case 'quiz':
+                        $query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
+                        break;
+
+                    case 'course_description':
+                        $query_document = "SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref";
+                        $rs_document = Database::query($query_document);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->title;
+                        break;
+
+                    case 'thematic':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+                    case 'thematic_advance':
+                        $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->content;
                         }
-				$resources[] = $row;
-			}
-		}
-
-		return $resources;
-	}
-
-	function get_tool_name_table($tool) {
-		switch ($tool) {
-			case 'document':
-				$table_name = TABLE_DOCUMENT;
-				$link_tool = 'document/document.php';
-				$id_tool = 'id';
-				break;
-			case 'learnpath':
-				$table_name = TABLE_LP_MAIN;
-				$link_tool = 'newscorm/lp_controller.php';
-				$id_tool = 'id';
-				break;
-			case 'quiz':
-				$table_name = TABLE_QUIZ_TEST;
-				$link_tool = 'exercice/exercice.php';
-				$id_tool = 'id';
-				break;
-			case 'glossary':
-				$table_name = TABLE_GLOSSARY;
-				$link_tool = 'glossary/index.php';
-				$id_tool = 'glossary_id';
-				break;
-			case 'link':
-				$table_name = TABLE_LINK;
-				$link_tool = 'link/link.php';
-				$id_tool = 'id';
-				break;
-			case 'course_description':
-				$table_name = TABLE_COURSE_DESCRIPTION;
-				$link_tool = 'course_description/';
-				$id_tool = 'id';
-				break;
-			case 'announcement':
-				$table_name = TABLE_ANNOUNCEMENT;
-				$link_tool = 'announcements/announcements.php';
-				$id_tool = 'id';
-				break;
-			case 'thematic':
-				$table_name = TABLE_THEMATIC;
-				$link_tool = 'course_progress/index.php';
-				$id_tool = 'id';
-				break;
-			case 'thematic_advance':
-				$table_name = TABLE_THEMATIC_ADVANCE;
-				$link_tool = 'course_progress/index.php';
-				$id_tool = 'id';
-				break;
-			case 'thematic_plan':
-				$table_name = TABLE_THEMATIC_PLAN;
-				$link_tool = 'course_progress/index.php';
-				$id_tool = 'id';
-				break;
-			default:
-				$table_name = $tool;
-			break;
-		}
-		return array('table_name' => $table_name,'link_tool' => $link_tool,'id_tool' => $id_tool);
-	}
-
-	static function display_additional_profile_fields() {
-		// getting all the extra profile fields that are defined by the platform administrator
-		$extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
-
-
-		// creating the form
-		$return = '
';
-
-		// the select field with the additional user profile fields (= this is where we select the field of which we want to see
-		// the information the users have entered or selected.
-		$return .= '';
-
-		// the form elements for the $_GET parameters (because the form is passed through GET
-		foreach ($_GET as $key=>$value){
-			if ($key <> 'additional_profile_field')    {
-				$return .= '';
-			}
-		}
-		// the submit button
-		$return .= '';
-		$return .= '
';
-		if ($extra_fields_to_show > 0) {
-			return $return;
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * This function gets all the information of a certrain ($field_id) additional profile field.
-	 * It gets the information of all the users so that it can be displayed in the sortable table or in the csv or xls export
-	 *
-	 * @author Patrick Cool , Ghent University, Belgium
-	 * @since October 2009
-	 * @version 1.8.7
-	 */
-	function get_addtional_profile_information_of_field($field_id){
-		// Database table definition
-		$table_user             = Database::get_main_table(TABLE_MAIN_USER);
-		$table_user_field_values     = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
-
-		$sql = "SELECT user.user_id, field.field_value FROM $table_user user, $table_user_field_values field
+                        break;
+                    case 'thematic_plan':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
+                            $row[5] = $obj->title;
+                        }
+                        break;
+
+                    default:
+                        break;
+                }
+
+                $row2 = $name_session;
+                if (!empty($coach_name)) {
+                    $row2 .= '
'.get_lang('Coach').': '.$coach_name;
+                }
+                $row[2] = $row2;
+                if (!empty($row['col3'])) {
+                    $row['col3'] = Display::url($row['col3'], api_get_path(WEB_CODE_PATH).'user/userInfo.php?'.api_get_cidreq().'&origin=tracking&uInfo='.$row['user_id']);
+                    $row[3] = $row['col3'];
+
+                    $ip = TrackingUserLog::get_ip_from_user_event($row['user_id'], $row['col5'], true);
+                    if (empty($ip)) {
+                        $ip = get_lang('Unknown');
+                    }
+                    $row[4] = $ip;
+                }
+                $resources[] = $row;
+            }
+        }
+
+        return $resources;
+    }
+
+    function get_tool_name_table($tool)
+    {
+        switch ($tool) {
+            case 'document':
+                $table_name = TABLE_DOCUMENT;
+                $link_tool = 'document/document.php';
+                $id_tool = 'id';
+                break;
+            case 'learnpath':
+                $table_name = TABLE_LP_MAIN;
+                $link_tool = 'newscorm/lp_controller.php';
+                $id_tool = 'id';
+                break;
+            case 'quiz':
+                $table_name = TABLE_QUIZ_TEST;
+                $link_tool = 'exercice/exercice.php';
+                $id_tool = 'id';
+                break;
+            case 'glossary':
+                $table_name = TABLE_GLOSSARY;
+                $link_tool = 'glossary/index.php';
+                $id_tool = 'glossary_id';
+                break;
+            case 'link':
+                $table_name = TABLE_LINK;
+                $link_tool = 'link/link.php';
+                $id_tool = 'id';
+                break;
+            case 'course_description':
+                $table_name = TABLE_COURSE_DESCRIPTION;
+                $link_tool = 'course_description/';
+                $id_tool = 'id';
+                break;
+            case 'announcement':
+                $table_name = TABLE_ANNOUNCEMENT;
+                $link_tool = 'announcements/announcements.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic':
+                $table_name = TABLE_THEMATIC;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_advance':
+                $table_name = TABLE_THEMATIC_ADVANCE;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_plan':
+                $table_name = TABLE_THEMATIC_PLAN;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            default:
+                $table_name = $tool;
+                break;
+        }
+        return array('table_name' => $table_name, 'link_tool' => $link_tool, 'id_tool' => $id_tool);
+    }
+
+    static function display_additional_profile_fields()
+    {
+        // getting all the extra profile fields that are defined by the platform administrator
+        $extra_fields = UserManager :: get_extra_fields(0, 50, 5, 'ASC');
+
+
+        // creating the form
+        $return = '
';
+
+        // the select field with the additional user profile fields (= this is where we select the field of which we want to see
+        // the information the users have entered or selected.
+        $return .= '';
+
+        // the form elements for the $_GET parameters (because the form is passed through GET
+        foreach ($_GET as $key => $value) {
+            if ($key <> 'additional_profile_field') {
+                $return .= '';
+            }
+        }
+        // the submit button
+        $return .= '';
+        $return .= '
';
+        if ($extra_fields_to_show > 0) {
+            return $return;
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * This function gets all the information of a certrain ($field_id) additional profile field.
+     * It gets the information of all the users so that it can be displayed in the sortable table or in the csv or xls export
+     *
+     * @author Patrick Cool , Ghent University, Belgium
+     * @since October 2009
+     * @version 1.8.7
+     */
+    function get_addtional_profile_information_of_field($field_id)
+    {
+        // Database table definition
+        $table_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table_user_field_values = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
+
+        $sql = "SELECT user.user_id, field.field_value FROM $table_user user, $table_user_field_values field
             WHERE user.user_id = field.user_id
             AND field.field_id='".intval($field_id)."'";
-		$result = Database::query($sql);
-		while($row = Database::fetch_array($result)) {
-			$return[$row['user_id']][] = $row['field_value'];
-		}
-		return $return;
-	}
-
-	/**
-	 * This function gets all the information of a certrain ($field_id) additional profile field for a specific list of users is more efficent than  get_addtional_profile_information_of_field() function
-	 * It gets the information of all the users so that it can be displayed in the sortable table or in the csv or xls export
-	 *
-	 * @author    Julio Montoya 
-	 * @param    int field id
-	 * @param    array list of user ids
-	 * @return    array
-	 * @since    Nov 2009
-	 * @version    1.8.6.2
-	 */
-	function get_addtional_profile_information_of_field_by_user($field_id, $users) {
-		// Database table definition
-		$table_user                 = Database::get_main_table(TABLE_MAIN_USER);
-		$table_user_field_values     = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
-		$result_extra_field         = UserManager::get_extra_field_information($field_id);
-
-		if (!empty($users)) {
-			if ($result_extra_field['field_type'] == USER_FIELD_TYPE_TAG ) {
-				foreach($users as $user_id) {
-					$user_result = UserManager::get_user_tags($user_id, $field_id);
-					$tag_list = array();
-					foreach($user_result as $item) {
-						$tag_list[] = $item['tag'];
-					}
-					$return[$user_id][] = implode(', ',$tag_list);
-				}
-			} else {
-				$new_user_array = array();
-				foreach($users as $user_id) {
-					$new_user_array[]= "'".$user_id."'";
-				}
-				$users = implode(',',$new_user_array);
-				//selecting only the necessary information NOT ALL the user list
-				$sql = "SELECT user.user_id, field.field_value FROM $table_user user INNER JOIN $table_user_field_values field
+        $result = Database::query($sql);
+        while ($row = Database::fetch_array($result)) {
+            $return[$row['user_id']][] = $row['field_value'];
+        }
+        return $return;
+    }
+
+    /**
+     * This function gets all the information of a certrain ($field_id) additional profile field for a specific list of users is more efficent than  get_addtional_profile_information_of_field() function
+     * It gets the information of all the users so that it can be displayed in the sortable table or in the csv or xls export
+     *
+     * @author    Julio Montoya 
+     * @param    int field id
+     * @param    array list of user ids
+     * @return    array
+     * @since    Nov 2009
+     * @version    1.8.6.2
+     */
+    function get_addtional_profile_information_of_field_by_user($field_id, $users)
+    {
+        // Database table definition
+        $table_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table_user_field_values = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
+        $result_extra_field = UserManager::get_extra_field_information($field_id);
+
+        if (!empty($users)) {
+            if ($result_extra_field['field_type'] == USER_FIELD_TYPE_TAG) {
+                foreach ($users as $user_id) {
+                    $user_result = UserManager::get_user_tags($user_id, $field_id);
+                    $tag_list = array();
+                    foreach ($user_result as $item) {
+                        $tag_list[] = $item['tag'];
+                    }
+                    $return[$user_id][] = implode(', ', $tag_list);
+                }
+            } else {
+                $new_user_array = array();
+                foreach ($users as $user_id) {
+                    $new_user_array[] = "'".$user_id."'";
+                }
+                $users = implode(',', $new_user_array);
+                //selecting only the necessary information NOT ALL the user list
+                $sql = "SELECT user.user_id, field.field_value FROM $table_user user INNER JOIN $table_user_field_values field
                         ON (user.user_id = field.user_id)
                         WHERE field.field_id=".intval($field_id)." AND user.user_id IN ($users)";
 
-				$result = Database::query($sql);
-				while($row = Database::fetch_array($result)) {
-					// get option value for field type double select by id
-					if (!empty($row['field_value'])) {
-						if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DOUBLE_SELECT) {
-							$id_double_select = explode(';',$row['field_value']);
-							if (is_array($id_double_select)) {
-								$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
-								$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
-								$row['field_value'] = ($value1.';'.$value2);
-							}
-						}
-					}
-					// get other value from extra field
-					$return[$row['user_id']][] = $row['field_value'];
-				}
-			}
-		}
-		return $return;
-	}
-
-	/**
-	 * count the number of students in this course (used for SortableTable)
-	 * Deprecated
-	 */
-	function count_student_in_course() {
-		global $nbStudents;
-		return $nbStudents;
-	}
-
-	function sort_users($a, $b) {
-		return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
-	}
-
-	function sort_users_desc($a, $b) {
-		return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
-	}
-
-	/**
-	 * Get number of users for sortable with pagination
-	 * @return int
-	 */
-	static function get_number_of_users() {
-		global $user_ids;
-		return count($user_ids);
-	}
-
-	/**
-	 * Get data for users list in sortable with pagination
-	 * @return array
-	 */
-	static function get_user_data($from, $number_of_items, $column, $direction) {
-		global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id, $_configuration;
-
-		$course_code        = Database::escape_string($course_code);
-		$tbl_user           = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_url_rel_user   = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-
-		$access_url_id      = api_get_current_access_url_id();
-
-		// get all users data from a course for sortable with limit
-		$condition_user = "";
+                $result = Database::query($sql);
+                while ($row = Database::fetch_array($result)) {
+                    // get option value for field type double select by id
+                    if (!empty($row['field_value'])) {
+                        if ($result_extra_field['field_type'] == USER_FIELD_TYPE_DOUBLE_SELECT) {
+                            $id_double_select = explode(';', $row['field_value']);
+                            if (is_array($id_double_select)) {
+                                $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+                                $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+                                $row['field_value'] = ($value1.';'.$value2);
+                            }
+                        }
+                    }
+                    // get other value from extra field
+                    $return[$row['user_id']][] = $row['field_value'];
+                }
+            }
+        }
+        return $return;
+    }
+
+    /**
+     * count the number of students in this course (used for SortableTable)
+     * Deprecated
+     */
+    function count_student_in_course()
+    {
+        global $nbStudents;
+        return $nbStudents;
+    }
+
+    function sort_users($a, $b)
+    {
+        return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
+    }
+
+    function sort_users_desc($a, $b)
+    {
+        return strcmp(trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
+    }
+
+    /**
+     * Get number of users for sortable with pagination
+     * @return int
+     */
+    static function get_number_of_users()
+    {
+        global $user_ids;
+        return count($user_ids);
+    }
+
+    /**
+     * Get data for users list in sortable with pagination
+     * @return array
+     */
+    static function get_user_data($from, $number_of_items, $column, $direction)
+    {
+        global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id, $_configuration;
+
+        $course_code = Database::escape_string($course_code);
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+
+        $access_url_id = api_get_current_access_url_id();
+
+        // get all users data from a course for sortable with limit
+        $condition_user = "";
         $url_table = null;
-        
+
         $url_condition = null;
-		if (is_array($user_ids)) {
-			$user_ids = array_map('intval', $user_ids);
-			$condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
-		} else {
-			$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."%' ) ";
-		}
-
-    	if (api_is_multiple_url_enabled()) {
-			$url_table = ", ".$tbl_url_rel_user."as url_users";
-			$url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
-		}
-
-		$sql = "SELECT user.user_id as user_id,
+        if (is_array($user_ids)) {
+            $user_ids = array_map('intval', $user_ids);
+            $condition_user = " WHERE user.user_id IN (".implode(',', $user_ids).") ";
+        } else {
+            $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."%' ) ";
+        }
+
+        if (api_is_multiple_url_enabled()) {
+            $url_table = ", ".$tbl_url_rel_user."as url_users";
+            $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
+        }
+
+        $sql = "SELECT user.user_id as user_id,
                 user.official_code  as col0,
                 user.lastname       as col1,
                 user.firstname      as col2,
@@ -3604,30 +3746,30 @@ class TrackingCourseLog {
                 FROM $tbl_user as user $url_table
 		        $condition_user $url_condition";
 
-		if (!in_array($direction, array('ASC','DESC'))) {
-			$direction = 'ASC';
-		}
+        if (!in_array($direction, array('ASC', 'DESC'))) {
+            $direction = 'ASC';
+        }
 
-		$column = intval($column);
+        $column = intval($column);
 
-		if ($is_western_name_order) {
-			$original_column = $column;
-			if ($original_column == 1) {
-				$column = 2;
-			}
-			if ($original_column == 2) {
-				$column = 1;
-			}
-		}
-		$from            = intval($from);
-		$number_of_items = intval($number_of_items);
+        if ($is_western_name_order) {
+            $original_column = $column;
+            if ($original_column == 1) {
+                $column = 2;
+            }
+            if ($original_column == 2) {
+                $column = 1;
+            }
+        }
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
 
-		$sql .= " ORDER BY col$column $direction ";
-		$sql .= " LIMIT $from,$number_of_items";
+        $sql .= " ORDER BY col$column $direction ";
+        $sql .= " LIMIT $from,$number_of_items";
 
-		$res      = Database::query($sql);
-		$users    = array();
-		$t        = time();
+        $res = Database::query($sql);
+        $users = array();
+        $t = time();
 
         $course_info = api_get_course_info($course_code);
         $total_surveys = 0;
@@ -3648,148 +3790,151 @@ class TrackingCourseLog {
             }
         }
 
-		while ($user = Database::fetch_array($res, 'ASSOC')) {
-			$user['official_code']  = $user['col0'];
-			if ($is_western_name_order) {
-				$user['lastname']       = $user['col2'];
-				$user['firstname']      = $user['col1'];
-			} else {
-				$user['lastname']       = $user['col1'];
-				$user['firstname']      = $user['col2'];
-			}
-			$user['username']           = $user['col3'];
-			$user['time']                = api_time_to_hms(Tracking::get_time_spent_on_the_course($user['user_id'], $course_code, $session_id));
+        while ($user = Database::fetch_array($res, 'ASSOC')) {
+            $user['official_code'] = $user['col0'];
+            if ($is_western_name_order) {
+                $user['lastname'] = $user['col2'];
+                $user['firstname'] = $user['col1'];
+            } else {
+                $user['lastname'] = $user['col1'];
+                $user['firstname'] = $user['col2'];
+            }
+            $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_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);
-			if (empty($avg_student_progress)) {
-				$avg_student_progress=0;
-			}
-			$user['average_progress']   = $avg_student_progress.'%';
+            $avg_student_progress = Tracking::get_avg_student_progress($user['user_id'], $course_code, array(), $session_id);
+            if (empty($avg_student_progress)) {
+                $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);
-            $user['exercise_progress']  = $total_user_exercise;
+            $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;
-			}
+            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);
-			$user['last_connection']    = Tracking::get_last_connection_date_on_the_course($user['user_id'], $course_code, $session_id);
+            $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);
+            $user['last_connection'] = Tracking::get_last_connection_date_on_the_course($user['user_id'], $course_code, $session_id);
 
-			// we need to display an additional profile field
-			$user['additional'] = '';
+            // 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']]);
-				}
-			}
+            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']]);
+                }
+            }
 
             if (empty($session_id)) {
-                $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
+                $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0).' / '.$total_surveys;
             }
 
-			$user['link'] = '
';
+            $user['link'] = '
';
 
-			// store columns in array $users
+            // store columns in array $users
 
-			$is_western_name_order = api_is_western_name_order();
+            $is_western_name_order = api_is_western_name_order();
             $user_row = array();
 
-            $user_row[]= $user['official_code']; //0
+            $user_row[] = $user['official_code']; //0
 
             if ($is_western_name_order) {
-                $user_row[]= $user['lastname'];
-                $user_row[]= $user['firstname'];
+                $user_row[] = $user['lastname'];
+                $user_row[] = $user['firstname'];
             } else {
-                $user_row[]= $user['firstname'];
-                $user_row[]= $user['lastname'];
+                $user_row[] = $user['firstname'];
+                $user_row[] = $user['lastname'];
             }
-            $user_row[]= $user['username'];
-            $user_row[]= $user['time'];
-            $user_row[]= $user['average_progress'];
-            $user_row[]= $user['exercise_progress'];
+            $user_row[] = $user['username'];
+            $user_row[] = $user['time'];
+            $user_row[] = $user['average_progress'];
+            $user_row[] = $user['exercise_progress'];
 
-            $user_row[]= $user['exercise_average_best_attempt'];
+            $user_row[] = $user['exercise_average_best_attempt'];
 
 
-            $user_row[]= $user['student_score'];
-            $user_row[]= $user['count_assignments'];
-            $user_row[]= $user['count_messages'];
+            $user_row[] = $user['student_score'];
+            $user_row[] = $user['count_assignments'];
+            $user_row[] = $user['count_messages'];
 
             if (empty($session_id)) {
-                $user_row[]= $user['survey'];
+                $user_row[] = $user['survey'];
             }
 
-            $user_row[]= $user['first_connection'];
-            $user_row[]= $user['last_connection'];
+            $user_row[] = $user['first_connection'];
+            $user_row[] = $user['last_connection'];
             if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
-                $user_row[]= $user['additional'];
+                $user_row[] = $user['additional'];
             }
 
-            $user_row[]= $user['link'];
+            $user_row[] = $user['link'];
 
             $users[] = $user_row;
 
-			if ($export_csv) {
-			    if (empty($session_id)) {
+            if ($export_csv) {
+                if (empty($session_id)) {
                     $user_row = array_map('strip_tags', $user_row);
-				    unset($user_row[14]);
-				    unset($user_row[15]);
+                    unset($user_row[14]);
+                    unset($user_row[15]);
                 } else {
                     $user_row = array_map('strip_tags', $user_row);
                     unset($user_row[13]);
                     unset($user_row[14]);
                 }
 
-				$csv_content[] = $user_row;
-			}
-		}
-		return $users;
-	}
+                $csv_content[] = $user_row;
+            }
+        }
+        return $users;
+    }
+
 }
+
 /**
  * @package chamilo.tracking
  */
-class TrackingUserLog {
-
-	/**
-	 * Displays the number of logins every month for a specific user in a specific course.
-	 */
-	function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
-	{
-		$MonthsLong = $GLOBALS['MonthsLong'];
-
-		// protected data
-		$user_id = intval($user_id);
-		$session_id = intval($session_id);
-		$course_id = Database::escape_string($course_id);
-
-		$track_access_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-		$tempView = $view;
-		if(substr($view,0,1) == '1') {
-			$new_view = substr_replace($view,'0',0,1);
-			echo "
+class TrackingUserLog
+{
+
+    /**
+     * Displays the number of logins every month for a specific user in a specific course.
+     */
+    function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
+    {
+        $MonthsLong = $GLOBALS['MonthsLong'];
+
+        // protected data
+        $user_id = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id = Database::escape_string($course_id);
+
+        $track_access_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $tempView = $view;
+        if (substr($view, 0, 1) == '1') {
+            $new_view = substr_replace($view, '0', 0, 1);
+            echo "
                 
                     
-                    -   " .
-                    "".get_lang('LoginsAndAccessTools')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
+                    -   ".
+            "".get_lang('LoginsAndAccessTools')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
                     
                 
                 ";
-			echo "".get_lang('LoginsDetails')."
";
+            echo "".get_lang('LoginsDetails')."
";
 
-			$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                         FROM $track_access_table
                         WHERE access_user_id = '$user_id'
                         AND access_cours_code = '$course_id'
@@ -3797,12 +3942,12 @@ class TrackingUserLog {
                         GROUP BY YEAR(access_date),MONTH(access_date)
                         ORDER BY YEAR(access_date),MONTH(access_date) ASC";
 
-			echo "";
-			//$results = getManyResults2Col($sql);
-			$results = getManyResults3Col($sql);
+            echo "";
+            //$results = getManyResults2Col($sql);
+            $results = getManyResults3Col($sql);
 
-			echo "";
-			echo "
+            echo "
";
+            echo "
@@ -3810,76 +3955,75 @@ class TrackingUserLog {
                     ".get_lang('LoginsTitleCountColumn')."
                     ";
-			$total = 0;
-			if (is_array($results)) {
-				for($j = 0 ; $j < count($results) ; $j++) {
-					echo "";
-					echo "";
-					echo "";
-					echo"";
-					$total = $total + $results[$j][1];
-				}
-				echo "";
-				echo "";
-				echo "";
-				echo"";
-			} else {
-				echo "";
-				echo "";
-				echo"";
-			}
-			echo "

                     
                     ".get_lang('LoginsTitleMonthColumn')."
                     
                 
".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."".$results[$j][1]."
".get_lang('Total')."".$total."
".get_lang('NoResult')."
";
-			echo "";
-		} else {
-			$new_view = substr_replace($view,'1',0,1);
-			echo "
+            $total = 0;
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    echo "";
+                    echo "".$MonthsLong[date('n', $results[$j][0]) - 1].' '.date('Y', $results[$j][0])."";
+                    echo "".$results[$j][1]."";
+                    echo"";
+                    $total = $total + $results[$j][1];
+                }
+                echo "";
+                echo "".get_lang('Total')."";
+                echo "".$total."";
+                echo"";
+            } else {
+                echo "";
+                echo "
".get_lang('NoResult')."
";
+                echo"";
+            }
+            echo "";
+            echo "";
+        } else {
+            $new_view = substr_replace($view, '1', 0, 1);
+            echo "
                 
                     
                     +  ".get_lang('LoginsAndAccessTools')."
                     
                 
             ";
-		}
-	}
-
-	/**
-	 * Displays the exercise results for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_exercise_tracking_info($view, $user_id, $course_id)
-	{
-		global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
-		if(substr($view,1,1) == '1')
-		{
-			$new_view = substr_replace($view,'0',1,1);
-			echo "
+        }
+    }
+
+    /**
+     * Displays the exercise results for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_exercise_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
+        if (substr($view, 1, 1) == '1') {
+            $new_view = substr_replace($view, '0', 1, 1);
+            echo "
                     
                         -   ".get_lang('ExercicesResults')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
                     
                 ";
-			echo "".get_lang('ExercicesDetails')."
";
+            echo "".get_lang('ExercicesDetails')."
";
 
-			$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                 FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                 WHERE te.exe_cours_id = '".Database::escape_string($course_id)."'
                     AND te.exe_user_id = '".Database::escape_string($user_id)."'
                     AND te.exe_exo_id = ce.id
                 ORDER BY ce.title ASC, te.exe_date ASC";
 
-			$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                 FROM $TBL_TRACK_HOTPOTATOES AS te
                 WHERE te.exe_user_id = '".Database::escape_string($user_id)."' AND te.exe_cours_id = '".Database::escape_string($course_id)."'
                 ORDER BY te.exe_cours_id ASC, te.exe_date ASC";
 
-			$hpresults = getManyResultsXCol($hpsql, 4);
+            $hpresults = getManyResultsXCol($hpsql, 4);
 
-			$NoTestRes = 0;
-			$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-			echo "\n\n";
-			$results = getManyResultsXCol($sql, 4);
-			echo "\n";
-			echo "
+            echo "\n\n\n";
-		} else {
-			$new_view = substr_replace($view,'1',1,1);
-			echo "
+            if (is_array($results)) {
+                for ($i = 0; $i < sizeof($results); $i++) {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    echo "\n";
+                    echo "\n";
+                    echo "\n";
+                    echo "\n";
+                    echo "\n";
+                }
+            } else {
+                // istvan begin
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for ($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0], '');
+                    if ($title == '')
+                        $title = basename($hpresults[$i][0]);
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+                    ?>
+                    
+                        
+                        
+                        
+                    
+
+                \n";
+                echo "\n";
+                echo "\n";
+            }
+            echo "
\n";
+            $results = getManyResultsXCol($sql, 4);
+            echo "\n";
+            echo "
                 ";
 
-			if (is_array($results)) {
-				for($i = 0; $i < sizeof($results); $i++) {
-					$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-					echo "\n";
-					echo "\n";
-					echo "\n";
-					echo "\n";
-					echo "\n";
-				}
-			} else {
-				// istvan begin
-				$NoTestRes = 1;
-			}
-
-			// The Result of Tests
-			if(is_array($hpresults)) {
-				for($i = 0; $i < sizeof($hpresults); $i++) {
-					$title = GetQuizName($hpresults[$i][0],'');
-					if ($title == '')
-					$title = basename($hpresults[$i][0]);
-					$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-					?>
-
-	
-	
-	
-
-
-\n";
-				echo "\n";
-				echo "\n";
-			}
-			echo "

                     
                     ".get_lang('ExercicesTitleExerciceColumn')."
@@ -3892,83 +4036,84 @@ class TrackingUserLog {
                     
                 
".$results[$i][0]."".$display_date."".$results[$i][1]." / ".$results[$i][2]."
 / 
-	
".get_lang('NoResult')."
";
-			echo "
".$results[$i][0]."".$display_date."".$results[$i][1]." / ".$results[$i][2]."
 / 
+                        
".get_lang('NoResult')."
";
+            echo "\n\n";
+        } else {
+            $new_view = substr_replace($view, '1', 1, 1);
+            echo "
                 
                     
                         +  ".get_lang('ExercicesResults')."
                     
                 ";
-		}
-	}
-
-	/**
-	 * Displays the student publications for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_student_publications_tracking_info($view, $user_id, $course_id)
-	{
-		global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK, $dateTimeFormatLong, $_course;
-		if(substr($view,2,1) == '1') {
-			$new_view = substr_replace($view,'0',2,1);
-			echo "
+        }
+    }
+
+    /**
+     * Displays the student publications for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_student_publications_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK, $dateTimeFormatLong, $_course;
+        if (substr($view, 2, 1) == '1') {
+            $new_view = substr_replace($view, '0', 2, 1);
+            echo "
                         
                         -   ".get_lang('WorkUploads')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
                         
                 ";
-			echo "".get_lang('WorksDetails')."
";
-			$sql = "SELECT u.upload_date, w.title, w.author,w.url
+            echo "".get_lang('WorksDetails')."
";
+            $sql = "SELECT u.upload_date, w.title, w.author,w.url
                                 FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                                 WHERE u.upload_work_id = w.id
                                     AND u.upload_user_id = '".Database::escape_string($user_id)."'
                                     AND u.upload_cours_id = '".Database::escape_string($course_id)."'
                                 ORDER BY u.upload_date DESC";
-			echo "";
-			$results = getManyResultsXCol($sql,4);
-			echo "";
-			echo "
+            echo "";
-		} else {
-			$new_view = substr_replace($view,'1',2,1);
-			echo "
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    echo "";
+                    echo "";
+                    echo "";
+                    echo "";
+                    echo"";
+                }
+            } else {
+                echo "";
+                echo "";
+                echo"";
+            }
+            echo "
";
+            $results = getManyResultsXCol($sql, 4);
+            echo "";
+            echo "
@@ -3979,160 +4124,161 @@ class TrackingUserLog {
                     ".get_lang('Date')."
                     ";
-			if (is_array($results)) {
-				for($j = 0 ; $j < count($results) ; $j++) {
-					$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-					$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-					echo "";
-					echo "";
-					echo "";
-					echo "";
-					echo"";
-				}
-			} else {
-				echo "";
-				echo "";
-				echo"";
-			}
-			echo "

                     
                     ".get_lang('WorkTitle')."
                     
                 
"
-					."".$results[$j][1].""
-					."".$results[$j][2]."".$beautifulDate."
".get_lang('NoResult')."
";
-			echo "
"
+                    ."".$results[$j][1].""
+                    ."".$results[$j][2]."".$beautifulDate."
".get_lang('NoResult')."
";
+            echo "";
+        } else {
+            $new_view = substr_replace($view, '1', 2, 1);
+            echo "
                 
                         
                         +  ".get_lang('WorkUploads')."
                         
                 
             ";
-		}
-	}
-
-	/**
-	 * Displays the links followed for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_links_tracking_info($view, $user_id, $course_id)
-	{
-		global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
-		if(substr($view,3,1) == '1') {
-			$new_view = substr_replace($view,'0',3,1);
-			echo "
+        }
+    }
+
+    /**
+     * Displays the links followed for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_links_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        if (substr($view, 3, 1) == '1') {
+            $new_view = substr_replace($view, '0', 3, 1);
+            echo "
                 
                         
                         -   ".get_lang('LinksAccess')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
                         
                 
             ";
-			echo "".get_lang('LinksDetails')."
";
-			$sql = "SELECT cl.title, cl.url
+            echo "".get_lang('LinksDetails')."
";
+            $sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
                             AND sl.links_cours_id = '".Database::escape_string($course_id)."'
                             AND sl.links_user_id = '".Database::escape_string($user_id)."'
                         GROUP BY cl.title, cl.url";
-			echo "";
-			$results = getManyResults2Col($sql);
-			echo "";
-			echo "
+            echo "";
-		} else {
-			$new_view = substr_replace($view,'1',3,1);
-			echo "
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    echo "";
+                    echo "";
+                    echo"";
+                }
+            } else {
+                echo "";
+                echo "";
+                echo"";
+            }
+            echo "
";
+            $results = getManyResults2Col($sql);
+            echo "";
+            echo "";
-			if (is_array($results)) {
-				for($j = 0 ; $j < count($results) ; $j++) {
-					echo "";
-					echo "";
-					echo"";
-				}
-			} else {
-				echo "";
-				echo "";
-				echo"";
-			}
-			echo "

                     
                     ".get_lang('LinksTitleLinkColumn')."
                     
                 
".$results[$j][0]."
".get_lang('NoResult')."
";
-			echo "
".$results[$j][0]."
".get_lang('NoResult')."
";
+            echo "";
+        } else {
+            $new_view = substr_replace($view, '1', 3, 1);
+            echo "
                 
                         
                         +  ".get_lang('LinksAccess')."
                         
                 
             ";
-		}
-	}
-
-	/**
-	 * Displays the documents downloaded for a specific user in a specific course.
-	 * @param     string    kind of view inside tracking info
-	 * @param    int        User id
-	 * @param    string    Course code
-	 * @param    int        Session id (optional, default = 0)
-	 * @return     void
-	 */
-    static function display_document_tracking_info($view, $user_id, $course_id, $session_id = 0) {
-
-		// protect data
-		$user_id     = intval($user_id);
-		$course_id     = Database::escape_string($course_id);
-		$session_id = intval($session_id);
-
-		$downloads_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-		if(substr($view,4,1) == '1')
-		{
-			$new_view = substr_replace($view,'0',4,1);
-			echo "
+        }
+    }
+
+    /**
+     * Displays the documents downloaded for a specific user in a specific course.
+     * @param     string    kind of view inside tracking info
+     * @param    int        User id
+     * @param    string    Course code
+     * @param    int        Session id (optional, default = 0)
+     * @return     void
+     */
+    static function display_document_tracking_info($view, $user_id, $course_id, $session_id = 0)
+    {
+
+        // protect data
+        $user_id = intval($user_id);
+        $course_id = Database::escape_string($course_id);
+        $session_id = intval($session_id);
+
+        $downloads_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        if (substr($view, 4, 1) == '1') {
+            $new_view = substr_replace($view, '0', 4, 1);
+            echo "
                 
                         
                         -   ".get_lang('DocumentsAccess')."   [".get_lang('Close')."]   [".get_lang('ExportAsCSV')."]
                         
                 
             ";
-			echo "".get_lang('DocumentsDetails')."
";
+            echo "".get_lang('DocumentsDetails')."
";
 
-			$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                         FROM $downloads_table
                         WHERE down_cours_id = '".$course_id."'
                             AND down_user_id = '$user_id'
                             AND down_session_id = '$session_id'
                         GROUP BY down_doc_path";
 
-			echo "";
-			$results = getManyResults1Col($sql);
-			echo "";
-			echo "
+            echo "";
-		} else {
-			$new_view = substr_replace($view,'1',4,1);
-			echo "
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    echo "";
+                    echo "";
+                    echo"";
+                }
+            } else {
+                echo "";
+                echo "";
+                echo"";
+            }
+            echo "
";
+            $results = getManyResults1Col($sql);
+            echo "";
+            echo "";
-			if (is_array($results)) {
-				for($j = 0 ; $j < count($results) ; $j++) {
-					echo "";
-					echo "";
-					echo"";
-				}
-			} else {
-				echo "";
-				echo "";
-				echo"";
-			}
-			echo "

                     
                     ".get_lang('DocumentsTitleDocumentColumn')."
                     
                 
".$results[$j]."
".get_lang('NoResult')."
";
-			echo "
".$results[$j]."
".get_lang('NoResult')."
";
+            echo "";
+        } else {
+            $new_view = substr_replace($view, '1', 4, 1);
+            echo "
                 
                         
                         +  ".get_lang('DocumentsAccess')."
                         
                 
             ";
-		}
-	}
+        }
+    }
+
     /**
      * Gets the IP of a given user, using the last login before the given date
      * @param int User ID
@@ -4142,50 +4288,53 @@ class TrackingUserLog {
      * @return string IP address (or false on error)
      * @assert (0,0) === false
      */
-    static function get_ip_from_user_event($user_id, $event_date, $return_as_link = false, $body_replace = null) {
+    static function get_ip_from_user_event($user_id, $event_date, $return_as_link = false, $body_replace = null)
+    {
         if (empty($user_id) or empty($event_date)) {
             return false;
-}
+        }
         $table_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
         $sql_ip = "SELECT login_date, login_ip FROM $table_login WHERE login_user_id = $user_id AND login_date < '$event_date' ORDER BY login_date DESC LIMIT 1";
         $ip = '';
         $res_ip = Database::query($sql_ip);
-        if ($res_ip !== false && Database::num_rows($res_ip)>0) {
+        if ($res_ip !== false && Database::num_rows($res_ip) > 0) {
             $row_ip = Database::fetch_row($res_ip);
             if ($return_as_link) {
-                $ip = Display::url((empty($body_replace)?$row_ip[1]:$body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1], array('title'=>get_lang('TraceIP'), 'target'=>'_blank'));
+                $ip = Display::url((empty($body_replace) ? $row_ip[1] : $body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1], array('title' => get_lang('TraceIP'), 'target' => '_blank'));
             } else {
                 $ip = $row_ip[1];
             }
         }
         return $ip;
     }
+
 }
+
 /**
  * @package chamilo.tracking
  */
-class TrackingUserLogCSV {
-
-	/**
-	 * Displays the number of logins every month for a specific user in a specific course.
-	 */
-	function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
-	{
-		$MonthsLong = $GLOBALS['MonthsLong'];
-		$track_access_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-
-		// protected data
-		$user_id    = intval($user_id);
-		$session_id = intval($session_id);
-		$course_id  = Database::escape_string($course_id);
-
-		$tempView = $view;
-		if(substr($view,0,1) == '1')
-		{
-			$new_view = substr_replace($view,'0',0,1);
-			$title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
-
-			$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+class TrackingUserLogCSV
+{
+
+    /**
+     * Displays the number of logins every month for a specific user in a specific course.
+     */
+    function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
+    {
+        $MonthsLong = $GLOBALS['MonthsLong'];
+        $track_access_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+
+        // protected data
+        $user_id = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id = Database::escape_string($course_id);
+
+        $tempView = $view;
+        if (substr($view, 0, 1) == '1') {
+            $new_view = substr_replace($view, '0', 0, 1);
+            $title[1] = get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
+
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                         FROM $track_access_table
                         WHERE access_user_id = '$user_id'
                         AND access_cours_code = '".$course_id."'
@@ -4193,216 +4342,203 @@ class TrackingUserLogCSV {
                         GROUP BY YEAR(access_date),MONTH(access_date)
                         ORDER BY YEAR(access_date),MONTH(access_date) ASC";
 
-			//$results = getManyResults2Col($sql);
-			$results = getManyResults3Col($sql);
-
-			$title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
-			$line='';
-			$total = 0;
-			if (is_array($results))
-			{
-				for($j = 0 ; $j < count($results) ; $j++)
-				{
-					$line .= $results[$j][0].';'.$results[$j][1]."\n";
-					$total = $total + $results[$j][1];
-				}
-				$line .= get_lang('Total').";".$total."\n";
-			}
-			else
-			{
-				$line= get_lang('NoResult')."";
-			}
-		}
-		else
-		{
-			$new_view = substr_replace($view,'1',0,1);
-		}
-		return array($title_line, $line);
-	}
-
-	/**
-	 * Displays the exercise results for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_exercise_tracking_info($view, $user_id, $course_id) {
-		global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
-		if (substr($view,1,1) == '1') {
-			$new_view = substr_replace($view,'0',1,1);
-
-			$title[1]= get_lang('ExercicesDetails');
-			$line='';
-
-			$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            //$results = getManyResults2Col($sql);
+            $results = getManyResults3Col($sql);
+
+            $title_line = get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
+            $line = '';
+            $total = 0;
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    $line .= $results[$j][0].';'.$results[$j][1]."\n";
+                    $total = $total + $results[$j][1];
+                }
+                $line .= get_lang('Total').";".$total."\n";
+            } else {
+                $line = get_lang('NoResult')."";
+            }
+        } else {
+            $new_view = substr_replace($view, '1', 0, 1);
+        }
+        return array($title_line, $line);
+    }
+
+    /**
+     * Displays the exercise results for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_exercise_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
+        if (substr($view, 1, 1) == '1') {
+            $new_view = substr_replace($view, '0', 1, 1);
+
+            $title[1] = get_lang('ExercicesDetails');
+            $line = '';
+
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                 FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                 WHERE te.exe_cours_id = '$course_id'
                     AND te.exe_user_id = '$user_id'
                     AND te.exe_exo_id = ce.id
                 ORDER BY ce.title ASC, te.exe_date ASC";
 
-			$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                 FROM $TABLETRACK_HOTPOTATOES AS te
                 WHERE te.exe_user_id = '$user_id' AND te.exe_cours_id = '$course_id'
                 ORDER BY te.exe_cours_id ASC, te.exe_date ASC";
 
-			$hpresults = getManyResultsXCol($hpsql, 4);
-
-			$NoTestRes = 0;
-			$NoHPTestRes = 0;
-
-			$results = getManyResultsXCol($sql, 4);
-			$title_line=get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
-
-			if (is_array($results))
-			{
-				for($i = 0; $i < sizeof($results); $i++)
-				{
-					$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-					$line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
-				}
-			}
-			else // istvan begin
-			{
-				$NoTestRes = 1;
-			}
-
-			// The Result of Tests
-			if(is_array($hpresults))
-			{
-				for($i = 0; $i < sizeof($hpresults); $i++)
-				{
-					$title = GetQuizName($hpresults[$i][0],'');
-
-					if ($title == '')
-					$title = basename($hpresults[$i][0]);
-
-					$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-
-					$line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
-				}
-			}
-			else
-			{
-				$NoHPTestRes = 1;
-			}
-
-			if ($NoTestRes == 1 && $NoHPTestRes == 1)
-			{
-				$line=get_lang('NoResult');
-			}
-		}
-		else
-		{
-			$new_view = substr_replace($view,'1',1,1);
-
-		}
-		return array($title_line, $line);
-	}
-
-	/**
-	 * Displays the student publications for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_student_publications_tracking_info($view, $user_id, $course_id) {
-		global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK, $dateTimeFormatLong, $_course;
-		if (substr($view,2,1) == '1') {
-			$new_view = substr_replace($view,'0',2,1);
-			$sql = "SELECT u.upload_date, w.title, w.author, w.url
+            $hpresults = getManyResultsXCol($hpsql, 4);
+
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
+
+            $results = getManyResultsXCol($sql, 4);
+            $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
+
+            if (is_array($results)) {
+                for ($i = 0; $i < sizeof($results); $i++) {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
+                }
+            } else { // istvan begin
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for ($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0], '');
+
+                    if ($title == '')
+                        $title = basename($hpresults[$i][0]);
+
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+
+                    $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
+                }
+            }
+            else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view, '1', 1, 1);
+        }
+        return array($title_line, $line);
+    }
+
+    /**
+     * Displays the student publications for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_student_publications_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK, $dateTimeFormatLong, $_course;
+        if (substr($view, 2, 1) == '1') {
+            $new_view = substr_replace($view, '0', 2, 1);
+            $sql = "SELECT u.upload_date, w.title, w.author, w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE u.upload_work_id = w.id
                         AND u.upload_user_id = '$user_id'
                         AND u.upload_cours_id = '$course_id'
                     ORDER BY u.upload_date DESC";
-			$results = getManyResultsXCol($sql,4);
-
-			$title[1]=get_lang('WorksDetails');
-			$line='';
-			$title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
-
-			if (is_array($results)) {
-				for($j = 0 ; $j < count($results) ; $j++) {
-					$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-					$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-					$line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
-				}
-
-			} else {
-				$line= get_lang('NoResult');
-			}
-		} else {
-			$new_view = substr_replace($view,'1',2,1);
-		}
-		return array($title_line, $line);
-	}
-
-	/**
-	 * Displays the links followed for a specific user in a specific course.
-	 * @todo remove globals
-	 */
-	function display_links_tracking_info($view, $user_id, $course_id) {
-		global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
-		if (substr($view,3,1) == '1') {
-			$new_view = substr_replace($view,'0',3,1);
-			$title[1]=get_lang('LinksDetails');
-			$sql = "SELECT cl.title, cl.url
+            $results = getManyResultsXCol($sql, 4);
+
+            $title[1] = get_lang('WorksDetails');
+            $line = '';
+            $title_line = get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
+
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view, '1', 2, 1);
+        }
+        return array($title_line, $line);
+    }
+
+    /**
+     * Displays the links followed for a specific user in a specific course.
+     * @todo remove globals
+     */
+    function display_links_tracking_info($view, $user_id, $course_id)
+    {
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        if (substr($view, 3, 1) == '1') {
+            $new_view = substr_replace($view, '0', 3, 1);
+            $title[1] = get_lang('LinksDetails');
+            $sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
                             AND sl.links_cours_id = '$course_id'
                             AND sl.links_user_id = '$user_id'
                         GROUP BY cl.title, cl.url";
-			$results = getManyResults2Col($sql);
-			$title_line= get_lang('LinksTitleLinkColumn')."\n";
-			if (is_array($results)) {
-				for ($j = 0 ; $j < count($results) ; $j++) {
-					$line .= $results[$j][0]."\n";
-				}
-			} else {
-				$line=get_lang('NoResult');
-			}
-		} else {
-			$new_view = substr_replace($view,'1',3,1);
-		}
-		return array($title_line, $line);
-	}
-
-	/**
-	 * Displays the documents downloaded for a specific user in a specific course.
-	 * @param     string    kind of view inside tracking info
-	 * @param    int        User id
-	 * @param    string    Course code
-	 * @param    int        Session id (optional, default = 0)
-	 * @return     void
-	 */
-	function display_document_tracking_info($view, $user_id, $course_id, $session_id = 0) {
-		// protect data
-		$user_id     = intval($user_id);
-		$course_id     = Database::escape_string($course_id);
-		$session_id = intval($session_id);
-
-		$downloads_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-
-		if (substr($view,4,1) == '1') {
-			$new_view = substr_replace($view,'0',4,1);
-			$title[1]= get_lang('DocumentsDetails');
-
-			$sql = "SELECT down_doc_path
+            $results = getManyResults2Col($sql);
+            $title_line = get_lang('LinksTitleLinkColumn')."\n";
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    $line .= $results[$j][0]."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view, '1', 3, 1);
+        }
+        return array($title_line, $line);
+    }
+
+    /**
+     * Displays the documents downloaded for a specific user in a specific course.
+     * @param     string    kind of view inside tracking info
+     * @param    int        User id
+     * @param    string    Course code
+     * @param    int        Session id (optional, default = 0)
+     * @return     void
+     */
+    function display_document_tracking_info($view, $user_id, $course_id, $session_id = 0)
+    {
+        // protect data
+        $user_id = intval($user_id);
+        $course_id = Database::escape_string($course_id);
+        $session_id = intval($session_id);
+
+        $downloads_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+
+        if (substr($view, 4, 1) == '1') {
+            $new_view = substr_replace($view, '0', 4, 1);
+            $title[1] = get_lang('DocumentsDetails');
+
+            $sql = "SELECT down_doc_path
                         FROM $downloads_table
                         WHERE down_cours_id = '$course_id'
                             AND down_user_id = '$user_id'
                             AND down_session_id = '$session_id'
                         GROUP BY down_doc_path";
 
-			$results = getManyResults1Col($sql);
-			$title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
-			if (is_array($results)) {
-				for ($j = 0 ; $j < count($results) ; $j++) {
-					$line .= $results[$j]."\n";
-				}
-			} else {
-				$line = get_lang('NoResult');
-			}
-		} else {
-			$new_view = substr_replace($view,'1',4,1);
-		}
-		return array($title_line, $line);
-	}
+            $results = getManyResults1Col($sql);
+            $title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
+            if (is_array($results)) {
+                for ($j = 0; $j < count($results); $j++) {
+                    $line .= $results[$j]."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view, '1', 4, 1);
+        }
+        return array($title_line, $line);
+    }
+
 }
\ No newline at end of file
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 8c27ec6179..5f6a37f138 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -2513,6 +2513,7 @@ class learnpath {
         $sql = "SELECT count(*) FROM $table WHERE c_id = $course_id AND lp_iv_id = $lp_iv_id";
         $res = Database::query($sql);
         $res = 0;
+        $num = 0;
         if (Database::num_rows($res)) {
             $row = Database::fetch_array($res);
             $num = $row[0];
@@ -2576,6 +2577,7 @@ class learnpath {
         //@todo seems that this always returns 0
         $res = Database::query($sql);
         $res = 0;
+        $num = 0;
         if (Database::num_rows($res)) {
             $row = Database :: fetch_array($res);
             $num = $row[0];
diff --git a/main/newscorm/lp_list.php b/main/newscorm/lp_list.php
index 26c199e87d..bacd18378c 100644
--- a/main/newscorm/lp_list.php
+++ b/main/newscorm/lp_list.php
@@ -206,10 +206,15 @@ if (!empty($flat_list)) {
         }
 
         $counter++;
-        if (($counter % 2) == 0) { $oddclass = 'row_odd'; } else { $oddclass = 'row_even'; }
+        if (($counter % 2) == 0) {
+            $oddclass = 'row_odd';
+        } else {
+            $oddclass = 'row_even';
+        }
 
         $url_start_lp = 'lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$id;
         $name = Security::remove_XSS($details['lp_name']);
+        $extra = null;
         if ($is_allowed_to_edit) {
             $url_start_lp .= '&isStudentView=true';
             $dsp_desc = ''.$details['lp_maker'].'   '.(learnpath::is_lp_visible_for_student($id, api_get_user_id())?'':' - ('.get_lang('LPNotVisibleToStudent').')');
@@ -380,19 +385,6 @@ if (!empty($flat_list)) {
 				}
             }
 
-            /* Increase SCORM recording */
-            /*
-            if ($details['lp_force_commit'] == 1) {
-                $dsp_force_commit = '' .
-                    'Normal SCORM recordings' .
-                    ' ';
-            }else{
-                $dsp_force_commit = '' .
-                    'Extra SCORM recordings' .
-                    ' ';
-            }
-            */
-
             /*  DEBUG  */
 
             if ($test_mode == 'test' or api_is_platform_admin()) {
diff --git a/main/pages/index.php b/main/pages/index.php
index 49c157fd0c..1a1af88bde 100755
--- a/main/pages/index.php
+++ b/main/pages/index.php
@@ -13,6 +13,10 @@ use Pagerfanta\View\TwitterBootstrapView;
 //use Pagerfanta\View\DefaultView;
 //use Pages\PagesAdmin;
 
+use APY\DataGridBundle\Grid\Grid;
+use APY\DataGridBundle\Grid\Source\Entity;
+
+
 class PagesController {
     /*
     function indexAction(Application $app, $page) {
@@ -83,11 +87,18 @@ class PagesController {
     }
 
     function listAction(Application $app, $page = 1) {
-        /*$app['sonata.crud_controller']->listAction();
-        require_once 'pageadmin.php';
-        $pages_admin = new PagesAdmin('a', 'b', 'Controller');
-        $html = $pages_admin->getDatagrid();
-        var_dump($html);*/
+
+        $source = new Entity('Entity\EntityPages');
+        $grid = new Grid();
+
+        // Attach the source to the grid
+        $grid->setSource($source);
+
+        // Return the response of the grid to the template
+        //return $grid->getGridResponse('MyProjectMyBundle::myGrid.html.twig');
+
+
+
 
         $em = $app['orm.em'];
         $dql = 'SELECT a FROM Entity\EntityPages a';
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 250f2ce8ff..245a9f19a4 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -26,16 +26,16 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.
  */
 function display_action_links($id, $cur_dir_path, $show_tool_options, $display_upload_link, $action) {
 	global $gradebook;
-    
+
     $id = $my_back_id = intval($id);
     if ($action == 'list') {
         $my_back_id = 0;
     }
-    
+
 	$display_output = '';
-	$origin = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '';    
-	
-	if (!empty($id)) {		
+	$origin = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '';
+
+	if (!empty($id)) {
 		$display_output .= ''.Display::return_icon('back.png', get_lang('BackToWorksList'),'',ICON_SIZE_MEDIUM).'';
 	}
 
@@ -68,7 +68,7 @@ function display_action_links($id, $cur_dir_path, $show_tool_options, $display_u
 
 	if (api_is_allowed_to_edit(null, true)) {
 		global $token;
-			
+
 		if (!empty($id)) {
 			if (empty($_GET['list']) or Security::remove_XSS($_GET['list']) == 'with') {
 				$display_output .= ''.
@@ -106,12 +106,12 @@ function display_action_links($id, $cur_dir_path, $show_tool_options, $display_u
  *
  * @param $uploadvisibledisabled
  * @param $origin
- 
+
  */
 function display_tool_options($uploadvisibledisabled, $origin) {
 	global $gradebook;
 	$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
-	
+
 	if (!$is_allowed_to_edit) {
 		return;
 	}
@@ -178,10 +178,10 @@ function display_studentsdelete_form() {
                         
         
         			
+        
 		
 
 
@@ -283,14 +283,14 @@ function get_work_count_by_student($user_id, $work_id) {
 	$work_id = intval($work_id);
 	$course_id = api_get_course_int_id();
     $session_id = api_get_session_id();
-	
+
 	$work_table      = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
-	$sql = "SELECT COUNT(*) as count FROM  $work_table 
+	$sql = "SELECT COUNT(*) as count FROM  $work_table
             WHERE c_id = $course_id AND parent_id = $work_id AND user_id = $user_id AND active = 1 AND session_id = $session_id ";
 	$result = Database::query($sql);
 	$return = 0;
 	if (Database::num_rows($result)) {
-		$return = Database::fetch_row($result,'ASSOC');		
+		$return = Database::fetch_row($result,'ASSOC');
 		$return = intval($return[0]);
 	}
 	return $return;
@@ -324,17 +324,17 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 	$iprop_table     = Database::get_course_table(TABLE_ITEM_PROPERTY);
         $user_table      = Database::get_main_table(TABLE_MAIN_USER);
 	$work_assigment  = Database::get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
-    
+
 	$is_allowed_to_edit = api_is_allowed_to_edit(null, true);
-    
-	$user_id 			= api_get_user_id();	
+
+	$user_id 			= api_get_user_id();
 	$session_id         = api_get_session_id();
-    $condition_session  = api_get_session_condition($session_id);    
+    $condition_session  = api_get_session_condition($session_id);
     $course_id          = api_get_course_int_id();
     $group_id           = api_get_group_id();
-    
+
     $course_info        = api_get_course_info(api_get_course_id());
-    
+
 	$sort_params = array();
 
 	if (isset($_GET['column'])) {
@@ -353,66 +353,66 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 	$my_params      = $sort_params;
 	$origin         = Security::remove_XSS($origin);
 
-	// Getting the work data	
-	$my_folder_data = get_work_data_by_id($id);   
-    
+	// Getting the work data
+	$my_folder_data = get_work_data_by_id($id);
+
     $qualification_exists = false;
     if (!empty($my_folder_data['qualification']) && intval($my_folder_data['qualification']) > 0) {
         $qualification_exists = true;
-    }    
-    
-    $work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/work';                    
+    }
+
+    $work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/work';
     if (!empty($my_folder_data)) {
         $work_dir = api_get_path(SYS_COURSE_PATH).$_course['path'].'/work'.$my_folder_data['url'];
     }
-        
+
     if (empty($my_folder_data)) {
     	$link_info = is_resource_in_course_gradebook(api_get_course_id(), 3 , $id, api_get_session_id());
         $work_in_gradebook_link_id = $link_info['id'];
-        
+
     	if ($work_in_gradebook_link_id) {
     		if ($is_allowed_to_edit)
     			if (intval($my_folder_data['qualification']) == 0) {
     				Display::display_warning_message(get_lang('MaxWeightNeedToBeProvided'));
     			}
-    	}    	
-    	$contains_file_query = '';    	
-        
+    	}
+    	$contains_file_query = '';
+
     	//Get list from database
     	if ($is_allowed_to_edit) {
-    		$active_condition = ' active IN (0, 1)';		
+    		$active_condition = ' active IN (0, 1)';
     		$sql_get_publications_list = "SELECT *  FROM  $work_table ".
                     " WHERE c_id = $course_id $add_in_where_query $condition_session AND $active_condition AND ".
                     "  ( parent_id = 0) ".
                     " $contains_file_query ".
                     " ORDER BY sent_date DESC";
-    	} else {		
+    	} else {
     		if (!empty($group_id)) {
     			$group_query = " WHERE c_id = $course_id AND post_group_id = '".$group_id."' "; // set to select only messages posted by the user's group
     			$subdirs_query = "AND parent_id = 0";
     		} else {
     			$group_query = " WHERE c_id = $course_id AND  post_group_id = '0' ";
     			$subdirs_query = "AND parent_id = 0";
-    		}    		
-            //@todo how we can active or not an assignment? 
-    		$active_condition = ' AND active IN (1,0)';    
-    		$sql_get_publications_list = "SELECT * FROM  $work_table $group_query $subdirs_query $add_in_where_query  $active_condition $condition_session ORDER BY title";    		
+    		}
+            //@todo how we can active or not an assignment?
+    		$active_condition = ' AND active IN (1,0)';
+    		$sql_get_publications_list = "SELECT * FROM  $work_table $group_query $subdirs_query $add_in_where_query  $active_condition $condition_session ORDER BY title";
     	}
- 
-        $work_parents = array();       
-       
+
+        $work_parents = array();
+
         $sql_result = Database::query($sql_get_publications_list);
-        if (Database::num_rows($sql_result)) {  
+        if (Database::num_rows($sql_result)) {
             while ($work = Database::fetch_object($sql_result)) {
                 if ($work->parent_id == 0) {
                     $work_parents[] = $work;
                 }
             }
-        }        
-    }    
-    	
-	$edit_dir = isset($_GET['edit_dir']) ? $_GET['edit_dir'] : '';    
-    
+        }
+    }
+
+	$edit_dir = isset($_GET['edit_dir']) ? $_GET['edit_dir'] : '';
+
 	$table_header = array();
 	$table_has_actions_column = false;
 	$table_header[] = array(get_lang('Type'), false, 'style="width:40px"');
@@ -425,7 +425,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 			$table_header[] = array(get_lang('Qualification'), true);
 		}
 	}
-	
+
 	$table_header[] = array(get_lang('Date'), true, 'style="width:200px"');
 
 	if ($is_allowed_to_edit) {
@@ -438,83 +438,83 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 	$table_data = array();
 
 	// List of all folders if no id was provided
-    
+
     $group_id = api_get_group_id();
-	
-	if (is_array($work_parents)) {	   
-		foreach ($work_parents as $work_parent) {	            
+
+	if (is_array($work_parents)) {
+		foreach ($work_parents as $work_parent) {
 			$sql_select_directory = "SELECT title, url, prop.insert_date, prop.lastedit_date, work.id, author, has_properties, view_properties, description, qualification, weight, allow_text_assignment ".
                   " FROM ".$iprop_table." prop INNER JOIN ".$work_table." work ON (prop.ref=work.id AND prop.c_id = $course_id  ) ".
                   " WHERE active IN (0, 1) AND ";
-			
+
 			if (!empty($group_id)) {
 				$sql_select_directory .= " work.post_group_id = '".$group_id."' "; // set to select only messages posted by the user's group
 			} else {
 				$sql_select_directory .= " work.post_group_id = '0' ";
-			}            
+			}
 			$sql_select_directory .= "  AND  ".
 			                           "  work.c_id = $course_id AND ".
 			                           "  work.id  = ".$work_parent->id." AND ".
 			                           "  work.filetype = 'folder' AND ".
-			                           "  prop.tool='work' $condition_session";    
+			                           "  prop.tool='work' $condition_session";
 			$result = Database::query($sql_select_directory);
 			$row    = Database::fetch_array($result, 'ASSOC');
-			
+
 			if (!$row) {
 				// the folder belongs to another session
 				continue;
 			}
-			$direc_date      = $row['lastedit_date']; //directory's date				
-			$author          = $row['author']; //directory's author				
+			$direc_date      = $row['lastedit_date']; //directory's date
+			$author          = $row['author']; //directory's author
 			$view_properties = $row['view_properties'];
 			$is_assignment   = $row['has_properties'];
 			$id2             = $row['id']; //work id
 
             $locked = api_resource_is_locked_by_gradebook($id2, LINK_STUDENTPUBLICATION);
-            
+
 			if ($is_allowed_to_edit && $locked == false) {
 			    // form edit directory
-                
+
 				if (!empty($edit_dir) && $edit_dir == $id2) {
-                    
+
 					if (!empty($row['has_properties'])) {
 						$sql = Database::query('SELECT * FROM '.$work_assigment.' WHERE c_id = '.$course_id.' AND id = "'.$row['has_properties'].'" LIMIT 1');
 						$homework = Database::fetch_array($sql);
 					}
-					$form_folder = new FormValidator('edit_dir', 'post', api_get_self().'?origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$id2);                  
-                    $form_folder->addElement('text', 'dir_name', get_lang('Title'));                    
+					$form_folder = new FormValidator('edit_dir', 'post', api_get_self().'?origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$id2);
+                    $form_folder->addElement('text', 'dir_name', get_lang('Title'));
                     $form_folder->addElement('hidden', 'work_id', $id2);
                     $form_folder -> addRule('dir_name', get_lang('ThisFieldIsRequired'), 'required');
-                    
+
                     $my_title = !empty($row['title']) ? $row['title'] : basename($row['url']);
-                    
+
 					$defaults = array('dir_name' => Security::remove_XSS($my_title), 'description' => Security::remove_XSS($row['description']));
 					$form_folder->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'work', 'Width' => '80%', 'Height' => '200'));
 
-					$there_is_a_end_date = false;						
+					$there_is_a_end_date = false;
 					$form_folder -> addElement('advanced_settings', '
 						 	  	                                  
 						 	  	                                  '.get_lang('AdvancedParameters').'
 						 	  	                                 
 						 	  	                                 ');
 					$form_folder->addElement('html', '');
+					}
+
 					if ($homework['ends_on'] != '0000-00-00 00:00:00') {
 						$homework['ends_on'] = api_get_local_time($homework['ends_on']);
 						$there_is_a_end_date = true;
-						
+
 						$defaults['enableEndDate'] = true;
-						
+
 						$form_folder -> addElement('checkbox', 'enableEndDate', null, get_lang('EnableEndDate'), 'onclick="javascript: if(this.checked){document.getElementById(\'option2\').style.display = \'block\';}else{document.getElementById(\'option2\').style.display = \'none\';}"');
 						$form_folder -> addElement('html', '
');
 						$form_folder -> addGroup(create_group_date_select(), 'ends', get_lang('EndsAt'));
 						$form_folder -> addElement('html', '
');
 						$form_folder -> addRule(array('expires', 'ends'), get_lang('DateExpiredNotBeLessDeadLine'), 'comparedate');
-						
+
 					} else {
 						$homework['ends_on'] = api_get_local_time();
-						
+
 						$expires_date_array = convert_date_to_array(api_get_local_time(), 'ends');
 						$defaults 			= array_merge($defaults, $expires_date_array);
-						
+
 						$there_is_a_end_date = false;
-						
+
 						$form_folder -> addElement('checkbox', 'enableEndDate', null, get_lang('EnableEndDate'), 'onclick="javascript: if(this.checked){document.getElementById(\'option2\').style.display = \'block\';}else{document.getElementById(\'option2\').style.display = \'none\';}"');
 						$form_folder -> addElement('html', '');
 					$form_folder -> addElement('style_submit_button', 'submit', get_lang('ModifyDirectory'), 'class="save"');
-					
+
 					if ($there_is_a_end_date) {
 						$end_date_array = convert_date_to_array($homework['ends_on'], 'ends');
 						$defaults = array_merge($defaults, $end_date_array);
 					}
-					
+
 					if ($there_is_a_expire_date) {
 						$expires_date_array = convert_date_to_array($homework['expires_on'], 'expires');
-						$defaults = array_merge($defaults, $expires_date_array);						
+						$defaults = array_merge($defaults, $expires_date_array);
 					}
-					
+
 					if (!empty($row['qualification'])) {
 						$defaults = array_merge($defaults, array('qualification[qualification]' => $row['qualification']));
-					}            
-                    
+					}
+
 					$defaults['allow_text_assignment'] = $row['allow_text_assignment'];
 					$form_folder -> setDefaults($defaults);
 					$display_edit_form = true;
 
 					if ($form_folder->validate()) {
-						
+
 						if ($_POST['enableExpiryDate'] == '1') {
 							$there_is_a_expire_date = true;
 						} else {
@@ -627,18 +627,18 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 							$there_is_a_end_date = true;
 						} else {
 							$there_is_a_end_date = false;
-						}							
-						
+						}
+
 						$values = $form_folder->exportValues();
                         $work_id = $values['work_id'];
-						                        
+
 						$dir_name = replace_dangerous_char($values['dir_name']);
 						$dir_name = disable_dangerous_file($dir_name);
 
 						$edit_check = false;
-                        
-                        $work_data = get_work_data_by_id($work_id);                        
-                        
+
+                        $work_data = get_work_data_by_id($work_id);
+
 						if (!empty($work_data)) {
                             $edit_check = true;
 					    } else {
@@ -646,43 +646,43 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 						}
 
 						if ($edit_check) {
-							$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);	
-								
+							$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
+
 							$expires_query = ' SET expires_on = '."'".($there_is_a_expire_date ? api_get_utc_datetime(get_date_from_group('expires')) : '0000-00-00 00:00:00')."'";
 							Database::query('UPDATE '.$work_assigment.$expires_query.' WHERE c_id = '.$course_id.' AND id = '."'".$row['has_properties']."'");
 							$sql_add_publication = "UPDATE ".$work_table." SET has_properties  = '".$row['has_properties'].  "', view_properties=1 WHERE c_id = $course_id AND id ='".$row['id']."'";
-							Database::query($sql_add_publication);						
-			
+							Database::query($sql_add_publication);
+
 							$ends_query = ' SET ends_on = '."'".($there_is_a_end_date ? api_get_utc_datetime(get_date_from_group('ends')) : '0000-00-00 00:00:00')."'";
 							Database::query('UPDATE '.$work_assigment.$ends_query.' WHERE c_id = '.$course_id.' AND id = '."'".$row['has_properties']."'");
 							$sql_add_publication = "UPDATE ".$work_table." SET has_properties  = '".$row['has_properties'].  "', view_properties=1 WHERE c_id = $course_id AND id ='".$row['id']."'";
 							Database::query($sql_add_publication);
-                                                        
+
                             $qualification_value = isset($_POST['qualification']['qualification']) && !empty($_POST['qualification']['qualification']) ? intval($_POST['qualification']['qualification']) : 0;
                             $enable_qualification = !empty($qualification_value) ? 1 : 0;
                             $sql_add_publication = "UPDATE ".$work_assigment." SET enable_qualification  = '".$enable_qualification.  "' WHERE c_id = $course_id AND publication_id ='".$row['id']."'";
-							Database::query($sql_add_publication);                      
-				
-                             $sql = 'UPDATE '.$work_table.' SET 
+							Database::query($sql_add_publication);
+
+                             $sql = 'UPDATE '.$work_table.' SET
                                                  allow_text_assignment = '."'".intval($_POST['allow_text_assignment'])."'".' ,
-                                                 title = '."'".Database::escape_string($_POST['dir_name'])."'".',  
-                                                 description = '."'".Database::escape_string($_POST['description'])."'".', 
+                                                 title = '."'".Database::escape_string($_POST['dir_name'])."'".',
+                                                 description = '."'".Database::escape_string($_POST['description'])."'".',
                                                  qualification = '."'".Database::escape_string($_POST['qualification']['qualification'])."'".',
-                                                 weight = '."'".Database::escape_string($_POST['weight']['weight'])."'".' 
-                                             WHERE c_id = '.$course_id.' AND id = '.$row['id'];                            
+                                                 weight = '."'".Database::escape_string($_POST['weight']['weight'])."'".'
+                                             WHERE c_id = '.$course_id.' AND id = '.$row['id'];
 							Database::query($sql);
-								
+
 							require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
                             require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
                             require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php';
                             require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/abstractlink.class.php';
-                                                        
+
                             $link_info = is_resource_in_course_gradebook(api_get_course_id(), LINK_STUDENTPUBLICATION, $row['id'], api_get_session_id());
                             $link_id = null;
                             if (!empty($link_info)) {
                                 $link_id = $link_info['id'];
                             }
-                                
+
                             if (isset($_POST['make_calification']) && $_POST['make_calification'] == 1 && !empty($_POST['category_id'])) {
                                 if (empty($link_id)) {
                                     add_resource_to_course_gradebook($_POST['category_id'], api_get_course_id(), LINK_STUDENTPUBLICATION, $row['id'], $_POST['dir_name'], (float)$_POST['weight']['weight'], (float)$_POST['qualification']['qualification'], $_POST['description'], 1, api_get_session_id(), $link_id);
@@ -690,12 +690,12 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
                                     update_resource_from_course_gradebook($link_id, api_get_course_id(), $_POST['weight']['weight']);
                                 }
                             } else {
-                                //Delete everything of the gradebook                                
-                                remove_resource_from_course_gradebook($link_id);                                
+                                //Delete everything of the gradebook
+                                remove_resource_from_course_gradebook($link_id);
                             }
 
 							update_dir_name($work_data, $dir_name, $values['dir_name']);
-							
+
 							$dir = $dir_name;
 							$display_edit_form = false;
 
@@ -704,7 +704,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 							$res = Database::query($sql);
 							$calendar_id = Database::fetch_row($res);
 							$dir_name = sprintf(get_lang('HandingOverOfTaskX'), $dir_name);
-								
+
 							$end_date = $row['insert_date'];
 
 							if ($_POST['enableExpiryDate'] == '1') {
@@ -728,16 +728,16 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 					}
 				}
 			}
-			
+
 			$work_data = get_work_data_by_id($work_parent->id);
-		
+
 			$action = '';
 			$row = array();
 			$class = '';
-			$cant_files = 0;			
+			$cant_files = 0;
 			$course_id  = api_get_course_int_id();
 			$session_id = api_get_session_id();
-				
+
 			if (api_is_allowed_to_edit()) {
                             $sql_document = "SELECT count(*) FROM $work_table w INNER JOIN $user_table u ON w.user_id = u.user_id WHERE w.c_id = $course_id AND w.parent_id = ".$work_data['id']." AND w.active IN (0, 1)";
 			} else {
@@ -746,18 +746,18 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
                     $user_filter  = null;
                 }
                 $sql_document = "SELECT count(*) FROM $work_table s, $iprop_table p
-                                  WHERE s.c_id = $course_id  AND 
+                                  WHERE s.c_id = $course_id  AND
                                         p.c_id = $course_id AND
-                                        s.id = p.ref AND 
-                                        p.tool='work' AND 
-                                        s.accepted='1' AND 
+                                        s.id = p.ref AND
+                                        p.tool='work' AND
+                                        s.accepted='1' AND
                                         $user_filter
-                                        parent_id = ".$work_data['id']." AND  
+                                        parent_id = ".$work_data['id']." AND
                                         active = 1 AND
                                         parent_id = ".$work_parent->id."";
 			}
-				
-			//count documents			
+
+			//count documents
 			$res_document   = Database::query($sql_document);
 			$count_document = Database::fetch_row($res_document);
 			$cant_files     = $count_document[0];
@@ -769,7 +769,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 			}
 
 			$icon = Display::return_icon('work.png', get_lang('Assignment'), array(), ICON_SIZE_SMALL);
-				
+
 			if (!empty($display_edit_form) && !empty($edit_dir)  && $edit_dir == $id2) {
 				$row[] = $icon;
 				$row[] = ''.$form_folder->toHtml(); // form to edit the directory's name
@@ -790,23 +790,23 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 				} else {
 					$add_to_name = '';
 				}
-				
+
 				$work_title = !empty($work_data['title']) ? $work_data['title'] : basename($work_data['url']);
-				
-				//Work name							    
-				//if (api_is_allowed_to_edit()) {                    
+
+				//Work name
+				//if (api_is_allowed_to_edit()) {
                     if ($cant_files > 0 ) {
                         $zip = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).'';
                     }
-				//}         
+				//}
 				$url = $zip.''.
-						$work_title.' '.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext;							
-				$row[] = $url;				
+						$work_title.' '.$add_to_name.'
'.$cant_files.' '.$text_file.$dirtext;
+				$row[] = $url;
 			}
 			if ($count_files != 0) {
 				$row[] = '';
 			}
-	
+
 			if ($direc_date != '' && $direc_date != '0000-00-00 00:00:00') {
 				$direc_date_local = api_get_local_time($direc_date);
 				$row[] = date_to_str_ago($direc_date_local).'
'.api_format_date($direc_date_local).'';
@@ -824,7 +824,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
                         $action .= ''.Display::return_icon('edit.png', get_lang('Modify'), array(), ICON_SIZE_SMALL).'';
                         $action .= ' '.Display::return_icon('delete.png',get_lang('DirDelete'),'',ICON_SIZE_SMALL).'';
                     }
-                    
+
 					$row[] = $action;
 				} else {
 					$row[] = '';
@@ -835,7 +835,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 			$table_data[] = $row;
 		}
 	}
-	
+
 	$sorting_options = array();
 	$sorting_options['column'] = 1;
 
@@ -849,7 +849,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 		$column_order[$i] = $i;
 		$i++;
 	}
-    if (empty($my_folder_data)) {	
+    if (empty($my_folder_data)) {
 		$column_order[1] = 5;
 	} else {
 		$column_order[2] = 2;
@@ -858,7 +858,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 	// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
 	$column_show = array();
 
-	$column_show[] = 1; // type 0 
+	$column_show[] = 1; // type 0
 	$column_show[] = 1; // title 1
 
 	if (!empty($my_folder_data)) {
@@ -878,13 +878,13 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 	if (isset($_GET['curdirpath'])) {
 		$my_params = array ('curdirpath' => Security::remove_XSS($_GET['curdirpath']));
 	}
-	
+
 	$my_params = array ('id' => isset($_GET['id']) ? $_GET['id'] : null);
 
 	if (isset($_GET['edit_dir'])) {
 		$my_params = array ('edit_dir' => intval($_GET['edit_dir']));
 	}
-	$my_params['origin'] = $origin;    
+	$my_params['origin'] = $origin;
 	Display::display_sortable_config_table('work', $table_header, $table_data, $sorting_options, $paging_options, $my_params, $column_show, $column_order);
 }
 /**
@@ -973,7 +973,7 @@ function build_work_directory_selector($folders, $curdirpath, $group_dir = '') {
  * @return string html form
  */
 function build_work_move_to_selector($folders, $curdirpath, $move_file, $group_dir = '') {
-    $course_id = api_get_course_int_id(); 
+    $course_id = api_get_course_int_id();
 	$move_file	= intval($move_file);
 	$tbl_work	= Database::get_course_table(TABLE_STUDENT_PUBLICATION);
 	$sql 		= "SELECT title FROM $tbl_work WHERE c_id = $course_id AND id ='".$move_file."'";
@@ -1025,7 +1025,7 @@ function build_work_move_to_selector($folders, $curdirpath, $move_file, $group_d
 	$form .= '';
 	$form .= '	
 			';
-	$form .= '
					
+	$form .= '

 					

 						
 					

@@ -1088,33 +1088,33 @@ function create_unexisting_work_directory($base_work_dir, $desired_dir_name) {
  * @return	integer	-1 on error
  */
 function del_dir($id) {
-    global $_course;	
+    global $_course;
     $id = intval($id);
     $work_data = get_work_data_by_id($id);
-    
+
     if (empty($work_data)) {
         return false;
-    }    
-    
-    $base_work_dir      = api_get_path(SYS_COURSE_PATH) .$_course['path'].'/work';    
-    $work_data_url      = $base_work_dir.$work_data['url'];    
-	$check = Security::check_abs_path($work_data_url.'/', $base_work_dir.'/');    
-	
-    
+    }
+
+    $base_work_dir      = api_get_path(SYS_COURSE_PATH) .$_course['path'].'/work';
+    $work_data_url      = $base_work_dir.$work_data['url'];
+	$check = Security::check_abs_path($work_data_url.'/', $base_work_dir.'/');
+
+
 	$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
 	$course_id = api_get_course_int_id();
 
 	if (!empty($work_data['url'])) {
-	  
+
 		//Deleting all contents inside the folder
-		//@todo replace to parent_id 
-		$sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND filetype = 'folder'  AND id =  $id";        
+		//@todo replace to parent_id
+		$sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND filetype = 'folder'  AND id =  $id";
 		$res = Database::query($sql);
-        
+
         $sql = "UPDATE $table SET active = 2 WHERE c_id = $course_id AND parent_id =  $id";
         $res = Database::query($sql);
 
-        if ($check) {     
+        if ($check) {
     		require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
     		$new_dir = $work_data_url.'_DELETED_'.$id;
     		if (api_get_setting('permanently_remove_deleted_files') == 'true'){
@@ -1157,7 +1157,7 @@ function update_work_url($id, $new_path, $parent_id) {
 	$course_id = api_get_course_int_id();
     $id = intval($id);
     $parent_id = intval($parent_id);
-    
+
 	$sql = "SELECT * FROM $table WHERE c_id = $course_id AND id = $id";
 	$res = Database::query($sql);
 	if (Database::num_rows($res) != 1) {
@@ -1177,18 +1177,18 @@ function update_work_url($id, $new_path, $parent_id) {
  * @param	string old path
  * @param	string new path
  */
-function update_dir_name($work_data, $new_name, $title) {    
+function update_dir_name($work_data, $new_name, $title) {
 	$course_id = api_get_course_int_id();
 	$work_id = intval($work_data['id']);
     $path  = $work_data['url'];
-    
+
     if ($work_data['title'] == $title) {
         return true;
-    }     
+    }
     $title = Database::escape_string($title);
-        
+
 	if (!empty($new_name)) {
-		global $base_work_dir;		
+		global $base_work_dir;
 
 		$new_name = Security::remove_XSS($new_name);
 		$new_name = replace_dangerous_char($new_name);
@@ -1204,12 +1204,12 @@ function update_dir_name($work_data, $new_name, $title) {
 
 		while ($work = Database :: fetch_array($rs)) {
 			$new_dir = $work['url'];
-			$name_with_directory = substr($new_dir, $work_len, strlen($new_dir)); 
+			$name_with_directory = substr($new_dir, $work_len, strlen($new_dir));
             $name = Database::escape_string('work/'.$new_name.'/'.$name_with_directory);
-			$sql = 'UPDATE '.$table.' SET url= "'.$name.'" WHERE c_id = '.$course_id.' AND id= '.$work['id'];            
+			$sql = 'UPDATE '.$table.' SET url= "'.$name.'" WHERE c_id = '.$course_id.' AND id= '.$work['id'];
 			Database::query($sql);
 		}
-        
+
         $sql = "UPDATE $table SET url= '/".$new_name."' , title = '".$title."' WHERE c_id = $course_id AND id = $work_id";
         Database::query($sql);
 	}
@@ -1232,7 +1232,7 @@ function get_parent_directories($id) {
     $list_id = array();
     if (Database::num_rows($result)) {
 	   while ($row = Database::fetch_array($result)) {
-		  $list_id[] = $row['id'];		
+		  $list_id[] = $row['id'];
 	   }
     }
 	return $list_id;
@@ -1279,12 +1279,12 @@ function insert_all_directory_in_course_table($base_work_dir) {
 	}
 	$course_id = api_get_course_int_id();
     $group_id  = api_get_group_id();
-    
+
 	for($i = 0; $i < count($only_dir); $i++) {
 		global $work_table;
 		$sql_insert_all= "INSERT INTO " . $work_table . " SET
-							   c_id 		= '$course_id', 
-							   url 			= '" . $only_dir[$i] . "', 
+							   c_id 		= '$course_id',
+							   url 			= '" . $only_dir[$i] . "',
 							   title        = '',
 			                   description 	= '',
 			                   author      	= '',
@@ -1333,9 +1333,9 @@ function count_dir($path_dir, $recurse) {
  * validation when you create a work
  * this goes into the $htmlHeadXtra[] array
  */
-function to_javascript_work() {        
+function to_javascript_work() {
     $origin = isset($_REQUEST['origin']) && !empty($_REQUEST['origin']) ? api_get_tools_lists($_REQUEST['origin']) : '';
-    
+
 	$js = '';    
+			';
     return $js;
 }
 
@@ -1476,12 +1476,12 @@ function get_work_id($path) {
 	$TBL_PROP_TABLE = Database::get_course_table(TABLE_ITEM_PROPERTY);
 	$course_id = api_get_course_int_id();
 	if (api_is_allowed_to_edit()) {
-		$sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work, $TBL_PROP_TABLE AS props  
+		$sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work, $TBL_PROP_TABLE AS props
 				WHERE props.c_id = $course_id AND work.c_id = $course_id AND props.tool='work' AND work.id=props.ref AND work.url LIKE 'work/".$path."%' AND work.filetype='file' AND props.visibility<>'2'";
 	} else {
-		$sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work,$TBL_PROP_TABLE AS props  
+		$sql = "SELECT work.id FROM $TBL_STUDENT_PUBLICATION AS work,$TBL_PROP_TABLE AS props
 				WHERE props.c_id = $course_id AND work.c_id = $course_id AND props.tool='work' AND work.id=props.ref AND work.url LIKE 'work/".$path."%' AND work.filetype='file' AND props.visibility<>'2' AND props.lastedit_user_id='".api_get_user_id()."'";
-	}	
+	}
 	$result = Database::query($sql);
 	$num_rows = Database::num_rows($result);
 
@@ -1493,37 +1493,37 @@ function get_work_id($path) {
 }
 
 function get_count_work($work_id) {
-    $work_table 	 = Database::get_course_table(TABLE_STUDENT_PUBLICATION);	
+    $work_table 	 = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
     $iprop_table     = Database::get_course_table(TABLE_ITEM_PROPERTY);
-    $user_table      = Database::get_main_table(TABLE_MAIN_USER);    
-            
-    $is_allowed_to_edit = api_is_allowed_to_edit(null, true);        
-    
+    $user_table      = Database::get_main_table(TABLE_MAIN_USER);
+
+    $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
+
     $session_id     = api_get_session_id();
     $condition_session  = api_get_session_condition($session_id);
-    
+
     $course_id      = api_get_course_int_id();
     $group_id       = api_get_group_id();
     $course_info    = api_get_course_info(api_get_course_id());
     $work_id       = intval($work_id);
-    
+
     if (!empty($group_id)) {
-        $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group            
+        $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
     } else {
-        $extra_conditions = " work.post_group_id = '0' ";            
+        $extra_conditions = " work.post_group_id = '0' ";
     }
 
     if ($is_allowed_to_edit) {
         $extra_conditions .= ' AND work.active IN (0, 1) ';
     } else {
-        $extra_conditions .= ' AND work.active = 1 AND accepted = 1';            
-        if (isset($course_info['show_score']) &&  $course_info['show_score'] == 1) {            
+        $extra_conditions .= ' AND work.active = 1 AND accepted = 1';
+        if (isset($course_info['show_score']) &&  $course_info['show_score'] == 1) {
             $extra_conditions .= " AND work.user_id = ".api_get_user_id()." ";
         } else {
             $extra_conditions .= '';
         }
-    }                   
-    
+    }
+
     $extra_conditions .= " AND parent_id  = ".$work_id."  ";
 
     $sql = "SELECT  count(*) as count ".
@@ -1532,112 +1532,129 @@ function get_count_work($work_id) {
            " AND prop.tool='work' AND work.active = 1 ".
            " AND prop.visibility <> 2 AND work.c_id = $course_id ) ".
            "   INNER JOIN $user_table u  ON (work.user_id = u.user_id) ".
-           " WHERE $extra_conditions $where_condition $condition_session ";
+           " WHERE $extra_conditions $condition_session ";
     $result = Database::query($sql);
-    
-    $users_with_work = 0;    
+
+    $users_with_work = 0;
     if (Database::num_rows($result)) {
-        $result = Database::fetch_array($result);    
+        $result = Database::fetch_array($result);
         $users_with_work = $result['count'];
     }
-    return $users_with_work;  
+    return $users_with_work;
 }
 
 function get_work_user_list($start, $limit, $column, $direction, $work_id, $where_condition) {
-    $work_table         = Database::get_course_table(TABLE_STUDENT_PUBLICATION);	
+
+    $work_table         = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
     $iprop_table        = Database::get_course_table(TABLE_ITEM_PROPERTY);
-    $user_table         = Database::get_main_table(TABLE_MAIN_USER);    
-                    
+    $user_table         = Database::get_main_table(TABLE_MAIN_USER);
+
     $session_id     = api_get_session_id();
     $course_id      = api_get_course_int_id();
     $group_id       = api_get_group_id();
     $course_info    = api_get_course_info(api_get_course_id());
-    
-    $work_id       = intval($work_id);    
+
+    $work_id       = intval($work_id);
     $column         = empty($column) ? : Database::escape_string($column);
     $start          = intval($start);
     $limit          = intval($limit);
 
     if (!in_array($direction, array('asc','desc'))) {
-        $direction = 'desc'; 
+        $direction = 'desc';
     }
-    
-    $work_data          = get_work_data_by_id($work_id);       
-    $is_allowed_to_edit = api_is_allowed_to_edit(null, true);    
+
+    $work_data          = get_work_data_by_id($work_id);
+    $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
     $condition_session  = api_get_session_condition($session_id);
-    
+
     $locked = api_resource_is_locked_by_gradebook($work_id, LINK_STUDENTPUBLICATION);
 
     if (!empty($work_data)) {
-        
+
         if (!empty($group_id)) {
-            $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group            
+            $extra_conditions = " work.post_group_id = '".intval($group_id)."' "; // set to select only messages posted by the user's group
         } else {
-            $extra_conditions = " work.post_group_id = '0' ";            
+            $extra_conditions = " work.post_group_id = '0' ";
         }
 
         if ($is_allowed_to_edit) {
             $extra_conditions .= ' AND work.active IN (0, 1) ';
         } else {
-            $extra_conditions .= ' AND work.active IN (1) ';         
-            
-            if (isset($course_info['show_score']) &&  $course_info['show_score'] == 1) {            
+            $extra_conditions .= ' AND work.active IN (1) ';
+
+            if (isset($course_info['show_score']) &&  $course_info['show_score'] == 1) {
                 $extra_conditions .= " AND u.user_id = ".api_get_user_id()." ";
             } else {
                 $extra_conditions .= '';
             }
         }
-        
-        $extra_conditions .= " AND parent_id  = ".$work_id."  ";        
-  
-        $select = 'DISTINCT work.id as id, title as title, description, url, sent_date, contains_file, has_properties, view_properties, 
-                    qualification, weight, allow_text_assignment, u.firstname, u.lastname, u.username, parent_id, accepted, qualificator_id';
-        
+
+        $extra_conditions .= " AND parent_id  = ".$work_id."  ";
+
+        $select = 'DISTINCT
+                    work.id as id,
+                    title as title,
+                    description,
+                    url,
+                    sent_date,
+                    contains_file,
+                    has_properties,
+                    view_properties,
+                    qualification,
+                    weight,
+                    allow_text_assignment,
+                    u.firstname,
+                    u.lastname,
+                    u.username,
+                    parent_id,
+                    accepted,
+                    qualificator_id';
+
         $user_condition = "INNER JOIN $user_table u  ON (work.user_id = u.user_id) ";
         $work_condition = "$iprop_table prop INNER JOIN $work_table work ON (prop.ref = work.id AND prop.c_id = $course_id AND work.c_id = $course_id ) ";
-                
+
         $work_assignment = get_work_assignment_by_id($work_id);
-        
+
         $sql = "SELECT $select
-                FROM $work_condition  $user_condition $course_conditions                      
+                FROM $work_condition  $user_condition
                 WHERE  $extra_conditions $where_condition $condition_session ";
-        
+
         $sql .= " ORDER BY $column $direction ";
         $sql .= " LIMIT $start, $limit";
-        
+
         $result = Database::query($sql);
         $works = array();
-        
+
         while ($work = Database::fetch_array($result, 'ASSOC')) {
-           //var_dump($work);
-            $item_id = $work['id'];            
-            
+
+            $item_id = $work['id'];
+
             //Get the author ID for that document from the item_property table
 			$is_author  = false;
             $can_read   = false;
-            
+
 			$item_property_data = api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
-            
+
 			if (!$is_allowed_to_edit && $item_property_data['insert_user_id'] == api_get_user_id()) {
 				$is_author = true;
-			}			
+			}
             if ($course_info['show_score'] == 0 ) {
                 $can_read = true;
             }
-            
+
             if ($work['accepted'] == '0') {
                 $class = 'invisible';
             } else {
                 $class = '';
-            }            
-            
+            }
+
             $qualification_exists = false;
             if (!empty($work_data['qualification']) && intval($work_data['qualification']) > 0) {
                 $qualification_exists = true;
             }
-            
+
             $qualification_string = '';
-            
+
             if ($qualification_exists) {
                 if ($work['qualification'] == '') {
                     $qualification_string = Display::label('-');
@@ -1645,46 +1662,47 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
                     $qualification_string = Display::label($work['qualification'], 'info');
                 }
             }
-            
-            $add_string = '';		
-            $time_expires = api_strtotime($work['expires_on'], 'UTC');
-            
+
+            $add_string = '';
+
+            $time_expires = api_strtotime($work_assignment['expires_on'], 'UTC');
+
             if (!empty($work_assignment['expires_on']) && $work_assignment['expires_on'] != '0000-00-00 00:00:00' && $time_expires && ($time_expires < api_strtotime($work['sent_date'], 'UTC'))) {
                 $add_string = Display::label(get_lang('Expired'),'important');
             }
-       
+
             if (($can_read && $work['accepted'] == '1') || ($is_author && $work['accepted'] == '1') || $is_allowed_to_edit) {
-                
+
                 //Firstname, lastname, username
                 $work['firstname'] = Display::div($work['firstname'], array('class' => $class));
                 $work['lastname'] = Display::div($work['lastname'], array('class' => $class));
                 $work['username'] = Display::div($work['username'], array('class' => $class));
-                
+
                 $work['title'] = Display::div($work['title'], array('class' => $class));
-           
+
                 //Type
-                $work['type'] = build_document_icon_tag('file', $work['file']);  
+                $work['type'] = build_document_icon_tag('file', $work['title']);
 
                 //File name
                 $link_to_download = null;
-                
+
                 if ($work['contains_file']) {
                     $link_to_download = ''.Display::return_icon('save.png', get_lang('Save'),array(), ICON_SIZE_SMALL).' ';
                 } else {
                     $link_to_download = ''.Display::return_icon('default.png', get_lang('View'),array(), ICON_SIZE_SMALL).' ';
                 }
-                
+
                 $send_to = Portfolio::share('work', $work['id'],  array('style' => 'white-space:nowrap;'));
-                
+
                 $work['qualification'] = $qualification_string;
 
                 //Date
-                $work_date = api_convert_and_format_date($work['sent_date']);                
-                $work['sent_date'] = date_to_str_ago(api_get_local_time($work['sent_date'])).' '.$add_string.'
'.$work_date;                    
+                $work_date = api_convert_and_format_date($work['sent_date']);
+                $work['sent_date'] = date_to_str_ago(api_get_local_time($work['sent_date'])).' '.$add_string.'
'.$work_date;
 
                 //Actions
-                $url = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'&id='.$work_id.'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']);                    
-                $action = '';     
+                $url = api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'&id='.$work_id;
+                $action = '';
                 if ($is_allowed_to_edit) {
                     if ($locked) {
                         if ($qualification_exists) {
@@ -1717,8 +1735,8 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
                         $action .= Display::return_icon('delete_na.png', get_lang('Delete'),'',ICON_SIZE_SMALL);
                     } else {
                         $action .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'';
-                    }                 
-                } elseif ($is_author && (empty($work['qualificator_id']) || $work['qualificator_id'] == 0)) {                        
+                    }
+                } elseif ($is_author && (empty($work['qualificator_id']) || $work['qualificator_id'] == 0)) {
                     if (api_is_allowed_to_session_edit(false, true)) {
                         $action .= ''.Display::return_icon('edit.png', get_lang('Modify'),array(), ICON_SIZE_SMALL).'';
                     } else {
@@ -1732,17 +1750,17 @@ function get_work_user_list($start, $limit, $column, $direction, $work_id, $wher
                 }
 
                 //Status
-                if (empty($work['qualificator_id'])) { 
+                if (empty($work['qualificator_id'])) {
                     $qualificator_id = Display::label(get_lang('NotRevised'), 'warning');
                 } else {
                     $qualificator_id = Display::label(get_lang('Revised'), 'success');
-                }                                       
+                }
                 $work['qualificator_id'] = $qualificator_id;
                 $work['actions'] = $send_to.$link_to_download.$action;
                 $works[] = $work;
-            }            
+            }
         }
-        return $works;                            
+        return $works;
     }
 }
 
@@ -1761,24 +1779,24 @@ function send_reminder_users_without_publication($task_data) {
 	$task_title = !empty($task_data['title']) ? $task_data['title'] : basename($task_data['url']);
 
 	$subject = '[' . api_get_setting('siteName') . '] ';
-    
+
 	// The body can be as long as you wish, and any combination of text and variables
-    
+
 	$content = get_lang('ReminderToSubmitPendingTask')."\n".get_lang('CourseName').' : '.$_course['name']."\n";
 	$content .= get_lang('WorkName').' : '.$task_title."\n";
 
 	$list_users = get_list_users_without_publication($task_id);
-    
-    $mails_sent_to = array();    
+
+    $mails_sent_to = array();
 	foreach ($list_users as $user) {
-		$name_user = api_get_person_name($user[1], $user[0], null, PERSON_NAME_EMAIL_ADDRESS);        
-        $dear_line = get_lang('Dear')." ".api_get_person_name($user[1], $user[0]) .", \n\n";            
-        $body      = $dear_line.$content;        
-        
-		api_mail($name_user, $user[3], $subject, $body, $sender_name, $email_admin);              
-        $mails_sent_to[] = $name_user;                
-	}    
-    return $mails_sent_to;    
+		$name_user = api_get_person_name($user[1], $user[0], null, PERSON_NAME_EMAIL_ADDRESS);
+        $dear_line = get_lang('Dear')." ".api_get_person_name($user[1], $user[0]) .", \n\n";
+        $body      = $dear_line.$content;
+
+		api_mail($name_user, $user[3], $subject, $body, $sender_name, $email_admin);
+        $mails_sent_to[] = $name_user;
+	}
+    return $mails_sent_to;
 }
 
 /**
@@ -1789,7 +1807,7 @@ function send_reminder_users_without_publication($task_data) {
  * @author Guillaume Viguier 
  * @author Julio Montoya  Adding session support - 2011
  */
-function send_email_on_homework_creation($course_id) {	
+function send_email_on_homework_creation($course_id) {
 	// Get the students of the course
 	$session_id = api_get_session_id();
 	if (empty($session_id)) {
@@ -1877,11 +1895,11 @@ function user_is_author($item_id, $user_id = null) {
     if (empty($user_id)) {
         $user_id = api_get_user_id();
     }
-    
-    $is_author 			= false;            
-    $item_to_edit_data 	= api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());					
+
+    $is_author 			= false;
+    $item_to_edit_data 	= api_get_item_property_info(api_get_course_int_id(), 'work', $item_id, api_get_session_id());
     $is_allowed_to_edit = api_is_allowed_to_edit();
-    
+
     if ($is_allowed_to_edit) {
         $is_author = true;
     } else {
@@ -1905,14 +1923,14 @@ function user_is_author($item_id, $user_id = null) {
  * @author Julio Montoya  Fixing query
  */
 function get_list_users_without_publication($task_id) {
-	$work_table 			 = Database::get_course_table(TABLE_STUDENT_PUBLICATION);	
+	$work_table 			 = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
 	$table_course_user 		 = Database::get_main_table(TABLE_MAIN_COURSE_USER);
 	$table_user 			 = Database::get_main_table(TABLE_MAIN_USER);
 	$session_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
 	//condition for the session
 	$session_id    = api_get_session_id();
-	$course_id     = api_get_course_int_id(); 
+	$course_id     = api_get_course_int_id();
 
 	$task_id = intval($task_id);
 
@@ -1928,39 +1946,39 @@ function get_list_users_without_publication($task_id) {
 	}
 
 	if ($session_id == 0){
-		$sql_users = "SELECT cu.user_id, u.lastname, u.firstname, u.email FROM $table_course_user AS cu, $table_user AS u 
+		$sql_users = "SELECT cu.user_id, u.lastname, u.firstname, u.email FROM $table_course_user AS cu, $table_user AS u
 		              WHERE u.status!=1 and cu.course_code='".api_get_course_id()."' AND u.user_id=cu.user_id";
 	} else {
-		$sql_users = "SELECT cu.id_user, u.lastname, u.firstname, u.email FROM $session_course_rel_user AS cu, $table_user AS u 
+		$sql_users = "SELECT cu.id_user, u.lastname, u.firstname, u.email FROM $session_course_rel_user AS cu, $table_user AS u
 		              WHERE u.status!=1 and cu.course_code='".api_get_course_id()."' AND u.user_id=cu.id_user and cu.id_session='".$session_id."'";
 	}
-    
+
     $group_id = api_get_group_id();
-        
+
     $new_group_user_list = array();
-    
+
     if ($group_id) {
-        $group_user_list = GroupManager::get_subscribed_users($group_id);        
+        $group_user_list = GroupManager::get_subscribed_users($group_id);
         if (!empty($group_user_list)) {
             foreach($group_user_list as $group_user) {
                 $new_group_user_list[] = $group_user['user_id'];
             }
         }
     }
-    
+
 	$result_users = Database::query($sql_users);
 	$users_without_tasks = array();
 	while ($row_users = Database::fetch_row($result_users)) {
-        
+
 		if (in_array($row_users[0], $users_with_tasks)) continue;
-		if ($group_id && !in_array($row_users[0], $new_group_user_list)) {            
+		if ($group_id && !in_array($row_users[0], $new_group_user_list)) {
             continue;
         }
 		//$user_id = array_shift($row_users);
         $row_users[0] = $row_users[1];
         $row_users[1] = $row_users[2];
 		$row_users[2] = Display::encrypted_mailto_link($row_users[3]);
-        
+
 		$users_without_tasks[] = $row_users;
 	}
 	return $users_without_tasks;
@@ -1981,7 +1999,7 @@ function display_list_users_without_publication($task_id) {
 	$table_header[] = array(get_lang('Email'), true);
 	// table_data
 	$table_data = get_list_users_without_publication($task_id);
-    
+
 	$sorting_options = array();
 	$sorting_options['column'] = 1;
 	$paging_options = array();