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

User list to PDF, now it shows the current teacher BT#2741

Browse Source
skala
Julio Montoya 13 years ago
parent 96f3aae2d1
commit e14297ff8a
2 changed files with 45 additions and 25 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. 5
      main/inc/lib/course.lib.php
  2. 65
      main/user/user.php

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

@ -1283,9 +1283,7 @@ class CourseManager {
} }
// We get the session coach. // We get the session coach.
$rs = Database::query('SELECT id_coach FROM '.Database::get_main_table(TABLE_MAIN_SESSION). $rs = Database::query('SELECT id_coach FROM '.Database::get_main_table(TABLE_MAIN_SESSION).' WHERE id="'.$session_id.'"');
' WHERE id="'.$session_id.'"');
$user_info = array();
$session_id_coach = Database::result($rs, 0, 'id_coach'); $session_id_coach = Database::result($rs, 0, 'id_coach');
$user_info = Database::get_user_info_from_id($session_id_coach); $user_info = Database::get_user_info_from_id($session_id_coach);
$user_info['status'] = $user['status']; $user_info['status'] = $user['status'];
@ -1293,7 +1291,6 @@ class CourseManager {
$user_info['tutor_id'] = $user['tutor_id']; $user_info['tutor_id'] = $user['tutor_id'];
$user_info['email'] = $user['email']; $user_info['email'] = $user['email'];
$users[$session_id_coach] = $user_info; $users[$session_id_coach] = $user_info;
return $users; return $users;
} }

65
main/user/user.php
Unescape View File

@ -130,7 +130,7 @@ if (api_is_allowed_to_edit(null, true)) {
// users subscribed to the course through a session // users subscribed to the course through a session
if (api_get_session_id()) { if (api_get_session_id()) {
$table_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); $table_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$sql_query = "SELECT DISTINCT user.user_id, ".($is_western_name_order ? "user.firstname, user.lastname" : "user.lastname, user.firstname").", $select_email_condition phone, user.official_code, active $legal $sql_query = "SELECT DISTINCT user.user_id, ".($is_western_name_order ? "user.firstname, user.lastname" : "user.lastname, user.firstname").", $select_email_condition phone, user.official_code, active $legal
FROM $table_session_course_user as session_course_user, $table_users as user "; FROM $table_session_course_user as session_course_user, $table_users as user ";
@ -242,27 +242,50 @@ if (api_is_allowed_to_edit(null, true)) {
Export::export_table_xls($a_users); Export::export_table_xls($a_users);
exit; exit;
case 'pdf' : case 'pdf' :
$header = get_lang('StudentList'); $header = get_lang('StudentList');
$description = '<table class="data_table_no_border">'; $description = '<table class="data_table_no_border">';
if (api_get_session_id()) { if (api_get_session_id()) {
$description .= '<tr><td>'.get_lang('Session').': </td><td class="highlight">'.api_get_session_name(api_get_session_id()).'</td>'; $description .= '<tr><td>'.get_lang('Session').': </td><td class="highlight">'.api_get_session_name(api_get_session_id()).'</td>';
} }
$description .= '<tr><td>'.get_lang('Course').': </td><td class="highlight">'.$course_info['name'].'</td>'; $description .= '<tr><td>'.get_lang('Course').': </td><td class="highlight">'.$course_info['name'].'</td>';
$teachers = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']);
$coaches = CourseManager::get_coach_list_from_course_code_to_string($course_info['code'], $session_id);
if (!empty($teachers)) { $teachers = CourseManager::get_teacher_list_from_course_code($course_info['code']);
$description .= '<tr><td>'.get_lang('Teachers').': </td><td class="highlight">'.$teachers.' </td>';
} //If I'm a teacher in this course show just my name
if (!empty($coaches)) { if (isset($teachers[$user_id])) {
$description .= '<tr><td>'.get_lang('Coachs').': </td><td class="highlight">'.$coaches.' </td>'; if (!empty($teachers)) {
} $teacher_info = $teachers[$user_id];
$description .= '<tr><td>'.get_lang('Date').': </td><td class="highlight">'.api_convert_and_format_date(time(), DATE_TIME_FORMAT_LONG).'</td>'; $description .= '<tr><td>'.get_lang('Teacher').': </td><td class="highlight">'.api_get_person_name($teacher_info['firstname'], $teacher_info['lastname']).'</td>';
$description .= '</table>'; }
$params = array(); } else {
Export::export_table_pdf($a_users, get_lang('UserList'), $header, $description, $params); //If not show all teachers
exit; $teachers = CourseManager::get_teacher_list_from_course_code_to_string($course_info['code']);
if (!empty($teachers)) {
$description .= '<tr><td>'.get_lang('Teachers').': </td><td class="highlight">'.$teachers.'</td>';
}
}
if (!empty($session_id)) {
//If I'm a coach
$coaches = CourseManager::get_coach_list_from_course_code($course_info['code'], $session_id);
if (isset($coaches) && isset($coaches[$user_id])) {
$user_info = api_get_user_info($user_id);
$description .= '<tr><td>'.get_lang('Coach').': </td><td class="highlight">'.$user_info['complete_name'].'</td>';
} else {
//If not show everything
$teachers = CourseManager::get_coach_list_from_course_code_to_string($course_info['code'], $session_id);
if (!empty($teachers)) {
$description .= '<tr><td>'.get_lang('Coachs').': </td><td class="highlight">'.$coaches.'</td>';
}
}
}
$description .= '<tr><td>'.get_lang('Date').': </td><td class="highlight">'.api_convert_and_format_date(time(), DATE_TIME_FORMAT_LONG).'</td>';
$description .= '</table>';
$params = array();
Export::export_table_pdf($a_users, get_lang('UserList'), $header, $description, $params);
exit;
} }
} }
} }

Write Preview
Loading…
Cancel
Save