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

Improving group UI see BT#7682

Browse Source
1.9.x
Julio Montoya 11 years ago
parent c9980f4289
commit 13c41764e0
5 changed files with 102 additions and 69 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. 57
      main/group/group_category.php
  2. 11
      main/group/group_creation.php
  3. 19
      main/group/settings.php
  4. 65
      main/inc/lib/groupmanager.lib.php
  5. 19
      main/user/user.php

57
main/group/group_category.php
Unescape View File

@ -87,7 +87,6 @@ if (isset($_GET['id'])) {
// Update settings of existing category
$action = 'update_settings';
$form = new FormValidator('group_category', 'post', '?id='.$category['id']);
$form->addElement('header', $nameTools);
$form->addElement('hidden', 'id');
} else {
// Checks if the field was created in the table Category. It creates it if is neccesary
@ -102,41 +101,49 @@ if (isset($_GET['id'])) {
// If categories allowed, show title & description field
if (api_get_setting('allow_group_categories') == 'true') {
$form->addElement('header', $nameTools);
$form->addElement('html', '<div class="row"><div class="span6">');
$form->add_textfield('title', get_lang('Title'));
// Groups per user
$possible_values = array();
for ($i = 1; $i <= 10; $i ++) {
$possible_values[$i] = $i;
}
$possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All');
$group = array(
$form->createElement('select', 'groups_per_user', null, $possible_values),
$form->createElement('static', null, null, get_lang('QtyOfUserCanSubscribe_PartAfterNumber'))
);
$form->addGroup($group, 'limit_group', get_lang('GroupLimit'), ' ', false);
$form->addRule('limit_group', get_lang('MaxGroupsPerUserInvalid'), 'callback', 'check_groups_per_user');
// Members per group
$group = array(
$form->createElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'), GroupManager::MEMBER_PER_GROUP_NO_LIMIT),
$form->createElement('radio', 'max_member_no_limit', null, get_lang('MaximumOfParticipants'), 1, array('id' => 'max_member_selected')),
$form->createElement('text', 'max_member', null, array('class' => 'span1', 'id' => 'max_member')),
$form->createElement('static', null, null, ' '.get_lang('GroupPlacesThis'))
);
$form->addGroup($group, 'max_member_group', get_lang('GroupLimit'), '', false);
$form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callback', 'check_max_number_of_members');
$form->addElement('html', '</div>');
$form->addElement('html', '<div class="span6">');
// Description
$form->addElement('textarea', 'description', get_lang('Description'), array ('class' => 'span6', 'rows' => 6));
$form->addElement('html', '</div>');
$form->addElement('html', '</div>');
} else {
$form->addElement('hidden', 'title');
$form->addElement('hidden', 'description');
}
$form->addElement('header', get_lang('DefaultSettingsForNewGroups'));
// Action
$form->addElement('hidden', 'action');
// Groups per user
//$group[] = $form->createElement('static', null, null, get_lang('QtyOfUserCanSubscribe_PartBeforeNumber'));
$possible_values = array ();
for ($i = 1; $i <= 10; $i ++) {
$possible_values[$i] = $i;
}
$possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All');
$group = array(
$form->createElement('select', 'groups_per_user', null, $possible_values),
$form->createElement('static', null, null, get_lang('QtyOfUserCanSubscribe_PartAfterNumber'))
);
$form->addGroup($group, 'limit_group', get_lang('GroupLimit'), ' ', false);
$form->addRule('limit_group', get_lang('MaxGroupsPerUserInvalid'), 'callback', 'check_groups_per_user');
$form->addElement('header', get_lang('DefaultSettingsForNewGroups'));
// Members per group
$group = array(
$form->createElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'), GroupManager::MEMBER_PER_GROUP_NO_LIMIT),
$form->createElement('radio', 'max_member_no_limit', null, get_lang('MaximumOfParticipants'), 1, array('id' => 'max_member_selected')),
$form->createElement('text', 'max_member', null, array('class' => 'span1', 'id' => 'max_member')),
$form->createElement('static', null, null, ' '.get_lang('GroupPlacesThis'))
);
$form->addGroup($group, 'max_member_group', get_lang('GroupLimit'), '', false);
$form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callback', 'check_max_number_of_members');
$form->addElement('html', '<div class="span6">');

11
main/group/group_creation.php
Unescape View File

@ -152,16 +152,16 @@ elseif (isset($_POST['number_of_groups'])) {
EOT;
$renderer->setElementTemplate($element_template);
$form->addElement('header', $nameTools);
$form->addElement('hidden', 'action');
$form->addElement('hidden', 'number_of_groups');
$defaults = array ();
// Table heading
$group_el = array ();
$group_el[] =$form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
if (api_get_setting('allow_group_categories') == 'true') {
$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
}
//$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupTutor').'</b>');
$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupPlacesThis').'</b>');
$form->addGroup($group_el, 'groups', null, "\n</td>\n<td>\n", false);
// Checkboxes
@ -197,25 +197,22 @@ EOT;
}
$defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
$form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
}
$defaults['action'] = 'create_groups';
$defaults['number_of_groups'] = intval($_POST['number_of_groups']);
$form->setDefaults($defaults);
$form->addElement('style_submit_button', 'submit', get_lang('CreateGroup'), 'class="save"');
echo Display::tag('h2',$nameTools);
$form->display();
$form->display();
}
} else {
/*
* Show form to generate new groups
*/
$categories = GroupManager :: get_categories();
//echo '<blockquote>';
if (count($categories) > 1 || isset ($categories[0]) && $categories[0]['id'] != GroupManager::VIRTUAL_COURSE_CATEGORY) {
$create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
$create_groups_form->addElement('header', '', $nameTools);
$create_groups_form->addElement('header', $nameTools);
$group_el = array ();
$group_el[] = $create_groups_form->createElement('static', null, null, get_lang('Create'));
$group_el[] = $create_groups_form->createElement('text', 'number_of_groups', null, array('class' => 'span1'));

19
main/group/settings.php
Unescape View File

@ -29,7 +29,6 @@ $current_group = GroupManager :: get_group_properties($group_id);
$nameTools = get_lang('EditGroup');
$interbreadcrumb[] = array('url' => 'group.php', 'name' => get_lang('Groups'));
$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidReq(), 'name' => $current_group['name']);
$is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $group_id);
if (!api_is_allowed_to_edit(false, true) && !$is_group_member) {
@ -39,13 +38,14 @@ if (!api_is_allowed_to_edit(false, true) && !$is_group_member) {
// Build form
$form = new FormValidator('group_edit', 'post', api_get_self().'?'.api_get_cidreq());
$form->addElement('hidden', 'action');
$form->addElement('html', '<div class="span12">');
$form->addElement('header', $nameTools);
$form->addElement('html', '</div>');
$form->addElement('html', '<div class="span6">');
// Group name
$form->addElement('text', 'name', get_lang('GroupName'));
// Description
$form->addElement('textarea', 'description', get_lang('Description'), array ('class' => 'span6', 'rows' => 6));
// Members per group
$group = array(
$form->createElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'), GroupManager::MEMBER_PER_GROUP_NO_LIMIT),
@ -56,6 +56,17 @@ $group = array(
$form->addGroup($group, 'max_member_group', get_lang('GroupLimit'), '', false);
$form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callback', 'check_max_number_of_members');
$form->addElement('html', '</div>');
$form->addElement('html', '<div class="span6">');
// Description
$form->addElement('textarea', 'description', get_lang('Description'), array ('class' => 'span6', 'rows' => 6));
$form->addElement('html', '</div>');
$form->addElement('html', '<div class="span12">');
$form->addElement('header', get_lang('DefaultSettingsForNewGroups'));
$form->addElement('html', '</div>');
$form->addElement('html', '<div class="span6">');
// Self registration

65
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -1788,7 +1788,6 @@ class GroupManager
*/
public static function user_has_access($user_id, $group_id, $tool)
{
// Admin have access everywhere
if (api_is_platform_admin()) {
return true;
@ -1830,23 +1829,6 @@ class GroupManager
// Check group properties
$group_info = self :: get_group_properties($group_id);
/*if (api_get_setting('allow_group_categories') == 'true') {
// Check if group category exists
$category_group_info = self::get_category_from_group($group_id);
if (!empty($category_group_info)) {
// If exists check the category group status first
if ($category_group_info[$state_key] == self::TOOL_NOT_AVAILABLE) {
return false;
} elseif($category_group_info[$state_key] == self::TOOL_PRIVATE && !$user_is_in_group) {
return false;
}
}
}*/
// is_user_in_group() is more complete that the is_subscribed() function
if ($group_info[$state_key] == self::TOOL_NOT_AVAILABLE) {
return false;
} elseif ($group_info[$state_key] == self::TOOL_PUBLIC) {
@ -1864,6 +1846,8 @@ class GroupManager
/**
* Get all groups where a specific user is subscribed
* @param int $user_id
* @return array
*/
public static function get_user_group_name($user_id)
{
@ -1871,12 +1855,45 @@ class GroupManager
$table_group = Database::get_course_table(TABLE_GROUP);
$user_id = intval($user_id);
$course_id = api_get_course_int_id();
$sql_groups = "SELECT name FROM $table_group g INNER JOIN $table_group_user gu
ON (gu.group_id=g.id)
WHERE gu.c_id= $course_id AND
g.c_id= $course_id AND
gu.user_id = $user_id";
$res = Database::query($sql_groups);
$sql = "SELECT name
FROM $table_group g INNER JOIN $table_group_user gu
ON (gu.group_id=g.id)
WHERE
gu.c_id= $course_id AND
g.c_id= $course_id AND
gu.user_id = $user_id";
$res = Database::query($sql);
$groups = array();
while ($group = Database::fetch_array($res)) {
$groups[] .= $group['name'];
}
return $groups;
}
/**
* Get all groups where a specific user is subscribed
* @param int $user_id
* @return array
*/
public static function getAllGroupPerUserSubscription($user_id)
{
$table_group_user = Database::get_course_table(TABLE_GROUP_USER);
$table_tutor_user = Database::get_course_table(TABLE_GROUP_TUTOR);
$table_group = Database::get_course_table(TABLE_GROUP);
$user_id = intval($user_id);
$course_id = api_get_course_int_id();
$sql = "SELECT DISTINCT name FROM $table_group g
INNER JOIN $table_group_user gu
ON (gu.group_id = g.id)
INNER JOIN $table_tutor_user tu
ON (tu.group_id = g.id)
WHERE
tu.c_id= $course_id AND
gu.c_id= $course_id AND
g.c_id= $course_id AND
(gu.user_id = $user_id OR tu.user_id = $user_id) ";
$res = Database::query($sql);
$groups = array();
while ($group = Database::fetch_array($res)) {
$groups[] .= $group['name'];

19
main/user/user.php
Unescape View File

@ -548,17 +548,17 @@ function get_user_data($from, $number_of_items, $column, $direction) {
foreach ($a_course_users as $user_id => $o_course_user) {
if ((
isset($_GET['keyword']) &&
searchUserKeyword(
$o_course_user['firstname'],
$o_course_user['lastname'],
$o_course_user['username'],
$o_course_user['official_code'],
$_GET['keyword'])
isset($_GET['keyword']) &&
searchUserKeyword(
$o_course_user['firstname'],
$o_course_user['lastname'],
$o_course_user['username'],
$o_course_user['official_code'],
$_GET['keyword'])
) || !isset($_GET['keyword']) || empty($_GET['keyword'])
) {
$groups_name = GroupManager :: get_user_group_name($user_id);
$groups_name = GroupManager::getAllGroupPerUserSubscription($user_id);
$temp = array();
if (api_is_allowed_to_edit(null, true)) {
$temp[] = $user_id;
@ -621,7 +621,8 @@ function get_user_data($from, $number_of_items, $column, $direction) {
}
$temp[] = $o_course_user['username'];
$temp[] = $o_course_user['role'];
$temp[] = implode(', ', $groups_name);//Group
// Group.
$temp[] = implode(', ', $groups_name);
if ($course_info['unsubscribe'] == 1) {
//User id for actions

Write Preview
Loading…
Cancel
Save