Added when a user is enrolled only in one course, go directly to the course after the login (defined by the platform administrator through platform administration > configuration setting > training)- DT#3466
Added user' photo into user list interface - DT#5496
Disabled field trainers(tutor name) in create course form from user portal, by default is current user's name, you can modify this field into setting course - DT#5496
-
Added option to export the trainings list to CSV file in Administration>Trainings - DT#4256
+
Added option to export the trainings list to CSV file in Administration>Trainings - DT#4256
+
Gradebook automatic deleted bug of a link fixed DT#5229
+
User tags added DT#5508
+
Who is online look revamped DT#5490
+
New search tool added DT#5610
+
User groups added DT#5611
+
Social network tab added
+
Debugging
diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index f30b46287b..94831ad06d 100644
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -39,7 +39,7 @@ $tbl_group_rel_user = Database::get_main_table(TABLE_MAIN_USER_REL_GROUP);
$tool_name = get_lang('SubscribeUsersToGroup');
$group_id = intval($_GET['id']);
-$add_type = 'single';
+$add_type = 'multiple';
if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
$add_type = Security::remove_XSS($_REQUEST['add_type']);
}
@@ -210,13 +210,19 @@ if($_POST['form_sent']) {
$UserList = $_POST['sessionUsersList'];
$ClassList = $_POST['sessionClassesList'];
+ $group_id = intval($_POST['id']);
+
if(!is_array($UserList)) {
$UserList=array();
}
if ($form_sent == 1) {
- //added a parameter to send emails when registering a user
- // SessionManager::suscribe_users_to_session($id_session,$UserList,true,true);
+
+ GroupPortalManager::delete_users($group_id);
+ $result = GroupPortalManager::add_users_to_groups($UserList, array($group_id));
+
+
+ //SessionManager::suscribe_users_to_session($id_session,$UserList,true,true);
//adding the session to the access_url_rel_session table
/*global $_configuration;
@@ -269,7 +275,7 @@ if ($ajax_search) {
WHERE access_url_id = $access_url_id
$order_clause";
}
- }
+ }
$result=Database::query($sql,__FILE__,__LINE__);
$Users=Database::store_result($result);
foreach ($Users as $user) {
@@ -332,14 +338,12 @@ if ($ajax_search) {
LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session'
$where_filter
- $order_clause";
-
- } else {
-
+ $order_clause";
+ } else {
$sql="SELECT u.user_id, lastname, firstname, username, group_id
FROM $tbl_user u
LEFT JOIN $tbl_group_rel_user gu
- ON (gu.user_id = u.user_id) WHERE gu.group_id = $group_id
+ ON (gu.user_id = u.user_id) AND gu.group_id = $group_id
$order_clause";
}
@@ -364,14 +368,14 @@ if ($ajax_search) {
if($user['group_id'] != $group_id)
$nosessionUsersList[$user['user_id']] = $user ;
}
- var_dump($nosessionUsersList);
+
$user_anonymous=api_get_anonymous_id();
- /* foreach($nosessionUsersList as $key_user_list =>$value_user_list) {
+ foreach($nosessionUsersList as $key_user_list =>$value_user_list) {
if ($nosessionUsersList[$key_user_list]['user_id']==$user_anonymous) {
unset($nosessionUsersList[$key_user_list]);
}
- }*/
-
+ }
+
//filling the correct users in list
$sql="SELECT u.user_id, lastname, firstname, username, group_id
FROM $tbl_user u
@@ -392,6 +396,7 @@ if ($ajax_search) {
$order_clause";
}
}
+
$result=Database::query($sql,__FILE__,__LINE__);
$Users=Database::store_result($result);
@@ -402,7 +407,7 @@ if ($ajax_search) {
}
foreach ($Users as $user) {
- if($user['group_id'] == $group_id){
+ if($user['group_id'] == $group_id) {
$sessionUsersList[$user['user_id']] = $user;
if (array_key_exists($user['user_id'],$nosessionUsersList))
unset($nosessionUsersList[$user['user_id']]);
@@ -411,25 +416,21 @@ if ($ajax_search) {
}
if ($add_type == 'multiple') {
- //$link_add_type_unique = ''.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'';
- //$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
+ $link_add_type_unique = ''.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'';
+ $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
} else {
- //$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
- //$link_add_type_multiple = ''.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'';
- /*
- *