Removing require libs already loaded in global.inc.php (autoloading)

skala
Julio Montoya 12 years ago
parent f8186898d7
commit 75523ff530
  1. 1
      main/admin/class_import.php
  2. 21
      main/admin/course_import.php
  3. 1
      main/admin/user_export.php
  4. 7
      main/admin/usergroup_export.php
  5. 2
      main/admin/usergroup_user_import.php
  6. 3
      main/attendance/index.php
  7. 119
      main/course_progress/index.php
  8. 1
      main/coursecopy/classes/CourseRestorer.class.php
  9. 1
      main/gradebook/gradebook.php
  10. 3
      main/gradebook/gradebook_view_result.php
  11. 4
      main/gradebook/user_info.php
  12. 4
      main/group/group_overview.php
  13. 4
      main/inc/global.inc.php
  14. 10
      main/mySpace/course.php
  15. 1
      main/mySpace/index.php
  16. 14
      main/mySpace/lp_tracking.php
  17. 2
      main/mySpace/myStudents.php
  18. 1
      main/mySpace/myspace.lib.php
  19. 23
      main/mySpace/session.php
  20. 47
      main/mySpace/student.php
  21. 2
      main/mySpace/user_import.php
  22. 1
      main/tracking/courseLog.php
  23. 1
      main/tracking/course_log_resources.php
  24. 1
      main/tracking/course_log_tools.php
  25. 132
      main/tracking/lp_results_by_user.php
  26. 2
      tests/main/dropbox/dropbox_functions.inc.test.php
  27. 2
      tests/main/inc/lib/export.lib.inc.test.php
  28. 2
      tests/main/inc/lib/sortable_table.class.test.php

@ -54,7 +54,6 @@ $cidReset = true;
// Including some necessary dokeos files.
include '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
// Setting the section (for the tabs).
$this_section = SECTION_PLATFORM_ADMIN;

