Adding session.description field in userportal requires a DB change. Code is harmless if the field does not exists.

1.9.x
Julio Montoya 12 years ago
parent 764d8c64b4
commit 0608bb9386
  1. 3
      main/inc/lib/course.lib.php
  2. 19
      main/inc/lib/display.lib.php
  3. 7
      main/inc/lib/userportal.lib.php

@ -2899,6 +2899,9 @@ class CourseManager {
$html .= '<div class="span6 '.$param_class.'">';
$html .='<h3>'.$params['title'].$notifications.'</h3> ';
if (isset($params['description'])) {
$html .= '<p>'.$params['description'].'</p>';
}
if (!empty($params['subtitle'])) {
$html .= '<small>'.$params['subtitle'].'</small>';
}

@ -1239,20 +1239,21 @@ class Display {
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$active = false;
// Request for the name of the general coach
$sql ='SELECT tu.lastname, tu.firstname, ts.name, ts.date_start, ts.date_end, ts.session_category_id
$sql ='SELECT tu.lastname, tu.firstname, ts.*
FROM '.$tbl_session.' ts LEFT JOIN '.$main_user_table .' tu ON ts.id_coach = tu.user_id
WHERE ts.id='.intval($session_id);
WHERE ts.id = '.intval($session_id);
$rs = Database::query($sql);
$session_info = Database::store_result($rs);
$session_info = Database::store_result($rs, 'ASSOC');
$session_info = $session_info[0];
$session = array();
$session['title'] = $session_info[2];
$session['title'] = $session_info['name'];
$session['coach'] = '';
$session['dates'] = '';
if ($session_info['date_end'] == '0000-00-00' && $session_info['date_start'] == '0000-00-00') {
if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info[1], $session_info[0]);
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
}
$active = true;
} else {
@ -1279,12 +1280,16 @@ class Display {
}
if ( api_get_setting('show_session_coach') === 'true' ) {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info[1], $session_info[0]);
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
}
$active = ($date_start <= $now && $date_end >= $now);
}
$session['active'] = $active;
$session['session_category_id'] = $session_info[5];
$session['session_category_id'] = $session_info['session_category_id'];
if (isset($session_info['description'])) {
$session['description'] = $session_info['description'];
}
$output = $session;
}
return $output;

@ -1016,8 +1016,10 @@ class IndexManager {
}
if (api_get_setting('hide_courses_in_sessions') == 'false') {
// $params['extra'] .= $html_courses_session;
// $params['extra'] .= $html_courses_session;
}
$params['description'] = isset($session_box['description']) ? $session_box['description'] : null;
$sessions_with_no_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_courses_session);
}
}
@ -1085,12 +1087,12 @@ class IndexManager {
}
$params['title'] .= $session_link;
$params['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
if (api_is_platform_admin()) {
$params['right_actions'] .= '<a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session_id.'">'.Display::return_icon('edit.png', get_lang('Edit'), array('align' => 'absmiddle'), ICON_SIZE_SMALL).'</a>';
}
$html_sessions .= CourseManager::course_item_html($params, true).$html_courses_session;
}
}
@ -1122,6 +1124,7 @@ class IndexManager {
$params['subtitle'] = get_lang('Until').' '.$session_category_end_date;
}
}
$sessions_with_category .= CourseManager::course_item_parent(CourseManager::course_item_html($params, true), $html_sessions);
}

Loading…
Cancel
Save