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

Fixing unavailable sessions when start date and end dates are correct

Browse Source
skala
Julio Montoya 15 years ago
parent 56ca770e2f
commit b6c9c76337
3 changed files with 14 additions and 22 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. 3
      main/inc/lib/course.lib.php
  2. 9
      main/inc/local.inc.php
  3. 24
      user_portal.php

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

@ -2913,7 +2913,7 @@ class CourseManager {
$s_htlm_status_icon = ''; $s_htlm_status_icon = '';
$s_htlm_status_icon =Display::return_icon('blackboard_blue.png', get_lang('Course'), array('width' => '48px')); $s_htlm_status_icon = Display::return_icon('blackboard_blue.png', get_lang('Course'), array('width' => '48px'));
/* /*
if ($s_course_status == 1) { if ($s_course_status == 1) {
$s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'), array('style' => 'width: 11px; height: 11px;')); $s_htlm_status_icon = Display::return_icon('course.gif', get_lang('Course')).' '.Display::return_icon('teachers.gif', get_lang('Status').': '.get_lang('Teacher'), array('style' => 'width: 11px; height: 11px;'));
@ -2926,7 +2926,6 @@ class CourseManager {
} }
*/ */
// Display course entry. // Display course entry.
$result.="\n\t";
$result .= '<li class="'.$class.'"><div class="coursestatusicons">'.$s_htlm_status_icon.'</div>'; $result .= '<li class="'.$class.'"><div class="coursestatusicons">'.$s_htlm_status_icon.'</div>';
// Show a hyperlink to the course, unless the course is closed and user is not course admin. // Show a hyperlink to the course, unless the course is closed and user is not course admin.
if ($session_accessible) { if ($session_accessible) {

9
main/inc/local.inc.php
Unescape View File

@ -678,9 +678,9 @@ if (isset($cidReset) && $cidReset) { // course session data refresh requested or
$_course['extLink']['name'] = $cData['department_name']; $_course['extLink']['name'] = $cData['department_name'];
$_course['categoryCode'] = $cData['faCode']; $_course['categoryCode'] = $cData['faCode'];
$_course['categoryName'] = $cData['faName']; $_course['categoryName'] = $cData['faName'];
$_course['visibility'] = $cData['visibility']; $_course['visibility'] = $cData['visibility'];
$_course['subscribe_allowed'] = $cData['subscribe']; $_course['subscribe_allowed'] = $cData['subscribe'];
$_course['unubscribe_allowed'] = $cData['unsubscribe']; $_course['unubscribe_allowed'] = $cData['unsubscribe'];
api_session_register('_cid'); api_session_register('_cid');
api_session_register('_course'); api_session_register('_course');
@ -971,9 +971,8 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) { // ses
} }
// requires testing!!! // requires testing!!!
// check the session visibility // check the session visibility
if (!empty($is_allowed_in_course)) { if (!empty($is_allowed_in_course)) {
$my_session_id = api_get_session_id(); $my_session_id = api_get_session_id();
//if I'm in a session //if I'm in a session
//var_dump($is_platformAdmin, $is_courseTutor,api_is_coach()); //var_dump($is_platformAdmin, $is_courseTutor,api_is_coach());

24
user_portal.php
Unescape View File

@ -338,33 +338,30 @@ if (is_array($courses_tree)) {
foreach ($session['courses'] as $course) { foreach ($session['courses'] as $course) {
$is_coach_course = api_is_coach($session['details']['id'], $course['code']); $is_coach_course = api_is_coach($session['details']['id'], $course['code']);
if ($is_coach_course) { if ($is_coach_course) {
$allowed_time = strtotime($date_session_start) - $days_access_before_beginning; $allowed_time = api_strtotime($date_session_start) - $days_access_before_beginning;
} else { } else {
$allowed_time = strtotime($date_session_start); $allowed_time = api_strtotime($date_session_start);
} }
if ($session_now > $allowed_time) { if ($session_now > $allowed_time) { //read only and accesible
$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true)); $c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',true);
//$c = CourseManager :: get_logged_user_course_html($course, $session['details']['id'], 'session_course_item',($session['details']['visibility']==3?false:true));
$html_courses_session .= $c[1]; $html_courses_session .= $c[1];
$count_courses_session++; $count_courses_session++;
} }
} }
if ($count_courses_session > 0) { if ($count_courses_session > 0) {
//echo '<div class="clear"></div>';
echo '<div class="userportal-session-item"><ul class="session_box">'; echo '<div class="userportal-session-item"><ul class="session_box">';
echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >'; echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >';
//echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
echo Display::return_icon('window_list.png', get_lang('Expand').'/'.get_lang('Hide'), array('width' => '48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' '; echo Display::return_icon('window_list.png', get_lang('Expand').'/'.get_lang('Hide'), array('width' => '48px', 'align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
$s = Display :: get_session_title_box($session['details']['id']); $s = Display :: get_session_title_box($session['details']['id']);
$extra_info = (!empty($s['coach']) ? $s['coach'].' | ' : '').$s['dates']; $extra_info = (!empty($s['coach']) ? $s['coach'].' | ' : '').$s['dates'];
if ($session['details']['visibility'] == 3) { /*if ($session['details']['visibility'] == 3) {
$session_link = $s['title']; $session_link = $s['title'];
} else { } else {*/
$session_link = Display::tag('a',$s['title'], array('href'=>api_get_path(WEB_CODE_PATH).'session/?session_id='.$session['details']['id'])); $session_link = Display::tag('a',$s['title'], array('href'=>api_get_path(WEB_CODE_PATH).'session/?session_id='.$session['details']['id']));
} //}
echo Display::tag('span',$session_link. ' </span> <span style="padding-left: 10px; font-size: 90%; font-weight: normal;">'.$extra_info); echo Display::tag('span',$session_link. ' </span> <span style="padding-left: 10px; font-size: 90%; font-weight: normal;">'.$extra_info);
if (api_is_platform_admin()) { if (api_is_platform_admin()) {
echo '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session['details']['id'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a></div>'; echo '<div style="float:right;"><a href="'.api_get_path(WEB_CODE_PATH).'admin/resume_session.php?id_session='.$session['details']['id'].'">'.Display::return_icon('edit.gif', get_lang('Edit'), array('align' => 'absmiddle')).'</a></div>';
@ -373,12 +370,9 @@ if (is_array($courses_tree)) {
echo $html_courses_session; echo $html_courses_session;
echo '</ul></div>'; echo '</ul></div>';
} }
} }
} else { } else {
// All sessions included in. // All sessions included in.
if (!empty($category['details'])) { if (!empty($category['details'])) {
$count_courses_session = 0; $count_courses_session = 0;

Write Preview
Loading…
Cancel
Save