Fix users count when removing user from course #2087

main/session/session_course_user.php

@@ -4,6 +4,11 @@
  *	@package chamilo.admin
  */
 
+use Chamilo\CoreBundle\Entity\Session,
+    Chamilo\CoreBundle\Entity\Course,
+    Chamilo\UserBundle\Entity\User,
+    Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
+
 // resetting the course id
 $cidReset = true;
 
@@ -11,264 +16,152 @@ 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);
+$id_user = intval($_GET['id_user']);
-
-// 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);
 
-// setting the name of the tool
+SessionManager::protectSession($id_session);
-$tool_name = get_lang('EditSessionCoursesByUser');
 
-$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)) {
+if (!api_is_platform_admin() && $session->getSessionAdminId() != api_get_user_id()) {
-    header('Location: resume_session.php?id_session='.$id_session);
+    api_not_allowed(true);
 }
 
-if (!api_is_platform_admin()) {
+if (!$session->getCourses()->count()) {
-    $sql = 'SELECT session_admin_id
+    Display::addFlash(Display::return_message(get_lang('NoCoursesForThisSession'), 'warning'));
-            FROM '.Database::get_main_table(TABLE_MAIN_SESSION).'
+    header('Location: session_course_user.php?id_session='.$id_session.'&id_user='.$id_user);
-            WHERE id='.$id_session;
+    exit;
-    $rs = Database::query($sql);
-    if (Database::result($rs, 0, 0) != $_user['user_id']) {
-        api_not_allowed(true);
-    }
 }
 
-$formSent = 0;
+$avoidedCourseIds = getAvoidedCourses($user, $session);
-$CourseList = $SessionList = array();
-$courses = $sessions = array();
-$noPHP_SELF = true;
 
-if (isset($_POST['formSent']) && $_POST['formSent']) {
+$form = new FormValidator(
-    $formSent = $_POST['formSent'];
+    'session_course_user',
-    $CourseList = isset($_POST['SessionCoursesList']) ? ($_POST['SessionCoursesList']) : null;
+    'post',
-
+    api_get_self().'?id_user='.$user->getId().'&id_session='.$session->getId()
-    if (!is_array($CourseList)) {
+);
-        $CourseList = array();
+$form->addElement(
-    }
+    'advmultiselect',
+    'courses_to_avoid',
+    $tool_name,
+    getSessionCourseList($session)
+);
+$form->addButtonSave(get_lang('Save'));
 
-    $sql = "SELECT DISTINCT course.id
+if ($form->validate()) {
-			FROM $tbl_course course
+    $values = $form->exportValues();
-			LEFT JOIN $tbl_session_rel_course session_rel_course
+    $values['courses_to_avoid'] = !empty($values['courses_to_avoid']) ? $values['courses_to_avoid'] : [];
-			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 (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) {
+    foreach ($values['courses_to_avoid'] as $courseId) {
-        $exists = false;
+        /** @var Course $course */
-        foreach ($existingCourses as $existingCourse) {
+        $course = $em->find('ChamiloCoreBundle:Course', $courseId);
-            if ($enreg_course == $existingCourse['id']) {
-                $exists = true;
-            }
-        }
 
-        if (!$exists) {
+        if (!$session->getUserInCourse($user, $course)->count()) {
-            $enreg_course = Database::escape_string($enreg_course);
+            continue;
-            $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);
-            }
         }
+
+        $session->removeUserCourseSubscription($user, $course);
     }
 
-    foreach ($existingCourses as $existingCourse) {
+    $coursesToResubscribe = array_diff($avoidedCourseIds, $values['courses_to_avoid']);
-        if (!in_array($existingCourse['id'], $CourseList)) {
+
-            $existingCourse = Database::escape_string($existingCourse['id']);
+    foreach ($coursesToResubscribe as $courseId) {
-            $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user (session_id,c_id,user_id)
+        /** @var Course $course */
-                    VALUES ('$id_session','$existingCourse','$id_user')";
+        $course = $em->find('ChamiloCoreBundle:Course', $courseId);
-            $result = Database::query($sql);
+
-            if (Database::affected_rows($result)) {
+        if ($session->getUserInCourse($user, $course)->count()) {
-                //update session rel course table
+            continue;
-                $sql = "UPDATE $tbl_session_rel_course
-                        SET nbr_users= nbr_users + 1
-                        WHERE session_id='$id_session' AND c_id = '$existingCourse'";
-                Database::query($sql);
-            }
         }
+
+        $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
+/* View */
-$session_info = SessionManager::fetch($id_session);
+// setting breadcrumbs
-$user_info = api_get_user_info($id_user);
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
-echo '<legend>'.$tool_name.': '.$session_info['name'].' - '.$user_info['complete_name'].'</legend>';
+$interbreadcrumb[] = array(
-
+    'url' => 'resume_session.php?id_session='.$id_session,
-$nosessionCourses = $sessionCourses = array();
+    'name' => get_lang('SessionOverview'),
-// 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'];
-}
 
-foreach ($CoursesAll as $course) {
+Display::display_header($tool_name);
-    if (in_array($course['id'], $course_temp)) {
+echo Display::page_header($session->getName().' - '.$user->getCompleteName());
-        $nosessionCourses[$course['id']] = $course;
-    } else {
-        $sessionCourses[$course['id']] = $course;
-    }
-}
-unset($Courses);
 ?>
+<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;">
+Display::display_footer();
-    <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);
-    }
 
-    function sortOptions(options) {
+/**
+ * @param Session $session
+ * @return array
+ */
+function getSessionCourseList(Session $session)
+{
+    $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);
+    /** @var SessionRelCourseRelUser $sessionCourse */
-        options.length = 0;
+    foreach ($session->getCourses() as $sessionCourse) {
+        /** @var Course $course */
+        $course = $sessionCourse->getCourse();
 
-        for(i = 0 ; i < newOptions.length ; i++){
+        if ($session->getUserInCourse($user, $course)->count()) {
-            options[i] = newOptions[i];
+            continue;
         }
 
+        $return[] = $course->getId();
     }
 
-    function mysort(a, b){
+    return $return;
-        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();

src/Chamilo/CoreBundle/Entity/Session.php

@@ -427,6 +427,32 @@ class Session
         }
     }
 
+    /**
+     * Remove course subscription for a user.
+     * If user status in session is student, then decrease number of course users
+     * @param User $user
+     * @param Course $course
+     */
+    public function removeUserCourseSubscription(User $user, Course $course)
+    {
+        /** @var SessionRelCourseRelUser $courseSubscription */
+        foreach ($this->userCourseSubscriptions as $i => $courseSubscription) {
+            if ($courseSubscription->getCourse()->getId() === $course->getId() &&
+                $courseSubscription->getUser()->getId() === $user->getId()) {
+
+                if ($this->userCourseSubscriptions[$i]->getStatus() === self::STUDENT) {
+                    $sessionCourse = $this->getCourseSubscription($course);
+
+                    $sessionCourse->setNbrUsers(
+                        $sessionCourse->getNbrUsers() - 1
+                    );
+                }
+
+                unset($this->userCourseSubscriptions[$i]);
+            }
+        }
+    }
+
     /**
      * @param User $user
      * @param Course $course
@@ -917,6 +943,26 @@ class Session
     }
 
     /**
+     * @param Course $course
+     * @return SessionRelCourse
+     */
+    public function getCourseSubscription(Course $course)
+    {
+        $criteria = Criteria::create()->where(
+            Criteria::expr()->eq('course', $course)
+        );
+
+        /** @var SessionRelCourse $sessionCourse */
+        $sessionCourse = $this->courses
+            ->matching($criteria)
+            ->current();
+
+        return $sessionCourse;
+    }
+
+    /**
+     * Add a user course subscription.
+     * If user status in session is student, then increase number of course users
      * @param int $status
      * @param User $user
      * @param Course $course
@@ -929,6 +975,14 @@ class Session
         $userRelCourseRelSession->setSession($this);
         $userRelCourseRelSession->setStatus($status);
         $this->addUserCourseSubscription($userRelCourseRelSession);
+
+        if ($status === self::STUDENT) {
+            $sessionCourse = $this->getCourseSubscription($course);
+
+            $sessionCourse->setNbrUsers(
+                $sessionCourse->getNbrUsers() + 1
+            );
+        }
     }
 
     /**