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

Fixing get_db_progress function + improving student reporting to work with exercises + sessions + lps BT#1613

Browse Source
skala
Julio Montoya 15 years ago
parent 57a3b9bafb
commit 2eb63345f1
6 changed files with 223 additions and 192 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. 378
      main/auth/my_progress.php
  2. 2
      main/inc/lib/course.lib.php
  3. 2
      main/inc/lib/events.lib.inc.php
  4. 13
      main/inc/lib/tracking.lib.php
  5. 14
      main/newscorm/learnpath.class.php
  6. 6
      main/newscorm/lp_list.php

378
main/auth/my_progress.php
Unescape View File

@ -11,6 +11,8 @@ require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
global $_configuration;
$this_section = SECTION_TRACKING;
$nameTools = get_lang('MyProgress');
@ -33,25 +35,40 @@ $tbl_course_lp = Database :: get_course_table(TABLE_LP_MAIN);
$tbl_course_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
$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_course = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
// get course list
$sql = 'SELECT course_code FROM '.$tbl_course_user.' WHERE user_id='.intval($_user['user_id']).' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' ';
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().'';
} else {
$sql = 'SELECT course_code FROM '.$tbl_course_user.' WHERE user_id='.intval($_user['user_id']).' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH.' ';
}
$rs = Database::query($sql);
$courses = array();
$courses = $course_in_session = array();
while($row = Database :: fetch_array($rs)) {
$courses[$row['course_code']] = CourseManager::get_course_information($row['course_code']);
}
// get the list of sessions where the user is subscribed as student
$sql = 'SELECT DISTINCT course_code FROM '.Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER).' WHERE id_user='.intval($_user['user_id']);
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().'';
} else {
$sql = 'SELECT DISTINCT course_code, id_session as session_id FROM '.$tbl_session_course_user.' WHERE id_user='.intval($_user['user_id']);
}
$rs = Database::query($sql);
while($row = Database :: fetch_array($rs)) {
$courses[$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 $nameTools;
echo '</div>';
$now = date('Y-m-d');
?>
<table class="data_table" width="100%">
<tr class="tableName">
@ -67,72 +84,125 @@ $now = date('Y-m-d');
<th><?php echo get_lang('LastConnexion'); ?></th>
<th><?php echo get_lang('Details'); ?></th>
</tr>
<?php
$i = 0;
foreach ($courses as $enreg) {
$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']);
$time = api_time_to_hms($total_time_login);
$percentage_score = Tracking :: get_average_test_scorm_and_lp ($_user['user_id'], $enreg['code']);
?>
<tr class='<?php echo $i?'row_odd':'row_even'; ?>'>
<td>
<?php echo api_html_entity_decode($enreg['title'], ENT_QUOTES, api_get_system_encoding()); ?>
</td>
<td align='center'>
<?php echo $time; ?>
</td>
<td align='center'>
<?php echo $progress.'%'; ?>
</td>
<td align='center'>
<?php
if (!is_null($percentage_score)) {
$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']);
$time = api_time_to_hms($total_time_login);
$percentage_score = Tracking :: get_average_test_scorm_and_lp ($_user['user_id'], $enreg['code']);
echo '<tr class='.($i?'row_odd':'row_even').'>';
echo '<td>'.$enreg['title'].'</td>';
echo '<td align="center">'.$time.'</td>';
echo '<td align="center">'.$progress.'%</td>';
echo '<td align="center">';
if (!is_null($percentage_score)) {
echo $percentage_score.'%';
} else {
echo '0%';
}
?>
</td>
<td align='center' >
<?php echo $last_connection; ?>
</td>
<td align='center'>
<?php
if ($enreg['code'] == $_GET['course']) {
echo '<a href="#">';
Display::display_icon('2rightarrow_na.gif', get_lang('Details'));
} else {
echo '<a href="'.api_get_self().'?course='.$enreg['code'].'">';
Display::display_icon('2rightarrow.gif', get_lang('Details'));
}
echo '</a>';
?>
</td>
}
echo '</td>';
echo '<td align="center">'.$last_connection.'</td>';
echo '<td align="center">';
if ($enreg['code'] == $_GET['course'] && empty($_GET['session_id'])) {
echo '<a href="#">';
Display::display_icon('2rightarrow_na.gif', get_lang('Details'));
} else {
echo '<a href="'.api_get_self().'?course='.$enreg['code'].'">';
Display::display_icon('2rightarrow.gif', get_lang('Details'));
}
echo '</a>';
echo '</td></tr>';
$i = $i ? 0 : 1;
}
?>
</table>
<br />
<table class="data_table" width="100%">
<tr class="tableName">
<td colspan="6">
<strong><?php echo get_lang('Sessions'); ?></strong>
</td>
</tr>
<tr>
<th><?php echo get_lang('Session'); ?></th>
<th><?php echo get_lang('Course'); ?></th>
<th><?php echo get_lang('Time'); ?></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('LastConnexion'); ?></th>
<th><?php echo get_lang('Details'); ?></th>
</tr>
<?php
$i = $i ? 0 : 1;
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) {
$weighting = 0;
$last_connection = Tracking :: get_last_connection_date_on_the_course($_user['user_id'], $enreg['code'], $enreg['session_id']);
$progress = Tracking :: get_avg_student_progress($_user['user_id'], $enreg['code'],array(), $enreg['session_id']);
$total_time_login = Tracking :: get_time_spent_on_the_course($_user['user_id'], $enreg['code'], $enreg['session_id']);
$time = api_time_to_hms($total_time_login);
$percentage_score = Tracking :: get_avg_student_score ($_user['user_id'], $enreg['code'], array(), $enreg['session_id']);
echo '<td>'.$enreg['title'].' </td>';
echo '<td align="center">'.$time.'</td>';
echo '<td align="center">'.$progress.'%</td>';
echo '<td align="center">';
if (!is_null($percentage_score)) {
echo $percentage_score.'%';
} else {
echo '0%';
}
echo '</td>';
echo '<td align="center">'.$last_connection.'</td>';
echo '<td align="center">';
if ($enreg['code'] == $_GET['course'] && $_GET['session_id'] == $key) {
echo '<a href="#">';
Display::display_icon('2rightarrow_na.gif', get_lang('Details'));
} else {
echo '<a href="'.api_get_self().'?course='.$enreg['code'].'&session_id='.$key.'">';
Display::display_icon('2rightarrow.gif', get_lang('Details'));
}
echo '</a>';
echo '</td>';
$i = $i ? 0 : 1;
echo '</tr>';
}
}
?>
</table>
<br /><br />
<?php
/*
* Details for one course
*
*/
/* Details for one course */
if (isset($_GET['course'])) {
$course = Database::escape_string($_GET['course']);
$course_info = CourseManager::get_course_information($course);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$session_id = $_GET['session_id'];
//var_dump($session_id);
$course = Database::escape_string($_GET['course']);
$course_info = CourseManager::get_course_information($course);
$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_course_lp_view = Database :: get_course_table(TABLE_LP_VIEW, $course_info['db_name']);
$tbl_course_lp_view_item = Database :: get_course_table(TABLE_LP_ITEM_VIEW, $course_info['db_name']);
$tbl_course_lp = Database :: get_course_table(TABLE_LP_MAIN, $course_info['db_name']);
@ -140,20 +210,27 @@ foreach ($courses as $enreg) {
$tbl_course_quiz = Database :: get_course_table(TABLE_QUIZ_TEST, $course_info['db_name']);
//get coach and session_name if there is one and if session_mode is activated
/*
if (api_get_setting('use_session_mode') == 'true') {
$sql = 'SELECT id_session
FROM '.$tbl_session_course_user.' session_course_user
WHERE session_course_user.id_user = '.intval($_user['user_id']).'
AND session_course_user.course_code = "'.Database::escape_string($course).'"
ORDER BY id_session DESC';
if ($_configuration['multiple_access_urls']) {
$sql = 'SELECT id_session
FROM '.$tbl_session_course_user.' session_course_user INNER JOIN '.$tbl_access_rel_session.' a ON(session_course_user.id_session = a.session_id)
WHERE session_course_user.id_user = '.intval($_user['user_id']).'
AND session_course_user.course_code = "'.Database::escape_string($course).'" AND access_url_id = '.api_get_current_access_url_id().'
ORDER BY id_session DESC';
} else {
$sql = 'SELECT id_session
FROM '.$tbl_session_course_user.' session_course_user
WHERE session_course_user.id_user = '.intval($_user['user_id']).'
AND session_course_user.course_code = "'.Database::escape_string($course).'"
ORDER BY id_session DESC';
}
$rs = Database::query($sql);
$row = Database::fetch_array($rs);
if (!empty($row[0])) {
$session_id = intval($row[0]);
}
//$session_id = intval(Database::result($rs, 0, 0));
if ($session_id > 0) {
// get session name and coach of the session
@ -184,15 +261,18 @@ foreach ($courses as $enreg) {
$course_info['tutor_name'] = api_get_person_name($coach_info['firstname'], $coach_info['lastname']);
}
}
} // end if (api_get_setting('use_session_mode') == 'true')
} // end if (api_get_setting('use_session_mode') == 'true')*/
$tableTitle = $course_info['title'].' | '.get_lang('Coach').' : '.$course_info['tutor_name'].((!empty($session_name)) ? ' | '.get_lang('Session').' : '.$session_name : '');
//$tableTitle = $course_info['title'].' | '.get_lang('Coach').' : '.$course_info['tutor_name'].((!empty($session_name)) ? ' | '.get_lang('Session').' : '.$session_name : '');
$session_name = api_get_session_name($session_id);
$tableTitle = ((!empty($session_name)) ? ' '.get_lang('Session').' : '.$session_name.' | ' : '').''.$course_info['title'];
?>
<table class="data_table" width="100%">
<tr class="tableName">
<td colspan="4">
<strong><?php echo $tableTitle; ?></strong>
<h3><?php echo $tableTitle; ?></h3>
</td>
</tr>
<tr>
@ -202,151 +282,107 @@ foreach ($courses as $enreg) {
<th class="head" style="color:#000"><?php echo get_lang('LastConnexion'); ?></th>
</tr>
<?php
$sql_learnpath = "SELECT lp.name,lp.id FROM ".$tbl_course_lp." AS lp ORDER BY lp.display_order";
if (empty($session_id)) {
$sql_learnpath = "SELECT lp.name,lp.id FROM ".$tbl_course_lp." AS lp WHERE session_id = 0 ORDER BY lp.display_order";
} else {
$sql_learnpath = "SELECT lp.name,lp.id FROM ".$tbl_course_lp." AS lp ORDER BY lp.display_order";
}
$result_learnpath = Database::query($sql_learnpath);
if (Database::num_rows($result_learnpath) > 0) {
while($learnpath = Database::fetch_array($result_learnpath)) {
$progress = learnpath :: get_db_progress($learnpath['id'], $_user['user_id'], '%', $course_info['db_name']);
// calculates last connection time
$sql = 'SELECT MAX(start_time)
FROM '.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$tbl_course_lp_view.' AS view
ON item_view.lp_view_id = view.id
AND view.lp_id = '.$learnpath['id'].'
AND view.user_id = '.$_user['user_id'];
$rs = Database::query($sql);
$start_time = Database::result($rs, 0, 0);
// calculates time
$sql = 'SELECT SUM(total_time)
FROM '.$tbl_course_lp_view_item.' AS item_view
INNER JOIN '.$tbl_course_lp_view.' AS view
ON item_view.lp_view_id = view.id
AND view.lp_id = '.$learnpath['id'].'
AND view.user_id = '.$_user['user_id'];
$rs = Database::query($sql);
$total_time = Database::result($rs, 0, 0);
echo "<tr>
<td>
";
echo stripslashes($learnpath['name']);
//$progress = learnpath :: get_db_progress($learnpath['id'], $_user['user_id'], 'abs', $course_info['db_name'], false, $session_id);
$progress = Tracking::get_avg_student_progress($_user['user_id'], $course, array($learnpath['id']), $session_id);
$last_connection_in_lp = Tracking::get_last_connection_time_in_lp($_user['user_id'], $course, $learnpath['id'], $session_id);
$time_spent_in_lp = Tracking::get_time_spent_in_lp($_user['user_id'], $course, array($learnpath['id']), $session_id);
$time_spent_in_lp = api_time_to_hms($time_spent_in_lp);
echo "<tr><td>";
echo $learnpath['name'];
echo " </td>
<td align='center'>
";
echo api_time_to_hms($total_time);
<td align='center'>";
echo $time_spent_in_lp;
echo " </td>
<td align='center'>
";
<td align='center'>";
if (is_numeric($progress)) {
$progress = $progress.'%';
}
echo $progress;
echo " </td>
<td align='center' width=180px >
";
$last_connection_in_lp = Tracking::get_last_connection_time_in_lp($_user['user_id'], $course, $learnpath['id']);
<td align='center' width=180px >";
if (!empty($last_connection_in_lp)) {
echo api_get_utc_datetime($last_connection_in_lp);
} else {
echo '-';
}
echo " </td>
</tr>
";
}
echo "</td></tr>";
}
} else {
echo ' <tr>
<td colspan="4" align="center">
'.get_lang('NoLearnpath').'
</td>
</tr>
';
</tr>';
}
?>
<?php
// This code was commented on purpose see BT#924
/*$sql = 'SELECT visibility FROM '.$course_info['db_name'].'.'.TABLE_TOOL_LIST.' WHERE name="quiz"';
$result_visibility_tests = Database::query($sql);
if (Database::result($result_visibility_tests, 0, 'visibility') == 1) {*/
$sql_exercices = " SELECT quiz.title,id, results_disabled
FROM ".$tbl_course_quiz." AS quiz
WHERE active='1'";
echo '<tr>
<th class="head" style="color:#000">'.get_lang('Exercices').'</th>
<th class="head" style="color:#000">'.get_lang('Score').'</th>
<th class="head" style="color:#000">'.get_lang('Attempts').'</th>
<th class="head" style="color:#000">'.get_lang('Details').'</th>
</tr>';
if (empty($session_id)) {
$sql_exercices = "SELECT quiz.title,id, results_disabled FROM ".$tbl_course_quiz." AS quiz WHERE active='1' AND session_id = 0";
} else {
$sql_exercices = "SELECT quiz.title,id, results_disabled FROM ".$tbl_course_quiz." AS quiz WHERE active='1'";
}
echo '<tr>
<th class="head" style="color:#000">'.get_lang('Exercices').'</th>
<th class="head" style="color:#000">'.get_lang('Score').'</th>
<th class="head" style="color:#000">'.get_lang('Attempts').'</th>
<th class="head" style="color:#000">'.get_lang('LatestAttempt').'</th>
</tr>';
$result_exercices = Database::query($sql_exercices);
if (Database::num_rows($result_exercices) > 0) {
while ($exercices = Database::fetch_array($result_exercices)) {
$sql_essais = " SELECT COUNT(ex.exe_id) as essais
FROM $tbl_stats_exercices AS ex
WHERE ex.exe_user_id='".$_user['user_id']."' AND ex.exe_cours_id = '".$course_info['code']."'
AND ex.exe_exo_id = ".$exercices['id']."
AND orig_lp_id = 0
AND orig_lp_item_id = 0 "
;
$result_essais = Database::query($sql_essais);
$essais = Database::fetch_array($result_essais);
$sql_score = "SELECT exe_id , exe_result,exe_weighting
FROM $tbl_stats_exercices
WHERE exe_user_id = ".$_user['user_id']."
AND exe_cours_id = '".$course_info['code']."'
AND exe_exo_id = ".$exercices['id']."
AND orig_lp_id = 0
AND orig_lp_item_id = 0
ORDER BY exe_date DESC LIMIT 1";
$result_score = Database::query($sql_score);
$score = 0;
while($current_score = Database::fetch_array($result_score)) {
$score = $score + $current_score['exe_result'];
$weighting = $weighting + $current_score['exe_weighting'];
$exe_id = $current_score['exe_id'];
}
$score = 0;
$weighting = 0;
$exercise_stats = get_all_exercise_event($exercices['id'],$course_info['code'], $session_id);
$attempts = 0;
foreach($exercise_stats as $exercise_stat) {
if ($exercise_stat['exe_user_id'] == $_user['user_id']) {
$score = $score + $exercise_stat['exe_result'];
$weighting = $weighting + $exercise_stat['exe_weighting'];
$exe_id = $exercise_stat['exe_id'];
$attempts++;
}
}
if ($weighting > 0) {
// i.e 10.50%
$percentage_score = round(($score * 100) / $weighting, 2);
} else {
$percentage_score = 0;
}
$weighting = 0;
echo '<tr>
<td>';
echo $exercices['title'];
echo '</td>';
if ($exercices['results_disabled'] == 0) {
echo '<td align="center">';
if ($essais['essais'] > 0) {
if ($attempts > 0) {
echo $percentage_score.'%';
} else {
echo '/';
}
echo '</td>';
echo '<td align="center">';
echo $essais['essais'];
echo $attempts;
echo '</td>
<td align="center" width="25">';
if ($essais['essais'] > 0) {
echo '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$exe_id.'&cidReq='.$course_info['code'].'&id_session='.Security::remove_XSS($_GET['id_session']).'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>';
if ($attempts > 0) {
echo '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$exe_id.'&cidReq='.$course_info['code'].'&id_session='.$session_id.'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>';
}
echo '</td>';
} else {
@ -366,12 +402,8 @@ foreach ($courses as $enreg) {
} else {
echo '<tr><td colspan="4" align="center">'.get_lang('NoEx').'</td></tr>';
}
/*} else {
echo '<tr><td colspan="4">'.get_lang('NoEx').'</td></tr>';
}*/
?>
</table>
<?php
}
Display :: display_footer();
Display :: display_footer();

2
main/inc/lib/course.lib.php
Unescape View File

@ -130,7 +130,7 @@ class CourseManager {
public static function get_course_information($course_code) {
return Database::fetch_array(Database::query(
"SELECT * FROM ".Database::get_main_table(TABLE_MAIN_COURSE)."
WHERE code='".Database::escape_string($course_code)."'")
WHERE code='".Database::escape_string($course_code)."'"),'ASSOC'
);
}

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

@ -696,7 +696,7 @@ function get_all_exercise_event($exercise_id, $course_code, $session_id = 0) {
$exercise_id = intval($exercise_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";
$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";
$res = api_sql_query($sql,__FILE__,__LINE__);
$list = array();

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

@ -394,13 +394,12 @@ class Tracking {
if (!empty($course_info['db_name'])) {
$tbl_stats_exercices = Database :: get_statistic_table(TABLE_STATISTIC_TRACK_E_EXERCICES, $course_info['db_name']);
$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 orig_lp_id = $lp_id
AND orig_lp_item_id = $lp_item_id
AND exe_user_id= $student_id ";
$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 orig_lp_id = $lp_id
AND orig_lp_item_id = $lp_item_id
AND exe_user_id= $student_id ";
$rs = Database::query($sql);
$row = Database::fetch_row($rs);
$count_attempts = $row[0];

14
main/newscorm/learnpath.class.php
Unescape View File

@ -1823,9 +1823,9 @@ class learnpath {
* @param boolean Whether to return null if no record was found (true), or 0 (false) (optional, defaults to false)
* @return integer Current progress value as found in the database
*/
public function get_db_progress($lp_id, $user_id, $mode = '%', $course_db = '', $sincere = false) {
public function get_db_progress($lp_id, $user_id, $mode = '%', $course_db = '', $sincere = false,$session_id = 0) {
//if ($this->debug > 0) { error_log('New LP - In learnpath::get_db_progress()', 0); }
$session_id = api_get_session_id();
$session_id = intval($session_id);
$session_condition = api_get_session_condition($session_id);
$table = Database :: get_course_table(TABLE_LP_VIEW, $course_db);
$sql = "SELECT * FROM $table WHERE lp_id = $lp_id AND user_id = $user_id $session_condition";
@ -1848,7 +1848,7 @@ class learnpath {
} else {
// Get the number of items completed and the number of items total.
$tbl = Database :: get_course_table(TABLE_LP_ITEM, $course_db);
$sql = "SELECT count(*) FROM $tbl WHERE lp_id = " . $lp_id . "
$sql = "SELECT count(*) FROM $tbl WHERE lp_id = " . $lp_id . "
AND item_type NOT IN('dokeos_chapter','chapter','dir')";
$res = Database::query($sql);
$row = Database :: fetch_array($res);
@ -1863,8 +1863,8 @@ class learnpath {
INNER JOIN $tbl_item as item
ON item.id = item_view.lp_item_id
AND item_type NOT IN('dokeos_chapter','chapter','dir')
WHERE lp_view_id = " . $view_id . "
AND status IN ('passed','completed','succeeded','browsed','failed')";
WHERE lp_view_id = " . $view_id . "
AND status IN ('passed','completed','succeeded','browsed','failed')"; echo '<br />';
$res = Database::query($sql);
$row = Database :: fetch_array($res);
$completed = $row[0];
@ -1951,8 +1951,8 @@ class learnpath {
$is_visible = true;
$progress = 0;
if (!empty($prerequisite)) {
$progress = self::get_db_progress($prerequisite,$student_id,'%');
if (!empty($prerequisite)) {
$progress = self::get_db_progress($prerequisite,$student_id,'%', '', false, api_get_session_id());
$progress = intval($progress);
if ($progress < 100) {
$is_visible = false;

6
main/newscorm/lp_list.php
Unescape View File

@ -219,10 +219,10 @@ if (is_array($flat_list)) {
$lp_theme_css = $mystyle;
if ($display_progress_bar) {
$dsp_progress = '<td width="140px">'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id, api_get_user_id()), '').'</td>';
if ($display_progress_bar) {
$dsp_progress = '<td width="140px">'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id, api_get_user_id(), '%', '', false, api_get_session_id())).'</td>';
} else {
$dsp_progress = '<td width="140px" style="padding-top:1em;">'.learnpath::get_db_progress($id, api_get_user_id(), 'both').'</td>';
$dsp_progress = '<td width="140px" style="padding-top:1em;">'.learnpath::get_db_progress($id, api_get_user_id(), 'both','',false, api_get_session_id()).'</td>';
}
if ($is_allowed_to_edit) {

Write Preview
Loading…
Cancel
Save