Skip to content

Commit

Permalink
Fix users count when removing user from course #2087
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC committed Aug 29, 2017
1 parent 7f127cf commit c9857e9
Show file tree
Hide file tree
Showing 2 changed files with 169 additions and 222 deletions.
337 changes: 115 additions & 222 deletions main/session/session_course_user.php
Expand Up @@ -4,271 +4,164 @@
* @package chamilo.admin
*/

use Chamilo\CoreBundle\Entity\Session,

This comment has been minimized.

Copy link
@jmontoyaa

jmontoyaa Aug 29, 2017

Member

One "use" keyword per line.

This comment has been minimized.

Copy link
@AngelFQC

AngelFQC Aug 29, 2017

Author Member

Fixed

Chamilo\CoreBundle\Entity\Course,
Chamilo\UserBundle\Entity\User,
Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;

// resetting the course id
$cidReset = true;

require_once __DIR__.'/../inc/global.inc.php';

// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
$tool_name = get_lang('EditSessionCoursesByUser');

$id_session = intval($_GET['id_session']);
SessionManager::protectSession($id_session);

// setting breadcrumbs
$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
$interbreadcrumb[] = array(
'url' => 'resume_session.php?id_session='.$id_session,
'name' => get_lang('SessionOverview'),
);

// Database Table Definitions
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$id_user = intval($_GET['id_user']);

// setting the name of the tool
$tool_name = get_lang('EditSessionCoursesByUser');
SessionManager::protectSession($id_session);

$id_user = intval($_GET['id_user']);
$em = Database::getManager();
/** @var Session $session */
$session = $em->find('ChamiloCoreBundle:Session', $id_session);
$user = api_get_user_entity($id_user);

