Switch all session.date_start and date_end to session.access_start_date and access_end_date - refs #7719

1.10.x
Yannick Warnier 11 years ago
parent 35ae772017
commit 0fe954e854
  1. 4
      main/admin/ldap_import_students_to_session.php
  2. 10
      main/admin/user_information.php
  3. 4
      main/attendance/attendance_controller.php
  4. 8
      main/inc/ajax/model.ajax.php
  5. 16
      main/inc/lib/auth.lib.php
  6. 12
      main/inc/lib/course.lib.php
  7. 12
      main/inc/lib/course_home.lib.php
  8. 22
      main/inc/lib/display.lib.php
  9. 4
      main/inc/lib/social.lib.php
  10. 14
      main/inc/lib/tracking.lib.php
  11. 20
      main/inc/lib/usermanager.lib.php
  12. 8
      main/inc/lib/userportal.lib.php
  13. 16
      main/mySpace/myStudents.php
  14. 20
      main/session/resume_session.php
  15. 12
      main/session/session_add.php
  16. 6
      main/session/session_category_list.php
  17. 12
      main/session/session_edit.php
  18. 4
      main/session/session_list.php
  19. 8
      main/tracking/userLog.php
  20. 8
      main/tracking/userlogCSV.php
  21. 18
      main/user/resume_session.php
  22. 4
      main/user/session_list.php
  23. 10
      main/webservices/registration.soap.php
  24. 2
      plugin/advanced_subscription/cron/notify_by_mail.php
  25. 2
      plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
  26. 2
      plugin/advanced_subscription/src/HookAdvancedSubscription.php
  27. 4
      plugin/buycourses/src/buy_course.lib.php
  28. 10
      plugin/buycourses/src/function.php
  29. 4
      plugin/dashboard/block_session/block_session.class.php
  30. 12
      whoisonlinesession.php

@ -73,7 +73,7 @@ elseif(!empty($annee) && empty($id_session))
echo '<select name="id_session">'; echo '<select name="id_session">';
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$sql = "SELECT id,name,nbr_courses,date_start,date_end " . $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
" FROM $tbl_session ". " FROM $tbl_session ".
" ORDER BY name"; " ORDER BY name";
$result = Database::query($sql); $result = Database::query($sql);
@ -81,7 +81,7 @@ elseif(!empty($annee) && empty($id_session))
$sessions=Database::store_result($result); $sessions=Database::store_result($result);
$nbr_results=count($sessions); $nbr_results=count($sessions);
foreach($sessions as $row) { foreach($sessions as $row) {
echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['date_start'].' - '.$row['date_end'].')</option>'; echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
} }
echo '</select>'; echo '</select>';
echo '<input type="submit" value="'.get_lang('Submit').'">'; echo '<input type="submit" value="'.get_lang('Submit').'">';

@ -204,16 +204,16 @@ if (count($sessions) > 0) {
} }
} }
if ($session_item['date_start'] == '0000-00-00') { if ($session_item['access_start_date'] == '0000-00-00') {
$session_item['date_start'] = null; $session_item['access_start_date'] = null;
} }
if ($session_item['date_end'] == '0000-00-00') { if ($session_item['access_end_date'] == '0000-00-00') {
$session_item['date_end'] = null; $session_item['access_end_date'] = null;
} }
$dates = array_filter( $dates = array_filter(
array($session_item['date_start'], $session_item['date_end']) array($session_item['access_start_date'], $session_item['access_end_date'])
); );
$sessionInformation .= Display::page_subheader( $sessionInformation .= Display::page_subheader(

@ -627,8 +627,8 @@ class AttendanceController
} else { } else {
if (!empty($sessionId)) { if (!empty($sessionId)) {
$sessionInfo = api_get_session_info($sessionId); $sessionInfo = api_get_session_info($sessionId);
$startDate = $sessionInfo['date_start']; $startDate = $sessionInfo['access_start_date'];
$endDate = $sessionInfo['date_end']; $endDate = $sessionInfo['access_end_date'];
} }
} }

