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

Restorinf the count of days to go in session for user - refs BT#12539

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent f7e0b79889
commit 1a68775e22
6 changed files with 62 additions and 37 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. 10
      main/inc/lib/display.lib.php
  2. 2
      main/inc/lib/sessionmanager.lib.php
  3. 2
      main/inc/lib/template.lib.php
  4. 38
      main/inc/lib/userportal.lib.php
  5. 29
      main/template/default/user_portal/classic_session.tpl
  6. 18
      main/template/default/user_portal/grid_session.tpl

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

@ -1558,14 +1558,14 @@ class Display
$session['coach'] = ''; $session['coach'] = '';
$session['dates'] = ''; $session['dates'] = '';
if (($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') || if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
}
if (
($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') || ($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') ||
(empty($session_info['access_end_date']) && empty($session_info['access_start_date'])) (empty($session_info['access_end_date']) && empty($session_info['access_start_date']))
) { ) {
if (api_get_setting('show_session_coach') === 'true') {
$session['coach'] = get_lang('GeneralCoach').': '.api_get_person_name($session_info['firstname'], $session_info['lastname']);
}
if (isset($session_info['duration']) && !empty($session_info['duration'])) { if (isset($session_info['duration']) && !empty($session_info['duration'])) {
$userDurationData = SessionManager::getUserSession( $userDurationData = SessionManager::getUserSession(
api_get_user_id(), api_get_user_id(),

2
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -6168,7 +6168,7 @@ class SessionManager
// If no previous access, return false // If no previous access, return false
if (count($courseAccess) == 0) { if (count($courseAccess) == 0) {
return false; return $duration;
} }
$firstAccess = api_strtotime($courseAccess['login_course_date'], 'UTC'); $firstAccess = api_strtotime($courseAccess['login_course_date'], 'UTC');

2
main/inc/lib/template.lib.php
Unescape View File

@ -220,7 +220,7 @@ class Template
* @param string $name * @param string $name
* @return string * @return string
*/ */
public static function get_image($image, $size = ICON_SIZE_SMALL, $name) public static function get_image($image, $size = ICON_SIZE_SMALL, $name = '')
{ {
return Display::return_icon($image, $name, array(), $size); return Display::return_icon($image, $name, array(), $size);
} }

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

@ -1326,7 +1326,7 @@ class IndexManager
$params['show_description'] = $session_box['show_description']; $params['show_description'] = $session_box['show_description'];
$params['description'] = $session_box['description']; $params['description'] = $session_box['description'];
$params['visibility'] = $session_box['visibility']; $params['visibility'] = $session_box['visibility'];
$params['show_simple_session_info'] = false; $params['show_simple_session_info'] = $showSimpleSessionInfo;
$params['course_list_session_style'] = $coursesListSessionStyle; $params['course_list_session_style'] = $coursesListSessionStyle;
$params['num_users'] = $session_box['num_users']; $params['num_users'] = $session_box['num_users'];
$params['num_courses'] = $session_box['num_courses']; $params['num_courses'] = $session_box['num_courses'];
@ -1336,7 +1336,11 @@ class IndexManager
$params['courses'] = $html_courses_session; $params['courses'] = $html_courses_session;
if ($showSimpleSessionInfo) { if ($showSimpleSessionInfo) {
$params['show_simple_session_info'] = true; $params['subtitle'] = self::getSimpleSessionDetails(
$session_box['coach'],
$session_box['dates'],
isset($session_box['duration']) ? $session_box['duration'] : null
);
} }
if ($gameModeIsActive) { if ($gameModeIsActive) {
@ -1427,15 +1431,21 @@ class IndexManager
$session_box = Display::get_session_title_box($session_id); $session_box = Display::get_session_title_box($session_id);
$sessionParams[0]['id'] = $session_id; $sessionParams[0]['id'] = $session_id;
$sessionParams[0]['date'] = $session_box['dates']; $sessionParams[0]['date'] = $session_box['dates'];
$sessionParams[0]['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
$sessionParams[0]['course_list_session_style'] = $coursesListSessionStyle; $sessionParams[0]['course_list_session_style'] = $coursesListSessionStyle;
$sessionParams[0]['title'] = $session_box['title']; $sessionParams[0]['title'] = $session_box['title'];
$sessionParams[0]['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates']; $sessionParams[0]['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
$sessionParams[0]['show_actions'] = api_is_platform_admin(); $sessionParams[0]['show_actions'] = api_is_platform_admin();
$sessionParams[0]['courses'] = $html_courses_session; $sessionParams[0]['courses'] = $html_courses_session;
$sessionParams[0]['show_simple_session_info'] = false; $sessionParams[0]['show_simple_session_info'] = $showSimpleSessionInfo;
$sessionParams[0]['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
if ($showSimpleSessionInfo) { if ($showSimpleSessionInfo) {
$sessionParams[0]['show_simple_session_info'] = true; $sessionParams[0]['subtitle'] = self::getSimpleSessionDetails(
$session_box['coach'],
$session_box['dates'],
isset($session_box['duration']) ? $session_box['duration'] : null
);
} }
$this->tpl->assign('session', $sessionParams); $this->tpl->assign('session', $sessionParams);
@ -1941,4 +1951,24 @@ class IndexManager
{ {
setcookie('defaultMyCourseView'.$userId, $view); setcookie('defaultMyCourseView'.$userId, $view);
} }
/**
* Get the session coach name, duration or dates when $_configuration['show_simple_session_info'] is enabled
* @param string $coachName
* @param string $dates
* @param string|null $duration Optional
* @return string
*/
private static function getSimpleSessionDetails($coachName, $dates, $duration = null)
{
$strDetails = [];
if (!empty($coachName)) {
$strDetails[] = $coachName;
}
$strDetails[] = !empty($duration) ? $duration : $dates;
return implode(' | ', $strDetails);
}
} }

29
main/template/default/user_portal/classic_session.tpl
Unescape View File

@ -40,17 +40,19 @@
{% if row.description != '' %} {% if row.description != '' %}
{{ row.description }} {{ row.description }}
{% endif %} {% endif %}
<div class="info-session"> <ul class="info-session list-inline">
{% if row.coach_name != '' %} {% if row.coach_name %}
<span><i class="fa fa-user" aria-hidden="true"></i> <li>
<i class="fa fa-user" aria-hidden="true"></i>
{{ row.coach_name }} {{ row.coach_name }}
</span> </li>
{% endif %} {% endif %}
<span>
<li>
<i class="fa fa-calendar" aria-hidden="true"></i> <i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }} {{ row.date ? row.date : row.duration }}
</span> </li>
</div> </ul>
<div class="sessions-items"> <div class="sessions-items">
{% for item in row.courses %} {% for item in row.courses %}
<div class="courses"> <div class="courses">
@ -103,16 +105,7 @@
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<div class="info-session"> <div class="info-session">
<div class="date"> <p>{{ row.subtitle }}</p>
<i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }}
{% if row.coach_name %}
<h5 class="teacher-name">{{ "teacher.png"|img(16) }}
<a class="ajax" href="{{ row.coach_url }}"
alt="{{ row.coach_name }}">{{ row.coach_name }}</a>
</h5>
{% endif %}
</div>
{% if row.description != '' %} {% if row.description != '' %}
<div class="description"> <div class="description">
{{ row.description }} {{ row.description }}

18
main/template/default/user_portal/grid_session.tpl
Unescape View File

@ -81,18 +81,20 @@
{% if row.description != '' %} {% if row.description != '' %}
{{ row.description }} {{ row.description }}
{% endif %} {% endif %}
<div class="info-session">
{% if row.coach_name != '' %} <ul class="info-session list-inline">
<span> {% if row.coach_name %}
<li>
<i class="fa fa-user" aria-hidden="true"></i> <i class="fa fa-user" aria-hidden="true"></i>
{{ row.coach_name }} {{ row.coach_name }}
</span> </li>
{% endif %} {% endif %}
<span>
<li>
<i class="fa fa-calendar" aria-hidden="true"></i> <i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }} {{ row.date ? row.date : row.duration }}
</span> </li>
</div> </ul>
<div class="grid-courses"> <div class="grid-courses">
{% if not group_courses %} {% if not group_courses %}
<div class="row"> <div class="row">

Write Preview
Loading…
Cancel
Save