Minor - format code.

1.9.x
Julio Montoya 11 years ago
parent 28baec78d2
commit 6b21e859a5
  1. 2
      main/admin/user_edit.php
  2. 32
      main/admin/user_move_stats.php
  3. 7
      main/inc/lib/course.lib.php

@ -260,7 +260,6 @@ $creatorInfo = api_get_user_info($user_data['creator_id']);
$date = sprintf(get_lang('CreatedByXYOnZ'), 'user_information.php?user_id='.$user_data['creator_id'], $creatorInfo['username'], $user_data['registration_date']);
$form->addElement('html', '<div class="control-group"><label class="control-label">'.get_lang('RegistrationDate').'</label><div class="controls">'.$date.'</div></div>');
if (!$user_data['platform_admin']) {
// Expiration Date
$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
@ -274,7 +273,6 @@ if (!$user_data['platform_admin']) {
$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
}
// EXTRA FIELDS
$return_params = UserManager::set_extra_fields_in_form($form, $extra_data, 'user_edit', true, $user_id);
$jquery_ready_content = $return_params['jquery_ready_content'];

@ -1,12 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
/**
* User move scripti (to move between courses and sessions)
* User move script (to move between courses and sessions)
* @package chamilo.admin
*/
/**
* Code
*/
$language_file = 'admin';
$cidReset = true;
@ -96,7 +94,6 @@ if (isset($_REQUEST['load_ajax'])) {
}
}
$result_message = array();
$result_message_compare = array();
@ -135,13 +132,11 @@ if (isset($_REQUEST['load_ajax'])) {
$TBL_DROPBOX_POST = Database::get_course_table(TABLE_DROPBOX_POST);
$TBL_AGENDA = Database::get_course_table(TABLE_AGENDA);
$course_code = Database::escape_string($course_code);
//1. track_e_exercises
//ORIGINAL COURSE
$sql = "SELECT * FROM $TABLETRACK_EXERCICES WHERE exe_cours_id = '$origin_course_code' AND session_id = $origin_session_id AND exe_user_id = $user_id ";
$sql = "SELECT * FROM $TABLETRACK_EXERCICES
WHERE exe_cours_id = '$origin_course_code' AND session_id = $origin_session_id AND exe_user_id = $user_id ";
$res = Database::query($sql);
$list = array();
while($row = Database::fetch_array($res,'ASSOC')) {
@ -647,11 +642,13 @@ $combinations = array();
if (!empty($user_list)) {
foreach ($user_list as $user) {
$user_id = $user['user_id'];
//if ($user_id != 78 ) continue;
$name = $user['firstname'].' '.$user['lastname'];
$course_list_registered = CourseManager::get_courses_list_by_user_id($user_id, true, false);
$course_list_registered = CourseManager::get_courses_list_by_user_id(
$user_id,
true,
false
);
$new_course_list = array();
foreach ($course_list_registered as $course_reg) {
@ -666,6 +663,7 @@ if (!empty($user_list)) {
if (is_array($course_list) && !empty($course_list)) {
foreach ($course_list as $my_course) {
$key = $my_course['code'].'_'.$my_course['id_session'];
if (!in_array($key, $new_course_list)) {
$my_course['not_registered'] = 1;
$course_list_registered[] = $my_course;
@ -673,6 +671,11 @@ if (!empty($user_list)) {
}
}
foreach ($course_list_registered as & $course) {
$courseInfo = api_get_course_info($course['code']);
$course['name'] = $courseInfo['name'];
}
$course_list = $course_list_registered;
echo '<div>';
@ -685,13 +688,12 @@ if (!empty($user_list)) {
if (!empty($course_list)) {
echo '<tr>';
foreach ($course_list as $course) {
echo '<td>';
if (isset($course['id_session']) && !empty($course['id_session'])) {
echo '<b>'.get_lang('SessionName').'</b> '.$my_session_list[$course['id_session']].'<br />';
}
echo $course['title'];
echo $course['name'];
echo ' ('.$course['code'].') ';
if (isset($course['not_registered']) && !empty($course['not_registered'])) {
echo ' <i>'.get_lang('UserNotRegistered').'</i>';
@ -735,5 +737,3 @@ if (!empty($user_list)) {
}
echo $navigation;
$_SESSION['combination'] = $combinations;

@ -2643,12 +2643,13 @@ class CourseManager
/**
* Get list of courses for a given user
* @param int user ID
* @param boolean Whether to include courses from session or not
* @param int $user_id
* @param boolean $include_sessions Whether to include courses from session or not
* @return array List of codes and db names
* @author isaac flores paz
*/
public static function get_courses_list_by_user_id($user_id, $include_sessions = false) {
public static function get_courses_list_by_user_id($user_id, $include_sessions = false)
{
$user_id = intval($user_id);
$course_list = array();
$codes = array();

Loading…
Cancel
Save