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

Merge pull request #4488 from AngelFQC/BT20364

Browse Source 
Session: Allow to don't include session users when exporting session
pull/4495/head
Nicolas Ducoulombier 3 years ago committed by GitHub
parent 2b490f2951 c6afcc4e20
commit e8c2ca00bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 127 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. 19
      main/inc/lib/course.lib.php
  2. 159
      main/session/session_export.php

19
main/inc/lib/course.lib.php
Unescape View File

@ -3384,6 +3384,25 @@ class CourseManager
return null;
}
public static function getExtraData(int $courseId, array $avoid = [])
{
$fields = (new ExtraField('course'))->getDataAndFormattedValues($courseId);
if ($avoid) {
$fields = array_filter(
$fields,
function (array $field) use ($avoid): bool {
return !in_array($field['variable'], $avoid);
}
);
}
$keys = array_column($fields, 'text');
$values = array_column($fields, 'value');
return array_combine($keys, $values);
}
/**
* Gets extra field value data and formatted values of a course
* for extra fields listed in configuration.php in my_course_course_extrafields_to_be_presented

159
main/session/session_export.php
Unescape View File

@ -33,8 +33,11 @@ $interbreadcrumb[] = ['url' => 'session_list.php', 'name' => get_lang('SessionLi
set_time_limit(0);
if (isset($_POST['formSent'])) {
$formSent = $_POST['formSent'];
$file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv';
$file_type = $_POST['file_type'] ?? 'csv';
$session_id = $_POST['session_id'];
$includeUsers = !isset($_POST['no_include_users']);
$includeCourseExtraFields = isset($_POST['include_course_fields']);
if (empty($session_id)) {
$sql = "SELECT
s.id,
@ -63,23 +66,22 @@ if (isset($_POST['formSent'])) {
ORDER BY id";
}
}
$result = Database::query($sql);
} else {
$sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
FROM $tbl_session s
INNER JOIN $tbl_user
ON $tbl_user.user_id = s.id_coach
WHERE s.id='$session_id'";
$result = Database::query($sql);
}
$result = Database::query($sql);
if (Database::num_rows($result)) {
$sessionListToExport = [];
if (in_array($file_type, ['csv', 'xls'])) {
$archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time();
$cvs = true;
$sessionListToExport[] = [
$exportHeaders = [
'SessionId',
'SessionName',
'Coach',
@ -87,9 +89,15 @@ if (isset($_POST['formSent'])) {
'DateEnd',
'Visibility',
'SessionCategory',
'Users',
'Courses',
];
if ($includeUsers) {
$exportHeaders[] = 'Users';
}
$exportHeaders[] = 'Courses';
$sessionListToExport[] = $exportHeaders;
} else {
if (!file_exists($archivePath)) {
mkdir($archivePath, api_get_permissions_for_new_directories(), true);
@ -119,7 +127,10 @@ if (isset($_POST['formSent'])) {
$row['visibility'] = str_replace(';', ',', $row['visibility']);
$row['session_category'] = str_replace(';', ',', $row['session_category_id']);
// users
$sql = "SELECT DISTINCT $tbl_user.username
$users = '';
if ($includeUsers) {
$sql = "SELECT DISTINCT $tbl_user.username
FROM $tbl_user
INNER JOIN $tbl_session_user
ON
@ -127,22 +138,23 @@ if (isset($_POST['formSent'])) {
$tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
$tbl_session_user.session_id = '".$row['id']."'";
$rsUsers = Database::query($sql);
$users = '';
while ($rowUsers = Database::fetch_array($rsUsers)) {
if ($cvs) {
$users .= str_replace(';', ',', $rowUsers['username']).'|';
} else {
$users .= "\t\t<User>$rowUsers[username]</User>\n";
$rsUsers = Database::query($sql);
while ($rowUsers = Database::fetch_array($rsUsers)) {
if ($cvs) {
$users .= str_replace(';', ',', $rowUsers['username']).'|';
} else {
$users .= "\t\t<User>$rowUsers[username]</User>\n";
}
}
}
if (!empty($users) && $cvs) {
$users = api_substr($users, 0, api_strlen($users) - 1);
if (!empty($users) && $cvs) {
$users = api_substr($users, 0, api_strlen($users) - 1);
}
}
// Courses
$sql = "SELECT DISTINCT c.code, sc.id, c_id
$sql = "SELECT DISTINCT c.code, sc.c_id
FROM $tbl_course c
INNER JOIN $tbl_session_course_user sc
ON c.id = sc.c_id AND sc.session_id = '".$row['id']."'";
@ -171,15 +183,22 @@ if (isset($_POST['formSent'])) {
if ($cvs) {
$courses .= str_replace(';', ',', $rowCourses['code']);
$courses .= '['.str_replace(';', ',', $coachs).'][';
$courses .= '['.str_replace(';', ',', $coachs).']';
if ($includeUsers) {
$courses .= '[';
}
} else {
$courses .= "\t\t<Course>\n";
$courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n";
$courses .= "\t\t\t<Coach>$coachs</Coach>\n";
}
// rel user courses
$sql = "SELECT DISTINCT u.username
$userscourse = '';
if ($includeUsers) {
// rel user courses
$sql = "SELECT DISTINCT u.username
FROM $tbl_session_course_user scu
INNER JOIN $tbl_session_user su
ON
@ -192,26 +211,49 @@ if (isset($_POST['formSent'])) {
scu.c_id='".$rowCourses['c_id']."' AND
scu.session_id='".$row['id']."'";
$rsUsersCourse = Database::query($sql);
$userscourse = '';
while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)) {
$rsUsersCourse = Database::query($sql);
while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)) {
if ($cvs) {
$userscourse .= str_replace(';', ',', $rowUsersCourse['username']).',';
} else {
$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
}
}
if ($cvs) {
$userscourse .= str_replace(';', ',', $rowUsersCourse['username']).',';
} else {
$courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n";
if (!empty($userscourse)) {
$userscourse = api_substr(
$userscourse,
0,
api_strlen($userscourse) - 1
);
}
$courses .= $userscourse.']';
}
}
if ($cvs) {
if (!empty($userscourse)) {
$userscourse = api_substr(
$userscourse,
0,
api_strlen($userscourse) - 1
);
}
if ($includeCourseExtraFields) {
$extraData = CourseManager::getExtraData($rowCourses['c_id'], ['special_course']);
$extraData = array_map(
function ($variable, $value) use ($cvs) {
$value = str_replace(';', ',', $value);
return $cvs
? '{'.$variable.'='.$value.'}'
: "<Variable>$variable</Variable><Value>$value</Value>";
},
array_keys($extraData),
array_values($extraData)
);
$courses .= $cvs
? '['.implode('', $extraData).']'
: "\t\t\t<ExtraField>".implode("\n", $extraData)."</ExtraField>\n";
}
$courses .= $userscourse.']|';
if ($cvs) {
$courses .= '|';
} else {
$courses .= "\t\t</Course>\n";
}
@ -220,10 +262,9 @@ if (isset($_POST['formSent'])) {
if (!empty($courses) && $cvs) {
$courses = api_substr($courses, 0, api_strlen($courses) - 1);
}
$add = $courses;
if (in_array($file_type, ['csv', 'xls'])) {
$sessionListToExport[] = [
$exportContent = [
$row['id'],
$row['name'],
$row['username'],
@ -231,22 +272,30 @@ if (isset($_POST['formSent'])) {
$row['access_end_date'],
$row['visibility'],
$row['session_category'],
$users,
$courses,
];
if ($includeUsers) {
$exportContent[] = $users;
}
$exportContent[] = $courses;
$sessionListToExport[] = $exportContent;
} else {
$add = "\t<Session>\n"
."\t\t<SessionId>$row[id]</SessionId>\n"
."\t\t<SessionName>$row[name]</SessionName>\n"
."\t\t<Coach>$row[username]</Coach>\n"
."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
."\t\t<Visibility>$row[visibility]</Visibility>\n"
."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
}
."\t\t<SessionId>$row[id]</SessionId>\n"
."\t\t<SessionName>$row[name]</SessionName>\n"
."\t\t<Coach>$row[username]</Coach>\n"
."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
."\t\t<Visibility>$row[visibility]</Visibility>\n"
."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
if ($includeUsers) {
$add .= $courses;
}
if (!$cvs) {
$add .= "\t</Session>\n";
fputs($fp, $add);
}
}
@ -264,7 +313,6 @@ if (isset($_POST['formSent'])) {
case 'xls':
Export::arrayToXls($sessionListToExport, $archiveFile);
exit;
break;
}
}
}
@ -310,6 +358,15 @@ foreach ($Sessions as $enreg) {
}
$form->addElement('select', 'session_id', get_lang('WhichSessionToExport'), $options);
$form->addCheckBox(
'no_include_users',
[
get_lang('Users'),
get_lang('ReportDoesNotIncludeListOfUsersNeitherForSessionNorForEachCourse'),
],
get_lang('DoNotIncludeUsers')
);
$form->addCheckBox('include_course_fields', get_lang('Courses'), get_lang('IncludeExtraFields'));
$form->addButtonExport(get_lang('ExportSession'));
$defaults = [];

Write Preview
Loading…
Cancel
Save