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

Merge

Browse Source
skala
Julio Montoya 16 years ago
parent b52436f922 e2d0321d78
commit 8b66419327
10 changed files with 24 additions and 193 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. 2
      main/exercice/exercise_result.class.php
  2. 8
      main/mySpace/myStudents.php
  3. 18
      main/tracking/courseLog.php
  4. 28
      main/tracking/courseLogCSV.php
  5. 29
      main/tracking/course_access_details.php
  6. 26
      main/tracking/logins_details.php
  7. 27
      main/tracking/personnalLog.php
  8. 24
      main/tracking/toolaccess_details.php
  9. 30
      main/tracking/userLog.php
  10. 25
      main/tracking/userlogCSV.php

2
main/exercice/exercise_result.class.php
Unescape View File

@ -116,7 +116,7 @@ class ExerciseResult
AND cuser.course_code=te.exe_cours_id ORDER BY te.exe_cours_id ASC, ce.title ASC, te.exe_date ASC";
$hpsql="SELECT ".(api_is_western_name_order() ? "CONCAT(tu.firstname,' ',tu.lastname)" : "CONCAT(tu.lastname,' ',tu.firstname)").", tth.exe_name,
tth.exe_result , tth.exe_weighting, UNIX_TIMESTAMP(tth.exe_date), tu.email, tu.user_id
tth.exe_result , tth.exe_weighting, tth.exe_date, tu.email, tu.user_id
FROM $TBL_TRACK_HOTPOTATOES tth, $TBL_USER tu
WHERE tu.user_id=tth.exe_user_id AND tth.exe_cours_id = '" . Database :: escape_string($cid) . " $user_id_and '
ORDER BY tth.exe_cours_id ASC, tth.exe_date ASC";

8
main/mySpace/myStudents.php
Unescape View File

@ -598,14 +598,14 @@ if ($timezone !== null) {
else $css_class = "row_even";
$i++;
// csv export content
$csv_content[] = array (
api_html_entity_decode(stripslashes($lp_name), ENT_QUOTES, $charset),
api_time_to_hms($total_time),
$score . '%',
$progress,
api_convert_and_format_date($start_time, "%Y-%m-%d")
date('Y-m-d h:i:s', $start_time)
);
?>
<tr class="<?php echo $css_class;?>">
@ -637,7 +637,9 @@ if ($timezone !== null) {
<td align="center">
<?php
if ($start_time != '' && $start_time > 0) {
echo api_convert_and_format_date($start_time, DATE_FORMAT_SHORT);
//Do not change with api_convert_and_format_date, because this value came from the lp_item_view table
//which implies several other changes not a priority right now
echo date('Y-m-d h:i:s', $start_time);
} else {
echo '-';
}

18
main/tracking/courseLog.php
Unescape View File

@ -1,17 +1,16 @@
<?php //$id: $
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /license.txt */
/**
==============================================================================
* @author Thomas Depraetere
* @author Hugues Peeters
* @author Christophe Gesche
* @author Sebastien Piraux
* @author Toon Keppens (Vi-Host.net)
*
* @package dokeos.tracking
==============================================================================
* @package chamilo.tracking
*/
/**
/*
* INIT SECTION
*/
$pathopen = isset($_REQUEST['pathopen']) ? $_REQUEST['pathopen'] : null;
@ -467,14 +466,9 @@ if ($_GET['studentlist'] == 'false') {
$all_datas = array();
$course_code = $_course['id'];
$user_ids = array_keys($a_students);
$table = new SortableTable('users_tracking', array('TrackingCourseLog','get_number_of_users'), array('TrackingCourseLog','get_user_data'), (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2);
$parameters['cidReq'] = Security::remove_XSS($_GET['cidReq']);

28
main/tracking/courseLogCSV.php
Unescape View File

@ -1,37 +1,13 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2006 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Author: Frederic Vauthier (frederic.vauthier@dokeos.com)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
/**
==============================================================================
* @author Thomas Depraetere
* @author Hugues Peeters
* @author Christophe Gesche
* @author Sebastien Piraux
* @author Toon Keppens (Vi-Host.net)
*
* @package dokeos.tracking
==============================================================================
* @package chamilo.tracking
*/
// TODO: Is this file deprecated?

29
main/tracking/course_access_details.php
Unescape View File

@ -1,43 +1,18 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
/**
==============================================================================
* @author Thomas Depraetere
* @author Hugues Peeters
* @author Christophe Gesche
* @author Sebastien Piraux
*
* @package dokeos.tracking
==============================================================================
* @package chamilo.tracking
*/
// TODO: Is this file deprecated?
/*
==============================================================================
INIT SECTION
==============================================================================
*/
$reqdate = $_REQUEST['reqdate'];
$period = $_REQUEST['period'];

26
main/tracking/logins_details.php
Unescape View File

@ -1,35 +1,13 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
/**
==============================================================================
* @author Thomas Depraetere
* @author Hugues Peeters
* @author Christophe Gesche
* @author Sebastien Piraux
*
* @package dokeos.tracking
==============================================================================
*/
// TODO: Is this file deprecated?

27
main/tracking/personnalLog.php
Unescape View File

@ -1,35 +1,12 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
/**
==============================================================================
* @author Thomas Depraetere
* @author Hugues Peeters
* @author Christophe Gesche
* @author Sebastien Piraux
*
* @package dokeos.tracking
==============================================================================
* @package chamilo.tracking
*/
// TODO: Is this file deprecated?

24
main/tracking/toolaccess_details.php
Unescape View File

@ -1,27 +1,5 @@
<?php // $Id: toolaccess_details.php 20472 2009-05-11 10:02:06Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
// TODO: Is this file deprecated?
/**

30
main/tracking/userLog.php
Unescape View File

@ -1,41 +1,15 @@
<?php // $Id: userLog.php 21626 2009-06-26 12:19:41Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2009 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
Copyright (c) Sebastien Piraux <piraux_seb@hotmail.com>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
// TODO: Is this file deprecated?
/**
==============================================================================
* @package dokeos.tracking
* @package chamilo.tracking
* @todo clean code - structure is unclear and difficult to modify
==============================================================================
*/
/*
==============================================================================
INIT SECTION
==============================================================================
*/
$uInfo = $_REQUEST['uInfo'];
$view = $_REQUEST['view'];

25
main/tracking/userlogCSV.php
Unescape View File

@ -1,28 +1,5 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2006 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
Copyright (c) Sebastien Piraux <piraux_seb@hotmail.com>
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
==============================================================================
*/
/* For licensing terms, see /license.txt */
// TODO: Is this file deprecated?
/**

Write Preview
Loading…
Cancel
Save