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

[svn r15833] In User's tool is possible to change the status of a user into coach. (see FS#2701)

Browse Source
skala
Julio Montoya 18 years ago
parent 273d1c458a
commit 07ed204af7
4 changed files with 56 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. 32
      main/inc/lib/course.lib.php
  2. 8
      main/user/user.php
  3. 48
      main/user/userInfo.php
  4. 11
      main/user/userInfoLib.php

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

@ -1085,14 +1085,23 @@ class CourseManager
{ {
$session_id = intval($session_id); $session_id = intval($session_id);
$a_users = array(); $a_users = array();
$table_users = Database :: get_main_table(TABLE_MAIN_USER); $table_users = Database :: get_main_table(TABLE_MAIN_USER);
$where = array(); $where = array();
$sql = 'SELECT DISTINCT user.user_id '; if ( $session_id == 0 )
if ( $session_id == 0 ) { {
$sql = 'SELECT DISTINCT course_rel_user.status, user.user_id ';
}
else
{
$sql = 'SELECT DISTINCT user.user_id ';
}
if ( $session_id == 0 )
{
$sql .= ', course_rel_user.role, course_rel_user.tutor_id '; $sql .= ', course_rel_user.role, course_rel_user.tutor_id ';
} }
$sql .= ' FROM '.$table_users.' as user '; $sql .= ' FROM '.$table_users.' as user ';
if(api_get_setting('use_session_mode')=='true' && $with_session) if(api_get_setting('use_session_mode')=='true' && $with_session)
@ -1121,17 +1130,20 @@ class CourseManager
$sql .= ' '.$order_by; $sql .= ' '.$order_by;
$sql .= ' '.$limit; $sql .= ' '.$limit;
$rs = api_sql_query($sql, __FILE__, __LINE__); $rs = api_sql_query($sql, __FILE__, __LINE__);
while($user = Database::fetch_array($rs)) while($user = Database::fetch_array($rs))
{ {
$user_infos = Database :: get_user_info_from_id($user['user_id']); $user_infos = Database :: get_user_info_from_id($user['user_id']);
//$user_infos['status'] = $user['status']; $user_infos['status'] = $user['status'];
if ( isset($user['role']) ) { //$user['status']=$user_infos['status'] ;
if ( isset($user['role']) )
{
$user_infos['role'] = $user['role']; $user_infos['role'] = $user['role'];
} }
if ( isset($user['tutor_id']) ) { if ( isset($user['tutor_id']) )
{
$user_infos['tutor_id'] = $user['tutor_id']; $user_infos['tutor_id'] = $user['tutor_id'];
} }
$a_users[$user['user_id']] = $user_infos; $a_users[$user['user_id']] = $user_infos;

8
main/user/user.php
Unescape View File

@ -518,7 +518,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
$temp[] = $o_course_user['official_code']; $temp[] = $o_course_user['official_code'];
/* // deprecated feature // deprecated feature
if(isset($o_course_user['tutor_id']) && $o_course_user['tutor_id']==1) if(isset($o_course_user['tutor_id']) && $o_course_user['tutor_id']==1)
{ {
$temp[] = get_lang('Tutor'); $temp[] = get_lang('Tutor');
@ -527,7 +527,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
{ {
$temp[] = '-'; $temp[] = '-';
} }
*/
if(isset($o_course_user['status']) && $o_course_user['status']==1) if(isset($o_course_user['status']) && $o_course_user['status']==1)
{ {
$temp[] = get_lang('CourseManager'); $temp[] = get_lang('CourseManager');
@ -653,10 +653,10 @@ $table->set_header($header_nr++, get_lang('OfficialCode'));
if( api_is_allowed_to_edit()) if( api_is_allowed_to_edit())
{ {
// deprecated feature // deprecated feature
// $table->set_header($header_nr++, get_lang('Tutor'),false); $table->set_header($header_nr++, get_lang('Tutor'),false);
$table->set_header($header_nr++, get_lang('CourseManager'),false); $table->set_header($header_nr++, get_lang('CourseManager'),false);
$table->set_header($header_nr++, get_lang('Active'),false); $table->set_header($header_nr++, get_lang('Active'),false);
$table->set_column_filter(7,'active_filter'); $table->set_column_filter(8,'active_filter');
} }
//actions column //actions column

48
main/user/userInfo.php
Unescape View File

@ -1,9 +1,9 @@
<?php // $Id: userInfo.php 15793 2008-07-15 22:13:13Z juliomontoya $ <?php // $Id: userInfo.php 15833 2008-07-21 18:57:25Z juliomontoya $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos S.A. Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 hent University (UGent) Copyright (c) 2003 hent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL) Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) various contributors Copyright (c) various contributors
@ -54,7 +54,7 @@ $editMainUserInfo = Security::remove_XSS($_REQUEST['editMainUserInfo']);
$uInfo = $editMainUserInfo; $uInfo = $editMainUserInfo;
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
$nameTools = get_lang("Users"); $nameTools = get_lang('Users');
api_protect_course_script(true); api_protect_course_script(true);
if(api_is_anonymous()) if(api_is_anonymous())
{ {
@ -65,7 +65,7 @@ if(api_is_anonymous())
$TBL_USERINFO_DEF = Database :: get_course_table(TABLE_USER_INFO); $TBL_USERINFO_DEF = Database :: get_course_table(TABLE_USER_INFO);
$TBL_USERINFO_CONTENT = Database :: get_course_table(TABLE_USER_INFO_CONTENT); $TBL_USERINFO_CONTENT = Database :: get_course_table(TABLE_USER_INFO_CONTENT);
$interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang('Users')); $interbreadcrumb[] = array ('url' => 'user.php', 'name' => get_lang('Users'));
if ($origin != 'learnpath') if ($origin != 'learnpath')
{ //so we are not in learnpath tool { //so we are not in learnpath tool
@ -102,7 +102,6 @@ $courseCode = $currentCourseID = $_course['sysCode'];
$tbl_coursUser = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $tbl_coursUser = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$userIdViewer = $_user['user_id']; // id fo the user currently online $userIdViewer = $_user['user_id']; // id fo the user currently online
//$userIdViewed = $_GET['userIdViewed']; // Id of the user we want to view //$userIdViewed = $_GET['userIdViewed']; // Id of the user we want to view
$allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin; $allowedToEditContent = ($userIdViewer == $userIdViewed) || $is_platformAdmin;
@ -190,7 +189,7 @@ if ($allowedToEditDef)
$userProperties['status'] = 1; $userProperties['status'] = 1;
} }
/* deprecated feature // deprecated feature
// is coach // is coach
if (isset ($_POST['promoteTutor'])) if (isset ($_POST['promoteTutor']))
@ -202,14 +201,14 @@ if ($allowedToEditDef)
$userProperties['tutor'] = 1; $userProperties['tutor'] = 1;
} }
} }
*/
// role is a string // role is a string
if (isset ($_POST['role'])) if (isset ($_POST['role']))
{ {
$role=$_POST['role']; $role=$_POST['role'];
$userProperties['role'] = $role; $userProperties['role'] = $role;
} }
update_user_course_properties($userIdViewed, $courseCode, $userProperties); update_user_course_properties($userIdViewed, $courseCode, $userProperties);
$displayMode = "viewContentList"; $displayMode = "viewContentList";
@ -238,8 +237,7 @@ if ($allowedToEditContent)
} }
elseif (!empty($_GET['editContent'])) elseif (!empty($_GET['editContent']))
{ {
$displayMode = "viewContentEdit"; $displayMode = "viewContentEdit";
$userIdViewed = $userIdViewed; $userIdViewed = $userIdViewed;
} }
} }
@ -355,14 +353,14 @@ elseif ($displayMode == "viewMainInfoEdit")
"<table width=\"80%\" border=\"0\">", "<table width=\"80%\" border=\"0\">",
"<tr align=\"center\" bgcolor=\"#E6E6E6\">\n", "<tr align=\"center\" bgcolor=\"#E6E6E6\">\n",
"<td align=\"left\">", get_lang('Name'), "</td>\n", "<td align=\"left\">", get_lang('Name'), "</td>\n",
"<td align=\"left\">", get_lang('Role'), "</td>\n", "<td width=\"100px\" align=\"left\">", get_lang('Description'), "</td>\n",
"<td>", get_lang('Tutor'), "</td>\n",
"<td>", get_lang('CourseManager'), "</td>\n", "<td>", get_lang('CourseManager'), "</td>\n",
"</tr>\n", "</tr>\n",
"<tr align=\"center\">", "<tr align=\"center\">",
"<td align=\"left\"><b>", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "</b></td>\n", "<td align=\"left\"><b>", htmlize($mainUserInfo['firstName']), " ", htmlize($mainUserInfo['lastName']), "</b></td>\n",
"<td align=\"left\"><input type=\"text\" name =\"role\" value=\"", $mainUserInfo['role'], "\" maxlength=\"40\" /></td>"; "<td align=\"left\"><input type=\"text\" name =\"role\" value=\"", $mainUserInfo['role'], "\" maxlength=\"40\" /></td>",
//deprecated feature "<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteTutor\" value=\"1\" ", $tutorChecked, " /></td>";
//"<td><input class=\"checkbox\" type=\"checkbox\" name=\"promoteTutor\" value=\"1\" ", $tutorChecked, " /></td>";
if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed)) if (!($is_courseAdmin && $_user['user_id'] == $userIdViewed))
{ {
@ -388,7 +386,8 @@ elseif ($displayMode == "viewMainInfoEdit")
} }
} }
else{ else
{
Display :: display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession')); Display :: display_normal_message(get_lang('ThisStudentIsSubscribeThroughASession'));
} }
} }
@ -407,19 +406,20 @@ elseif ($displayMode == "viewContentList") // default display
$mainUserInfo = get_main_user_info($userIdViewed, $courseCode); $mainUserInfo = get_main_user_info($userIdViewed, $courseCode);
if ($mainUserInfo) if ($mainUserInfo)
{ {
$image_array=UserManager::get_user_picture_path_by_id($userIdViewed,'web',false,true); $image_array=UserManager::get_user_picture_path_by_id($userIdViewed,'web',false,true);
echo '<img src="'.$image_array['dir'].$image_array['file'].'" border="1">'; echo '<img src="'.$image_array['dir'].$image_array['file'].'" border="1">';
//DISPLAY TABLE HEADING //DISPLAY TABLE HEADING
if ($origin == 'learnpath') { $allowedToEditDef=false; $is_allowedToTrack=false; } if ($origin == 'learnpath') { $allowedToEditDef=false; $is_allowedToTrack=false; }
//"<td>",get_lang('Tutor'),"</td>\n",
//"<td>",get_lang('Tutor'),"</td>\n",
echo "<table width=\"80%\" border=\"0\">", echo "<table width=\"80%\" border=\"0\">",
"<tr align=\"center\" bgcolor=\"#E6E6E6\">\n", "<tr align=\"center\" bgcolor=\"#E6E6E6\">\n",
"<td align=\"left\">",get_lang('Name'),"</td>\n", "<td align=\"left\">",get_lang('Name'),"</td>\n",
"<td align=\"left\">",get_lang('Role'),"</td>\n", "<td width=\"100px\" align=\"left\">",get_lang('Description'),"</td>\n",
"<td>",get_lang('Tutor'),"</td>\n",
"<td>",get_lang('CourseManager'),"</td>\n", "<td>",get_lang('CourseManager'),"</td>\n",
($allowedToEditDef?"<td>".get_lang('Edit')."</td>\n":""), ($allowedToEditDef?"<td>".get_lang('Edit')."</td>\n":""),
($is_allowedToTrack?"<td>".get_lang('Tracking')."</td>\n":""), ($is_allowedToTrack?"<td>".get_lang('Tracking')."</td>\n":""),
@ -430,8 +430,9 @@ elseif ($displayMode == "viewContentList") // default display
"<td align=\"left\"><b>",htmlize($mainUserInfo['firstName'])," ",htmlize($mainUserInfo['lastName']),"</b></td>\n", "<td align=\"left\"><b>",htmlize($mainUserInfo['firstName'])," ",htmlize($mainUserInfo['lastName']),"</b></td>\n",
"<td align=\"left\">",htmlize($mainUserInfo['role']),"</td>"; "<td align=\"left\">",htmlize($mainUserInfo['role']),"</td>";
//DISPLAY TABLE CONTENT //DISPLAY TABLE CONTENT
/* deprecated feature
// deprecated feature
if ($mainUserInfo['tutor_id'] == 1) if ($mainUserInfo['tutor_id'] == 1)
{ {
echo "<td>",get_lang('Tutor'),"</td>\n"; echo "<td>",get_lang('Tutor'),"</td>\n";
@ -439,8 +440,7 @@ elseif ($displayMode == "viewContentList") // default display
else else
{ {
echo "<td> - </td>\n"; echo "<td> - </td>\n";
} }
*/
if ($mainUserInfo['status'] == 1) if ($mainUserInfo['status'] == 1)
{ {

11
main/user/userInfoLib.php
Unescape View File

@ -264,11 +264,12 @@ function update_user_course_properties($user_id, $course_code, $properties)
} }
//feature deprecated tutor_id = '".Database::escape_string($properties['tutor'])."' //feature deprecated tutor_id = '".Database::escape_string($properties['tutor'])."'
$sql = "UPDATE $tbl_coursUser $sql = "UPDATE $tbl_coursUser
SET ".$sqlChangeStatus." SET ".$sqlChangeStatus."
role = '".Database::escape_string($properties['role'])."' role = '".Database::escape_string($properties['role'])."',
WHERE user_id = '".$user_id."' tutor_id = '".Database::escape_string($properties['tutor'])."'
AND course_code = '".$course_code."'"; WHERE user_id = '".$user_id."'
AND course_code = '".$course_code."'";
$result = api_sql_query($sql,__FILE__,__LINE__); $result = api_sql_query($sql,__FILE__,__LINE__);

Write Preview
Loading…
Cancel
Save