|
@@ -1908,16 +1908,10 @@ class Tracking {
|
|
|
$rs = Database::query($sql);
|
|
|
while($row = Database :: fetch_array($rs)) {
|
|
|
$course_in_session[$row['session_id']][$row['course_code']] = CourseManager::get_course_information($row['course_code']);
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
|
|
|
$html = '';
|
|
|
- if ($show_courses) {
|
|
|
-
|
|
|
- /*echo '<div class="actions-title" >';
|
|
|
- echo $nameTools;
|
|
|
- echo '</div>';*/
|
|
|
-
|
|
|
+ if ($show_courses) {
|
|
|
if (!empty($courses)) {
|
|
|
|
|
|
$html = '<table class="data_table" width="100%">';
|
|
@@ -1982,6 +1976,7 @@ class Tracking {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ //Courses in a session
|
|
|
if (!empty($course_in_session)) {
|
|
|
$html .= '<br />';
|
|
|
$html .= Display::tag('h1',get_lang('Sessions'));
|
|
@@ -1998,17 +1993,19 @@ class Tracking {
|
|
|
$html .= '
|
|
|
<tr>
|
|
|
<th width="300px">'.get_lang('Course').'</th>
|
|
|
- '.Display::tag('th', get_lang('Time') , array('class'=>'head')).'
|
|
|
- '.Display::tag('th', get_lang('Progress') , array('class'=>'head')).'
|
|
|
+ '.Display::tag('th', get_lang('PublishedExercises'),array('class'=>'head')).'
|
|
|
+ '.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).'
|
|
|
+ '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).'
|
|
|
+ '.Display::tag('th', get_lang('Time') , 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('LastConnexion'), array('class'=>'head')).'
|
|
|
+ '.Display::tag('th', get_lang('Details'), array('class'=>'head')).'
|
|
|
</tr>';
|
|
|
foreach ($session as $enreg) {
|
|
|
$weighting = 0;
|
|
|
$last_connection = Tracking :: get_last_connection_date_on_the_course($user_id, $enreg['code'], $key);
|
|
|
- $progress = Tracking :: get_avg_student_progress($user_id, $enreg['code'],array(), $key);
|
|
|
-
|
|
|
+ $progress = Tracking :: get_avg_student_progress($user_id, $enreg['code'],array(), $key);
|
|
|
$total_time_login = Tracking :: get_time_spent_on_the_course($user_id, $enreg['code'], $key);
|
|
|
$time = api_time_to_hms($total_time_login);
|
|
|
$percentage_score = Tracking :: get_avg_student_score($user_id, $enreg['code'], array(), $key);
|
|
@@ -2019,35 +2016,45 @@ class Tracking {
|
|
|
$html .= '<tr class="row_even">';
|
|
|
}
|
|
|
|
|
|
+ $html .= Display::tag('td', $enreg['title']);
|
|
|
+ //All exercises in the course
|
|
|
+ $exercises = get_all_exercises($enreg, $key);
|
|
|
+ //Count of user results
|
|
|
+ $done_exercises = get_all_exercise_results_by_course($enreg['code'], $key);
|
|
|
+ //Averaga
|
|
|
+ $averate = get_average_score_by_course($enreg['code'], $key);
|
|
|
+
|
|
|
+ $html .= Display::tag('td', count($exercises));
|
|
|
+ $html .= Display::tag('td', $done_exercises);
|
|
|
+ $html .= Display::tag('td', $averate);
|
|
|
|
|
|
- $html .= '<td>'.$enreg['title'].' </td>';
|
|
|
- $html .= '<td align="center">'.$time.'</td>';
|
|
|
|
|
|
+ $html .= Display::tag('td', $time, array('align'=>'center'));
|
|
|
if (is_numeric($progress)) {
|
|
|
$progress = $progress.'%';
|
|
|
} else {
|
|
|
$progress = '0%';
|
|
|
}
|
|
|
-
|
|
|
- $html .= '<td align="center">'.$progress.'</td>';
|
|
|
- $html .= '<td align="center">';
|
|
|
+ $html .= Display::tag('td', $progress, array('align'=>'center'));
|
|
|
if (is_numeric($percentage_score)) {
|
|
|
- $html .= $percentage_score.'%';
|
|
|
+ $percentage_score = $percentage_score.'%';
|
|
|
} else {
|
|
|
- $html .= '0%';
|
|
|
+ $percentage_score = '0%';
|
|
|
}
|
|
|
- $html .= '</td>';
|
|
|
- $html .= '<td align="center">'.$last_connection.'</td>';
|
|
|
- $html .= '<td align="center">';
|
|
|
+ $html .= Display::tag('td', $percentage_score, array('align'=>'center'));
|
|
|
+ $html .= Display::tag('td', $last_connection, array('align'=>'center'));
|
|
|
+
|
|
|
if ($enreg['code'] == $_GET['course'] && $_GET['session_id'] == $key) {
|
|
|
- $html .= '<a href="#">';
|
|
|
- $html .=Display::return_icon('2rightarrow_na.gif', get_lang('Details'));
|
|
|
+ $details = '<a href="#">';
|
|
|
+ $details .=Display::return_icon('2rightarrow_na.gif', get_lang('Details'));
|
|
|
} else {
|
|
|
- $html .= '<a href="'.api_get_self().'?course='.$enreg['code'].'&session_id='.$key.$extra_params.'">';
|
|
|
- $html .=Display::return_icon('2rightarrow.gif', get_lang('Details'));
|
|
|
+ $details = '<a href="'.api_get_self().'?course='.$enreg['code'].'&session_id='.$key.$extra_params.'">';
|
|
|
+ $details .=Display::return_icon('2rightarrow.gif', get_lang('Details'));
|
|
|
}
|
|
|
- $html .= '</a>';
|
|
|
- $html .= '</td>';
|
|
|
+ $details .= '</a>';
|
|
|
+
|
|
|
+ $html .= Display::tag('td', $details, array('align'=>'center'));
|
|
|
+
|
|
|
$i = $i ? 0 : 1;
|
|
|
$html .= '</tr>';
|
|
|
}
|
|
@@ -2142,7 +2149,7 @@ class Tracking {
|
|
|
//$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'];
|
|
|
+ $tableTitle = $course_info['title'];
|
|
|
|
|
|
$html .='
|
|
|
<table class="data_table" width="100%">
|
|
@@ -2210,14 +2217,13 @@ class Tracking {
|
|
|
$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'";
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
$html .= '<tr>
|
|
|
<th class="head" style="color:#000">'.get_lang('Exercices').'</th>
|
|
|
<th class="head" style="color:#000">'.get_lang('Attempts').'</th>
|
|
|
<th class="head" style="color:#000">'.get_lang('LatestAttempt').'</th>
|
|
|
<th class="head" style="color:#000">'.get_lang('Position').'</th>
|
|
|
- <th class="head" style="color:#000">'.get_lang('MyBestAttempt').'</th>
|
|
|
+ <th class="head" style="color:#000">'.get_lang('BestResultInCourse').'</th>
|
|
|
</tr>';
|
|
|
$result_exercices = Database::query($sql_exercices);
|
|
|
if (Database::num_rows($result_exercices) > 0) {
|
|
@@ -2226,8 +2232,7 @@ class Tracking {
|
|
|
$exercise_stats = get_all_exercise_results($exercices['id'], $course_info['code'], $session_id);
|
|
|
//User attempts we assume the latest item in the loop is the latest attempt
|
|
|
if (!empty($exercise_stats)) {
|
|
|
- $best_score = 0;
|
|
|
- $best_score_array = array();
|
|
|
+ //$best_score = 0; $best_score_array = array();
|
|
|
foreach($exercise_stats as $exercise_stat) {
|
|
|
if ($exercise_stat['exe_user_id'] == $user_id) {
|
|
|
|
|
@@ -2240,11 +2245,12 @@ class Tracking {
|
|
|
//$score = $score + $exercise_stat['exe_result'];
|
|
|
//$weighting = $weighting + $exercise_stat['exe_weighting'];
|
|
|
|
|
|
- //Getting the best score
|
|
|
+ //Getting my best score
|
|
|
+ /*
|
|
|
if ($score > $best_score ) {
|
|
|
$best_score = $score;
|
|
|
$best_score_array = $exercise_stat;
|
|
|
- }
|
|
|
+ }*/
|
|
|
$attempts++;
|
|
|
}
|
|
|
}
|
|
@@ -2259,6 +2265,8 @@ class Tracking {
|
|
|
$position = '-';
|
|
|
$best_score = '-';
|
|
|
|
|
|
+ $best_score_data = get_best_score($exercices['id'], $course_info['code'], $session_id);
|
|
|
+ $best_score = show_score($best_score_data['exe_result'], $best_score_data['exe_weighting']);
|
|
|
if ($attempts > 0) {
|
|
|
$latest_attempt_url .= '<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>';
|
|
|
$percentage_score_result = show_score($score, $weighting).' '.$latest_attempt_url;
|
|
@@ -2266,12 +2274,7 @@ class Tracking {
|
|
|
if (!empty($weighting)) {
|
|
|
$my_score = $score/$weighting;
|
|
|
}
|
|
|
- $position = get_exercise_result_ranking($my_score, $exe_id, $exercices['id'], $course_info['code'], $session_id);
|
|
|
- if (!empty($best_score_array)) {
|
|
|
- $best_attempt_url .= '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$best_score_array['exe_id'].'&cidReq='.$course_info['code'].'&id_session='.$session_id.'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>';
|
|
|
- $best_score = show_score($best_score_array['exe_result'], $best_score_array['exe_weighting']).' '.$best_attempt_url;
|
|
|
- }
|
|
|
-
|
|
|
+ $position = get_exercise_result_ranking($my_score, $exe_id, $exercices['id'], $course_info['code'], $session_id);
|
|
|
}
|
|
|
$html .= Display::tag('td', $attempts, array('align'=>'center'));
|
|
|
$html .= Display::tag('td', $percentage_score_result, array('align'=>'center'));
|
|
@@ -2290,7 +2293,7 @@ class Tracking {
|
|
|
$html .= '</tr>';
|
|
|
}
|
|
|
} else {
|
|
|
- $html .= '<tr><td colspan="4" align="center">'.get_lang('NoEx').'</td></tr>';
|
|
|
+ $html .= '<tr><td colspan="5" align="center">'.get_lang('NoEx').'</td></tr>';
|
|
|
}
|
|
|
$html .= '</table>';
|
|
|
}
|