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

Fixing user export and improving tag field exports see CT#493

Browse Source
skala
Julio Montoya 15 years ago
parent 89e4ba1f3c
commit a0a95a11e5
2 changed files with 62 additions and 43 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. 74
      main/inc/lib/usermanager.lib.php
  2. 31
      main/mySpace/index.php

74
main/inc/lib/usermanager.lib.php
Unescape View File

@ -1337,38 +1337,45 @@ class UserManager
$res = Database::query($sql, __FILE__, __LINE__);
if (Database::num_rows($res) > 0) {
while ($row = Database::fetch_array($res)) {
$sqlu = "SELECT field_value as fval " .
" FROM $t_ufv " .
" WHERE field_id=".$row['id']."" .
" AND user_id=".$user_id;
$resu = Database::query($sqlu, __FILE__, __LINE__);
$fval = '';
// get default value
$sql_df = "SELECT field_default_value as fval_df " .
" FROM $t_uf " .
" WHERE id=".$row['id'];
$res_df = Database::query($sql_df, __FILE__, __LINE__);
if (Database::num_rows($resu) > 0) {
$rowu = Database::fetch_array($resu);
$fval = $rowu['fval'];
if ($row['type'] == USER_FIELD_TYPE_SELECT_MULTIPLE) {
$fval = split(';',$rowu['fval']);
}
if ($row['type'] == USER_FIELD_TYPE_TAG) {
$tags = self::get_user_tags_to_string($user_id,$row['id'],false);
$extra_data['extra_'.$row['fvar']] = $tags;
} else {
$row_df = Database::fetch_array($res_df);
$fval = $row_df['fval_df'];
}
if ($prefix) {
if ($row['type'] == USER_FIELD_TYPE_RADIO) {
$extra_data['extra_'.$row['fvar']]['extra_'.$row['fvar']] = $fval;
$sqlu = "SELECT field_value as fval " .
" FROM $t_ufv " .
" WHERE field_id=".$row['id']."" .
" AND user_id=".$user_id;
$resu = Database::query($sqlu, __FILE__, __LINE__);
$fval = '';
// get default value
$sql_df = "SELECT field_default_value as fval_df " .
" FROM $t_uf " .
" WHERE id=".$row['id'];
$res_df = Database::query($sql_df, __FILE__, __LINE__);
if (Database::num_rows($resu) > 0) {
$rowu = Database::fetch_array($resu);
$fval = $rowu['fval'];
if ($row['type'] == USER_FIELD_TYPE_SELECT_MULTIPLE) {
$fval = split(';',$rowu['fval']);
}
} else {
$extra_data['extra_'.$row['fvar']] = $fval;
$row_df = Database::fetch_array($res_df);
$fval = $row_df['fval_df'];
}
} else {
if ($row['type'] == USER_FIELD_TYPE_RADIO) {
$extra_data['extra_'.$row['fvar']]['extra_'.$row['fvar']] = $fval;
if ($prefix) {
if ($row['type'] == USER_FIELD_TYPE_RADIO) {
$extra_data['extra_'.$row['fvar']]['extra_'.$row['fvar']] = $fval;
} else {
$extra_data['extra_'.$row['fvar']] = $fval;
}
} else {
$extra_data[$row['fvar']] = $fval;
if ($row['type'] == USER_FIELD_TYPE_RADIO) {
$extra_data['extra_'.$row['fvar']]['extra_'.$row['fvar']] = $fval;
} else {
$extra_data[$row['fvar']] = $fval;
}
}
}
}
@ -2388,9 +2395,10 @@ class UserManager
* Get user's tags
* @param int user_id
* @param int field_id
* @param bool show links or not
* @return array
*/
public static function get_user_tags_to_string($user_id,$field_id) {
public static function get_user_tags_to_string($user_id,$field_id,$show_links=true) {
// database table definition
$table_user_tag = Database::get_main_table(TABLE_MAIN_TAG);
$table_user_tag_values = Database::get_main_table(TABLE_MAIN_USER_REL_TAG);
@ -2410,10 +2418,16 @@ class UserManager
$user_tags = $return;
$tag_tmp = array();
foreach ($user_tags as $tag) {
$tag_tmp[] = '<a href="'.api_get_path(WEB_PATH).'main/search/?q='.$tag['tag'].'">'.$tag['tag'].'</a>';
if ($show_links) {
$tag_tmp[] = '<a href="'.api_get_path(WEB_PATH).'main/search/?q='.$tag['tag'].'">'.$tag['tag'].'</a>';
} else {
$tag_tmp[] = $tag['tag'];
}
}
if (is_array($user_tags) && count($user_tags)>0) {
$return = implode(', ',$tag_tmp);
} else {
return '';
}
return $return;
}

31
main/mySpace/index.php
Unescape View File

@ -1,5 +1,5 @@
<?php // $Id: index.php 16620 2008-10-25 20:03:54Z yannoo $
/* For licensing terms, see /dokeos_license.txt */
/* For licensing terms, see /chamilo_license.txt */
/**
* @todo use constant for $this_section
*/
@ -10,22 +10,21 @@ $language_file = array ('registration', 'index', 'tracking');
$cidReset = true;
// including the global Dokeos file
require '../inc/global.inc.php';
require_once '../inc/global.inc.php';
// including additional libraries
require api_get_path(LIBRARY_PATH).'tracking.lib.php';
require_once api_get_path(LIBRARY_PATH).'tracking.lib.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
// the section (for the tabs)
$this_section = "session_my_space";
$this_section = 'session_my_space';
ob_start();
$export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
$csv_content = array();
$nameTools = get_lang("MySpace");
$nameTools = get_lang('MySpace');
// access control
api_block_anonymous_users();
@ -163,8 +162,13 @@ if ($nb_menu_items > 1) {
}
}
}
echo '<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a> ';
echo (isset($_GET['display']) && $_GET['display'] == 'useroverview')? '' : '<a href="'.api_get_self().'?export=csv&view='.$view.'"><img align="absbottom" src="../img/excel.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
echo '&nbsp;<a href="javascript: void(0);" onclick="javascript: window.print()"><img align="absbottom" src="../img/printmgr.gif">&nbsp;'.get_lang('Print').'</a> ';
if ($view == 'admin') {
echo (isset($_GET['display']) && $_GET['display'] == 'useroverview')? '<a href="'.api_get_self().'?display=useroverview&export=csv&view='.$view.'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>' : '';
} else {
echo (isset($_GET['display']) && $_GET['display'] == 'useroverview')? '' : '<a href="'.api_get_self().'?export=csv&view='.$view.'"><img align="absbottom" src="../img/csv.gif">&nbsp;'.get_lang('ExportAsCSV').'</a>';
}
echo '</div>';
echo '<h4>'.$title.'</h4>';
@ -469,7 +473,7 @@ if (api_is_allowed_to_create_course() && $view == 'teacher') {
}
}
if ($is_platform_admin && $view == 'admin') {
if ($is_platform_admin && $view == 'admin') {
echo '<a href="'.api_get_self().'?view=admin&amp;display=coaches">'.get_lang('DisplayCoaches').'</a> | ';
echo '<a href="'.api_get_self().'?view=admin&amp;display=useroverview">'.get_lang('DisplayUserOverview').'</a>';
if ($_GET['display'] == 'useroverview') {
@ -723,6 +727,7 @@ function export_tracking_user_overview() {
// the additional user defined fields (only those that were selected to be exported)
require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
$fields = UserManager::get_extra_fields(0, 50, 5, 'ASC');
if (is_array($_SESSION['additional_export_fields'])) {
foreach ($_SESSION['additional_export_fields'] as $key => $extra_field_export) {
$csv_row[] = $fields[$extra_field_export][3];
@ -762,6 +767,7 @@ function export_tracking_user_overview() {
$csv_row[] = $row[0];
// the additional defined user fields
$extra_fields = get_user_overview_export_extra_fields($user[4]);
if (is_array($field_names_to_be_exported)) {
foreach ($field_names_to_be_exported as $key => $extra_field_export) {
$csv_row[] = $extra_fields[$extra_field_export];
@ -792,7 +798,7 @@ function export_tracking_user_overview() {
$csv_content[] = $csv_row;
}
}
}
Export :: export_table_csv($csv_content, 'reporting_user_overview');
exit;
}
@ -1104,9 +1110,8 @@ function display_user_overview_export_options() {
*/
function get_user_overview_export_extra_fields($user_id) {
// include the user manager
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
$extra_data = UserManager::get_extra_user_data($user_id, true);
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
$extra_data = UserManager::get_extra_user_data($user_id, true);
return $extra_data;
}
/**

Write Preview
Loading…
Cancel
Save