@ -85,12 +85,12 @@ function validate_data($courses) {
* Saves imported data.
* @param array List of courses
*/
function save_data($courses) {
function save_data($courses) {
global $purification_option_for_usernames;
$user_table = Database::get_main_table(TABLE_MAIN_USER);
$msg = '';
foreach ($courses as $index => $course) {
$course_language = api_get_valid_language($course['Language']);
$titular = $uidCreator = $username = '';
@ -119,21 +119,21 @@ function save_data($courses) {
$titular = $course['Teacher'];
$uidCreator = 1;
}
$params = array();
$params['title'] = $course['Title'];
$params['wanted_code'] = $course['Code'];
$params['wanted_code'] = $course['Code'];
$params['tutor_name'] = $titular;
$params['course_category'] = $course['CourseCategory'];
$params['course_category'] = $course['CourseCategory'];
$params['course_language'] = $course_language;
$params['user_id'] = $uidCreator;
$params['user_id'] = $uidCreator;
$course_info = CourseManager::create_course($params);
if (!empty($course_info)) {
$msg .= '<a href="'.api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/">'.$course_info['title'].'</a> '.get_lang('Created').'<br />';
}
}
if (!empty($msg)) {
Display::display_normal_message($msg, false);
}
@ -158,7 +158,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$defined_auth_sources[] = PLATFORM_AUTH_SOURCE;
if (is_array($extAuthSource)) {
@ -184,7 +183,7 @@ if ($_POST['formSent']) {
if (!in_array($ext_import_file, $allowed_file_mimetype)) {
Display :: display_error_message(get_lang('YouMustImportAFileAccordingToSelectedOption'));
} else {
$courses = parse_csv_data($_FILES['import_file']['tmp_name']);
$courses = parse_csv_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($courses);
if (count($errors) == 0) {
save_data($courses);
@ -212,7 +211,7 @@ if (count($errors) != 0) {
<input type="file" name="import_file"/>
</div>
</div>
<div class="control-group ">
<div class="control-group ">
<div class="control">
<button type="submit" class="save" value="<?php echo get_lang('Import'); ?>"><?php echo get_lang('Import'); ?></button>
</div>

@ -15,7 +15,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
// Database table definitions
$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);

@ -15,7 +15,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script();
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$tool_name = get_lang('Export');
@ -31,9 +30,9 @@ $form->addElement('style_submit_button', 'submit',get_lang('Export'),'class="sav
if ($form->validate()) {
$user_group = new UserGroup;
$header = array(array('name', 'description'));
$data = $user_group->get_all_for_export();
$data = array_merge($header, $data);
$filename = 'export_classes_'.api_get_local_time();
$data = $user_group->get_all_for_export();
$data = array_merge($header, $data);
$filename = 'export_classes_'.api_get_local_time();
Export::export_table_csv($data,$filename);
exit;
}

@ -129,8 +129,6 @@ require_once '../inc/global.inc.php';
$this_section = SECTION_PLATFORM_ADMIN;
api_protect_admin_script(true);
require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
$tool_name = get_lang('AddUsersToAClass') . ' CSV';
$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));

@ -15,12 +15,9 @@ $language_file = array ('course_description', 'course_info', 'userInfo', 'admin'
// including files
require_once '../inc/global.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';
require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
require_once 'attendance_controller.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$current_course_tool = TOOL_ATTENDANCE;

@ -14,12 +14,9 @@ $language_file = array ('course_description', 'userInfo', 'admin');
// including files
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';
require_once 'thematic_controller.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
// current section
$this_section = SECTION_COURSES;
@ -78,19 +75,19 @@ if (!empty($thematic_id)) {
// get default thematic plan title
$default_thematic_plan_title = $thematic->get_default_thematic_plan_title();
// Only when I see the 3 columns. Avoids double or triple click binding for onclick event
// Only when I see the 3 columns. Avoids double or triple click binding for onclick event
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready(function() {
//Second col
//Second col
/*
$("#thematic_plan_add").live("submit", function() {
var serialize_form_content = $(this).serialize();
//Getting FCK content
//Getting FCK content
var oEditor = FCKeditorAPI.GetInstance("description[1]");
content_1= oEditor.GetXHTML(true) ;
var oEditor = FCKeditorAPI.GetInstance("description[2]");
@ -102,93 +99,93 @@ $(document).ready(function() {
var oEditor = FCKeditorAPI.GetInstance("description[5]");
content_5= oEditor.GetXHTML(true) ;
var oEditor = FCKeditorAPI.GetInstance("description[6]");
content_6= oEditor.GetXHTML(true) ;
content_6= oEditor.GetXHTML(true) ;
$.ajax({
type: "POST",
url: "'.api_get_path(WEB_AJAX_PATH).'thematic.ajax.php?a=save_thematic_plan",
data: "desc[1]="+content_1+"&"+"desc[2]="+content_2+"&"+"desc[3]="+content_3+"&"+"desc[4]="+content_4+"&"+"desc[5]="+content_5+"&"+"desc[6]="+content_6+"&"+serialize_form_content,
success: function(data) {
success: function(data) {
var thematic_id = $("input[name=\"thematic_id\"]").val();
$("#thematic_plan_"+thematic_id).html(data);
$("#thematic_plan_add").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");
//location.reload(true);
$("#thematic_plan_"+thematic_id).html(data);
$("#thematic_plan_add").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");
//location.reload(true);
}
});
//prevent the browser to follow the link
return false;
return false;
});*/
// Third col
/*
$("#thematic_advance").live("submit", function() {
var url = this.href;
var url = this.href;
var my_id = this.id;
var serialize_form_content = $(this).serialize();
//Getting FCK content
//Getting FCK content
var oEditor = FCKeditorAPI.GetInstance("content");
content = oEditor.GetXHTML(true) ;
content = oEditor.GetXHTML(true) ;
$.ajax({
type: "POST",
url: "'.api_get_path(WEB_AJAX_PATH).'thematic.ajax.php?a=save_thematic_advance",
data: "real_content=" + content + "&" +serialize_form_content,
success: function(data) {
success: function(data) {
var thematic_advance_id = $("input[name=\"thematic_advance_id\"]").val();
$("#thematic_advance_"+thematic_advance_id).html(data);
$("#thematic_advance").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");
$("#thematic_advance_"+thematic_advance_id).html(data);
$("#thematic_advance").html("<div class=\"confirmation-message\">'.addslashes(get_lang('Saved')).'</div>");
//Only refresh if the parent is to add
if (my_id == "add_button") {
//location.reload(true);
}
}
});
});
//prevent the browser to follow the link
return false;
return false;
});*/
$(".thematic_advance_actions, .thematic_tools ").hide();
$(".thematic_advance_actions, .thematic_tools ").hide();
$(".thematic_content").mouseover(function() {
var id = parseInt(this.id.split("_")[3]);
$("#thematic_id_content_"+id ).show();
});
$(".thematic_content").mouseleave(function() {
var id = parseInt(this.id.split("_")[3]);
$("#thematic_id_content_"+id ).hide();
});
});
$(".thematic_advance_content").mouseover(function() {
var id = parseInt(this.id.split("_")[4]);
$("#thematic_advance_tools_"+id ).show();
});
$(".thematic_advance_content").mouseleave(function() {
var id = parseInt(this.id.split("_")[4]);
$("#thematic_advance_tools_"+id ).hide();
});
});
/*
$("#custom_date").live("click", function() {
$("#custom_date").live("click", function() {
$("#div_custom_datetime").css("display", "none");
$("#div_datetime_by_attendance").hide();
$("#div_datetime_by_attendance").hide();
});
$("#from_attendance").live("click", function() {
$("#from_attendance").live("click", function() {
$("#div_custom_datetime").css("display", "block");
$("#div_custom_datetime").show();
$("#div_datetime_by_attendance").show();
$("#div_datetime_by_attendance").show();
});*/
});
});
</script>';
$htmlHeadXtra[] = '<script type="text/javascript">
function datetime_by_attendance(attendance_id, thematic_advance_id) {
$.ajax({
contentType: "application/x-www-form-urlencoded",
beforeSend: function(objeto) {},
@ -196,10 +193,10 @@ function datetime_by_attendance(attendance_id, thematic_advance_id) {
url: "'.api_get_path(WEB_AJAX_PATH).'thematic.ajax.php?a=get_datetime_by_attendance",
data: "attendance_id="+attendance_id+"&thematic_advance_id="+thematic_advance_id,
success: function(data) {
$("#div_datetime_attendance").html(data);
$("#div_datetime_attendance").html(data);
if (thematic_advance_id == 0) {
$("#start_date_select_calendar").val($("#start_date_select_calendar option:first").val());
}
}
}
});
}
@ -217,9 +214,9 @@ function update_done_thematic_advance(selected_value) {
});
// clean all radios
for (var i=0; i< $(".done_thematic").length;i++) {
var id_radio_thematic = $(".done_thematic").get(i).id;
var id_radio_thematic = $(".done_thematic").get(i).id;
$("#td_"+id_radio_thematic).css({"background-color":"#FFF"});
}
@ -235,21 +232,21 @@ function update_done_thematic_advance(selected_value) {
function check_per_attendance(obj) {
if (obj.checked) {
$("#div_datetime_by_attendance").show();
$("#div_datetime_by_attendance").show();
$("#div_custom_datetime").hide();
} else {
$("#div_datetime_by_attendance").hide();
$("#div_custom_datetime").show();
$("#div_custom_datetime").show();
}
}
function check_per_custom_date(obj) {
if (obj.checked) {
$("#div_custom_datetime").show();
$("#div_datetime_by_attendance").hide();
$("#div_datetime_by_attendance").hide();
} else {
$("#div_custom_datetime").hide();
$("#div_datetime_by_attendance").show();
$("#div_datetime_by_attendance").show();
}
}
@ -271,7 +268,7 @@ if ($action == 'thematic_details') {
}
if ($action == 'thematic_plan_list' || $action == 'thematic_plan_delete') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].') ');
$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicPlan').' ('.$thematic_data['title'].') ');
}
if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
@ -285,7 +282,7 @@ if ($action == 'thematic_plan_add' || $action == 'thematic_plan_edit') {
if ($action == 'thematic_advance_list' || $action == 'thematic_advance_delete') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
$interbreadcrumb[] = array ('url' => '#', 'name' => get_lang('ThematicAdvance').' ('.$thematic_data['title'].')');
}
if ($action == 'thematic_advance_add' || $action == 'thematic_advance_edit') {
$interbreadcrumb[] = array ('url' => 'index.php?'.api_get_cidreq().'&action='.$_SESSION['thematic_control'], 'name' => get_lang('ThematicControl'));
@ -303,32 +300,32 @@ switch ($action) {
case 'thematic_import_select' :
case 'thematic_import' :
case 'moveup' :
case 'movedown' :
case 'movedown' :
if (!api_is_allowed_to_edit(null,true)) {
api_not_allowed();
}
case 'thematic_list' :
case 'thematic_export' :
case 'thematic_export_pdf' :
case 'thematic_details' :
case 'thematic_details' :
$thematic_controller->thematic($action);
break;
break;
case 'thematic_plan_add' :
case 'thematic_plan_edit' :
case 'thematic_plan_delete' :
case 'thematic_plan_delete' :
if (!api_is_allowed_to_edit(null,true)) {
api_not_allowed();
}
}
case 'thematic_plan_list' :
$thematic_controller->thematic_plan($action);
break;
break;
case 'thematic_advance_add' :
case 'thematic_advance_edit' :
case 'thematic_advance_delete' :
if (!api_is_allowed_to_edit(null,true)) {
api_not_allowed();
api_not_allowed();
}
case 'thematic_advance_list' :
case 'thematic_advance_list' :
$thematic_controller->thematic_advance($action);
break;
}

