Browse Source

Minor - formatting code.

Julio Montoya 11 years ago
parent
commit
690f153ce5
2 changed files with 29 additions and 12 deletions
  1. 14 5
      main/inc/lib/tracking.lib.php
  2. 15 7
      main/tracking/courseLog.php

+ 14 - 5
main/inc/lib/tracking.lib.php

@@ -3106,12 +3106,16 @@ class Tracking {
         return $html;
     }
 }
+
 /**
+ * @todo move into a proper file
  * @package chamilo.tracking
  */
-class TrackingCourseLog {
+class TrackingCourseLog
+{
 
-    function count_item_resources() {
+    function count_item_resources()
+    {
     	global $session_id;
         $course_id = api_get_course_int_id();
 
@@ -3132,7 +3136,8 @@ class TrackingCourseLog {
     	return $obj->total_number_of_items;
     }
 
-    function get_item_resources_data($from, $number_of_items, $column, $direction) {
+    function get_item_resources_data($from, $number_of_items, $column, $direction)
+    {
     	global $dateTimeFormatLong, $session_id;
         $course_id = api_get_course_int_id();
 
@@ -3541,9 +3546,14 @@ class TrackingCourseLog {
 
     /**
      * Get data for users list in sortable with pagination
+     * @param $from
+     * @param $number_of_items
+     * @param $column
+     * @param $direction
      * @return array
      */
-    static function get_user_data($from, $number_of_items, $column, $direction) {
+    static function get_user_data($from, $number_of_items, $column, $direction)
+    {
     	global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id, $_configuration;
 
     	$course_code        = Database::escape_string($course_code);
@@ -3650,7 +3660,6 @@ class TrackingCourseLog {
             $total_user_exercise = Tracking::get_exercise_student_average_best_attempt($total_exercises, $user['user_id'], $course_code, $session_id);
             $user['exercise_average_best_attempt']  = $total_user_exercise;
 
-
     		if (is_numeric($avg_student_score)) {
     			$user['student_score']  = $avg_student_score.'%';
     		} else {

+ 15 - 7
main/tracking/courseLog.php

@@ -250,10 +250,14 @@ if (count($a_students) > 0) {
     $course_name = get_lang('Course').' '.$course_info['name'];
 
     if ($session_id) {
-        echo Display::page_subheader(Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id).' '.
-             Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name);
+        echo Display::page_subheader(
+            Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id).' '.
+            Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name
+        );
     } else {
-        echo Display::page_subheader(Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name']);
+        echo Display::page_subheader(
+            Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name']
+        );
     }
 
     $extra_field_select = TrackingCourseLog::display_additional_profile_fields();
@@ -263,7 +267,7 @@ if (count($a_students) > 0) {
     }
     $form->display();
 
-    //PERSON_NAME_DATA_EXPORT is buggy
+    // PERSON_NAME_DATA_EXPORT is buggy
     $is_western_name_order = api_is_western_name_order();
 
     if ($export_csv) {
@@ -277,7 +281,11 @@ if (count($a_students) > 0) {
 
     $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);
+    $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']);
     $parameters['id_session'] 	= $session_id;
@@ -324,7 +332,7 @@ if (count($a_students) > 0) {
         $tab_table_header[] = get_lang('FirstLogin');
         $table->set_header(13, get_lang('LatestLogin'), false);
         $tab_table_header[] = get_lang('LatestLogin');
-        if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
+        if (isset($_GET['additional_profile_field']) and is_numeric($_GET['additional_profile_field'])) {
             $table->set_header(14, $extra_info['field_display_text'], false);
             $tab_table_header[] = $extra_info['field_display_text'];
             $table->set_header(15, get_lang('Details'), false);
@@ -340,7 +348,7 @@ if (count($a_students) > 0) {
         $table->set_header(12, get_lang('LatestLogin'), false);
         $tab_table_header[] = get_lang('LatestLogin');
 
-        if (isset($_GET['additional_profile_field']) AND is_numeric($_GET['additional_profile_field'])) {
+        if (isset($_GET['additional_profile_field']) and is_numeric($_GET['additional_profile_field'])) {
             $table->set_header(13, $extra_info['field_display_text'], false);
             $tab_table_header[] = $extra_info['field_display_text'];
             $table->set_header(14, get_lang('Details'), false);