@ -857,12 +857,12 @@ switch ($action) {
$count_users_in_session = count(SessionManager::get_users_by_session($session['id'], 0)); $count_users_in_session = count(SessionManager::get_users_by_session($session['id'], 0));
$session_date = array(); $session_date = array();
if (!empty($session['date_start']) && $session['date_start'] != '0000-00-00') { if (!empty($session['access_start_date']) && $session['access_start_date'] != '0000-00-00') {
$session_date[] = get_lang('From').' '.api_format_date($session['date_start'], DATE_FORMAT_SHORT); $session_date[] = get_lang('From').' '.api_format_date($session['access_start_date'], DATE_FORMAT_SHORT);
} }
if (!empty($session['date_end']) && $session['date_end'] != '0000-00-00') { if (!empty($session['access_end_date']) && $session['access_end_date'] != '0000-00-00') {
$session_date[] = get_lang('Until').' '.api_format_date($session['date_end'], DATE_FORMAT_SHORT); $session_date[] = get_lang('Until').' '.api_format_date($session['access_end_date'], DATE_FORMAT_SHORT);
} }
if (empty($session_date)) { if (empty($session_date)) {

@ -552,7 +552,7 @@ class Auth
$userId = api_get_user_id(); $userId = api_get_user_id();
$limitFilter = getLimitFilterFromArray($limit); $limitFilter = getLimitFilterFromArray($limit);
$sql = "SELECT s.id, s.name, s.nbr_courses, s.nbr_users, s.date_start, s.date_end, u.lastname, u.firstname, u.username, description, show_description " $sql = "SELECT s.id, s.name, s.nbr_courses, s.nbr_users, s.access_start_date, s.access_end_date, u.lastname, u.firstname, u.username, description, show_description "
. "FROM $sessionTable AS s " . "FROM $sessionTable AS s "
. "INNER JOIN $userTable AS u " . "INNER JOIN $userTable AS u "
. "ON s.id_coach = u.user_id " . "ON s.id_coach = u.user_id "
@ -561,9 +561,9 @@ class Auth
if (!is_null($date)) { if (!is_null($date)) {
$date = Database::escape_string($date); $date = Database::escape_string($date);
$sql .= "AND ('$date' BETWEEN s.date_start AND s.date_end) " $sql .= "AND ('$date' BETWEEN s.access_start_date AND s.access_end_date) "
. "OR (s.date_end = '0000-00-00') " . "OR (s.access_end_date = '0000-00-00') "
. "OR (s.date_start = '0000-00-00' AND s.date_end != '0000-00-00' AND s.date_end > '$date')"; . "OR (s.access_start_date = '0000-00-00' AND s.access_end_date != '0000-00-00' AND s.access_end_date > '$date')";
} }
// Add limit filter to do pagination // Add limit filter to do pagination
@ -598,10 +598,10 @@ class Auth
$date = Database::escape_string($date); $date = Database::escape_string($date);
$dateFilter = ''; $dateFilter = '';
if (!empty($date)) { if (!empty($date)) {
$dateFilter = ' AND ("' . $date . '" BETWEEN s.date_start AND s.date_end) ' . $dateFilter = ' AND ("' . $date . '" BETWEEN s.access_start_date AND s.access_end_date) ' .
'OR (s.date_end = "0000-00-00") ' . 'OR (s.access_end_date = "0000-00-00") ' .
'OR (s.date_start = "0000-00-00" AND ' . 'OR (s.access_start_date = "0000-00-00" AND ' .
's.date_end != "0000-00-00" AND s.date_end > "' . $date . '") '; 's.access_end_date != "0000-00-00" AND s.access_end_date > "' . $date . '") ';
} }
$sql = "SELECT COUNT(*) FROM $sessionTable s WHERE 1 = 1 $dateFilter"; $sql = "SELECT COUNT(*) FROM $sessionTable s WHERE 1 = 1 $dateFilter";
$res = Database::query($sql); $res = Database::query($sql);

@ -1809,7 +1809,7 @@ class CourseManager
if (!empty($date_from) && !empty($date_to)) { if (!empty($date_from) && !empty($date_to)) {
$date_from = Database::escape_string($date_from); $date_from = Database::escape_string($date_from);
$date_to = Database::escape_string($date_to); $date_to = Database::escape_string($date_to);
$sql_query .= " AND s.date_start >= '$date_from' AND s.date_end <= '$date_to'"; $sql_query .= " AND s.access_start_date >= '$date_from' AND s.access_end_date <= '$date_to'";
} }
if ($session_id != 0) { if ($session_id != 0) {
@ -3878,8 +3878,8 @@ class CourseManager
), ),
) )
); );
$date_start = $sess[$course_info['id_session']]['date_start']; $date_start = $sess[$course_info['id_session']]['access_start_date'];
$date_end = $sess[$course_info['id_session']]['date_end']; $date_end = $sess[$course_info['id_session']]['access_end_date'];
} }
if (empty($now)) { if (empty($now)) {
// maybe use api_get_utcdate() here? // maybe use api_get_utcdate() here?
@ -4044,7 +4044,7 @@ class CourseManager
$session['title'] = $course_info['session_name']; $session['title'] = $course_info['session_name'];
$session_category_id = CourseManager::get_session_category_id_by_session_id($course_info['id_session']); $session_category_id = CourseManager::get_session_category_id_by_session_id($course_info['id_session']);
$session['category'] = $sessioncoach['name']; $session['category'] = $sessioncoach['name'];
if ($course_info['date_start'] == '0000-00-00') { if ($course_info['access_start_date'] == '0000-00-00') {
//$session['dates'] = get_lang('WithoutTimeLimits'); //$session['dates'] = get_lang('WithoutTimeLimits');
$session['dates'] = ''; $session['dates'] = '';
if (api_get_setting('show_session_coach') === 'true') { if (api_get_setting('show_session_coach') === 'true') {
@ -4053,7 +4053,7 @@ class CourseManager
} }
$active = true; $active = true;
} else { } else {
$session ['dates'] = ' - ' . get_lang('From') . ' ' . $course_info['date_start'] . ' ' . get_lang('To') . ' ' . $course_info['date_end']; $session ['dates'] = ' - ' . get_lang('From') . ' ' . $course_info['access_start_date'] . ' ' . get_lang('To') . ' ' . $course_info['access_end_date'];
if (api_get_setting('show_session_coach') === 'true') { if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'], $session['coach'] = get_lang('GeneralCoach') . ': ' . api_get_person_name($sessioncoach['firstname'],
$sessioncoach['lastname']); $sessioncoach['lastname']);
@ -5515,7 +5515,7 @@ class CourseManager
{ {
$dateConditional = ($startDate && $endDate) ? $dateConditional = ($startDate && $endDate) ?
" WHERE session_id IN (SELECT id FROM " . Database::get_main_table(TABLE_MAIN_SESSION) . " WHERE session_id IN (SELECT id FROM " . Database::get_main_table(TABLE_MAIN_SESSION) .
" WHERE date_start = '$startDate' AND date_end = '$endDate')" : " WHERE access_start_date = '$startDate' AND access_end_date = '$endDate')" :
null; null;
$visibility = ($includeClosed ? '' : 'visibility NOT IN (0, 4) AND '); $visibility = ($includeClosed ? '' : 'visibility NOT IN (0, 4) AND ');

@ -976,14 +976,14 @@ class CourseHome
nbr_courses, nbr_courses,
nbr_users, nbr_users,
nbr_classes, nbr_classes,
DATE_FORMAT(date_start,"%d-%m-%Y") as date_start, DATE_FORMAT(access_start_date,"%d-%m-%Y") as access_start_date,
DATE_FORMAT(date_end,"%d-%m-%Y") as date_end, DATE_FORMAT(access_end_date,"%d-%m-%Y") as access_end_date,
lastname, lastname,
firstname, firstname,
username, username,
session_admin_id, session_admin_id,
nb_days_access_before_beginning, coach_access_start_date,
nb_days_access_after_end, coach_access_end_date,
session_category_id, session_category_id,
visibility visibility
FROM '.$session_table.' FROM '.$session_table.'
@ -1005,10 +1005,10 @@ class CourseHome
$session_category = $rows_session_category['name']; $session_category = $rows_session_category['name'];
} }
if ($session['date_start'] == '00-00-0000') { if ($session['access_start_date'] == '00-00-0000') {
$msg_date = get_lang('NoTimeLimits'); $msg_date = get_lang('NoTimeLimits');
} else { } else {
$msg_date = get_lang('From').' '.$session['date_start'].' '.get_lang('To').' '.$session['date_end']; $msg_date = get_lang('From').' '.$session['access_start_date'].' '.get_lang('To').' '.$session['access_end_date'];
} }
$output = ''; $output = '';

@ -1508,8 +1508,8 @@ class Display
$session['coach'] = ''; $session['coach'] = '';
$session['dates'] = ''; $session['dates'] = '';
if ($session_info['date_end'] == '0000-00-00' && if ($session_info['access_end_date'] == '0000-00-00' &&
$session_info['date_start'] == '0000-00-00' $session_info['access_start_date'] == '0000-00-00'
) { ) {
if (api_get_setting('show_session_coach') === 'true') { if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']); $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
@ -1536,24 +1536,24 @@ class Display
} else { } else {
$start = $stop = false; $start = $stop = false;
$start_buffer = $stop_buffer = ''; $start_buffer = $stop_buffer = '';
if ($session_info['date_start'] == '0000-00-00') { if ($session_info['access_start_date'] == '0000-00-00') {
$session_info['date_start'] = ''; $session_info['access_start_date'] = '';
} else { } else {
$start = true; $start = true;
$start_buffer = $session_info['date_start']; $start_buffer = $session_info['access_start_date'];
$session_info['date_start'] = get_lang('From').' '.$session_info['date_start']; $session_info['access_start_date'] = get_lang('From').' '.$session_info['access_start_date'];
} }
if ($session_info['date_end'] == '0000-00-00') { if ($session_info['access_end_date'] == '0000-00-00') {
$session_info['date_end'] = ''; $session_info['access_end_date'] = '';
} else { } else {
$stop = true; $stop = true;
$stop_buffer = $session_info['date_end']; $stop_buffer = $session_info['access_end_date'];
$session_info['date_end'] = get_lang('Until').' '.$session_info['date_end']; $session_info['access_end_date'] = get_lang('Until').' '.$session_info['access_end_date'];
} }
if ($start && $stop) { if ($start && $stop) {
$session['dates'] = Display::tag('i', sprintf(get_lang('FromDateXToDateY'), $start_buffer, $stop_buffer)); $session['dates'] = Display::tag('i', sprintf(get_lang('FromDateXToDateY'), $start_buffer, $stop_buffer));
} else { } else {
$session['dates'] = Display::tag('i', $session_info['date_start'].' '.$session_info['date_end']); $session['dates'] = Display::tag('i', $session_info['access_start_date'].' '.$session_info['access_end_date']);
} }
if ( api_get_setting('show_session_coach') === 'true' ) { if ( api_get_setting('show_session_coach') === 'true' ) {

@ -537,14 +537,14 @@ class SocialManager extends UserManager
$session = array(); $session = array();
$session['title'] = $my_course['session_name']; $session['title'] = $my_course['session_name'];
if ($my_course['date_start'] == '0000-00-00') { if ($my_course['access_start_date'] == '0000-00-00') {
$session['dates'] = get_lang('WithoutTimeLimits'); $session['dates'] = get_lang('WithoutTimeLimits');
if (api_get_setting('show_session_coach') === 'true') { if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'], $sessioncoach['lastname']); $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'], $sessioncoach['lastname']);
} }
$active = true; $active = true;
} else { } else {
$session ['dates'] = ' - '.get_lang('From').' '.$my_course['date_start'].' '.get_lang('To').' '.$my_course['date_end']; $session ['dates'] = ' - '.get_lang('From').' '.$my_course['access_start_date'].' '.get_lang('To').' '.$my_course['access_end_date'];
if (api_get_setting('show_session_coach') === 'true') { if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'], $sessioncoach['lastname']); $session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($sessioncoach['firstname'], $sessioncoach['lastname']);
} }

@ -2998,8 +2998,8 @@ class Tracking
SELECT DISTINCT SELECT DISTINCT
id, id,
name, name,
date_start, access_start_date,
date_end access_end_date
FROM $tbl_session session INNER JOIN $tbl_session_rel_access_url session_rel_url FROM $tbl_session session INNER JOIN $tbl_session_rel_access_url session_rel_url
ON (session.id = session_rel_url.session_id) ON (session.id = session_rel_url.session_id)
WHERE WHERE
@ -3010,8 +3010,8 @@ class Tracking
SELECT DISTINCT SELECT DISTINCT
session.id, session.id,
session.name, session.name,
session.date_start, session.access_start_date,
session.date_end session.access_end_date
FROM $tbl_session as session FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as session_course_user INNER JOIN $tbl_session_course_user as session_course_user
ON session.id = session_course_user.session_id AND ON session.id = session_course_user.session_id AND
@ -3038,13 +3038,13 @@ class Tracking
if (!empty($sessions)) { if (!empty($sessions)) {
foreach ($sessions as & $session) { foreach ($sessions as & $session) {
if ($session['date_start'] == '0000-00-00') { if ($session['access_start_date'] == '0000-00-00') {
$session['status'] = get_lang('SessionActive'); $session['status'] = get_lang('SessionActive');
} }
else { else {
$date_start = explode('-', $session['date_start']); $date_start = explode('-', $session['access_start_date']);
$time_start = mktime(0, 0, 0, $date_start[1], $date_start[2], $date_start[0]); $time_start = mktime(0, 0, 0, $date_start[1], $date_start[2], $date_start[0]);
$date_end = explode('-', $session['date_end']); $date_end = explode('-', $session['access_end_date']);
$time_end = mktime(0, 0, 0, $date_end[1], $date_end[2], $date_end[0]); $time_end = mktime(0, 0, 0, $date_end[1], $date_end[2], $date_end[0]);
if ($time_start < time() && time() < $time_end) { if ($time_start < time() && time() < $time_end) {
$session['status'] = get_lang('SessionActive'); $session['status'] = get_lang('SessionActive');

@ -2401,8 +2401,8 @@ class UserManager
$categories[$row['session_category_id']]['sessions'][$row['id']] = array( $categories[$row['session_category_id']]['sessions'][$row['id']] = array(
'session_name' => $row['name'], 'session_name' => $row['name'],
'session_id' => $row['id'], 'session_id' => $row['id'],
'date_start' => $row['access_start_date'], 'access_start_date' => $row['access_start_date'],
'date_end' => $row['access_end_date'], 'access_end_date' => $row['access_end_date'],
'nb_days_access_before_beginning' => $row['nb_days_access_before_beginning'], 'nb_days_access_before_beginning' => $row['nb_days_access_before_beginning'],
'nb_days_access_after_end' => $row['nb_days_access_after_end'], 'nb_days_access_after_end' => $row['nb_days_access_after_end'],
'courses' => $courseList 'courses' => $courseList
@ -2500,7 +2500,7 @@ class UserManager
// Get the list of sessions where the user is subscribed // Get the list of sessions where the user is subscribed
// This is divided into two different queries // This is divided into two different queries
$sessions = array(); $sessions = array();
$sql = "SELECT DISTINCT s.id, name, date_start, date_end $sql = "SELECT DISTINCT s.id, name, access_start_date, access_end_date
FROM $tbl_session_user, $tbl_session s FROM $tbl_session_user, $tbl_session s
WHERE ( WHERE (
session_id = s.id AND session_id = s.id AND
@ -2508,7 +2508,7 @@ class UserManager
relation_type <> ".SESSION_RELATION_TYPE_RRHH." relation_type <> ".SESSION_RELATION_TYPE_RRHH."
) )
$coachCourseConditions $coachCourseConditions
ORDER BY date_start, date_end, name"; ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)>0) { if (Database::num_rows($result)>0) {
@ -2517,13 +2517,13 @@ class UserManager
} }
} }
$sql = "SELECT DISTINCT id, name, date_start, date_end $sql = "SELECT DISTINCT id, name, access_start_date, access_end_date
FROM $tbl_session FROM $tbl_session
WHERE ( WHERE (
id_coach = $user_id id_coach = $user_id
) )
$coachCourseConditions $coachCourseConditions
ORDER BY date_start, date_end, name"; ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql); $result = Database::query($sql);
if (Database::num_rows($result)>0) { if (Database::num_rows($result)>0) {
@ -2553,8 +2553,8 @@ class UserManager
email, course.course_language l, email, course.course_language l,
1 sort, 1 sort,
category_code user_course_cat, category_code user_course_cat,
date_start, access_start_date,
date_end, access_end_date,
session.id as session_id, session.id as session_id,
session.name as session_name session.name as session_name
FROM $tbl_session_course_user as session_course_user FROM $tbl_session_course_user as session_course_user
@ -2596,8 +2596,8 @@ class UserManager
course.course_language l, course.course_language l,
1 sort, 1 sort,
category_code user_course_cat, category_code user_course_cat,
date_start, access_start_date,
date_end, access_end_date,
session.id as session_id, session.id as session_id,
session.name as session_name, session.name as session_name,
IF((session_course_user.user_id = 3 AND session_course_user.status=2),'2', '5') IF((session_course_user.user_id = 3 AND session_course_user.status=2),'2', '5')

@ -1158,8 +1158,8 @@ class IndexManager
} }
// Courses inside the current session. // Courses inside the current session.
$date_session_start = $session['date_start']; $date_session_start = $session['access_start_date'];
$date_session_end = $session['date_end']; $date_session_end = $session['access_end_date'];
$days_access_before_beginning = $session['nb_days_access_before_beginning']; $days_access_before_beginning = $session['nb_days_access_before_beginning'];
$days_access_after_end = $session['nb_days_access_after_end']; $days_access_after_end = $session['nb_days_access_after_end'];
@ -1294,8 +1294,8 @@ class IndexManager
continue; continue;
} }
$date_session_start = $session['date_start']; $date_session_start = $session['access_start_date'];
$date_session_end = $session['date_end']; $date_session_end = $session['access_end_date'];
$days_access_before_beginning = $session['nb_days_access_before_beginning']; $days_access_before_beginning = $session['nb_days_access_before_beginning'];
$days_access_after_end = $session['nb_days_access_after_end']; $days_access_after_end = $session['nb_days_access_after_end'];

@ -614,19 +614,19 @@ if (!empty($student_id)) {
if ($session_info) { if ($session_info) {
$session_name = $session_info['name']; $session_name = $session_info['name'];
} }
$date_start = ''; $access_start_date = '';
if (!empty($session_info['date_start']) && $session_info['date_start'] != '0000-00-00') { if (!empty($session_info['access_start_date']) && $session_info['access_start_date'] != '0000-00-00') {
$date_start = api_format_date($session_info['date_start'], DATE_FORMAT_SHORT); $access_start_date = api_format_date($session_info['access_start_date'], DATE_FORMAT_SHORT);
} }
$date_end = ''; $access_end_date = '';
if (!empty($session_info['date_end']) && $session_info['date_end'] != '0000-00-00') { if (!empty($session_info['access_end_date']) && $session_info['access_end_date'] != '0000-00-00') {
$date_end = api_format_date($session_info['date_end'], DATE_FORMAT_SHORT); $access_end_date = api_format_date($session_info['access_end_date'], DATE_FORMAT_SHORT);
} }
$date_session = ''; $date_session = '';
if (!empty($date_start) && !empty($date_end)) { if (!empty($access_start_date) && !empty($access_end_date)) {
$date_session = get_lang('From') . ' ' . $date_start . ' ' . get_lang('Until') . ' ' . $date_end; $date_session = get_lang('From') . ' ' . $access_start_date . ' ' . get_lang('Until') . ' ' . $access_end_date;
} }
$title = ''; $title = '';
if (empty($sessionId)) { if (empty($sessionId)) {

@ -46,8 +46,8 @@ $sql = 'SELECT
nbr_courses, nbr_courses,
nbr_users, nbr_users,
nbr_classes, nbr_classes,
DATE_FORMAT(access_start_date,"%d-%m-%Y") as date_start, DATE_FORMAT(access_start_date,"%d-%m-%Y") as access_start_date,
DATE_FORMAT(access_end_date,"%d-%m-%Y") as date_end, DATE_FORMAT(access_end_date,"%d-%m-%Y") as access_end_date,
lastname, lastname,
firstname, firstname,
username, username,
@ -170,20 +170,20 @@ echo Display::page_subheader(get_lang('GeneralProperties').$url);
<td><?php echo get_lang('Date'); ?> :</td> <td><?php echo get_lang('Date'); ?> :</td>
<td> <td>
<?php <?php
if ($session['date_start'] == '00-00-0000' && $session['date_end']== '00-00-0000' ) if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' )
echo get_lang('NoTimeLimits'); echo get_lang('NoTimeLimits');
else { else {
if ($session['date_start'] != '00-00-0000') { if ($session['access_start_date'] != '00-00-0000') {
$session['date_start'] = get_lang('From').' '.$session['date_start']; $session['access_start_date'] = get_lang('From').' '.$session['access_start_date'];
} else { } else {
$session['date_start'] = ''; $session['access_start_date'] = '';
} }
if ($session['date_end'] == '00-00-0000') { if ($session['access_end_date'] == '00-00-0000') {
$session['date_end'] =''; $session['access_end_date'] ='';
} else { } else {
$session['date_end'] = get_lang('Until').' '.$session['date_end']; $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
} }
echo $session['date_start'].' '.$session['date_end']; echo $session['access_start_date'].' '.$session['access_end_date'];
} }
?> ?>
</td> </td>

@ -305,7 +305,7 @@ $form->addElement('checkbox', 'start_limit', '', get_lang('DateStartSession'), a
)); ));
$form->addElement('html','<div id="start_date" style="display:none">'); $form->addElement('html','<div id="start_date" style="display:none">');
$form->addElement('date_picker', 'date_start'); $form->addElement('date_picker', 'access_start_date');
$form->addElement('html','</div>'); $form->addElement('html','</div>');
$form->addElement('checkbox', 'end_limit', '', get_lang('DateEndSession'), array( $form->addElement('checkbox', 'end_limit', '', get_lang('DateEndSession'), array(
@ -315,7 +315,7 @@ $form->addElement('checkbox', 'end_limit', '', get_lang('DateEndSession'), array
$form->addElement('html', '<div id="end_date" style="display:none">'); $form->addElement('html', '<div id="end_date" style="display:none">');
$form->addElement('date_picker', 'date_end'); $form->addElement('date_picker', 'access_end_date');
$visibilityGroup = array(); $visibilityGroup = array();
$visibilityGroup[] = $form->createElement('select', 'session_visibility', null, array( $visibilityGroup[] = $form->createElement('select', 'session_visibility', null, array(
@ -361,8 +361,8 @@ $formDefaults = array(
); );
if (!$formSent) { if (!$formSent) {
$formDefaults['date_start'] = "$thisYear-$thisMonth-$thisDay"; $formDefaults['access_start_date'] = "$thisYear-$thisMonth-$thisDay";
$formDefaults['date_end'] = date('Y-m-d', strtotime("$thisYear-$thisMonth-$thisDay +1 year")); $formDefaults['access_end_date'] = date('Y-m-d', strtotime("$thisYear-$thisMonth-$thisDay +1 year"));
} else { } else {
$formDefaults['name'] = api_htmlentities($name, ENT_QUOTES, $charset); $formDefaults['name'] = api_htmlentities($name, ENT_QUOTES, $charset);
} }
@ -373,8 +373,8 @@ if ($form->validate()) {
$params = $form->getSubmitValues(); $params = $form->getSubmitValues();
$name = $params['name']; $name = $params['name'];
$startDate = $params['date_start']; $startDate = $params['access_start_date'];
$endDate = $params['date_end']; $endDate = $params['access_end_date'];
$nb_days_acess_before = $params['nb_days_acess_before']; $nb_days_acess_before = $params['nb_days_acess_before'];
$nb_days_acess_after = $params['nb_days_acess_after']; $nb_days_acess_after = $params['nb_days_acess_after'];
$coach_username = intval($params['coach_username']); $coach_username = intval($params['coach_username']);

@ -186,9 +186,9 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
<tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>"> <tr class="<?php echo $i ? 'row_odd' : 'row_even'; ?>">
<td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]" value="<?php echo $enreg['id']; ?>"></td> <td><input type="checkbox" id="idChecked_<?php echo $x; ?>" name="idChecked[]" value="<?php echo $enreg['id']; ?>"></td>
<td><?php echo api_htmlentities($enreg['name'], ENT_QUOTES, $charset); ?></td> <td><?php echo api_htmlentities($enreg['name'], ENT_QUOTES, $charset); ?></td>
<td><?php echo "<a href=\"session_list.php?id_category=".$enreg['id']."\">".$nb_courses." Sesion(es) </a>"; ?></td> <td><?php echo "<a href=\"session_list.php?id_category=".$enreg['id']."\">".$nb_courses." Session(s) </a>"; ?></td>
<td><?php echo api_htmlentities($enreg['date_start'], ENT_QUOTES, $charset); ?></td> <td><?php echo api_htmlentities($enreg['access_start_date'], ENT_QUOTES, $charset); ?></td>
<td><?php echo api_htmlentities($enreg['date_end'], ENT_QUOTES, $charset); ?></td> <td><?php echo api_htmlentities($enreg['access_end_date'], ENT_QUOTES, $charset); ?></td>
<td> <td>
<a href="session_category_edit.php?&id=<?php echo $enreg['id']; ?>"> <a href="session_category_edit.php?&id=<?php echo $enreg['id']; ?>">
<?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?> <?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?>

@ -166,7 +166,7 @@ if ($year_start!="0000") {
$form->addElement('html','<div id="start_date" style="display:none">'); $form->addElement('html','<div id="start_date" style="display:none">');
} }
$form->addElement('date_picker', 'date_start'); $form->addElement('date_picker', 'access_start_date');
$form->addElement('html','</div>'); $form->addElement('html','</div>');
@ -187,7 +187,7 @@ if ($year_end != "0000") {
$form->addElement('html','<div id="end_date" style="display:none">'); $form->addElement('html','<div id="end_date" style="display:none">');
} }
$form->addElement('date_picker', 'date_end'); $form->addElement('date_picker', 'access_end_date');
$visibilityGroup = array(); $visibilityGroup = array();
$visibilityGroup[] = $form->createElement( $visibilityGroup[] = $form->createElement(
@ -241,8 +241,8 @@ $form->addButtonUpdate(get_lang('ModifyThisSession'));
$formDefaults = array( $formDefaults = array(
'id_coach' => $infos['id_coach'], 'id_coach' => $infos['id_coach'],
'session_category' => $infos['session_category_id'], 'session_category' => $infos['session_category_id'],
'date_start' => $infos['access_start_date'], 'access_start_date' => $infos['access_start_date'],
'date_end' => $infos['access_end_date'], 'access_end_date' => $infos['access_end_date'],
'session_visibility' => $infos['visibility'], 'session_visibility' => $infos['visibility'],
'description' => $infos['description'] 'description' => $infos['description']
); );
@ -265,8 +265,8 @@ if ($form->validate()) {
$params = $form->getSubmitValues(); $params = $form->getSubmitValues();
$name = $params['name']; $name = $params['name'];
$startDate = $params['date_start']; $startDate = $params['access_start_date'];
$endDate = $params['date_end']; $endDate = $params['access_end_date'];
$nb_days_acess_before = $params['nb_days_access_before']; $nb_days_acess_before = $params['nb_days_access_before'];
$nb_days_acess_after = $params['nb_days_access_after']; $nb_days_acess_after = $params['nb_days_access_after'];
$id_coach = $params['id_coach']; $id_coach = $params['id_coach'];

@ -112,8 +112,8 @@ $column_model = array(
array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'), array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'), array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'category_name', 'index'=>'sc.name', 'width'=>'70', 'align'=>'left', 'search' => 'true'), array('name'=>'category_name', 'index'=>'sc.name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
array('name'=>'date_start', 'index'=>'s.date_start', 'width'=>'40', 'align'=>'left', 'search' => 'true'), array('name'=>'access_start_date', 'index'=>'s.access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
array('name'=>'date_end', 'index'=>'s.date_end', 'width'=>'40', 'align'=>'left', 'search' => 'true'), array('name'=>'access_end_date', 'index'=>'s.access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'), array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
array('name'=>'status', 'index'=>'session_active','width'=>'45', array('name'=>'status', 'index'=>'session_active','width'=>'45',
'align'=>'left', 'search' => 'true', 'stype'=>'select', 'align'=>'left', 'search' => 'true', 'stype'=>'select',

@ -73,10 +73,10 @@ $sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session INNER JOIN $tbl_session AS session
ON session_course_user.session_id = session.id ON session_course_user.session_id = session.id
AND ((date_start <= '$now' AND ((access_start_date <= '$now'
AND date_end >= '$now') AND access_end_date >= '$now')
OR (date_start='0000-00-00' AND date_end='0000-00-00')) OR (access_start_date='0000-00-00' AND access_end_date='0000-00-00'))
WHERE session_id='".api_get_session_id()."' AND course_code='$_cid'"; WHERE session_id='".api_get_session_id()."' AND c_id = $courseId";
//echo $sql; //echo $sql;
$result=Database::query($sql); $result=Database::query($sql);
if(!Database::num_rows($result)){ if(!Database::num_rows($result)){

@ -68,10 +68,10 @@ $sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session INNER JOIN $tbl_session AS session
ON session_course_user.session_id = session.id ON session_course_user.session_id = session.id
AND ((date_start <= '$now' AND ((access_start_date <= '$now'
AND date_end >= '$now') AND access_end_date >= '$now')
OR (date_start='0000-00-00' AND date_end='0000-00-00')) OR (access_start_date='0000-00-00' AND access_end_date='0000-00-00'))
WHERE session_id='" . $_SESSION['id_session'] . "' AND course_code='$_cid'"; WHERE session_id='" . $_SESSION['id_session'] . "' AND c_id = $courseId";
//echo $sql; //echo $sql;
$result = Database::query($sql); $result = Database::query($sql);
if (!Database::num_rows($result)) { if (!Database::num_rows($result)) {

@ -32,7 +32,7 @@ if($allowTutors == 'true') {
$table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $table_access_url_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$sql = 'SELECT name, nbr_courses, nbr_users, nbr_classes, DATE_FORMAT(date_start,"%d-%m-%Y") as date_start, DATE_FORMAT(date_end,"%d-%m-%Y") as date_end, lastname, firstname, username, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility $sql = 'SELECT name, nbr_courses, nbr_users, nbr_classes, DATE_FORMAT(access_start_date,"%d-%m-%Y") as access_start_date, DATE_FORMAT(access_end_date,"%d-%m-%Y") as access_end_date, lastname, firstname, username, session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end, session_category_id, visibility
FROM '.$tbl_session.' LEFT JOIN '.$tbl_user.' ON id_coach = user_id FROM '.$tbl_session.' LEFT JOIN '.$tbl_user.' ON id_coach = user_id
WHERE '.$tbl_session.'.id='.$id_session; WHERE '.$tbl_session.'.id='.$id_session;
@ -135,22 +135,22 @@ if($allowTutors == 'true') {
<td><?php echo get_lang('Date'); ?> :</td> <td><?php echo get_lang('Date'); ?> :</td>
<td> <td>
<?php <?php
if ($session['date_start'] == '00-00-0000' && $session['date_end']== '00-00-0000' ) { if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
echo get_lang('NoTimeLimits'); echo get_lang('NoTimeLimits');
} }
else { else {
if ($session['date_start'] != '00-00-0000') { if ($session['access_start_date'] != '00-00-0000') {
//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits')); //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
$session['date_start'] = get_lang('From').' '.$session['date_start']; $session['access_start_date'] = get_lang('From').' '.$session['access_start_date'];
} else { } else {
$session['date_start'] = ''; $session['access_start_date'] = '';
} }
if ($session['date_end'] == '00-00-0000') { if ($session['access_end_date'] == '00-00-0000') {
$session['date_end'] =''; $session['access_end_date'] ='';
} else { } else {
$session['date_end'] = get_lang('Until').' '.$session['date_end']; $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
} }
echo $session['date_start'].' '.$session['date_end']; echo $session['access_start_date'].' '.$session['access_end_date'];
} }
?> ?>
</td> </td>

@ -53,8 +53,8 @@ if($allowTutors == 'true') {
array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'), array('name'=>'nbr_courses', 'index'=>'nbr_courses', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'), array('name'=>'nbr_users', 'index'=>'nbr_users', 'width'=>'30', 'align'=>'left', 'search' => 'true'),
array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'), array('name'=>'category_name', 'index'=>'category_name', 'width'=>'70', 'align'=>'left', 'search' => 'true'),
array('name'=>'date_start', 'index'=>'date_start', 'width'=>'40', 'align'=>'left', 'search' => 'true'), array('name'=>'access_start_date', 'index'=>'access_start_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
array('name'=>'date_end', 'index'=>'date_end', 'width'=>'40', 'align'=>'left', 'search' => 'true'), array('name'=>'access_end_date', 'index'=>'access_end_date', 'width'=>'40', 'align'=>'left', 'search' => 'true'),
array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'), array('name'=>'coach_name', 'index'=>'coach_name', 'width'=>'80', 'align'=>'left', 'search' => 'false'),
array('name'=>'status', 'index'=>'session_active','width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select', array('name'=>'status', 'index'=>'session_active','width'=>'40', 'align'=>'left', 'search' => 'true', 'stype'=>'select',
//for the bottom bar //for the bottom bar

@ -3701,7 +3701,7 @@ function WSCreateSession($params)
$results[] = 0; $results[] = 0;
continue; continue;
} else { } else {
Database::query("INSERT INTO $tbl_session(name,date_start,date_end,id_coach,session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end) Database::query("INSERT INTO $tbl_session(name,access_start_date,access_end_date,id_coach,session_admin_id, nb_days_access_before_beginning, nb_days_access_after_end)
VALUES('".addslashes($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.")"); VALUES('".addslashes($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.")");
$id_session = Database::insert_id(); $id_session = Database::insert_id();
@ -5800,10 +5800,10 @@ function WSListSessions($params) {
$sql_params = array(); $sql_params = array();
// Dates should be provided in YYYY-MM-DD format, UTC // Dates should be provided in YYYY-MM-DD format, UTC
if (!empty($params['date_start'])) { if (!empty($params['date_start'])) {
$sql_params['s.date_start'] = array('operator' => '>=', 'value' => $params['date_start']); $sql_params['s.access_start_date'] = array('operator' => '>=', 'value' => $params['date_start']);
} }
if (!empty($params['date_end'])) { if (!empty($params['date_end'])) {
$sql_params['s.date_end'] = array('operator' => '<=', 'value' => $params['date_end']); $sql_params['s.access_end_date'] = array('operator' => '<=', 'value' => $params['date_end']);
} }
$sessions_list = SessionManager::get_sessions_list($sql_params); $sessions_list = SessionManager::get_sessions_list($sql_params);
$return_list = array(); $return_list = array();
@ -5812,8 +5812,8 @@ function WSListSessions($params) {
'id' => $session['id'], 'id' => $session['id'],
'title' => $session['name'], 'title' => $session['name'],
'url' => api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$session['id'], // something like http://my.chamilo.net/main/session/index.php?session_id=5 'url' => api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$session['id'], // something like http://my.chamilo.net/main/session/index.php?session_id=5
'date_start' => $session['date_start'], 'date_start' => $session['access_start_date'],
'date_end' => $session['date_end'], 'date_end' => $session['access_end_date'],
); );
} }

@ -25,7 +25,7 @@ $joinTables = Database::get_main_table(TABLE_MAIN_SESSION) . ' s INNER JOIN ' .
$columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status'; $columns = 's.id AS session_id, uu.friend_user_id AS superior_id, uu.user_id AS student_id, asq.id AS queue_id, asq.status AS status';
$conditions = array( $conditions = array(
'where' => array( 'where' => array(
's.date_start >= ? AND uu.relation_type = ? AND asq.updated_at <= ?' => array( 's.access_start_date >= ? AND uu.relation_type = ? AND asq.updated_at <= ?' => array(
$now, $now,
USER_RELATION_TYPE_BOSS, USER_RELATION_TYPE_BOSS,
$weekAgo, $weekAgo,

@ -216,7 +216,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
$extra = new ExtraFieldValue('session'); $extra = new ExtraFieldValue('session');
$joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su INNER JOIN ' . $joinSessionTable = Database::get_main_table(TABLE_MAIN_SESSION_USER) . ' su INNER JOIN ' .
Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.session_id'; Database::get_main_table(TABLE_MAIN_SESSION) . ' s ON s.id = su.session_id';
$whereSessionParams = 'su.relation_type = ? AND s.date_start >= ? AND su.user_id = ?'; $whereSessionParams = 'su.relation_type = ? AND s.access_start_date >= ? AND su.user_id = ?';
$whereSessionParamsValues = array( $whereSessionParamsValues = array(
0, 0,
$newYearDate->format('Y-m-d'), $newYearDate->format('Y-m-d'),

@ -549,7 +549,7 @@ class HookAdvancedSubscription extends HookObserver implements
/** /**
* Get a list of sessions (id, coach_id, name, courses_num, users_num, classes_num, * Get a list of sessions (id, coach_id, name, courses_num, users_num, classes_num,
* date_start, date_end, access_days_before_num, session_admin_id, visibility, * access_start_date, access_end_date, access_days_before_num, session_admin_id, visibility,
* session_category_id, promotion_id, * session_category_id, promotion_id,
* validated_user_num, waiting_user_num, * validated_user_num, waiting_user_num,
* extra, course) the validated_usernum and waiting_user_num are * extra, course) the validated_usernum and waiting_user_num are

@ -77,7 +77,7 @@ function sync()
$sql = "UPDATE $tableBuySession SET sync = 0"; $sql = "UPDATE $tableBuySession SET sync = 0";
Database::query($sql); Database::query($sql);
$sql = "SELECT id, name, date_start, date_end FROM $tableSession"; $sql = "SELECT id, name, access_start_date, access_end_date FROM $tableSession";
$res = Database::query($sql); $res = Database::query($sql);
while ($row = Database::fetch_assoc($res)) { while ($row = Database::fetch_assoc($res)) {
$sql = "SELECT 1 FROM $tableBuySession WHERE session_id='" . $row['id'] . "';"; $sql = "SELECT 1 FROM $tableBuySession WHERE session_id='" . $row['id'] . "';";
@ -88,7 +88,7 @@ function sync()
} else { } else {
$sql = "INSERT INTO $tableBuySession (session_id, name, date_start, date_end, visible, sync) $sql = "INSERT INTO $tableBuySession (session_id, name, date_start, date_end, visible, sync)
VALUES ('" . $row['id'] . "', '" . $row['name'] . "', '" . VALUES ('" . $row['id'] . "', '" . $row['name'] . "', '" .
$row['date_start'] . "', '" . $row['date_end'] . "', 0, 1);"; $row['access_start_date'] . "', '" . $row['access_end_date'] . "', 0, 1);";
Database::query($sql); Database::query($sql);
} }
} }

@ -35,12 +35,12 @@ if ($_REQUEST['tab'] == 'sync') {
$aux_code .= $row['code']; $aux_code .= $row['code'];
$aux_title .= $row['title']; $aux_title .= $row['title'];
} }
$sql = "SELECT name, date_start, date_end FROM $tableSession;"; $sql = "SELECT name, access_start_date, access_end_date FROM $tableSession;";
$res = Database::query($sql); $res = Database::query($sql);
while ($row = Database::fetch_assoc($res)) { while ($row = Database::fetch_assoc($res)) {
$aux_name .= $row['name']; $aux_name .= $row['name'];
$aux_date_start .= $row['date_start']; $aux_date_start .= $row['access_start_date'];
$aux_date_end .= $row['date_end']; $aux_date_end .= $row['access_end_date'];
} }
echo json_encode(array("status" => "true", "content" => $content)); echo json_encode(array("status" => "true", "content" => $content));
} }
@ -160,8 +160,8 @@ if ($_REQUEST['tab'] == 'sessions_filter') {
<div class="span4 "> <div class="span4 ">
<div class="categories-course-description"> <div class="categories-course-description">
<h3>'.$session['name'].'</h3> <h3>'.$session['name'].'</h3>
<h5>'.get_lang('From').' '.$session['date_start']. <h5>'.get_lang('From').' '.$session['access_start_date'].
' '.get_lang('Until').' '.$session['date_end'].'</h5>'; ' '.get_lang('Until').' '.$session['access_end_date'].'</h5>';
if ($session['enrolled'] == "YES") { if ($session['enrolled'] == "YES") {
$content .= '<span class="label label-info">'.$plugin->get_lang('TheUserIsAlreadyRegisteredInTheSession').'</span>'; $content .= '<span class="label label-info">'.$plugin->get_lang('TheUserIsAlreadyRegisteredInTheSession').'</span>';
} }

@ -108,8 +108,8 @@ class BlockSession extends Block
$session_id = intval($session['id']); $session_id = intval($session['id']);
$title = $session['name']; $title = $session['name'];
if ($session['date_start'] != '0000-00-00' && $session['date_end'] != '0000-00-00') { if ($session['access_start_date'] != '0000-00-00 00:00:00' && $session['access_end_date'] != '0000-00-00 00:00:00') {
$date = get_lang('From').' '.api_convert_and_format_date($session['date_start'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['date_end'], DATE_FORMAT_SHORT, date_default_timezone_get()); $date = get_lang('From').' '.api_convert_and_format_date($session['access_start_date'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['access_end_date'], DATE_FORMAT_SHORT, date_default_timezone_get());
} else { } else {
$date = ' - '; $date = ' - ';
} }

@ -46,13 +46,13 @@ Display::display_header(get_lang('UserOnlineListSession'));
$_user['user_id'] = intval($_user['user_id']); $_user['user_id'] = intval($_user['user_id']);
$sql = "SELECT DISTINCT session.id, $sql = "SELECT DISTINCT session.id,
name, name,
date_start, access_start_date,
date_end access_end_date
FROM $tbl_session as session FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as srcru INNER JOIN $tbl_session_course_user as srcru
ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2 ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2
AND session.id = srcru.session_id AND session.id = srcru.session_id
ORDER BY date_start, date_end, name"; ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql); $result = Database::query($sql);
while ($session = Database:: fetch_array($result)) { while ($session = Database:: fetch_array($result)) {
@ -61,11 +61,11 @@ Display::display_header(get_lang('UserOnlineListSession'));
$sql = "SELECT DISTINCT session.id, $sql = "SELECT DISTINCT session.id,
name, name,
date_start, access_start_date,
date_end access_end_date
FROM $tbl_session as session FROM $tbl_session as session
WHERE session.id_coach = ".$_user['user_id']." WHERE session.id_coach = ".$_user['user_id']."
ORDER BY date_start, date_end, name"; ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql); $result = Database::query($sql);
while ($session = Database:: fetch_array($result)) { while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session; $session_is_coach[$session['id']] = $session;

Loading…
Cancel
Save