Compare commits

..

No commits in common. '01125b8c52a692c1a7f72119efb6907510b6c28f' and '1cf3d21d57a1a0c34e33bb5f55db175f84227619' have entirely different histories.

  1. 17
      main/inc/lib/statistics.lib.php

@ -1935,18 +1935,10 @@ class Statistics
get_lang('Progress'),
];
$extraField = new ExtraField('user');
$extraFields = $extraField->get_all(['filter = ?' => 1], 'option_order');
foreach ($extraFields as $field) {
$headers[] = $field['variable'];
}
$exportData = [$headers];
foreach ($sessions as $session) {
$sessionId = (int) $session['id'];
$students = SessionManager::get_users_by_session($sessionId);
$extraValueObj = new ExtraFieldValue('user');
foreach ($students as $student) {
$studentId = $student['user_id'];
@ -1959,7 +1951,7 @@ class Statistics
$averageScore = round(Tracking::getAverageStudentScore($studentId, $courseCode, [], $sessionId));
$averageProgress = round(Tracking::get_avg_student_progress($studentId, $courseCode, [], $sessionId));
$userData = [
$exportData[] = [
$courseInfo['name'],
$session['name'],
$studentInfo['lastname'],
@ -1970,13 +1962,6 @@ class Statistics
$averageScore,
$averageProgress,
];
foreach ($extraFields as $field) {
$extraValue = $extraValueObj->get_values_by_handler_and_field_id($studentId, $field['id'], true);
$userData[] = $extraValue['value'] ?? '';
}
$exportData[] = $userData;
}
}

Loading…
Cancel
Save