if (empty($id_user) || empty($id_session)) {
header('Location: resume_session.php?id_session='.$id_session);
if (!api_is_platform_admin() && $session->getSessionAdminId() != api_get_user_id()) {
api_not_allowed(true);
}

if (!api_is_platform_admin()) {
$sql = 'SELECT session_admin_id
FROM '.Database::get_main_table(TABLE_MAIN_SESSION).'
WHERE id='.$id_session;
$rs = Database::query($sql);
if (Database::result($rs, 0, 0) != $_user['user_id']) {
api_not_allowed(true);
}
if (!$session->getCourses()->count()) {
Display::addFlash(Display::return_message(get_lang('NoCoursesForThisSession'), 'warning'));
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
exit;
}

$formSent = 0;
$CourseList = $SessionList = array();
$courses = $sessions = array();
$noPHP_SELF = true;
$avoidedCourseIds = getAvoidedCourses($user, $session);

if (isset($_POST['formSent']) && $_POST['formSent']) {
$formSent = $_POST['formSent'];
$CourseList = isset($_POST['SessionCoursesList']) ? ($_POST['SessionCoursesList']) : null;

if (!is_array($CourseList)) {
$CourseList = array();
}
$form = new FormValidator(
'session_course_user',
'post',
api_get_self().'?id_user='.$user->getId().'&id_session='.$session->getId()
);
$form->addElement(
'advmultiselect',
'courses_to_avoid',
$tool_name,
getSessionCourseList($session)
);
$form->addButtonSave(get_lang('Save'));

$sql = "SELECT DISTINCT course.id
FROM $tbl_course course
LEFT JOIN $tbl_session_rel_course session_rel_course
ON course.id = session_rel_course.c_id
INNER JOIN $tbl_session_rel_course_rel_user as srcru
ON (srcru.session_id = session_rel_course.session_id)
WHERE
user_id = $id_user AND
session_rel_course.session_id = $id_session";

$rs = Database::query($sql);
$existingCourses = Database::store_result($rs);

if (empty($CourseList) && empty($existingCourses)) {
Display::addFlash(Display::return_message(get_lang('NoCoursesForThisSession'), 'warning'));
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
exit;
}
if ($form->validate()) {
$values = $form->exportValues();
$values['courses_to_avoid'] = !empty($values['courses_to_avoid']) ? $values['courses_to_avoid'] : [];

if (count($CourseList) == count($existingCourses)) {
if ($session->getCourses()->count() == count($values['courses_to_avoid'])) {
Display::addFlash(Display::return_message(get_lang('MaybeYouWantToDeleteThisUserFromSession')));
header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
header('Location: session_course_user.php?id_session=' . $id_session . '&id_user=' . $id_user);
exit;
}

foreach ($CourseList as $enreg_course) {
$exists = false;
foreach ($existingCourses as $existingCourse) {
if ($enreg_course == $existingCourse['id']) {
$exists = true;
}
}
foreach ($values['courses_to_avoid'] as $courseId) {
/** @var Course $course */
$course = $em->find('ChamiloCoreBundle:Course', $courseId);

if (!$exists) {
$enreg_course = Database::escape_string($enreg_course);
$sql = "DELETE FROM $tbl_session_rel_course_rel_user
WHERE user_id = '".$id_user."' AND c_id='".$enreg_course."' AND session_id=$id_session";
$result = Database::query($sql);
if (Database::affected_rows($result)) {
//update session rel course table
$sql = "UPDATE $tbl_session_rel_course
SET nbr_users= nbr_users - 1
WHERE session_id='$id_session' AND c_id = '$enreg_course'";
Database::query($sql);
}
if (!$session->getUserInCourse($user, $course)->count()) {
continue;
}

$session->removeUserCourseSubscription($user, $course);
}

foreach ($existingCourses as $existingCourse) {
if (!in_array($existingCourse['id'], $CourseList)) {
$existingCourse = Database::escape_string($existingCourse['id']);
$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (session_id,c_id,user_id)
VALUES ('$id_session','$existingCourse','$id_user')";
$result = Database::query($sql);
if (Database::affected_rows($result)) {
//update session rel course table
$sql = "UPDATE $tbl_session_rel_course
SET nbr_users= nbr_users + 1
WHERE session_id='$id_session' AND c_id = '$existingCourse'";
Database::query($sql);
}
$coursesToResubscribe = array_diff($avoidedCourseIds, $values['courses_to_avoid']);

foreach ($coursesToResubscribe as $courseId) {
/** @var Course $course */
$course = $em->find('ChamiloCoreBundle:Course', $courseId);

if ($session->getUserInCourse($user, $course)->count()) {
continue;
}

$session->addUserInCourse(Session::STUDENT, $user, $course);
}
Display::addFlash(Display::return_message(get_lang('CoursesUpdated')));

header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
$em->persist($session);
$em->flush();

Display::addFlash(Display::return_message(get_lang('CoursesUpdated')));
header('Location: session_course_user.php?id_session='.$session->getId().'&id_user='.$user->getId());
exit;
}

Display::display_header($tool_name);
$form->setDefaults(['courses_to_avoid' => $avoidedCourseIds]);

// the form header
$session_info = SessionManager::fetch($id_session);
$user_info = api_get_user_info($id_user);
echo '<legend>'.$tool_name.': '.$session_info['name'].' - '.$user_info['complete_name'].'</legend>';

$nosessionCourses = $sessionCourses = array();
// actual user
$sql = "SELECT course.id, code, title, visual_code, srcru.session_id
FROM $tbl_course course
INNER JOIN $tbl_session_rel_course_rel_user as srcru
ON course.id = srcru.c_id
WHERE srcru.user_id = $id_user AND session_id = $id_session";

//all
$sql_all = "SELECT course.id, code, title, visual_code, src.session_id
FROM $tbl_course course
INNER JOIN $tbl_session_rel_course as src
ON course.id = src.c_id AND session_id = $id_session";
$result = Database::query($sql);
$Courses = Database::store_result($result);

$result = Database::query($sql_all);
$CoursesAll = Database::store_result($result);

$course_temp = array();
foreach ($Courses as $course) {
$course_temp[] = $course['id'];
}
/* View */
// setting breadcrumbs
$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
$interbreadcrumb[] = array(
'url' => 'resume_session.php?id_session='.$id_session,
'name' => get_lang('SessionOverview'),
);

foreach ($CoursesAll as $course) {
if (in_array($course['id'], $course_temp)) {
$nosessionCourses[$course['id']] = $course;
} else {
$sessionCourses[$course['id']] = $course;
}
}
unset($Courses);
Display::display_header($tool_name);
echo Display::page_header($session->getName().' - '.$user->getCompleteName());
?>
<div class="row">
<div class="col-sm-8 col-sm-offset-2">
<div class="row">
<div class="col-sm-5">
<label for="courses_to_avoid-f"><?php echo get_lang('CourseListInSession') ?></label>
</div>
<div class="col-sm-5 col-sm-offset-2">
<label for="courses_to_avoid-t"><?php echo get_lang('CoursesToAvoid') ?></label>
</div>
</div>
</div>
</div>
<?php
echo $form->returnForm();

<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id_user=<?php echo $id_user; ?>&id_session=<?php echo $id_session; ?>" style="margin:0px;">
<input type="hidden" name="formSent" value="1" />
<table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
<tr>
<td width="45%" align="center"><b><?php echo get_lang('CurrentCourses') ?> :</b></td>
<td width="10%">&nbsp;</td>
<td align="center" width="45%"><b><?php echo get_lang('CoursesToAvoid') ?> :</b></td>
</tr>
</td>
<tr>
<td width="45%" align="center">
<div id="ajax_list_courses_multiple">
<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:320px;"> <?php
foreach ($nosessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES).'"'; if (in_array($enreg['code'], $CourseList)) echo 'selected="selected"'; ?>><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
?> </select></div> <?php
unset($nosessionCourses);
?>

</select></td>
<td width="10%" valign="middle" align="center">
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
<em class="fa fa-arrow-right"></em>
</button>
<br /><br />
<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
<em class="fa fa-arrow-left"></em>
</button>
<br /><br /><br /><br /><br /><br />
<?php
echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.
get_lang('EditSessionCourses').'</button>';
?>
</td>
<td width="45%" align="center">
<select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:320px;">
<?php
foreach ($sessionCourses as $enreg) {
?>
<option value="<?php echo $enreg['id']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')', ENT_QUOTES); ?>"><?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?></option>
<?php
}
unset($sessionCourses);
?>
</select></td>
</tr>
</table>
</form>
<script>
function moveItem(origin , destination) {
for(var i = 0 ; i<origin.options.length ; i++) {
if(origin.options[i].selected) {
destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
origin.options[i]=null;
i = i-1;
}
}
destination.selectedIndex = -1;
sortOptions(destination.options);
}
Display::display_footer();

function sortOptions(options) {
/**
* @param Session $session
* @return array
*/
function getSessionCourseList(Session $session)

This comment has been minimized.

Copy link
@jmontoyaa

jmontoyaa Aug 29, 2017

Member

Better to move those functions in sessionmanager.lib.php or in the entity

This comment has been minimized.

Copy link
@AngelFQC

AngelFQC Aug 29, 2017

Author Member

I moved the next function (getAvoidedCourses) to SessionManager

{
$return = [];

foreach ($session->getCourses() as $sessionCourse) {
/** @var Course $course */
$course = $sessionCourse->getCourse();
$return[$course->getId()] = $course->getTitle().' ('.$course->getCode().')';
}

newOptions = new Array();
return $return;
};

for (i = 0 ; i<options.length ; i++) {
newOptions[i] = options[i];
}
/**
* @param User $user
* @param Session $session
* @return array
*/
function getAvoidedCourses(User $user, Session $session)
{
$return = [];

newOptions = newOptions.sort(mysort);
options.length = 0;
/** @var SessionRelCourseRelUser $sessionCourse */
foreach ($session->getCourses() as $sessionCourse) {
/** @var Course $course */
$course = $sessionCourse->getCourse();

for(i = 0 ; i < newOptions.length ; i++){
options[i] = newOptions[i];
if ($session->getUserInCourse($user, $course)->count()) {
continue;
}

$return[] = $course->getId();
}

function mysort(a, b){
if(a.text.toLowerCase() > b.text.toLowerCase()){
return 1;
}
if(a.text.toLowerCase() < b.text.toLowerCase()){
return -1;
}
return 0;
}

function valide(){
var options = document.getElementById('destination').options;
for (i = 0 ; i<options.length ; i++)
options[i].selected = true;

document.forms.formulaire.submit();
}
</script>
<?php
Display::display_footer();
return $return;
}

0 comments on commit c9857e9

Please sign in to comment.