|
@@ -1339,15 +1339,10 @@ class IndexManager
|
|
|
|
|
|
if ($specialCourses) {
|
|
|
if ($categoryCodeFilter) {
|
|
|
- $specialCourses = self::filterByCategory(
|
|
|
- $specialCourses,
|
|
|
- $categoryCodeFilter
|
|
|
- );
|
|
|
+ $specialCourses = self::filterByCategory($specialCourses, $categoryCodeFilter);
|
|
|
}
|
|
|
$this->tpl->assign('courses', $specialCourses);
|
|
|
- $specialCourseList = $this->tpl->fetch(
|
|
|
- $this->tpl->get_template($coursesWithoutCategoryTemplate)
|
|
|
- );
|
|
|
+ $specialCourseList = $this->tpl->fetch($this->tpl->get_template($coursesWithoutCategoryTemplate));
|
|
|
$courseCompleteList = array_merge($courseCompleteList, $specialCourses);
|
|
|
}
|
|
|
|
|
@@ -1385,6 +1380,14 @@ class IndexManager
|
|
|
|
|
|
$sessions_with_category = '';
|
|
|
$sessions_with_no_category = '';
|
|
|
+
|
|
|
+ $collapsable = api_get_configuration_value('allow_user_session_collapsable');
|
|
|
+ $collapsableLink = '';
|
|
|
+ if ($collapsable) {
|
|
|
+ $collapsableLink = api_get_path(WEB_PATH).'user_portal.php?action=collapse_session';
|
|
|
+ }
|
|
|
+
|
|
|
+ $extraFieldValue = new ExtraFieldValue('session');
|
|
|
if ($showSessions) {
|
|
|
$coursesListSessionStyle = api_get_configuration_value('courses_list_session_title_link');
|
|
|
$coursesListSessionStyle = $coursesListSessionStyle === false ? 1 : $coursesListSessionStyle;
|
|
@@ -1558,7 +1561,6 @@ class IndexManager
|
|
|
];
|
|
|
$session_box = Display::getSessionTitleBox($session_id);
|
|
|
$coachId = $session_box['id_coach'];
|
|
|
- $extraFieldValue = new ExtraFieldValue('session');
|
|
|
$imageField = $extraFieldValue->get_values_by_handler_and_field_variable(
|
|
|
$session_id,
|
|
|
'image'
|
|
@@ -1567,9 +1569,8 @@ class IndexManager
|
|
|
$params['category_id'] = $session_box['category_id'];
|
|
|
$params['title'] = $session_box['title'];
|
|
|
$params['id_coach'] = $coachId;
|
|
|
- $params['coach_url'] = api_get_path(
|
|
|
- WEB_AJAX_PATH
|
|
|
- ).'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId;
|
|
|
+ $params['coach_url'] = api_get_path(WEB_AJAX_PATH).
|
|
|
+ 'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId;
|
|
|
$params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
|
|
|
$params['coach_avatar'] = UserManager::getUserPicture(
|
|
|
$coachId,
|
|
@@ -1579,6 +1580,18 @@ class IndexManager
|
|
|
$params['image'] = isset($imageField['value']) ? $imageField['value'] : null;
|
|
|
$params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
|
|
|
$params['show_actions'] = SessionManager::cantEditSession($session_id);
|
|
|
+
|
|
|
+ if ($collapsable) {
|
|
|
+ $collapsableData = Sessionmanager::getCollapsableData(
|
|
|
+ $user_id,
|
|
|
+ $session_id,
|
|
|
+ $extraFieldValue,
|
|
|
+ $collapsableLink
|
|
|
+ );
|
|
|
+ $params['collapsed'] = $collapsableData['collapsed'];
|
|
|
+ $params['collapsable_link'] = $collapsableData['collapsable_link'];
|
|
|
+ }
|
|
|
+
|
|
|
$params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription;
|
|
|
$params['description'] = $session_box['description'];
|
|
|
$params['visibility'] = $session_box['visibility'];
|
|
@@ -1722,6 +1735,17 @@ class IndexManager
|
|
|
$sessionParams[0]['is_old'] = $markAsOld;
|
|
|
$sessionParams[0]['is_future'] = $markAsFuture;
|
|
|
|
|
|
+ if ($collapsable) {
|
|
|
+ $collapsableData = Sessionmanager::getCollapsableData(
|
|
|
+ $user_id,
|
|
|
+ $session_id,
|
|
|
+ $extraFieldValue,
|
|
|
+ $collapsableLink
|
|
|
+ );
|
|
|
+ $sessionParams[0]['collapsable_link'] = $collapsableData['collapsable_link'];
|
|
|
+ $sessionParams[0]['collapsed'] = $collapsableData['collapsed'];
|
|
|
+ }
|
|
|
+
|
|
|
if ($showSimpleSessionInfo) {
|
|
|
$sessionParams[0]['subtitle'] = self::getSimpleSessionDetails(
|
|
|
$session_box['coach'],
|