From fd62ba72117f70237b21d98d63ae9ff026ea6b34 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Tue, 8 Aug 2017 09:15:23 +0200 Subject: [PATCH] Minor - format code. --- main/inc/lib/sessionmanager.lib.php | 10 +++++----- main/session/resume_session.php | 21 ++++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index d5657b9541..7465715fa2 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -8668,16 +8668,16 @@ class SessionManager INNER JOIN ChamiloCoreBundle:SessionRelUser su WITH scu.user = su.user AND scu.session = su.session - WHERE scu.course = :course - AND su.relationType != :rrhh - AND scu.session = :session + WHERE + scu.course = :course AND + su.relationType <> :relationType AND + scu.session = :session ") ->setParameters([ 'course' => $course->getId(), - 'rrhh' => SESSION_RELATION_TYPE_RRHH, + 'relationType' => SESSION_RELATION_TYPE_RRHH, 'session' => $session->getId() ]) ->getSingleScalarResult(); - } } diff --git a/main/session/resume_session.php b/main/session/resume_session.php index cf4eaec184..90b9172ee5 100644 --- a/main/session/resume_session.php +++ b/main/session/resume_session.php @@ -163,19 +163,21 @@ if ($sessionInfo['nbr_courses'] == 0) { foreach ($courses as $course) { // Select the number of users - $numberOfUsers = SessionManager::getCountUsersInCourseSession($course, $session); + $numberOfUsers = SessionManager::getCountUsersInCourseSession( + $course, + $session + ); // Get coachs of the courses in session $namesOfCoaches = []; $coachSubscriptions = $session ->getUserCourseSubscriptionsByStatus($course, Session::COACH) - ->forAll(function($index, SessionRelCourseRelUser $subscription) use (&$namesOfCoaches) { + ->forAll(function ($index, SessionRelCourseRelUser $subscription) use (&$namesOfCoaches) { $namesOfCoaches[] = $subscription->getUser()->getCompleteNameWithUserName(); return true; }); $orderButtons = ''; - if (SessionManager::orderCourseIsEnabled()) { $orderButtons = Display::url( Display::return_icon( @@ -202,14 +204,15 @@ if ($sessionInfo['nbr_courses'] == 0) { // hide_course_breadcrumb the parameter has been added to hide the name // of the course, that appeared in the default $interbreadcrumb - $courseItem .= ' - - '.Display::url( + $courseItem .= ' + '. + Display::url( $course->getTitle().' ('.$course->getVisualCode().')', $courseUrl - ).' - '.($namesOfCoaches ? implode('
', $namesOfCoaches) : get_lang('None')).' - '.$numberOfUsers.' + ).''; + $courseItem .= ''.($namesOfCoaches ? implode('
', $namesOfCoaches) : get_lang('None')).''; + $courseItem .= ''.$numberOfUsers.''; + $courseItem .= ' '. Display::return_icon('course_home.gif', get_lang('Course')).'