Minor - format code

pull/2487/head
jmontoyaa 8 years ago
parent 0d7337e52f
commit 3fa34745c0
  1. 180
      main/admin/dashboard_add_users_to_user.php

@ -55,7 +55,7 @@ if ($isAdmin) {
$add_type = 'multiple'; $add_type = 'multiple';
if (isset($_GET['add_type']) && $_GET['add_type'] != '') { if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
$add_type = Security::remove_XSS($_REQUEST['add_type']); $add_type = Security::remove_XSS($_REQUEST['add_type']);
} }
if (!api_is_platform_admin()) { if (!api_is_platform_admin()) {
@ -160,7 +160,11 @@ function search_users($needle, $type)
$return .= '...<br />'; $return .= '...<br />';
} }
} }
$xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return)); $xajax_response->addAssign(
'ajax_list_users_single',
'innerHTML',
api_utf8_encode($return)
);
} else { } else {
$return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">'; $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
while ($user = Database :: fetch_array($rs)) { while ($user = Database :: fetch_array($rs)) {
@ -172,73 +176,73 @@ function search_users($needle, $type)
} }
} }
return $xajax_response; return $xajax_response;
} }
$xajax->processRequests(); $xajax->processRequests();
$htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/'); $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
$htmlHeadXtra[] = '<script> $htmlHeadXtra[] = '<script>
function add_user_to_user (code, content) { function add_user_to_user (code, content) {
document.getElementById("user_to_add").value = ""; document.getElementById("user_to_add").value = "";
document.getElementById("ajax_list_users_single").innerHTML = ""; document.getElementById("ajax_list_users_single").innerHTML = "";
destination = document.getElementById("destination"); destination = document.getElementById("destination");
for (i=0;i<destination.length;i++) { for (i=0;i<destination.length;i++) {
if(destination.options[i].text == content) { if(destination.options[i].text == content) {
return false; return false;
} }
} }
destination.options[destination.length] = new Option(content,code); destination.options[destination.length] = new Option(content,code);
destination.selectedIndex = -1; destination.selectedIndex = -1;
sortOptions(destination.options); sortOptions(destination.options);
} }
function moveItem(origin , destination) { function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) { for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) { if(origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value); destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
origin.options[i]=null; origin.options[i]=null;
i = i-1; i = i-1;
} }
} }
destination.selectedIndex = -1; destination.selectedIndex = -1;
sortOptions(destination.options); sortOptions(destination.options);
} }
function sortOptions(options) { function sortOptions(options) {
var newOptions = new Array(); var newOptions = new Array();
for (i = 0 ; i<options.length ; i++) { for (i = 0 ; i<options.length ; i++) {
newOptions[i] = options[i]; newOptions[i] = options[i];
} }
newOptions = newOptions.sort(mysort); newOptions = newOptions.sort(mysort);
options.length = 0; options.length = 0;
for(i = 0 ; i < newOptions.length ; i++){ for(i = 0 ; i < newOptions.length ; i++){
options[i] = newOptions[i]; options[i] = newOptions[i];
} }
} }
function mysort(a, b) { function mysort(a, b) {
if (a.text.toLowerCase() > b.text.toLowerCase()) { if (a.text.toLowerCase() > b.text.toLowerCase()) {
return 1; return 1;
} }
if (a.text.toLowerCase() < b.text.toLowerCase()) { if (a.text.toLowerCase() < b.text.toLowerCase()) {
return -1; return -1;
} }
return 0; return 0;
} }
function valide() { function valide() {
var options = document.getElementById("destination").options; var options = document.getElementById("destination").options;
for (i = 0 ; i<options.length ; i++) { for (i = 0 ; i<options.length ; i++) {
options[i].selected = true; options[i].selected = true;
} }
document.forms.formulaire.submit(); document.forms.formulaire.submit();
} }
function remove_item(origin) { function remove_item(origin) {
for(var i = 0 ; i<origin.options.length ; i++) { for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) { if(origin.options[i].selected) {
origin.options[i]=null; origin.options[i]=null;
i = i-1; i = i-1;
} }
} }
} }
</script>'; </script>';
@ -285,7 +289,6 @@ if (!empty($filters) && !empty($filterData)) {
$msg = ''; $msg = '';
if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) { if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
$user_list = $_POST['UsersList']; $user_list = $_POST['UsersList'];
switch ($userStatus) { switch ($userStatus) {
case DRH: case DRH:
//no break; //no break;
@ -359,13 +362,13 @@ switch ($userStatus) {
$assigned_users_id = array_keys($assigned_users_to_hrm); $assigned_users_id = array_keys($assigned_users_to_hrm);
$without_assigned_users = ''; $without_assigned_users = '';
if (count($assigned_users_id) > 0) { if (count($assigned_users_id) > 0) {
$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND "; $without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
} }
$search_user = ''; $search_user = '';
if (!empty($firstLetterUser)) { if (!empty($firstLetterUser)) {
$needle = Database::escape_string($firstLetterUser); $needle = Database::escape_string($firstLetterUser);
$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'"; $search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
} }
$sqlConditions = null; $sqlConditions = null;
@ -385,10 +388,10 @@ if (!empty($conditions)) {
} }
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$sql = "SELECT user.user_id, username, lastname, firstname $sql = "SELECT user.user_id, username, lastname, firstname
FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au FROM $tbl_user user LEFT JOIN $tbl_access_url_rel_user au
ON (au.user_id = user.user_id) ON (au.user_id = user.user_id)
WHERE WHERE
$without_assigned_users $without_assigned_users
user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND
status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user AND
@ -396,14 +399,14 @@ if (api_is_multiple_url_enabled()) {
$sqlConditions $sqlConditions
ORDER BY firstname"; ORDER BY firstname";
} else { } else {
$sql = "SELECT user_id, username, lastname, firstname $sql = "SELECT user_id, username, lastname, firstname
FROM $tbl_user user FROM $tbl_user user
WHERE WHERE
$without_assigned_users $without_assigned_users
user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND
status NOT IN(".DRH.", ".SESSIONADMIN.") status NOT IN(".DRH.", ".SESSIONADMIN.")
$search_user $search_user
$sqlConditions $sqlConditions
ORDER BY firstname "; ORDER BY firstname ";
} }
$result = Database::query($sql); $result = Database::query($sql);
@ -412,14 +415,13 @@ $result = Database::query($sql);
<input type="hidden" name="formSent" value="1" /> <input type="hidden" name="formSent" value="1" />
<?php <?php
if (!empty($msg)) { if (!empty($msg)) {
Display::addFlash(Display::return_message($msg, 'normal')); //main API Display::addFlash(Display::return_message($msg, 'normal')); //main API
} }
?> ?>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<?php echo get_lang('UserListInPlatform') ?> <?php echo get_lang('UserListInPlatform') ?>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<div id="ajax_list_users_multiple"> <div id="ajax_list_users_multiple">
@ -435,8 +437,6 @@ if (!empty($msg)) {
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<div class="code-course"> <div class="code-course">
@ -453,7 +453,7 @@ if (!empty($msg)) {
<div class="separate-action"> <div class="separate-action">
<button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button> <button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
</div> </div>
<?php } else { ?> <?php } else { ?>
<div class="separate-action"> <div class="separate-action">
<button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))"> <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<em class="fa fa-chevron-right"></em> <em class="fa fa-chevron-right"></em>
@ -464,28 +464,30 @@ if (!empty($msg)) {
<em class="fa fa-chevron-left"></em> <em class="fa fa-chevron-left"></em>
</button> </button>
</div> </div>
<?php <?php } ?>
}
?>
<div class="separate-action"> <div class="separate-action">
<?php <?php
echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>'; echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?php <?php
if (UserManager::is_admin($user_id)) { if (UserManager::is_admin($user_id)) {
echo get_lang('AssignedUsersListToPlatformAdministrator'); echo get_lang('AssignedUsersListToPlatformAdministrator');
} else if ($user_info['status'] == SESSIONADMIN) { } else {
echo get_lang('AssignedUsersListToSessionsAdministrator'); if ($user_info['status'] == SESSIONADMIN) {
} else if ($user_info['status'] == STUDENT_BOSS) { echo get_lang('AssignedUsersListToSessionsAdministrator');
echo get_lang('AssignedUsersListToStudentBoss'); } else {
if ($user_info['status'] == STUDENT_BOSS) {
echo get_lang('AssignedUsersListToStudentBoss');
} else { } else {
echo get_lang('AssignedUsersListToHumanResourcesManager'); echo get_lang('AssignedUsersListToHumanResourcesManager');
} }
?> }
}
?>
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<br> <br>

Loading…
Cancel
Save