Fixes class name LearnpathList

1.10.x
Julio Montoya 10 years ago
parent 57eeea7543
commit 1ede08ef43
  1. 1
      main/admin/user_move_stats.php
  2. 2
      main/exercice/exercise.lib.php
  3. 1
      main/exercice/exercise_submit_modal.php
  4. 3
      main/exercice/hotspot_admin.inc.php
  5. 2
      main/exercice/unique_answer.class.php
  6. 3
      main/inc/ajax/course_home.ajax.php
  7. 1
      main/inc/ajax/model.ajax.php
  8. 1
      main/inc/lib/myspace.lib.php
  9. 4
      main/inc/lib/sessionmanager.lib.php
  10. 4
      main/newscorm/learnpathList.class.php
  11. 2
      main/tracking/course_session_report.php
  12. 133
      main/tracking/lp_results_by_user.php
  13. 2
      main/tracking/question_course_report.php
  14. 1
      main/webservices/webservice_report.php
  15. 1
      main/wiki/index.php

@ -12,7 +12,6 @@ require_once '../inc/global.inc.php';
$this_section=SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once '../newscorm/learnpathList.class.php';
$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
$debug = 0;

@ -1404,7 +1404,7 @@ function get_exam_results_data(
}
}
$lp_list_obj = new learnpathList(api_get_user_id());
$lp_list_obj = new LearnpathList(api_get_user_id());
$lp_list = $lp_list_obj->get_flat_list();
if (is_array($results)) {

@ -487,7 +487,6 @@ if ($try==1) {
// the link to theory (a learning path)
if (!empty($lp)) {
$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
require_once('../newscorm/learnpathList.class.php');
$list = new LearnpathList(api_get_user_id());
$flat_list = $list->get_flat_list();
$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';

@ -566,7 +566,7 @@ if ($modifyAnswers) {
</tr>
<?php
require_once '../newscorm/learnpathList.class.php';
$list = new LearnpathList(api_get_user_id());
$flat_list = $list->get_flat_list(); //loading list of LPs
@ -874,7 +874,6 @@ if ($modifyAnswers) {
</tr>
<?php
}
require_once '../newscorm/learnpathList.class.php';
$list = new LearnpathList(api_get_user_id());
$flat_list = $list->get_flat_list();
$select_lp_id = array();

@ -106,8 +106,6 @@ class UniqueAnswer extends Question
$question_list = $obj_ex->selectQuestionList();
$select_question = array();
$select_question[0] = get_lang('SelectTargetQuestion');
require_once '../newscorm/learnpathList.class.php';
if (is_array($question_list)) {
foreach ($question_list as $key => $questionid) {
//To avoid warning messages

@ -106,7 +106,6 @@ switch ($action) {
*/
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$now = time();
$page = intval($_REQUEST['page']); //page
$limit = intval($_REQUEST['rows']); // quantity of rows
@ -231,7 +230,6 @@ switch ($action) {
break;
case 'session_courses_lp_by_week':
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$now = time();
$page = intval($_REQUEST['page']); //page
@ -357,7 +355,6 @@ switch ($action) {
break;
case 'session_courses_lp_by_course':
require_once '../global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$now = time();
$page = intval($_REQUEST['page']); //page
$limit = intval($_REQUEST['rows']); // quantity of rows

@ -852,7 +852,6 @@ switch ($action) {
'firstname',
'lastname',
);
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
foreach ($lessons as $lesson_id => $lesson) {
$columns[] = $lesson_id;

@ -514,7 +514,6 @@ class MySpace
get_lang('LastName'),
);
//add lessons of course
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
$lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
//create columns array

@ -626,7 +626,6 @@ class SessionManager
}
//Get lessons
require_once api_get_path(SYS_CODE_PATH) . 'newscorm/learnpathList.class.php';
$lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
$table = array();
@ -3443,7 +3442,6 @@ class SessionManager
if ($course_info) {
//By default new elements are invisible
if ($set_exercises_lp_invisible) {
require_once api_get_path(SYS_CODE_PATH) . 'newscorm/learnpathList.class.php';
$list = new LearnpathList('', $course_info['code'], $sid);
$flat_list = $list->get_flat_list();
if (!empty($flat_list)) {
@ -5379,7 +5377,7 @@ class SessionManager
}
/**
* Calculate the total user time in the platform
* Calculate the total user time in the platform
* @param int $userId The user id
* @param string $from Optional. From date
* @param string $until Optional. Until date

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
/**
* Class learnpathList
* Class LearnpathList
* This class is only a learning path list container with several practical methods for sorting the list and
* provide links to specific paths
* @uses Database.lib.php to use the database
@ -10,7 +10,7 @@
* @author Yannick Warnier <ywarnier@beeznest.org>
*
*/
class learnpathList
class LearnpathList
{
// Holds a flat list of learnpaths data from the database.
public $list = array();

@ -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

@ -1,9 +1,9 @@
<?php
/* For licensing terms, see /license.txt */
/**
*
*
* Exercise results from Learning paths
*
*
* @todo implement pagination
* @package chamilo.tracking
*/
@ -32,21 +32,21 @@ if (isset($_GET['export'])) {
$export_to_csv = true;
}
if (api_is_platform_admin() ) {
if (api_is_platform_admin() ) {
$global = true;
} else {
$global = false;
}
if ($global) {
$temp_course_list = CourseManager :: get_courses_list();
$temp_course_list = CourseManager :: get_courses_list();
foreach($temp_course_list as $temp_course_item) {
$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']);
$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 '<div class="actions" style ="font-size:10pt;">';
if ($global) {
echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>' .
'<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a></div>';
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
if (api_is_platform_admin()) {
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
} else {
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
$menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
}
$menu_items[] = get_lang('ExamTracking');
$menu_items[] = get_lang('ExamTracking');
$nb_menu_items = count($menu_items);
if($nb_menu_items>1) {
foreach($menu_items as $key=> $item) {
@ -108,37 +108,36 @@ if (!$export_to_csv) {
echo '<br />';
}
} else {
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;|&nbsp';
echo '<a href="courseLog.php?'.api_get_cidreq().'&studentlist=resources">'.get_lang('ResourcesTracking').'</a>';
echo ' | '.get_lang('ExamTracking').'';
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
}
echo '</div>';
echo '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsXLS').'</a><br /><br />';
}
echo '</div>';
echo '<br /><br />';
$form->display();
$form->display();
//echo '<h3>'.sprintf(get_lang('FilteringWithScoreX'), $filter_score).'%</h3>';
}
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 '<pre>';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 .= '<table class="data_table">';
$html_result .= '<tr><th>'.get_lang('Course').'</th>';
$html_result .= '<th>'.get_lang('LearningPath').'</th>';
@ -173,20 +172,20 @@ if (!empty($main_result)) {
$html_result .= '<th>'.get_lang('Attempt').'</th>';
$html_result .= '<th>'.get_lang('Date').'</th>';
$html_result .= '<th>'.get_lang('Results').'</th>';
$html_result .= '</tr>';
$html_result .= '</tr>';
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 .= '<tr colspan="">';
$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 .= '</tr>';
$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 .='</table>';
}
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;*/
}

@ -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();

@ -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();

@ -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();

Loading…
Cancel
Save