Skip to content

Session: Use config-defined headers and order for Excel export - refs BT#22533 #6280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

Session: Use config-defined headers and order for Excel export - refs BT#22533 #6280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions main/inc/lib/sessionmanager.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10159,6 +10159,10 @@ public static function exportCourseSessionReport(int $sessionId, string $courseC
}

$config = api_get_configuration_value('session_course_excel_export');
if (empty($config)) {
die('Configuration not set.');
}

$sessionFields = $config['session_fields'] ?? [];
$userFieldsBefore = $config['user_fields_before'] ?? [];
$userFieldsAfter = $config['user_fields_after'] ?? [];
Expand All @@ -10168,14 +10172,8 @@ public static function exportCourseSessionReport(int $sessionId, string $courseC
$header1[] = get_lang('StartDate');
$header1[] = get_lang('EndDate');

$extraField = new ExtraFieldModel('session');
$extraDefs = $extraField->get_all();
$extraDefsByVariable = array_column($extraDefs, null, 'variable');

foreach ($sessionFields as $field) {
if (isset($extraDefsByVariable[$field])) {
$header1[] = $extraDefsByVariable[$field]['display_text'] ?? $field;
}
foreach ($sessionFields as $entry) {
$header1[] = $entry['header'] ?? '';
}

// 2. SESSION DATA
Expand All @@ -10187,24 +10185,27 @@ public static function exportCourseSessionReport(int $sessionId, string $courseC
$sessionExtra = $extraValuesObj->getAllValuesByItem($sessionId);
$sessionExtraMap = array_column($sessionExtra, 'value', 'variable');

foreach ($sessionFields as $field) {
$value = $sessionExtraMap[$field] ?? '';
foreach ($sessionFields as $entry) {
if (!empty($entry['field'])) {
$value = $sessionExtraMap[$entry['field']] ?? '';
} else {
$value = '';
}
$row2[] = $value;
}

// 3. USER HEADER
$header3 = [''];
$extraFieldUser = new ExtraFieldModel('user');
$extraDefsUser = $extraFieldUser->get_all();
$extraDefsByVariableUser = array_column($extraDefsUser, null, 'variable');
$header3 = [''];

foreach ($userFieldsBefore as $field) {
$header3[] = $extraDefsByVariableUser[$field]['display_text'] ?? $field;
foreach ($userFieldsBefore as $entry) {
$header3[] = $entry['header'] ?? '';
}

$header3[] = get_lang('FirstName');
$header3[] = get_lang('LastName');
foreach ($userFieldsAfter as $field) {
$header3[] = $extraDefsByVariableUser[$field]['display_text'] ?? $field;

foreach ($userFieldsAfter as $entry) {
$header3[] = $entry['header'] ?? '';
}

// 4. USERS WITH CERTIFICATE
Expand Down Expand Up @@ -10239,16 +10240,24 @@ public static function exportCourseSessionReport(int $sessionId, string $courseC
$userExtra = $userExtraObj->getAllValuesByItem($userId);
$userExtraMap = array_column($userExtra, 'value', 'variable');

foreach ($userFieldsBefore as $field) {
$value = $userExtraMap[$field] ?? '';
foreach ($userFieldsBefore as $entry) {
if (!empty($entry['field'])) {
$value = $userExtraMap[$entry['field']] ?? '';
} else {
$value = '';
}
$row[] = $value;
}

$row[] = $userInfo['firstname'];
$row[] = $userInfo['lastname'];

foreach ($userFieldsAfter as $field) {
$value = $userExtraMap[$field] ?? '';
foreach ($userFieldsAfter as $entry) {
if (!empty($entry['field'])) {
$value = $userExtraMap[$entry['field']] ?? '';
} else {
$value = '';
}
$row[] = $value;
}

Expand Down
11 changes: 7 additions & 4 deletions main/session/resume_session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,13 @@
$codePath."user/user_export.php?file_type=csv&course_session={$course->getCode()}:$sessionId&addcsvheader=1"
);

$courseItem .= Display::url(
Display::return_icon('excel.png', get_lang('ExportCertifiedUsersExcel')),
api_get_self()."?id_session=$sessionId&action=export_certified_course_users&course_code=".$course->getCode()
);
$config = api_get_configuration_value('session_course_excel_export');
if (!empty($config)) {
$courseItem .= Display::url(
Display::return_icon('excel.png', get_lang('ExportCertifiedUsersExcel')),
api_get_self()."?id_session=$sessionId&action=export_certified_course_users&course_code=".$course->getCode()
);
}

$courseItem .= Display::url(
Display::return_icon('statistics.gif', get_lang('Tracking')),
Expand Down
Loading