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

More stats fixes

Browse Source
skala
Julio Montoya 14 years ago
parent 89da8436be
commit 12c2be1e54
3 changed files with 52 additions and 44 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. 65
      main/auth/my_progress.php
  2. 7
      main/inc/lib/events.lib.inc.php
  3. 4
      main/inc/lib/tracking.lib.php

65
main/auth/my_progress.php
Unescape View File

@ -38,7 +38,6 @@ $tbl_course_quiz = Database :: get_course_table(TABLE_QUIZ_TEST);
$tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); $tbl_access_rel_session = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
$tbl_access_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); $tbl_access_rel_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
// get course list // get course list
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$sql = 'SELECT cu.course_code FROM '.$tbl_course_user.' cu INNER JOIN '.$tbl_access_rel_course.' a ON(a.course_code = cu.course_code) WHERE user_id='.intval($_user['user_id']).' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' AND access_url_id = '.api_get_current_access_url_id().''; $sql = 'SELECT cu.course_code FROM '.$tbl_course_user.' cu INNER JOIN '.$tbl_access_rel_course.' a ON(a.course_code = cu.course_code) WHERE user_id='.intval($_user['user_id']).' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' AND access_url_id = '.api_get_current_access_url_id().'';
@ -53,9 +52,7 @@ while($row = Database :: fetch_array($rs)) {
$courses[$row['course_code']] = CourseManager::get_course_information($row['course_code']); $courses[$row['course_code']] = CourseManager::get_course_information($row['course_code']);
} }
// get the list of sessions where the user is subscribed as student // Get the list of sessions where the user is subscribed as student
if ($_configuration['multiple_access_urls']) { if ($_configuration['multiple_access_urls']) {
$sql = 'SELECT DISTINCT cu.course_code, id_session as session_id FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a ON(a.session_id = cu.id_session) WHERE id_user='.$_user['user_id'].' AND access_url_id = '.api_get_current_access_url_id().''; $sql = 'SELECT DISTINCT cu.course_code, id_session as session_id FROM '.$tbl_session_course_user.' cu INNER JOIN '.$tbl_access_rel_session.' a ON(a.session_id = cu.id_session) WHERE id_user='.$_user['user_id'].' AND access_url_id = '.api_get_current_access_url_id().'';
} else { } else {
@ -66,20 +63,20 @@ $rs = Database::query($sql);
while($row = Database :: fetch_array($rs)) { while($row = Database :: fetch_array($rs)) {
$course_in_session[$row['session_id']][$row['course_code']] = CourseManager::get_course_information($row['course_code']); $course_in_session[$row['session_id']][$row['course_code']] = CourseManager::get_course_information($row['course_code']);
} }
echo '<div class="actions-title" >'; /*echo '<div class="actions-title" >';
echo $nameTools; echo $nameTools;
echo '</div>'; echo '</div>';*/
if (!empty($courses)) { if (!empty($courses)) {
?> ?>
<table class="data_table" width="100%"> <table class="data_table" width="100%">
<tr class="tableName"> <tr class="tableName">
<td colspan="6"> <td colspan="6">
<strong><?php echo get_lang('MyCourses'); ?></strong> <h1><?php echo get_lang('MyCourses'); ?></h1>
</td> </td>
</tr> </tr>
<tr> <tr>
<th><?php echo get_lang('Course'); ?></th> <th width="300px"><?php echo get_lang('Course'); ?></th>
<th><?php echo get_lang('Time'); ?></th> <th><?php echo get_lang('Time'); ?></th>
<th><?php echo get_lang('Progress'); ?></th> <th><?php echo get_lang('Progress'); ?></th>
<th><?php echo get_lang('Score'); Display :: display_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')); ?></th> <th><?php echo get_lang('Score'); Display :: display_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')); ?></th>
@ -87,17 +84,23 @@ if (!empty($courses)) {
<th><?php echo get_lang('Details'); ?></th> <th><?php echo get_lang('Details'); ?></th>
</tr> </tr>
<?php <?php
$i = 0; $i = 0;
foreach ($courses as $enreg) { foreach ($courses as $enreg) {
$weighting = 0; $weighting = 0;
$last_connection = Tracking :: get_last_connection_date_on_the_course($_user['user_id'], $enreg['code']);
$progress = Tracking :: get_avg_student_progress($_user['user_id'], $enreg['code']);
$total_time_login = Tracking :: get_time_spent_on_the_course($_user['user_id'], $enreg['code']); $total_time_login = Tracking :: get_time_spent_on_the_course($_user['user_id'], $enreg['code']);
$time = api_time_to_hms($total_time_login); $time = api_time_to_hms($total_time_login);
$percentage_score = Tracking :: get_average_test_scorm_and_lp ($_user['user_id'], $enreg['code']); $progress = Tracking :: get_avg_student_progress($_user['user_id'], $enreg['code']);
$percentage_score = Tracking :: get_avg_student_score($_user['user_id'], $enreg['code'], array());
$last_connection = Tracking :: get_last_connection_date_on_the_course($_user['user_id'], $enreg['code']);
if ($enreg['code'] == $_GET['course'] && empty($_GET['session_id'])) {
echo '<tr class="row_odd" style="background-color:#FBF09D">';
} else {
echo '<tr class="row_even">';
}
echo '<tr class='.($i?'row_odd':'row_even').'>';
echo '<td>'.$enreg['title'].'</td>'; echo '<td>'.$enreg['title'].'</td>';
echo '<td align="center">'.$time.'</td>'; echo '<td align="center">'.$time.'</td>';
@ -130,26 +133,22 @@ if (!empty($course_in_session)) {
?> ?>
<br /> <br />
<table class="data_table" width="100%"> <h1><?php echo get_lang('Sessions'); ?></h1>
<tr class="tableName"> <?php
<td colspan="7"> foreach ($course_in_session as $key=>$session) {
<strong><?php echo get_lang('Sessions'); ?></strong> echo '<h2>'.api_get_session_name($key).' </h2>';
</td> ?>
</tr> <table class="data_table" width="100%">
<tr> <tr>
<th><?php echo get_lang('Session'); ?></th> <th width="300px"><?php echo get_lang('Course'); ?></th>
<th><?php echo get_lang('Course'); ?></th>
<th><?php echo get_lang('Time'); ?></th> <th><?php echo get_lang('Time'); ?></th>
<th><?php echo get_lang('Progress'); ?></th> <th><?php echo get_lang('Progress'); ?></th>
<th><?php echo get_lang('Score'); Display :: display_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')); ?></th> <th><?php echo get_lang('Score'); Display :: display_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')); ?></th>
<th><?php echo get_lang('LastConnexion'); ?></th> <th><?php echo get_lang('LastConnexion'); ?></th>
<th><?php echo get_lang('Details'); ?></th> <th><?php echo get_lang('Details'); ?></th>
</tr> </tr>
<?php <?php
foreach ($course_in_session as $key=>$session) {
echo '<tr class='.($i?'row_odd':'row_even').'>';
echo '<td rowspan="'.count($session).'" > '.api_get_session_name($key).' </td>';
foreach ($session as $enreg) { foreach ($session as $enreg) {
$weighting = 0; $weighting = 0;
$last_connection = Tracking :: get_last_connection_date_on_the_course($_user['user_id'], $enreg['code'], $key); $last_connection = Tracking :: get_last_connection_date_on_the_course($_user['user_id'], $enreg['code'], $key);
@ -157,7 +156,14 @@ if (!empty($course_in_session)) {
$total_time_login = Tracking :: get_time_spent_on_the_course($_user['user_id'], $enreg['code'], $key); $total_time_login = Tracking :: get_time_spent_on_the_course($_user['user_id'], $enreg['code'], $key);
$time = api_time_to_hms($total_time_login); $time = api_time_to_hms($total_time_login);
$percentage_score = Tracking :: get_avg_student_score ($_user['user_id'], $enreg['code'], array(), $key); $percentage_score = Tracking :: get_avg_student_score($_user['user_id'], $enreg['code'], array(), $key);
if ($enreg['code'] == $_GET['course'] && $_GET['session_id'] == $key) {
echo '<tr class="row_odd" style="background-color:#FBF09D" >';
} else {
echo '<tr class="row_even">';
}
echo '<td>'.$enreg['title'].' </td>'; echo '<td>'.$enreg['title'].' </td>';
echo '<td align="center">'.$time.'</td>'; echo '<td align="center">'.$time.'</td>';
@ -190,8 +196,9 @@ if (!empty($course_in_session)) {
$i = $i ? 0 : 1; $i = $i ? 0 : 1;
echo '</tr>'; echo '</tr>';
} }
}
echo '</table>'; echo '</table>';
}
} }
?> ?>
<br /><br /> <br /><br />

7
main/inc/lib/events.lib.inc.php
Unescape View File

@ -379,7 +379,6 @@ function update_event_exercice($exeid, $exo_id, $score, $weighting,$session_id,$
status = '', status = '',
start_date = '".api_get_utc_datetime($start_date)."' start_date = '".api_get_utc_datetime($start_date)."'
WHERE exe_id = '".Database::escape_string($exeid)."'"; WHERE exe_id = '".Database::escape_string($exeid)."'";
$res = @Database::query($sql); $res = @Database::query($sql);
//Deleting control time session track //Deleting control time session track
@ -438,8 +437,8 @@ function create_event_exercice($exo_id) {
$expired_date = '0000-00-00 00:00:00'; $expired_date = '0000-00-00 00:00:00';
} }
$sql = "INSERT INTO $TABLETRACK_EXERCICES ( exe_user_id, exe_cours_id, expired_time_control, exe_exo_id) $sql = "INSERT INTO $TABLETRACK_EXERCICES ( exe_user_id, exe_cours_id, expired_time_control, exe_exo_id, session_id)
VALUES ( ".$user_id.", '".api_get_course_id()."' ,'".$expired_date."','".$exo_id."')"; VALUES ( ".$user_id.", '".api_get_course_id()."' ,'".$expired_date."','".$exo_id."','".api_get_session_id()."')";
$res = Database::query($sql); $res = Database::query($sql);
$id= Database::insert_id(); $id= Database::insert_id();
return $id; return $id;
@ -696,7 +695,7 @@ function get_all_exercise_event($exercise_id, $course_code, $session_id = 0) {
$exercise_id = intval($exercise_id); $exercise_id = intval($exercise_id);
$session_id = intval($session_id); $session_id = intval($session_id);
$sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE status = '' AND exe_cours_id = '$course_code' AND exe_exo_id = '$exercise_id' AND session_id = $session_id ORDER BY exe_id"; $sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE status = '' AND exe_cours_id = '$course_code' AND exe_exo_id = '$exercise_id' AND session_id = $session_id AND orig_lp_id =0 AND orig_lp_item_id = 0 ORDER BY exe_id";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
$list = array(); $list = array();

4
main/inc/lib/tracking.lib.php
Unescape View File

@ -759,8 +759,9 @@ class Tracking {
// Compose a filter based on optional session id // Compose a filter based on optional session id
$condition_session = ""; $condition_session = "";
if (isset($session_id)) {
$session_id = intval($session_id); $session_id = intval($session_id);
if (isset($session_id)) {
if (count($lp_ids) > 0) { if (count($lp_ids) > 0) {
$condition_session = " AND session_id = $session_id "; $condition_session = " AND session_id = $session_id ";
} else { } else {
@ -1643,6 +1644,7 @@ class Tracking {
* @param string Course id * @param string Course id
* @return float average of test * @return float average of test
* @author isaac flores paz <florespaz@bidsoftperu.com> * @author isaac flores paz <florespaz@bidsoftperu.com>
* @deprecated get_avg_student_score should be use
*/ */
public static function get_average_test_scorm_and_lp ($user_id,$course_id) { public static function get_average_test_scorm_and_lp ($user_id,$course_id) {

Write Preview
Loading…
Cancel
Save