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 r18519] Minor - updating only one select tag when filtering users. When subscribing users to a course now we can filter by extra field (admin interface) see FS#3462

Browse Source
skala
Julio Montoya 17 years ago
parent e6103dc847
commit 2fc889ccc1
2 changed files with 209 additions and 77 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. 39
      main/admin/add_users_to_session.php
  2. 163
      main/admin/subscribe_user2course.php

39
main/admin/add_users_to_session.php
Unescape View File

@ -88,7 +88,7 @@ if (is_array($extra_field_list)) {
foreach ($extra_field_list as $extra_field) {
//if is enabled to filter and is a "<select>" field type
if ($extra_field[8]==1 && $extra_field[2]==4 ) {
$new_field_list[] = array('name'=> $extra_field[1], 'variable'=>$extra_field[1], 'data'=> $extra_field[9]);
$new_field_list[] = array('name'=> $extra_field[3], 'variable'=>$extra_field[1], 'data'=> $extra_field[9]);
}
}
}
@ -321,6 +321,7 @@ if ($ajax_search) {
$sessionUsersList[$user['user_id']] = $user ;
}
} else {
//Filter by Extra Fields
$use_extra_fields = false;
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
@ -367,9 +368,6 @@ if ($ajax_search) {
}
}
$table_user_field = Database::get_main_table(TABLE_MAIN_USER_FIELD);
$table_user_field_values = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
if ($use_extra_fields) {
$sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u
@ -400,15 +398,42 @@ if ($ajax_search) {
}
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
//var_dump($_REQUEST['id_session']);
foreach ($Users as $user) {
if($user['id_session'] != $id_session)
$nosessionUsersList[$user['user_id']] = $user ;
}
//filling the correct users in list
$sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session'
ORDER BY lastname,firstname,username";
if ($_configuration['multiple_access_urls']==true) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1){
$sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session'
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id
ORDER BY lastname,firstname,username";
}
}
$result=api_sql_query($sql,__FILE__,__LINE__);
$Users=api_store_result($result);
//var_dump($_REQUEST['id_session']);
foreach ($Users as $user) {
if($user['id_session'] == $id_session)
$sessionUsersList[$user['user_id']] = $user ;
else
$nosessionUsersList[$user['user_id']] = $user ;
}
}
if ($add_type == 'multiple') {
@ -432,6 +457,8 @@ if ($add_type == 'multiple') {
<?php
if ($add_type=='multiple') {
if (is_array($extra_field_list)) {
echo '<h3>'.get_lang('FilterUsers').'</h3>';
if (is_array($new_field_list) && count($new_field_list)>0 ) {
foreach ($new_field_list as $new_field) {
echo $new_field['name'];

163
main/admin/subscribe_user2course.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: subscribe_user2course.php 18262 2009-02-05 20:57:35Z juliomontoya $
// $Id: subscribe_user2course.php 18519 2009-02-16 15:38:49Z juliomontoya $
/*
==============================================================================
Dokeos - elearning and course management software
@ -72,8 +72,24 @@ $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
*/
$tool_name = get_lang('AddUsersToACourse');
$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
$htmlHeadXtra[] = '
<script type="text/javascript">
function validate_filter() {
document.formulaire.form_sent.value=0;
document.formulaire.submit();
}
</script>';
Display :: display_header($tool_name);
//api_display_tool_title($tool_name);
api_display_tool_title($tool_name);
/*
==============================================================================
@ -81,36 +97,43 @@ Display :: display_header($tool_name);
==============================================================================
*/
//checking for extra field with filter on
include_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
$extra_field_list= UserManager::get_extra_fields();
$new_field_list = array();
if (is_array($extra_field_list)) {
foreach ($extra_field_list as $extra_field) {
//if is enabled to filter and is a "<select>" field type
if ($extra_field[8]==1 && $extra_field[2]==4 ) {
$new_field_list[] = array('name'=> $extra_field[3], 'variable'=>$extra_field[1], 'data'=> $extra_field[9]);
}
}
}
/*
-----------------------------------------------------------
React on POSTed request
-----------------------------------------------------------
*/
if ($_POST['formSent'])
{
$form_sent = $_POST['formSent'];
if ($_POST['form_sent']) {
$form_sent = $_POST['form_sent'];
$users = is_array($_POST['UserList']) ? $_POST['UserList'] : array() ;
$courses = is_array($_POST['CourseList']) ? $_POST['CourseList'] : array() ;
$first_letter_user = $_POST['firstLetterUser'];
$first_letter_course = $_POST['firstLetterCourse'];
foreach($users as $key => $value)
{
foreach ($users as $key => $value) {
$users[$key] = intval($value);
}
if ($form_sent == 1)
{
if ( count($users) == 0 || count($courses) == 0)
{
if ($form_sent == 1) {
if ( count($users) == 0 || count($courses) == 0) {
Display :: display_error_message(get_lang('AtLeastOneUserAndOneCourse'));
}
else
{
foreach ($courses as $course_code)
{
foreach ($users as $user_id)
{
} else {
foreach ($courses as $course_code) {
foreach ($users as $user_id) {
CourseManager::subscribe_user($user_id,$course_code);
}
}
@ -124,8 +147,7 @@ if ($_POST['formSent'])
Display GUI
-----------------------------------------------------------
*/
if(empty($first_letter_user))
{
if(empty($first_letter_user)) {
$sql = "SELECT count(*) as nb_users FROM $tbl_user";
$result = api_sql_query($sql, __FILE__, __LINE__);
$num_row = Database::fetch_array($result);
@ -136,7 +158,59 @@ if(empty($first_letter_user))
}
unset($result);
}
$sql = "SELECT user_id,lastname,firstname,username FROM $tbl_user WHERE lastname LIKE '".$first_letter_user."%' ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." lastname";
//Filter by Extra Fields
$use_extra_fields = false;
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
$result_list=array();
foreach ($new_field_list as $new_field) {
$varname = 'field_'.$new_field['variable'];
if (Usermanager::is_extra_field_available($new_field['variable'])) {
if (isset($_POST[$varname]) && $_POST[$varname]!='0') {
$use_extra_fields = true;
$extra_field_result[]= Usermanager::get_extra_user_data_by_value($new_field['variable'], $_POST[$varname]);
}
}
}
}
}
if ($use_extra_fields) {
$final_result = array();
if (count($extra_field_result)>1) {
for($i=0;$i<count($extra_field_result)-1;$i++) {
if (is_array($extra_field_result[$i+1])) {
$final_result = array_intersect($extra_field_result[$i],$extra_field_result[$i+1]);
}
}
} else {
$final_result = $extra_field_result[0];
}
$where_filter ='';
if ($_configuration['multiple_access_urls']==true) {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND u.user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " AND u.user_id = -1";
}
} else {
if (is_array($final_result) && count($final_result)>0) {
$where_filter = " AND user_id IN ('".implode("','",$final_result)."') ";
} else {
//no results
$where_filter = " AND user_id = -1";
}
}
}
$sql = "SELECT user_id,lastname,firstname,username
FROM $tbl_user
WHERE lastname LIKE '".$first_letter_user."%' $where_filter
ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." lastname";
global $_configuration;
if ($_configuration['multiple_access_urls']==true) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -145,14 +219,17 @@ if ($_configuration['multiple_access_urls']==true) {
$sql = "SELECT u.user_id,lastname,firstname,username FROM ".$tbl_user ." u
INNER JOIN $tbl_user_rel_access_url user_rel_url
ON (user_rel_url.user_id = u.user_id)
WHERE access_url_id = $access_url_id AND (lastname LIKE '".$first_letter_user."%' ) ORDER BY ". (count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." lastname";
WHERE access_url_id = $access_url_id AND (lastname LIKE '".$first_letter_user."%' ) $where_filter
ORDER BY ". (count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." lastname";
}
}
$result = api_sql_query($sql, __FILE__, __LINE__);
$db_users = api_store_result($result);
unset($result);
$sql = "SELECT code,visual_code,title FROM $tbl_course WHERE visual_code LIKE '".$first_letter_course."%' ORDER BY ". (count($courses) > 0 ? "(code IN('".implode("','", $courses)."')) DESC," : "")." visual_code";
if ($_configuration['multiple_access_urls']==true) {
$tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$access_url_id = api_get_current_access_url_id();
@ -188,14 +265,44 @@ if ($_configuration['multiple_access_urls']==true) {
?>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1"/>
<?php
if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list)>0 ) {
echo '<h3>'.get_lang('FilterUsers').'</h3>';
foreach ($new_field_list as $new_field) {
echo $new_field['name'];
$varname = 'field_'.$new_field['variable'];
echo '&nbsp;<select name="'.$varname.'">';
echo '<option value="0">--'.get_lang('Select').'--</option>';
foreach ($new_field['data'] as $option) {
$checked='';
if (isset($_POST[$varname])) {
if ($_POST[$varname]==$option[1]) {
$checked = 'selected="true"';
}
}
echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
}
echo '</select>';
echo '&nbsp;&nbsp;';
}
echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
echo '<br /><br />';
}
}
?>
<input type="hidden" name="form_sent" value="1"/>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td width="40%" align="center">
<b><?php echo get_lang('UserList'); ?></b>
<br/><br/>
<?php echo get_lang('FirstLetterUser'); ?> :
<select name="firstLetterUser" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
<select name="firstLetterUser" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
<option value="">--</option>
<?php
echo Display :: get_alphabet_options($first_letter_user);
@ -207,7 +314,7 @@ if ($_configuration['multiple_access_urls']==true) {
<b><?php echo get_lang('CourseList'); ?> :</b>
<br/><br/>
<?php echo get_lang('FirstLetterCourse'); ?> :
<select name="firstLetterCourse" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
<select name="firstLetterCourse" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
<option value="">--</option>
<?php
echo Display :: get_alphabet_options($first_letter_course);
@ -219,8 +326,7 @@ if ($_configuration['multiple_access_urls']==true) {
<td width="40%" align="center">
<select name="UserList[]" multiple="multiple" size="20" style="width:230px;">
<?php
foreach ($db_users as $user)
{
foreach ($db_users as $user) {
?>
<option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>><?php echo $user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'; ?></option>
<?php
@ -234,8 +340,7 @@ foreach ($db_users as $user)
<td width="40%" align="center">
<select name="CourseList[]" multiple="multiple" size="20" style="width:230px;">
<?php
foreach ($db_courses as $course)
{
foreach ($db_courses as $course) {
?>
<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo '('.$course['visual_code'].') '.$course['title']; ?></option>
<?php

Write Preview
Loading…
Cancel
Save