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

Allow show course grouped by category in session list - refs BT#12430

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent 98ec16a5cc
commit 00ecb30cc9
4 changed files with 105 additions and 61 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. 16
      main/inc/lib/course.lib.php
  2. 7
      main/inc/lib/userportal.lib.php
  3. 2
      main/install/configuration.dist.php
  4. 115
      main/template/default/user_portal/grid_session.tpl

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

@ -4141,6 +4141,7 @@ class CourseManager
$params['title'] = $session_title;
$params['edit_actions'] = '';
$params['document'] = '';
$params['category'] = $course_info['categoryName'];
if ($course_visibility != COURSE_VISIBILITY_CLOSED &&
$course_visibility != COURSE_VISIBILITY_HIDDEN
@ -6285,4 +6286,19 @@ class CourseManager
$courseFieldValue = new ExtraFieldValue('course');
$courseFieldValue->saveFieldValues($params);
}
/**
* Get the course categories form a course list
* @param array $courseList
* @return array
*/
public static function getCourseCategoriesFromCourseList(array $courseList)
{
$allCategories = array_column($courseList, 'category');
$categories = array_unique($allCategories);
sort($categories);
return $categories;
}
}

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

@ -1133,7 +1133,7 @@ class IndexManager
$listCourse = '';
$specialCourseList = '';
$load_history = isset($_GET['history']) && intval($_GET['history']) == 1 ? true : false;
$viewGridCourses = api_get_configuration_value('view_grid_courses');
$viewGridCourses = api_get_configuration_value('view_grid_courses') === 'true';
$showSimpleSessionInfo = api_get_configuration_value('show_simple_session_info');
$coursesWithoutCategoryTemplate = '/user_portal/classic_courses_without_category.tpl';
@ -1330,6 +1330,9 @@ class IndexManager
$params['course_list_session_style'] = $coursesListSessionStyle;
$params['num_users'] = $session_box['num_users'];
$params['num_courses'] = $session_box['num_courses'];
$params['course_categories'] = CourseManager::getCourseCategoriesFromCourseList(
$html_courses_session
);
$params['courses'] = $html_courses_session;
if ($showSimpleSessionInfo) {
@ -1511,7 +1514,7 @@ class IndexManager
$this->tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
$this->tpl->assign('gamification_mode', $gameModeIsActive);
if (api_get_configuration_value('view_grid_courses')) {
if ($viewGridCourses) {
$sessions_with_no_category = $this->tpl->fetch(
$this->tpl->get_template('/user_portal/grid_session.tpl')
);

2
main/install/configuration.dist.php
Unescape View File

@ -244,6 +244,8 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE;
//$_configuration['show_invisible_exercise_in_lp_list'] = false;
// New grid view the list of courses
//$_configuration['view_grid_courses'] = 'true';
// Show courses grouped by categories when $_configuration['view_grid_courses'] is enabled
//$_configuration['view_grid_courses_grouped_categories_in_sessions'] = true;
// Chamilo is installed/downloaded. Packagers can change this
// to reflect their packaging method. The default value is 'chamilo'. This will
// be reflected on the https://version.chamilo.org/stats page in the future.

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

@ -1,47 +1,17 @@
{% for row in session %}
<div id="session-{{ item.id }}" class="session panel panel-default">
<div class="panel-heading">
<img id="session_img_{{ row.id }}" src="{{ "window_list.png"|icon(32) }}" width="32" height="32"
alt="{{ row.title }}" title="{{ row.title }}"/>
{{ row.title }}
{% if row.edit_actions != '' %}
<div class="pull-right">
<a class="btn btn-default btn-sm" href="{{ row.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
<div class="panel-body">
{% if row.description != '' %}
{{ row.description }}
{% endif %}
<div class="info-session">
{% if row.coach_name != '' %}
<span>
<i class="fa fa-user" aria-hidden="true"></i>
{{ row.coach_name }}
</span>
{% endif %}
<span>
<i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }}
</span>
</div>
<div class="grid-courses">
<div class="row">
{% for item in row.courses %}
{% set group_courses = 'view_grid_courses_grouped_categories_in_sessions'|get_configuration_value %}
{% macro course_block(course, show_category) %}
<div class="col-xs-12 col-sm-6 col-md-4">
<div class="items">
<div class="image">
<img src="{{ item.image }}" class="img-responsive">
{% if item.category != '' %}
<span class="category">{{ item.category }}</span>
<img src="{{ course.image }}" class="img-responsive">
{% if course.category != '' and show_category %}
<span class="category">{{ course.category }}</span>
<div class="cribbon"></div>
{% endif %}
<div class="black-shadow">
<div class="author-card">
{% for teacher in item.teachers %}
{% for teacher in course.teachers %}
{% set counter = counter + 1 %}
{% if counter <= 3 %}
<a href="{{ teacher.url }}" class="ajax"
@ -60,18 +30,18 @@
{% endfor %}
</div>
</div>
{% if item.edit_actions != '' %}
{% if course.edit_actions != '' %}
<div class="admin-actions">
{% if item.document == '' %}
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
{% if course.document == '' %}
<a class="btn btn-default btn-sm" href="{{ course.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
{% else %}
<div class="btn-group" role="group">
<a class="btn btn-default btn-sm" href="{{ item.edit_actions }}">
<a class="btn btn-default btn-sm" href="{{ course.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
{{ item.document }}
{{ course.document }}
</div>
{% endif %}
</div>
@ -79,18 +49,71 @@
</div>
<div class="description">
<h4 class="title">
{% if item.visibility == constant('COURSE_VISIBILITY_CLOSED') %}
{{ item.title }} {{ item.code_course }}
{% if course.visibility == constant('COURSE_VISIBILITY_CLOSED') %}
{{ course.title }} {{ course.code_course }}
{% else %}
<a href="{{ item.link }}">{{ item.title }} {{ item.code_course }}</a>
<a href="{{ course.link }}">{{ course.title }} {{ course.code_course }}</a>
{% endif %}
</h4>
<div class="notifications">{{ item.notifications }}</div>
<div class="notifications">{{ course.notifications }}</div>
</div>
</div>
</div>
{% endmacro %}
{% import _self as blocks %}
{% for row in session %}
<div id="session-{{ item.id }}" class="session panel panel-default">
<div class="panel-heading">
<img id="session_img_{{ row.id }}" src="{{ "window_list.png"|icon(32) }}" width="32" height="32"
alt="{{ row.title }}" title="{{ row.title }}"/>
{{ row.title }}
{% if row.edit_actions != '' %}
<div class="pull-right">
<a class="btn btn-default btn-sm" href="{{ row.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
<div class="panel-body">
{% if row.description != '' %}
{{ row.description }}
{% endif %}
<div class="info-session">
{% if row.coach_name != '' %}
<span>
<i class="fa fa-user" aria-hidden="true"></i>
{{ row.coach_name }}
</span>
{% endif %}
<span>
<i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }}
</span>
</div>
<div class="grid-courses">
{% if not group_courses %}
<div class="row">
{% for item in row.courses %}
{{ blocks.course_block(item, true) }}
{% endfor %}
</div>
{% else %}
{% for category_code in row.course_categories %}
<div class="row">
<div class="col-xs-12">
<h4>{{ category_code }}</h4>
</div>
{% for course in row.courses %}
{% if course.category == category_code %}
{{ blocks.course_block(course, false) }}
{% endif %}
{% endfor %}
</div>
{% endfor %}
{% endif %}
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save