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

Reporting: Update lang, fix php errors

Browse Source
pull/3984/head
Julio 4 years ago
parent 4ad96e3436
commit f2cddb56fd
4 changed files with 51 additions and 51 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. 6
      public/main/inc/lib/tracking.lib.php
  2. 4
      public/main/mySpace/myStudents.php
  3. 16
      public/main/mySpace/session.php
  4. 76
      public/main/tracking/courseLog.php

6
public/main/inc/lib/tracking.lib.php
Unescape View File

@ -367,7 +367,7 @@ class Tracking
$time_for_total = 0;
$attemptResult = 0;
if ($allowNewTracking && $timeCourse) {
if ($timeCourse) {
if (isset($timeCourse['learnpath_detailed']) &&
isset($timeCourse['learnpath_detailed'][$lp_id]) &&
isset($timeCourse['learnpath_detailed'][$lp_id][$my_item_id])
@ -459,7 +459,7 @@ class Tracking
$extend_attempt_link = '';
$extend_this_attempt = 0;
if ($allowNewTracking && $timeCourse) {
if ($timeCourse) {
//$attemptResult = 0;
if (isset($timeCourse['learnpath_detailed']) &&
isset($timeCourse['learnpath_detailed'][$lp_id]) &&
@ -524,7 +524,7 @@ class Tracking
}
$time_for_total = $lpTime;
if ($allowNewTracking) {
if ($timeCourse) {
$time_for_total = (int) $attemptResult;
$attemptTime = (int) $attemptResult;
}

4
public/main/mySpace/myStudents.php
Unescape View File

@ -1543,10 +1543,10 @@ if (empty($details)) {
),
'progress' => get_lang('Progress').
Display::return_icon('info3.gif', get_lang('LPProgressScore'), ['align' => 'absmiddle', 'hspace' => '3px']),
'last_connection' => get_lang('LastConnexion').
'last_connection' => get_lang('Latest login').
Display::return_icon(
'info3.gif',
get_lang('LastTimeTheCourseWasUsed'),
get_lang('Last time learner entered the course'),
['align' => 'absmiddle', 'hspace' => '3px']
),
];

16
public/main/mySpace/session.php
Unescape View File

@ -92,11 +92,11 @@ switch ($action) {
$column = 0;
$row = 0;
$headers = [
get_lang('TimeSpent'),
get_lang('NumberOfVisits'),
get_lang('GlobalProgress'),
get_lang('FirstLogin'),
get_lang('LastConnexionDate'),
get_lang('Time spent'),
get_lang('Number of visits'),
get_lang('Global progress'),
get_lang('First connection'),
get_lang('Last connexion date'),
];
foreach ($headers as $header) {
$table->setHeaderContents($row, $column, $header);
@ -109,7 +109,7 @@ switch ($action) {
$table->setCellContents(1, 4, $last);
$timeSpentContent = $table->toHtml();
} else {
$pdfTitle = get_lang('CertificateOfAchievement');
$pdfTitle = get_lang('Certificate of achievement');
}
$courseTable = '';
@ -117,8 +117,8 @@ switch ($action) {
$courseTable .= '<table class="table table-hover table-striped data_table">';
$courseTable .= '<thead>';
$courseTable .= '<tr>
<th>'.get_lang('FormationUnit').'</th>
<th>'.get_lang('ConnectionTime').'</th>
<th>'.get_lang('Formation unit').'</th>
<th>'.get_lang('Connection time').'</th>
<th>'.get_lang('Progress').'</th>';
if ('attendance' === $type) {

76
public/main/tracking/courseLog.php
Unescape View File

@ -536,7 +536,7 @@ if ($nbStudents > 0) {
$html .= Display::page_subheader2(get_lang('Learners list'));
$bestScoreLabel = get_lang('Score').' - '.get_lang('BestAttempt');
$bestScoreLabel = get_lang('Score').' - '.get_lang('Only best attempts');
if ($nbStudents > 0) {
$mainForm = new FormValidator(
'filter',
@ -545,7 +545,7 @@ if ($nbStudents > 0) {
);
$mainForm->addButtonAdvancedSettings(
'advanced_search',
[get_lang('AdvancedSearch')]
[get_lang('Advanced search')]
);
$mainForm->addHtml('<div id="advanced_search_options" style="display:none;">');
$mainForm->addHtml($formClass->returnForm());
@ -630,62 +630,62 @@ if ($nbStudents > 0) {
$headerCounter = 0;
$headers = [];
// tab of header texts
$table->set_header($headerCounter++, get_lang('OfficialCode'), true);
$headers['official_code'] = get_lang('OfficialCode');
$table->set_header($headerCounter++, get_lang('Code'), true);
$headers['official_code'] = get_lang('Code');
if ($sortByFirstName) {
$table->set_header($headerCounter++, get_lang('FirstName'), true);
$table->set_header($headerCounter++, get_lang('LastName'), true);
$headers['firstname'] = get_lang('FirstName');
$headers['lastname'] = get_lang('LastName');
$table->set_header($headerCounter++, get_lang('First name'), true);
$table->set_header($headerCounter++, get_lang('Last name'), true);
$headers['firstname'] = get_lang('First name');
$headers['lastname'] = get_lang('Last name');
} else {
$table->set_header($headerCounter++, get_lang('LastName'), true);
$table->set_header($headerCounter++, get_lang('FirstName'), true);
$headers['lastname'] = get_lang('LastName');
$headers['firstname'] = get_lang('FirstName');
$table->set_header($headerCounter++, get_lang('Last name'), true);
$table->set_header($headerCounter++, get_lang('First name'), true);
$headers['lastname'] = get_lang('Last name');
$headers['firstname'] = get_lang('First name');
}
$table->set_header($headerCounter++, get_lang('Login'), false);
$headers['login'] = get_lang('Login');
$table->set_header(
$headerCounter++,
get_lang('TrainingTime').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('CourseTimeInfo'), [], ICON_SIZE_TINY),
get_lang('Time').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('Time spent in the course'), [], ICON_SIZE_TINY),
false
);
$headers['training_time'] = get_lang('TrainingTime');
$headers['training_time'] = get_lang('Time');
$table->set_header(
$headerCounter++,
get_lang('CourseProgress').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('ScormAndLPProgressTotalAverage'), [], ICON_SIZE_TINY),
get_lang('Progress').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('Average progress in courses'), [], ICON_SIZE_TINY),
false
);
$headers['course_progress'] = get_lang('CourseProgress');
$headers['course_progress'] = get_lang('Course progress');
$table->set_header(
$headerCounter++,
get_lang('ExerciseProgress').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('ExerciseProgressInfo'), [], ICON_SIZE_TINY),
get_lang('Exercise progress').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('Progress of exercises taken by the student'), [], ICON_SIZE_TINY),
false
);
$headers['exercise_progress'] = get_lang('ExerciseProgress');
$headers['exercise_progress'] = get_lang('Exercise progress');
$table->set_header(
$headerCounter++,
get_lang('ExerciseAverage').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('ExerciseAverageInfo'), [], ICON_SIZE_TINY),
get_lang('Exercise average').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('Average of best grades of each exercise attempt'), [], ICON_SIZE_TINY),
false
);
$headers['exercise_average'] = get_lang('ExerciseAverage');
$headers['exercise_average'] = get_lang('Exercise average');
$table->set_header(
$headerCounter++,
get_lang('Score').'&nbsp;'.
Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), [], ICON_SIZE_TINY),
Display::return_icon('info3.gif', get_lang('Average of tests in Learning Paths'), [], ICON_SIZE_TINY),
false
);
$headers['score'] = get_lang('Score');
$table->set_header(
$headerCounter++,
$bestScoreLabel.'&nbsp;'.
Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), [], ICON_SIZE_TINY),
Display::return_icon('info3.gif', get_lang('Average of tests in Learning Paths'), [], ICON_SIZE_TINY),
false
);
$headers['score_best'] = $bestScoreLabel;
@ -711,8 +711,8 @@ if ($nbStudents > 0) {
}
}
$table->set_header($headerCounter++, get_lang('Student_publication'), false);
$headers['student_publication'] = get_lang('Student_publication');
$table->set_header($headerCounter++, get_lang('Assignments'), false);
$headers['student_publication'] = get_lang('Assignment');
$table->set_header($headerCounter++, get_lang('Messages'), false);
$headers['messages'] = get_lang('Messages');
$table->set_header($headerCounter++, get_lang('Classes'));
@ -722,13 +722,13 @@ if ($nbStudents > 0) {
$table->set_header($headerCounter++, get_lang('Survey'), false);
$headers['survey'] = get_lang('Survey');
} else {
$table->set_header($headerCounter++, get_lang('RegisteredDate'), false);
$headers['registered_at'] = get_lang('RegisteredDate');
$table->set_header($headerCounter++, get_lang('Registered date'), false);
$headers['registered_at'] = get_lang('Registered date');
}
$table->set_header($headerCounter++, get_lang('FirstLoginInCourse'), false);
$headers['first_login'] = get_lang('FirstLoginInCourse');
$table->set_header($headerCounter++, get_lang('LatestLoginInCourse'), false);
$headers['latest_login'] = get_lang('LatestLoginInCourse');
$table->set_header($headerCounter++, get_lang('First access to course'), false);
$headers['first_login'] = get_lang('First access to course');
$table->set_header($headerCounter++, get_lang('Latest access in course'), false);
$headers['latest_login'] = get_lang('Latest access in course');
$counter = $headerCounter;
if ('true' === api_get_setting('show_email_addresses')) {
$table->set_header($counter, get_lang('Email'), false);
@ -789,10 +789,10 @@ echo Display::panel($html, $titleSession);
$groupTable = new HTML_Table(['class' => 'table table-hover table-striped table-bordered data_table']);
$column = 0;
$groupTable->setHeaderContents(0, $column++, get_lang('Name'));
$groupTable->setHeaderContents(0, $column++, get_lang('TrainingTime'));
$groupTable->setHeaderContents(0, $column++, get_lang('AverageTrainingTime'));
$groupTable->setHeaderContents(0, $column++, get_lang('CourseProgress'));
$groupTable->setHeaderContents(0, $column++, get_lang('ExerciseAverage'));
$groupTable->setHeaderContents(0, $column++, get_lang('Time'));
$groupTable->setHeaderContents(0, $column++, get_lang('Average time in the course'));
$groupTable->setHeaderContents(0, $column++, get_lang('Course progress'));
$groupTable->setHeaderContents(0, $column++, get_lang('Exercise average'));
/*$exerciseList = ExerciseLib::get_all_exercises(
$courseInfo,

Write Preview
Loading…
Cancel
Save