Minor: Code conventions + format code - refs BT#20297

pull/4439/head
Angel Fernando Quiroz Campos 3 years ago
parent 1cf3110de5
commit 65204017bf
  1. 634
      main/inc/lib/TrackingCourseLog.php
  2. 2
      main/session/session_list.php
  3. 1
      main/template/default/tracking/tracking_course_log.tpl
  4. 8
      main/tracking/courseLog.php
  5. 6
      main/tracking/course_log_resources.php
  6. 2
      main/tracking/total_time.php

File diff suppressed because it is too large Load Diff

@ -196,7 +196,7 @@ switch ($action) {
$course_code = $courseCode; $course_code = $courseCode;
$export_csv = true; $export_csv = true;
$csvContentInSession = TrackingCourseLog::get_user_data( $csvContentInSession = TrackingCourseLog::getUserData(
null, null,
$nbStudents, $nbStudents,
null, null,

@ -223,4 +223,3 @@ window.onload = function() {
</div> </div>
</div> </div>
</div> </div>

@ -574,7 +574,7 @@ if ($nbStudents > 0 || isset($parameters['user_active'])) {
if ($hideReports === false) { if ($hideReports === false) {
$conditions['include_invited_users'] = false; $conditions['include_invited_users'] = false;
$usersTracking = TrackingCourseLog::get_user_data( $usersTracking = TrackingCourseLog::getUserData(
0, 0,
$nbStudents, $nbStudents,
$trackingColumn, $trackingColumn,
@ -694,7 +694,7 @@ if ($nbStudents > 0 || isset($parameters['user_active'])) {
Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), ''). Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '').
get_lang('ExportAsCSV') get_lang('ExportAsCSV')
.' </a>'); .' </a>');
$extraFieldSelect = TrackingCourseLog::display_additional_profile_fields($defaultExtraFields); $extraFieldSelect = TrackingCourseLog::displayAdditionalProfileFields($defaultExtraFields);
if (!empty($extraFieldSelect)) { if (!empty($extraFieldSelect)) {
$html .= $extraFieldSelect; $html .= $extraFieldSelect;
} }
@ -718,8 +718,8 @@ if ($nbStudents > 0 || isset($parameters['user_active'])) {
$conditions['include_invited_users'] = true; $conditions['include_invited_users'] = true;
$table = new SortableTable( $table = new SortableTable(
'users_tracking', 'users_tracking',
['TrackingCourseLog', 'get_number_of_users'], ['TrackingCourseLog', 'getNumberOfUsers'],
['TrackingCourseLog', 'get_user_data'], ['TrackingCourseLog', 'getUserData'],
1, 1,
20 20
); );

@ -25,7 +25,7 @@ if (!$is_allowedToTrack) {
} }
if ($export_csv || $exportXls) { if ($export_csv || $exportXls) {
$csvData = TrackingCourseLog::get_item_resources_data(0, 0, '', ''); $csvData = TrackingCourseLog::getItemResourcesData(0, 0, '', '');
array_walk( array_walk(
$csvData, $csvData,
function (&$item) { function (&$item) {
@ -137,8 +137,8 @@ echo '</div>';
$table = new SortableTable( $table = new SortableTable(
'resources', 'resources',
['TrackingCourseLog', 'count_item_resources'], ['TrackingCourseLog', 'countItemResources'],
['TrackingCourseLog', 'get_item_resources_data'], ['TrackingCourseLog', 'getItemResourcesData'],
6, 6,
20, 20,
'DESC' 'DESC'

@ -258,7 +258,7 @@ if (count($a_students) > 0) {
$table = new SortableTable( $table = new SortableTable(
'users_tracking', 'users_tracking',
['TrackingCourseLog', 'get_number_of_users'], ['TrackingCourseLog', 'getNumberOfUsers'],
['TrackingCourseLog', 'getTotalTimeReport'], ['TrackingCourseLog', 'getTotalTimeReport'],
(api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2 (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2
); );

Loading…
Cancel
Save