*
*/
-class learnpathList
+class LearnpathList
{
// Holds a flat list of learnpaths data from the database.
public $list = array();
diff --git a/main/tracking/course_session_report.php b/main/tracking/course_session_report.php
index 13b95ec6db..88fee5d638 100755
--- a/main/tracking/course_session_report.php
+++ b/main/tracking/course_session_report.php
@@ -94,7 +94,7 @@ foreach ($course_list as $current_course ) {
$attempt_result = array();
//Getting LP list
- $list = new learnpathList('', $current_course['code'], $session_id);
+ $list = new LearnpathList('', $current_course['code'], $session_id);
$lp_list = $list->get_flat_list();
// Looping LPs
diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php
index edee52e28a..8f87981864 100755
--- a/main/tracking/lp_results_by_user.php
+++ b/main/tracking/lp_results_by_user.php
@@ -1,9 +1,9 @@
$course_item['db_name'],'code'=>$course_item['code'], 'title'=>$course_item['title']);
+ $course_item = CourseManager ::get_course_information($temp_course_item['code']);
+ $course_list[]= array('db_name' =>$course_item['db_name'],'code'=>$course_item['code'], 'title'=>$course_item['title']);
}
-} else {
+} else {
$current_course['db_name'] = $_course['dbName'];
- $current_course['code'] = $_course['id'];
+ $current_course['code'] = $_course['id'];
$course_list = array($current_course);
}
@@ -62,41 +62,41 @@ if ($global) {
} else {
//Get exam lists
$course_id = api_get_course_int_id();
- $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
+ $t_quiz = Database::get_course_table(TABLE_QUIZ_TEST);
$sqlExercices = " SELECT quiz.title,id FROM ".$t_quiz." AS quiz WHERE c_id = $course_id AND active='1' ORDER BY quiz.title ASC";
- $resultExercices = Database::query($sqlExercices);
+ $resultExercices = Database::query($sqlExercices);
$exercise_list[0] = get_lang('All');
while($a_exercices = Database::fetch_array($resultExercices)) {
$exercise_list[$a_exercices['id']] = $a_exercices['title'];
- }
+ }
$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
}
-
+
//$form->addElement('submit','submit',get_lang('Filter'));
$form->addElement('style_submit_button','submit', get_lang('Filter'),'class="search"' );
-if (!empty($_REQUEST['course_code']))
+if (!empty($_REQUEST['course_code']))
$selected_course = $_REQUEST['course_code'];
if (!empty($selected_course)) {
$selected_course = api_get_course_info($selected_course);
- $course_list = array($selected_course);
+ $course_list = array($selected_course);
}
if (!$export_to_csv) {
Display :: display_header(get_lang('Reporting'));
echo '';
+ echo '
'.get_lang('ExportAsXLS').'
';
+
+ }
+ echo '';
echo '
';
- $form->display();
+ $form->display();
//echo ''.sprintf(get_lang('FilteringWithScoreX'), $filter_score).'%
';
}
-require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$main_result = array();
$session_id = 0;
$user_list = array();
//Getting course list
foreach($course_list as $current_course ) {
$course_info = api_get_course_info($current_course['code']);
- $_course = $course_info;
-
-
+ $_course = $course_info;
+
+
//Getting LP list
- $list = new learnpathList('', $current_course['code'], $session_id);
- $lp_list = $list->get_flat_list();
-
+ $list = new LearnpathList('', $current_course['code'], $session_id);
+ $lp_list = $list->get_flat_list();
+
// Looping LPs
$lps = array();
- foreach ($lp_list as $lp_id =>$lp) {
+ foreach ($lp_list as $lp_id =>$lp) {
$exercise_list = get_all_exercises_from_lp($lp_id, $course_info['real_id']);
- $attempt_result = array();
+ $attempt_result = array();
//Looping Chamilo Exercises in LP
foreach ($exercise_list as $exercise) {
$exercise_stats = get_all_exercise_event_from_lp($exercise['path'], $course_info['id'], $session_id);
@@ -147,13 +146,13 @@ foreach($course_list as $current_course ) {
//$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = array('exe_result' =>$stats['exe_result'],'exe_weighting' =>$stats['exe_weighting']);
$attempt_result[$exercise['id']]['users'][$stats['exe_user_id']][$stats['exe_id']] = $stats;
$user_list[$stats['exe_user_id']] = $stats['exe_user_id'];
- }
+ }
$exercise_list_name[$exercise['id']] = $exercise['title'];
}
- $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
+ $lps[$lp_id] = array('lp_name' =>$lp['lp_name'], 'exercises' =>$attempt_result);
$lp_list_name[$lp_id] = $lp['lp_name'];
}
- $main_result[$current_course['code']] = $lps;
+ $main_result[$current_course['code']] = $lps;
}
//echo '';print_r($main_result);
if (!empty($user_list)) {
@@ -164,7 +163,7 @@ if (!empty($user_list)) {
}
$export_array = array();
if (!empty($main_result)) {
-
+
$html_result .= '';
$html_result .= '| '.get_lang('Course').' | ';
$html_result .= ''.get_lang('LearningPath').' | ';
@@ -173,20 +172,20 @@ if (!empty($main_result)) {
$html_result .= ''.get_lang('Attempt').' | ';
$html_result .= ''.get_lang('Date').' | ';
$html_result .= ''.get_lang('Results').' | ';
- $html_result .= '
|---|
';
-
+ $html_result .= '';
+
foreach ($main_result as $course_code => $lps) {
if (empty($lps)) {
continue;
- }
-
- foreach($lps as $lp_id => $lp_data) {
- $exercises = $lp_data['exercises'];
-
+ }
+
+ foreach($lps as $lp_id => $lp_data) {
+ $exercises = $lp_data['exercises'];
+
foreach($exercises as $exercise_id => $exercise_data) {
$users = $exercise_data['users'];
foreach($users as $user_id => $attempts) {
- $attempt = 1;
+ $attempt = 1;
foreach($attempts as $exe_id => $attempt_data) {
$html_result .= '';
$html_result .= Display::tag('td', $course_code);
@@ -194,77 +193,77 @@ if (!empty($main_result)) {
$html_result .= Display::tag('td', $exercise_list_name[$exercise_id]);
$html_result .= Display::tag('td', $user_list_name[$user_id]);
$result = $attempt_data['exe_result'].' / '.$attempt_data['exe_weighting'];
- $html_result .= Display::tag('td', $attempt);
+ $html_result .= Display::tag('td', $attempt);
$html_result .= Display::tag('td', api_get_local_time($attempt_data['exe_date']));
$html_result .= Display::tag('td', $result);
-
+
$html_result .= '
';
$export_array[]= array($course_code, $lp_list_name[$lp_id], $exercise_list_name[$exercise_id], $user_list_name[$user_id], $attempt, api_get_local_time($attempt_data['exe_date']), $result);
$attempt++;
}
- }
- }
+ }
+ }
}
}
$html_result .='
';
}
if (!$export_to_csv) {
- echo $html_result;
+ echo $html_result;
}
$filename = 'learning_path_results-'.date('Y-m-d-h:i:s').'.xls';
if ($export_to_csv) {
export_complete_report_csv($filename, $export_array);
exit;
}
-function export_complete_report_csv($filename, $array) {
+function export_complete_report_csv($filename, $array) {
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$header[] = array(get_lang('Course'),get_lang('LearningPath'), get_lang('Exercise'), get_lang('User'),get_lang('Attempt'), get_lang('Date'),get_lang('Results'));
if (!empty($array)) {
- $array = array_merge($header, $array);
+ $array = array_merge($header, $array);
Export :: export_table_csv($array, $filename);
}
exit;
- /*
- * Too much encoding problems while exporting to XLS, keep it simple
- *
- *
+ /*
+ * Too much encoding problems while exporting to XLS, keep it simple
+ *
+ *
global $global, $filter_score;
$workbook = new Spreadsheet_Excel_Writer();
$workbook ->setTempDir(api_get_path(SYS_ARCHIVE_PATH));
$workbook->send($filename);
$workbook->setVersion(8); // BIFF8
$worksheet =& $workbook->addWorksheet('Report');
- $worksheet->setInputEncoding(api_get_system_encoding());
-
+ $worksheet->setInputEncoding(api_get_system_encoding());
+
$line = 0;
- $column = 0; //skip the first column (row titles)
+ $column = 0; //skip the first column (row titles)
$worksheet->write($line,$column,get_lang('Course'));
$column++;
$worksheet->write($line,$column,get_lang('LearningPath'));
$column++;
$worksheet->write($line,$column,get_lang('Exercise'));
- $column++;
+ $column++;
$worksheet->write($line,$column,get_lang('User'));
$column++;
$worksheet->write($line,$column,get_lang('Attempt'));
$column++;
$worksheet->write($line,$column,get_lang('Date'));
- $column++;
+ $column++;
$worksheet->write($line,$column,get_lang('Results'));
- $column++;
- $line++;
+ $column++;
+ $line++;
foreach ($array as $row) {
$column = 0;
- foreach ($row as $item) {
+ foreach ($row as $item) {
$worksheet->write($line,$column,html_entity_decode(strip_tags($item)));
$column++;
}
$line++;
- }
- $line++;
-
+ }
+ $line++;
+
$workbook->close();
exit;*/
}
diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php
index 798fdb4732..bafa852b7c 100755
--- a/main/tracking/question_course_report.php
+++ b/main/tracking/question_course_report.php
@@ -86,7 +86,7 @@ $form->setDefaults(array('course_code'=>(string)$course_code));
$course_info = api_get_course_info($course_code);
//var_dump($session_id);
if (!empty($course_info)) {
- $list = new learnpathList('', $course_code);
+ $list = new LearnpathList('', $course_code);
$lp_list = $list->get_flat_list();
$_course = $course_info;
$main_question_list = array();
diff --git a/main/webservices/webservice_report.php b/main/webservices/webservice_report.php
index 5268c1dc77..c087f3dbaa 100755
--- a/main/webservices/webservice_report.php
+++ b/main/webservices/webservice_report.php
@@ -97,7 +97,6 @@ class WSReport extends WS {
$course_code = CourseManager::get_course_code_from_course_id($course_id);
}
- require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$lp = new LearnpathList($user_id,$course_code);
$list = $lp->list;
$return = array();
diff --git a/main/wiki/index.php b/main/wiki/index.php
index 668b51b1f5..355ee86c32 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -23,7 +23,6 @@ $wiki->charset = $charset;
// section (for the tabs)
$this_section = SECTION_COURSES;
$current_course_tool = TOOL_WIKI;
-require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
$course_id = api_get_course_int_id();
$session_id = api_get_session_id();
'.get_lang('ExportAsCSV').'
'.get_lang('Print').'