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

Internal - Fix behat test

Browse Source
pull/3464/head
Julio Montoya 4 years ago
parent 7bdca5f6ca
commit 80ba75c9fe
2 changed files with 45 additions and 54 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. 96
      public/main/session/add_users_to_session.php
  2. 3
      tests/behat/features/sessionAccess.feature

96
public/main/session/add_users_to_session.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
// resetting the course id // resetting the course id
@ -231,10 +232,10 @@ function search_users($needle, $type)
} }
$return .= Display::url( $return .= Display::url(
$person_name, $person_name,
'javascript: void(0);', 'javascript: void(0);',
['onclick' => "add_user_to_session('".$user['id']."', '".addslashes($person_name)."');"] ['onclick' => "add_user_to_session('".$user['id']."', '".addslashes($person_name)."');"]
).'<br>'; ).'<br>';
} else { } else {
$return .= '...<br />'; $return .= '...<br />';
} }
@ -250,7 +251,7 @@ function search_users($needle, $type)
$officialCode = !empty($user['official_code']) ? $user['official_code'].' - ' : '? - '; $officialCode = !empty($user['official_code']) ? $user['official_code'].' - ' : '? - ';
$person_name = $officialCode.$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')'; $person_name = $officialCode.$user['lastname'].' '.$user['firstname'].' ('.$user['username'].')';
} }
$return .= '<option value="'.$user['id'].'">'.$person_name.' </option>'; $return .= '<option value="'.$user['id'].'">'.trim($person_name).' </option>';
} }
$return .= '</select>'; $return .= '</select>';
$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return)); $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@ -560,32 +561,33 @@ $link_add_group = Display::url(
$newLinks = Display::url( $newLinks = Display::url(
Display::return_icon('teacher.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY). Display::return_icon('teacher.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
get_lang('Enroll trainers from existing sessions'), get_lang('Enroll trainers from existing sessions'),
api_get_path(WEB_CODE_PATH).'session/add_teachers_to_session.php?id='.$id_session api_get_path(WEB_CODE_PATH).'session/add_teachers_to_session.php?id='.$id_session
); );
$newLinks .= Display::url( $newLinks .= Display::url(
Display::return_icon('user.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY). Display::return_icon('user.png', get_lang('Enroll trainers from existing sessions'), null, ICON_SIZE_TINY).
get_lang('Enroll students from existing sessions'), get_lang('Enroll students from existing sessions'),
api_get_path(WEB_CODE_PATH).'session/add_students_to_session.php?id='.$id_session api_get_path(WEB_CODE_PATH).'session/add_students_to_session.php?id='.$id_session
); );
echo '<div class="actions">';
echo $link_add_type_unique;
echo $link_add_type_multiple;
echo $link_add_group;
echo $newLinks;
echo '</div>';
?> ?>
<div class="actions">
<?php
echo $link_add_type_unique;
echo $link_add_type_multiple;
echo $link_add_group;
echo $newLinks;
?>
</div>
<form name="formulaire" method="post" <form name="formulaire" method="post"
action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($addProcess)) { action="<?php echo api_get_self(
echo '&add=true'; ); ?>?page=<?php echo $page; ?>&id_session=<?php echo $id_session; ?><?php if (!empty($addProcess)) {
} ?>" <?php if ($ajax_search) { echo '&add=true';
echo ' onsubmit="valide();"'; } ?>" <?php if ($ajax_search) {
} ?>> echo ' onsubmit="valide();"';
} ?>>
<?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?> <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?>
<?php <?php
if ('multiple' == $add_type) { if ('multiple' === $add_type) {
if (is_array($extra_field_list)) { if (is_array($extra_field_list)) {
if (is_array($new_field_list) && count($new_field_list) > 0) { if (is_array($new_field_list) && count($new_field_list) > 0) {
echo '<h3>'.get_lang('Filter users').'</h3>'; echo '<h3>'.get_lang('Filter users').'</h3>';
@ -638,12 +640,12 @@ $newLinks .= Display::url(
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
if (!('multiple' == $add_type)) { if (!('multiple' === $add_type)) {
?> ?>
<input <input
placeholder="<?php echo get_lang('Search'); ?>" placeholder="<?php echo get_lang('Search'); ?>"
type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')"
class="form-control"/> class="form-control"/>
<div id="ajax_list_users_single" class="select-list-ajax"></div> <div id="ajax_list_users_single" class="select-list-ajax"></div>
<?php <?php
} else { } else {
@ -653,30 +655,25 @@ $newLinks .= Display::url(
class="form-control"> class="form-control">
<?php <?php
foreach ($nosessionUsersList as $uid => $enreg) { foreach ($nosessionUsersList as $uid => $enreg) {
?> $selected = in_array($uid, $UserList) ? 'selected="selected"' : '';
<option value="<?php echo $uid; ?>" <?php if (in_array($uid, $UserList)) { $personName = $enreg['ln'].' '.$enreg['fn'].' ('.$enreg['un'].')';
echo 'selected="selected"'; if (!empty($enreg['official_code'])) {
} ?>> $personName.= ' '.$enreg['official_code'];
<?php }
$personName = $enreg['ln'].' '.$enreg['fn'].' ('.$enreg['un'].') '
.$enreg['official_code'];
if ($showOfficialCode) { if ($showOfficialCode) {
$officialCode = $officialCode = !empty($enreg['official_code']) ? $enreg['official_code'].' - ' : '? - ';
!empty($enreg['official_code']) ? $enreg['official_code'].' - ' $personName = $officialCode.$enreg['ln'].' '.$enreg['fn'].' ('.$enreg['un'].')';
: '? - ';
$personName =
$officialCode.$enreg['ln'].' '.$enreg['fn'].' ('.$enreg['un'].')';
} }
echo $personName; ?> echo "<option value='$uid' $selected>$personName</option>";
</option>
<?php
} ?> } ?>
</select> </select>
</div> </div>
<input type="checkbox" onchange="checked_in_no_session(this.checked);" <input type="checkbox" onchange="checked_in_no_session(this.checked);"
name="user_with_any_session" id="user_with_any_session_id"> name="user_with_any_session" id="user_with_any_session_id">
<label <label
for="user_with_any_session_id"><?php echo get_lang('Users not registered in any session'); ?></label> for="user_with_any_session_id"><?php echo get_lang(
'Users not registered in any session'
); ?></label>
<?php <?php
} }
unset($nosessionUsersList); unset($nosessionUsersList);
@ -685,24 +682,21 @@ $newLinks .= Display::url(
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<?php if ('multiple' == $add_type) { <?php if ('multiple' === $add_type) {
?> ?>
<?php echo get_lang('First letter (last name)'); ?> : <?php echo get_lang('First letter (last name)'); ?> :
<select id="first_letter_user" name="firstLetterUser" onchange="change_select(this.value);"> <select id="first_letter_user" name="firstLetterUser" onchange="change_select(this.value);">
<option value="%">--</option> <option value="%">--</option>
<?php <?php
echo Display:: get_alphabet_options(); ?> echo Display::get_alphabet_options(); ?>
</select> </select>
<br/> <br/>
<br/> <br/>
<?php <?php
} ?> } ?>
<div class="control-course"> <div class="control-course">
<?php <?php
if ($ajax_search) { if ($ajax_search) {
?>
<?php
} else { } else {
?> ?>
<div class="separate-action"> <div class="separate-action">
@ -719,7 +713,6 @@ $newLinks .= Display::url(
<em class="fa fa-chevron-left"></em> <em class="fa fa-chevron-left"></em>
</button> </button>
</div> </div>
<?php <?php
} }
if (!empty($addProcess)) { if (!empty($addProcess)) {
@ -737,12 +730,11 @@ $newLinks .= Display::url(
<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" <select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15"
class="form-control"> class="form-control">
</select> </select>
<br /> <br/>
<button style="display:none" id="remove_user" name="remove_user" class="btn btn-danger" type="button" <button style="display:none" id="remove_user" name="remove_user" class="btn btn-danger" type="button"
onclick="remove_item(document.getElementById('destination_users'))"> onclick="remove_item(document.getElementById('destination_users'))">
<?php echo get_lang('Remove'); ?> <em class="fa fa-trash"></em> <?php echo get_lang('Remove'); ?> <em class="fa fa-trash"></em>
</button> </button>
</div> </div>
</div> </div>
</form> </form>

3
tests/behat/features/sessionAccess.feature
Unescape View File

@ -19,8 +19,7 @@ Feature: Session access
Then I should see "Subscribe users to this session" Then I should see "Subscribe users to this session"
Then I follow "Multiple registration" Then I follow "Multiple registration"
And wait very long for the page to be loaded And wait very long for the page to be loaded
And wait very long for the page to be loaded Then I select "Warnier Yannick (ywarnier)" from "origin_users"
Then I select "Warnier Yannick (ywarnier)" from "nosessionUsersList[]"
And I press "add_user" And I press "add_user"
And I press "next" And I press "next"
And wait very long for the page to be loaded And wait very long for the page to be loaded

Write Preview
Loading…
Cancel
Save