@ -1516,7 +1516,6 @@ class CourseRestorer
$question_order = $quiz->question_orders[$index] ? $quiz->question_orders[$index] : ++$order;
$sql = "INSERT IGNORE INTO ".$table_rel." SET c_id = ".$this->destination_course_id.", question_id = ".$qid.", exercice_id = ".$new_id.", question_order = ".$question_order;
Database::query($sql);
}
}
}

@ -32,7 +32,6 @@ require_once 'lib/gradebook_data_generator.class.php';
require_once 'lib/fe/gradebooktable.class.php';
require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/userform.class.php';
require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
$htmlHeadXtra[] = '<script>
$(document).ready( function() {
for (i=0;i<$(".actions").length;i++) {

@ -17,13 +17,10 @@ require_once 'lib/gradebook_functions.inc.php';
require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/evalform.class.php';
require_once 'lib/fe/dataform.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
require_once 'lib/results_data_generator.class.php';
require_once 'lib/fe/resulttable.class.php';
require_once 'lib/fe/exportgradebook.php';
require_once 'lib/scoredisplay.class.php';
require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
api_block_anonymous_users();

@ -8,10 +8,8 @@
* Init
*/
$language_file = 'gradebook';
//$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
api_block_anonymous_users();
if (isset($_GET['userid'])) {

@ -28,10 +28,6 @@ api_protect_course_script(true);
$nameTools = get_lang('GroupOverview');
/* Libraries */
include_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
if (isset($_GET['action'])) {
switch ($_GET['action']) {
case 'export':

@ -154,8 +154,8 @@ $app['languages_file'] = array();
$app['installed'] = $alreadyInstalled;
//Loading $app settings
//require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/prod.php';
require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';
require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/prod.php';
//require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';
//Setting HttpCacheService provider in order to use do: $app['http_cache']->run();
/*

@ -14,8 +14,6 @@ $language_file = array ('admin', 'registration', 'index', 'tracking');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';
$this_section = SECTION_TRACKING;
$id_session = intval($_GET['id_session']);
@ -83,7 +81,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
$a_courses = array_keys($courses);
if (!api_is_session_admin()) {
if (!api_is_session_admin()) {
$menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
$menu_items[] = Display::url(Display::return_icon('user.png', get_lang('Students'), array(), 32), "index.php?view=drh_students&amp;display=yourstudents");
$menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), 32), 'teachers.php');
@ -95,7 +93,7 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
$nb_menu_items = count($menu_items);
if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) {
echo $item;
echo $item;
}
}
if (count($a_courses) > 0) {
@ -186,7 +184,7 @@ if (is_array($a_courses)) {
$avg_time_spent_in_course = api_time_to_hms($avg_time_spent_in_course / $nb_students_in_course);
$avg_progress_in_course = round($avg_progress_in_course / $nb_students_in_course, 2);
if (is_numeric($avg_score_in_course)) {
$avg_score_in_course = round($avg_score_in_course / $nb_students_in_course, 2).'%';
}
@ -201,7 +199,7 @@ if (is_array($a_courses)) {
$tematic_advance_progress = 0;
$thematic = new Thematic();
$tematic_advance = $thematic->get_total_average_of_thematic_advances($course_code, $id_session);
$tematic_advance = $thematic->get_total_average_of_thematic_advances($course_code, $id_session);
if (!empty($tematic_advance)) {
$tematic_advance_csv = $tematic_advance_progress.'%';

@ -16,7 +16,6 @@ $cidReset = true;
require_once '../inc/global.inc.php';
// including additional libraries
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once 'myspace.lib.php';
// the section (for the tabs)

@ -20,10 +20,8 @@ if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
} else {
$this_section = SECTION_COURSES;
}
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
@ -41,12 +39,12 @@ if (isset($_GET['course'])) {
$user_infos = UserManager :: get_user_info_by_id($user_id);
$name = api_get_person_name($user_infos['firstname'], $user_infos['lastname']);
if (!api_is_platform_admin(true) && !CourseManager :: is_course_teacher(api_get_user_id(), $cidReq) && !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $_GET['student_id']) && !api_is_drh() && !api_is_course_tutor()) {
api_not_allowed();
if (!api_is_platform_admin(true) && !CourseManager :: is_course_teacher(api_get_user_id(), $cidReq) && !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $_GET['student_id']) && !api_is_drh() && !api_is_course_tutor()) {
api_not_allowed();
}
$course_exits = CourseManager::course_exists($cidReq);
if (!empty($course_exits)) {
if (!empty($course_exits)) {
$course_info = api_get_course_info($cidReq);
} else {
api_not_allowed();
@ -89,7 +87,7 @@ $table_title = ($session_name? Display::return_icon('session.png', get_lang('Ses
Display::return_icon('user.png', get_lang('User'), array(), ICON_SIZE_SMALL).' '.$name;
echo Display::page_header($table_title);
echo Display::page_subheader('<h3>'.Display::return_icon('learnpath.png', get_lang('ToolLearnpath'), array(), ICON_SIZE_SMALL).' '.$lp_title.'</h3>');
//Needed in newscorm/lp_stats.php
$list = learnpath :: get_flat_ordered_items_list($lp_id, 0, $course_info['real_id']);
@ -101,8 +99,8 @@ if ($export_csv) {
ob_start();
require_once api_get_path(SYS_CODE_PATH).'newscorm/lp_stats.php';
$tracking_content = ob_get_contents();
ob_end_clean();
ob_end_clean();
echo api_utf8_decode($tracking_content, $charset);
}
Display :: display_footer();

@ -12,7 +12,6 @@ $language_file = array('registration', 'index', 'tracking', 'exercice', 'admin',
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
require_once api_get_path(SYS_CODE_PATH).'mySpace/myspace.lib.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
@ -20,7 +19,6 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php'
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/linkfactory.class.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
api_block_anonymous_users();

@ -7,7 +7,6 @@
/**
* Init
*/
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
/**
* MySpace class definition
*/

@ -11,7 +11,6 @@ $language_file = array ('registration', 'index', 'trad4all', 'tracking', 'admin'
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
api_block_anonymous_users();
@ -63,13 +62,13 @@ if (isset($_GET['id_coach']) && $_GET['id_coach'] != '') {
}
if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
$a_sessions = SessionManager :: get_sessions_coached_by_user(api_get_user_id());
$a_sessions_drh = SessionManager::get_sessions_followed_by_drh(api_get_user_id());
$a_sessions = SessionManager :: get_sessions_coached_by_user(api_get_user_id());
$a_sessions_drh = SessionManager::get_sessions_followed_by_drh(api_get_user_id());
if (!empty($a_sessions_drh)) {
$a_sessions = array_merge($a_sessions, $a_sessions_drh);
}
}
if (!api_is_session_admin()) {
$menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
@ -83,15 +82,15 @@ if (api_is_drh() || api_is_session_admin() || api_is_platform_admin()) {
$nb_menu_items = count($menu_items);
if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) {
echo $item;
echo $item;
}
}
if (count($a_sessions) > 0) {
echo '<span style="float:right">';
echo Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), 32), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
echo Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), 32), api_get_self().'?export=csv');
echo '</span>';
echo '</span>';
}
echo '</div>';
echo Display::page_header(get_lang('YourSessionsList'));
@ -111,7 +110,7 @@ if ($export_csv) {
}
if ($nb_sessions > 0) {
$table = new SortableTable('tracking', 'count_sessions_coached');
$table->set_header(0, get_lang('Title'));
$table->set_header(1, get_lang('Date'));
@ -119,10 +118,10 @@ if ($nb_sessions > 0) {
$table->set_header(3, get_lang('Details'), false);
$all_data = array();
foreach ($a_sessions as $session) {
foreach ($a_sessions as $session) {
$row = array();
$row[] = $session['name'];
$row[] = SessionManager::parse_session_dates($session);
$row[] = SessionManager::parse_session_dates($session);
$row[] = count(Tracking::get_courses_list_from_session($session['id']));
if ($export_csv) {

@ -12,7 +12,6 @@ $language_file = array ('registration', 'index', 'tracking', 'admin');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
api_block_anonymous_users();
@ -76,7 +75,7 @@ function rsort_users($a, $b) {
/* MAIN CODE */
//if ($isCoach || api_is_platform_admin() || api_is_drh()) {
if (api_is_allowed_to_create_course() || api_is_drh()) {
if (api_is_allowed_to_create_course() || api_is_drh()) {
if ($export_csv) {
$is_western_name_order = api_is_western_name_order(PERSON_NAME_DATA_EXPORT);
} else {
@ -91,29 +90,29 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
$menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), 32), 'teachers.php');
$menu_items[] = Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), 32), 'course.php');
$menu_items[] = Display::url(Display::return_icon('session.png', get_lang('Sessions'), array(), 32), 'session.php');
echo '<div class="actions">';
$nb_menu_items = count($menu_items);
if ($nb_menu_items > 1) {
foreach ($menu_items as $key => $item) {
echo $item;
echo $item;
}
}
//if (count($students) > 0) { //
echo '<span style="float:right">';
echo Display::url(Display::return_icon('printer.png', get_lang('Print'), array(), 32), 'javascript: void(0);', array('onclick'=>'javascript: window.print();'));
echo Display::url(Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), array(), 32), api_get_self().'?export=csv');
echo '</span>';
echo '</span>';
//}
echo '</div>';
} else {
echo '</div>';
} else {
echo '<div class="actions"><div style="float:right;">
<a href="javascript: void(0);" onclick="javascript: window.print();"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a>
<a href="'.api_get_self().'?export=csv"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>
</div></div>';
</div></div>';
}
echo Display::page_subheader($page_title);
if (isset($_GET['id_coach'])) {
@ -124,7 +123,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
if (api_is_drh()) {
$page_title = get_lang('YourStudents');
if (!isset($_GET['id_session'])) {
if (isset($_GET['user_id'])) {
$user_id = intval($_GET['user_id']);
$user_info = api_get_user_info($user_id);
@ -147,22 +146,22 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
} else {
$students = array_keys(UserManager::get_users_followed_by_drh(api_get_user_id() , STUDENT));
}
$courses_of_the_platform = CourseManager :: get_real_course_list();
foreach ($courses_of_the_platform as $course) {
$courses[$course['code']] = $course['code'];
}
}
} else {
if (!isset($_GET['id_session'])) {
if (!isset($_GET['id_session'])) {
//Getting courses
$courses = CourseManager::get_course_list_as_coach($coach_id, false);
if (isset($courses[0])) {
$courses = $courses[0];
}
//Getting students
}
//Getting students
$students = CourseManager::get_user_list_from_courses_as_coach($coach_id);
} else {
$students = Tracking :: get_student_followed_by_coach_in_a_session($_GET['id_session'], $coach_id);
}
@ -170,7 +169,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
$tracking_column = isset($_GET['tracking_column']) ? $_GET['tracking_column'] : ($is_western_name_order xor $sort_by_first_name) ? 1 : 0;
$tracking_direction = isset($_GET['tracking_direction']) ? $_GET['tracking_direction'] : DESC;
if (count($students) > 0) {
$table = new SortableTable('tracking_student', 'count_student_coached', null, ($is_western_name_order xor $sort_by_first_name) ? 1 : 0);
if ($is_western_name_order) {
@ -217,19 +216,19 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
}
}
$all_datas = array();
$all_datas = array();
foreach ($students as $student_id) {
$student_data = UserManager :: get_user_info_by_id($student_id);
if (isset($_GET['id_session'])) {
$courses = Tracking :: get_course_list_in_session_from_student($student_id, $_GET['id_session']);
}
$courses = Tracking :: get_course_list_in_session_from_student($student_id, $_GET['id_session']);
}
$avg_time_spent = $avg_student_score = $avg_student_progress = $total_assignments = $total_messages = 0;
$nb_courses_student = 0;
foreach ($courses as $course_code) {
if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) {
$avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $course_code, $_GET['id_session']);
$avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $course_code, $_GET['id_session']);
$my_average = Tracking :: get_avg_student_score($student_id, $course_code);
if (is_numeric($my_average)) {
$avg_student_score += $my_average;
@ -259,7 +258,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
$row[] = $student_data['lastname'];
$row[] = $student_data['firstname'];
}
/*
$row[] = api_time_to_hms($avg_time_spent);
$row[] = is_null($avg_student_progress) ? null : round($avg_student_progress, 2).'%';
@ -273,7 +272,7 @@ if (api_is_allowed_to_create_course() || api_is_drh()) {
$row[] = $first_date;
$row[] = $string_date;
if ($export_csv) {
if ($export_csv) {
$row[count($row) - 1] = strip_tags($row[count($row) - 1]);
$row[count($row) - 2] = strip_tags($row[count($row) - 2]);
$csv_content[] = $row;

@ -17,8 +17,6 @@ require_once 'myspace.lib.php';
$this_section = SECTION_PLATFORM_ADMIN; // TODO: Platform admin section?
require_once api_get_path(LIBRARY_PATH).'import.lib.php';
$tool_name = get_lang('ImportUserListXMLCSV');
api_block_anonymous_users();

@ -47,7 +47,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';

@ -47,7 +47,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';

@ -41,7 +41,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';

@ -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,16 +108,16 @@ 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';
@ -127,18 +127,18 @@ $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();
$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 +147,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 +164,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 +173,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 +194,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) {
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
function export_complete_report_csv($filename, $array) {
$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;*/
}

@ -1,6 +1,4 @@
<?php
//include_once(api_get_path(LIBRARY_PATH)."/pclzip/pclzip.lib.php");
require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
class TestDropboxFunctions extends UnitTestCase {
/**

@ -1,6 +1,4 @@
<?php
require_once(api_get_path(LIBRARY_PATH).'export.lib.inc.php');
require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
/** Test about export csv using class document manager
* @author Arthur portugal

@ -1,6 +1,4 @@
<?php
require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
class TestSortableTable extends UnitTestCase {

Loading…
Cancel
Save