chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add session id see BT#13000

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent c7e93e04b7
commit e1a6b5da91
2 changed files with 35 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 52
      main/inc/lib/myspace.lib.php
  2. 8
      main/mySpace/access_details.php

52
main/inc/lib/myspace.lib.php
Unescape View File

@ -121,26 +121,27 @@ class MySpace
/**
* Gets the connections to a course as an array of login and logout time
*
* @param int $userId User id
* @param int $courseId
* @param int $sessionId Session id (optional, default = 0)
* @return array Connections
* @param int $userId User id
* @param array $courseInfo
* @param int $sessionId Session id (optional, default = 0)
* @return array Connections
*/
public static function get_connections_to_course($userId, $courseId, $sessionId = 0)
public static function get_connections_to_course($userId, $courseInfo, $sessionId = 0)
{
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
// protect data
$userId = (int) $userId;
$courseId = (int) $courseId;
$courseId = (int) $courseInfo['real_id'];
$sessionId = (int) $sessionId;
$sessionCondition = api_get_session_condition($sessionId);
$sql = 'SELECT login_course_date, logout_course_date
FROM ' . $table.'
WHERE
user_id = '.$userId.' AND
c_id = '.$courseId.' AND
session_id = '.$sessionId.'
c_id = '.$courseId.'
'.$sessionCondition.'
ORDER BY login_course_date ASC';
$rs = Database::query($sql);
$connections = array();
@ -2679,22 +2680,29 @@ class MySpace
* Gets the connections to a course as an array of login and logout time
*
* @param int $user_id
* @param int $courseId
* @param array $course_info
* @param int $sessionId
* @param string $start_date
* @param string $end_date
* @author Jorge Frisancho Jibaja
* @author Julio Montoya <gugli100@gmail.com> fixing the function
* @version OCT-22- 2010
* @return array
*/
public static function get_connections_to_course_by_date($user_id, $courseId, $start_date, $end_date)
{
public static function get_connections_to_course_by_date(
$user_id,
$course_info,
$sessionId,
$start_date,
$end_date
) {
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
$course_info = api_get_course_info_by_id($courseId);
$user_id = intval($user_id);
$courseId = intval($courseId);
$connections = array();
if (!empty($course_info)) {
$courseId = intval($course_info['real_id']);
$end_date = add_day_to($end_date);
$sessionCondition = api_get_session_condition($sessionId);
$sql = "SELECT login_course_date, logout_course_date
FROM $table
WHERE
@ -2702,6 +2710,7 @@ class MySpace
c_id = $courseId AND
login_course_date BETWEEN '$start_date' AND '$end_date' AND
logout_course_date BETWEEN '$start_date' AND '$end_date'
$sessionCondition
ORDER BY login_course_date ASC";
$rs = Database::query($sql);
@ -2718,16 +2727,16 @@ class MySpace
/**
* @param $user_id
* @param int $courseId
* @param array $course_info
* @param int $sessionId
* @param null $start_date
* @param null $end_date
* @return array
*/
function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
function get_stats($user_id, $course_info, $sessionId, $start_date = null, $end_date = null)
{
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
$course_info = api_get_course_info_by_id($courseId);
$result = array();
if (!empty($course_info)) {
$stringStartDate = '';
$stringEndDate = '';
@ -2737,7 +2746,8 @@ function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
$stringEndDate = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'";
}
$user_id = intval($user_id);
$courseId = intval($courseId);
$courseId = intval($course_info['real_id']);
$sessionCondition = api_get_session_condition($sessionId);
$sql = "SELECT
SEC_TO_TIME(AVG(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg,
SEC_TO_TIME(SUM(time_to_sec(timediff(logout_course_date,login_course_date)))) as total,
@ -2745,11 +2755,11 @@ function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
FROM $table
WHERE
user_id = $user_id AND
c_id = $courseId $stringStartDate $stringEndDate
c_id = $courseId $stringStartDate $stringEndDate
$sessionCondition
ORDER BY login_course_date ASC";
$rs = Database::query($sql);
$result = array();
if ($row = Database::fetch_array($rs)) {
$foo_avg = $row['avrg'];
$foo_total = $row['total'];

8
main/mySpace/access_details.php
Unescape View File

@ -73,7 +73,7 @@ if ($form->validate()) {
$course = $values['course'];
}
$url = api_get_path(WEB_AJAX_PATH).'myspace.ajax.php?a=access_detail_by_date&course='.$course.'&student='.$user_id;
$url = api_get_path(WEB_AJAX_PATH).'myspace.ajax.php?a=access_detail_by_date&course='.$course.'&student='.$user_id.'&session_id='.$session_id;
$htmlHeadXtra[] = '<script src="slider.js" type="text/javascript"></script>';
$htmlHeadXtra[] = '<link rel="stylesheet" href="slider.css" />';
@ -124,7 +124,7 @@ $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('AccessDetails'));
Display :: display_header('');
$userInfo = api_get_user_info($user_id);
$result_to_print = '';
$sql_result = MySpace::get_connections_to_course($user_id, $courseId);
$sql_result = MySpace::get_connections_to_course($user_id, $courseInfo);
$result_to_print = convert_to_string($sql_result);
echo Display::page_header(get_lang('DetailsStudentInCourse'));
@ -147,8 +147,8 @@ $form->display();
</div><br />
<div id="cev_cont_stats">
<?php
if ($result_to_print != "") {
$rst = get_stats($user_id, $courseId);
if ($result_to_print != '') {
$rst = get_stats($user_id, $courseInfo, $session_id);
$foo_stats = '<strong>'.get_lang('Total').': </strong>'.$rst['total'].'<br />';
$foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
$foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';

Write Preview
Loading…
Cancel
Save