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

Fixes after merge

Browse Source
pull/3006/head
Julio Montoya 6 years ago
parent 9eb9e741d8
commit 518191070d
4 changed files with 33 additions and 29 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. 4
      main/inc/lib/course.lib.php
  2. 4
      main/inc/lib/display.lib.php
  3. 4
      main/inc/lib/userportal.lib.php
  4. 50
      src/ThemeBundle/EventListener/TwigListener.php

4
main/inc/lib/course.lib.php
Unescape View File

@ -3926,8 +3926,8 @@ class CourseManager
$params['title_cut'] = $params['title'];
$params['category'] = $course_info['categoryName'];
$params['category_code'] = $course_info['categoryCode'];
$params['category_id'] = $course_info['categoryId'];
$params['color'] = Display::randomColor($params['category_id']);
//$params['category_id'] = $course_info['categoryId'];
//$params['color'] = Display::randomColor($params['category_id']);
$params['teachers'] = $teachers;
$params['real_id'] = $course_info['real_id'];

4
main/inc/lib/display.lib.php
Unescape View File

@ -1807,7 +1807,7 @@ class Display
/**
* Get the session box details as an array.
*
* @param int Session ID
* @param int $session_id
*
* @return array Empty array or session array
* ['title'=>'...','category'=>'','dates'=>'...','coach'=>'...','active'=>true/false,'session_category_id'=>int]
@ -1830,7 +1830,7 @@ class Display
$session = [];
$session['category_id'] = $session_info['session_category_id'];
$session['title'] = $session_info['name'];
$session['id_coach'] = $session_info['id_coach'];
$session['coach_id'] = $session['id_coach'] = $session_info['id_coach'];
$session['dates'] = '';
$session['coach'] = '';
if (api_get_setting('show_session_coach') === 'true' && isset($coachInfo['complete_name'])) {

4
main/inc/lib/userportal.lib.php
Unescape View File

@ -1487,8 +1487,8 @@ class IndexManager
$params['courses'] = $list_courses_session;
$params['is_old'] = $markAsOld;
$params['is_future'] = $markAsFuture;
$params['category'] = $session_box['category'];
$params['color'] = Display::randomColor($session_box['category']['id']);
//$params['category'] = $session_box['category'];
//$params['color'] = Display::randomColor($session_box['category']['id']);
if ($showSimpleSessionInfo) {
$params['subtitle'] = self::getSimpleSessionDetails(

50
src/ThemeBundle/EventListener/TwigListener.php
Unescape View File

@ -4,10 +4,12 @@
namespace Chamilo\ThemeBundle\EventListener;
use Chamilo\CoreBundle\Framework\Container;
use CourseManager;
use SessionManager;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\KernelEvents;
/**
@ -30,9 +32,9 @@ class TwigListener implements EventSubscriberInterface
}
/**
* @param GetResponseEvent $event
* @param RequestEvent $event
*/
public function onKernelRequest(GetResponseEvent $event)
public function onKernelRequest(RequestEvent $event)
{
if (!$event->isMasterRequest()) {
return;
@ -96,21 +98,23 @@ class TwigListener implements EventSubscriberInterface
if (!empty($courseId)) {
$tutorData = '';
if ($sessionId !== 0) {
$coachEmail = \CourseManager::get_email_of_tutor_to_session(
$sessionId,
$courseId
);
$email_link = [];
foreach ($coachEmail as $coach) {
$email_link[] = \Display::encrypted_mailto_link($coach['email'], $coach['complete_name']);
$users = SessionManager::getCoachesByCourseSession($sessionId, $courseId);
$links = [];
if (!empty($users)) {
$coaches = [];
foreach ($users as $userId) {
$coaches[] = api_get_user_info($userId);
}
$links = array_column($coaches, 'complete_name_with_message_link');
}
if (count($coachEmail) > 1) {
$count = count($links);
if ($count > 1) {
$tutorData .= get_lang('Coachs').' : ';
$tutorData .= array_to_string($email_link, \CourseManager::USER_SEPARATOR);
} elseif (count($coachEmail) == 1) {
$tutorData .= array_to_string($links, CourseManager::USER_SEPARATOR);
} elseif ($count === 1) {
$tutorData .= get_lang('Coach').' : ';
$tutorData .= array_to_string($email_link, \CourseManager::USER_SEPARATOR);
} elseif (count($coachEmail) == 0) {
$tutorData .= array_to_string($links, CourseManager::USER_SEPARATOR);
} elseif ($count === 0) {
$tutorData .= '';
}
}
@ -119,19 +123,19 @@ class TwigListener implements EventSubscriberInterface
if (!empty($courseId)) {
$teacherData = '';
$mail = \CourseManager::get_emails_of_tutors_to_course($courseId);
if (!empty($mail)) {
$teachers = CourseManager::getTeachersFromCourse($courseId);
if (!empty($teachers)) {
$teachersParsed = [];
foreach ($mail as $value) {
foreach ($value as $email => $name) {
$teachersParsed[] = \Display::encrypted_mailto_link($email, $name);
}
foreach ($teachers as $teacher) {
$userId = $teacher['id'];
$teachersParsed[] = api_get_user_info($userId);
}
$links = array_column($teachersParsed, 'complete_name_with_message_link');
$label = get_lang('Teacher');
if (count($mail) > 1) {
if (count($links) > 1) {
$label = get_lang('Teachers');
}
$teacherData .= $label.' : '.array_to_string($teachersParsed, \CourseManager::USER_SEPARATOR);
$teacherData .= $label.' : '.array_to_string($links, CourseManager::USER_SEPARATOR);
}
$twig->addGlobal('teachers', $teacherData);
}

Write Preview
Loading…
Cancel
Save