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

Fix course description in session about page - refs #2619

Browse Source
pull/2624/head
Angel Fernando Quiroz Campos 7 years ago
parent 000f4032bf
commit de96de1a8c
3 changed files with 102 additions and 90 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. 2
      main/inc/lib/course_description.lib.php
  2. 86
      main/session/about.php
  3. 104
      main/template/default/session/about.tpl

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

@ -84,7 +84,7 @@ class CourseDescription
true, true,
true true
); );
$course_id = api_get_course_int_id(); $course_id = $this->course_id ?: api_get_course_int_id();
$sql = "SELECT * FROM $table $sql = "SELECT * FROM $table
WHERE c_id = $course_id $condition_session WHERE c_id = $course_id $condition_session
ORDER BY id "; ORDER BY id ";

86
main/session/about.php
Unescape View File

@ -80,54 +80,48 @@ foreach ($sessionCourses as $sessionCourse) {
$coachesData[] = $coachData; $coachesData[] = $coachData;
} }
$courseDescriptionTools = $em->getRepository('ChamiloCourseBundle:CCourseDescription') $cd = new CourseDescription();
->findBy( $cd->set_course_id($sessionCourse->getId());
[ $cd->set_session_id($session->getId());
'cId' => $sessionCourse->getId(), $descriptionsData = $cd->get_description_data();
'sessionId' => 0,
], $courseDescription = [];
[ $courseObjectives = [];
'id' => 'DESC', $courseTopics = [];
'descriptionType' => 'ASC', $courseMethodology = [];
] $courseMaterial = [];
); $courseResources = [];
$courseAssessment = [];
$courseDescription = '';
$courseObjectives = '';
$courseTopics = '';
$courseMethodology = '';
$courseMaterial = '';
$courseResources = '';
$courseAssessment = '';
$courseCustom = []; $courseCustom = [];
/** @var CCourseDescription $descriptionTool */ if (!empty($descriptionsData['descriptions'])) {
foreach ($courseDescriptionTools as $descriptionTool) { foreach ($descriptionsData['descriptions'] as $descriptionInfo) {
switch ($descriptionTool->getDescriptionType()) { switch ($descriptionInfo['description_type']) {
case CCourseDescription::TYPE_DESCRIPTION: case CCourseDescription::TYPE_DESCRIPTION:
$courseDescription = $descriptionTool; $courseDescription[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_OBJECTIVES: case CCourseDescription::TYPE_OBJECTIVES:
$courseObjectives = $descriptionTool; $courseObjectives[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_TOPICS: case CCourseDescription::TYPE_TOPICS:
$courseTopics = $descriptionTool; $courseTopics[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_METHODOLOGY: case CCourseDescription::TYPE_METHODOLOGY:
$courseMethodology = $descriptionTool; $courseMethodology[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_COURSE_MATERIAL: case CCourseDescription::TYPE_COURSE_MATERIAL:
$courseMaterial = $descriptionTool; $courseMaterial[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_RESOURCES: case CCourseDescription::TYPE_RESOURCES:
$courseResources = $descriptionTool; $courseResources[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_ASSESSMENT: case CCourseDescription::TYPE_ASSESSMENT:
$courseAssessment = $descriptionTool; $courseAssessment[] = $descriptionInfo;
break; break;
case CCourseDescription::TYPE_CUSTOM: case CCourseDescription::TYPE_CUSTOM:
$courseCustom[] = $descriptionTool; $courseCustom[] = $descriptionInfo;
break; break;
}
} }
} }

104
main/template/default/session/about.tpl
Unescape View File

@ -142,7 +142,9 @@
</div> </div>
{% endif %} {% endif %}
<div class="course-description"> <div class="course-description">
{{ course_data.description.getContent }} {% for description in course_data.description %}
{{ description.content }}
{% endfor %}
</div> </div>
</div> </div>
</div> </div>
@ -169,72 +171,84 @@
<h3 class="sub-title">{{ "CourseInformation"|get_lang }}</h3> <h3 class="sub-title">{{ "CourseInformation"|get_lang }}</h3>
<div class="course-information read-more-area"> <div class="course-information read-more-area">
{% if course_data.objectives %} {% if course_data.objectives %}
<div class="topics"> {% for objectives in course_data.objectives %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.objectives.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ objectives.title }}</h4>
{{ course_data.objectives.getContent }} <div class="content-info">
{{ objectives.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.topics %} {% if course_data.topics %}
<div class="topics"> {% for topics in course_data.topics %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.topics.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ topics.title }}</h4>
{{ course_data.topics.getContent }} <div class="content-info">
{{ topics.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.methodology %} {% if course_data.methodology %}
<div class="topics"> {% for methodology in course_data.methodology %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.methodology.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ methodology.title }}</h4>
{{ course_data.methodology.getContent }} <div class="content-info">
{{ methodology.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.material %} {% if course_data.material %}
<div class="topics"> {% for material in course_data.material %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.material.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ material.title }}</h4>
{{ course_data.material.getContent }} <div class="content-info">
{{ material.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.resources %} {% if course_data.resources %}
<div class="topics"> {% for resources in course_data.resources %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.resources.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ resources.title }}</h4>
{{ course_data.resources.getContent }} <div class="content-info">
{{ resources.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.assessment %} {% if course_data.assessment %}
<div class="topics"> {% for assessment in course_data.assessment %}
<h4 class="title-info"><em <div class="topics">
class="fa fa-book"></em> {{ course_data.assessment.getTitle }}</h4> <h4 class="title-info"><em
<div class="content-info"> class="fa fa-book"></em> {{ assessment.title }}</h4>
{{ course_data.assessment.getContent }} <div class="content-info">
{{ assessment.content }}
</div>
</div> </div>
</div> {% endfor %}
{% endif %} {% endif %}
{% if course_data.custom %} {% if course_data.custom %}
{% for custom in course_data.custom %} {% for custom in course_data.custom %}
<div class="topics"> <div class="topics">
<h4 class="title-info"><em class="fa fa-book"></em> {{ custom.getTitle }} <h4 class="title-info"><em class="fa fa-book"></em> {{ custom.title }}
</h4> </h4>
<div class="content-info"> <div class="content-info">
{{ custom.getContent }} {{ custom.content }}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@ -271,10 +285,14 @@
</div> </div>
{% endif %} {% endif %}
{% for coach_extra_field in coach.extra_fields %} {% for coach_extra_field in coach.extra_fields %}
<dl class="coach-extrafield"> {% set coach_field = coach_extra_field.value.field %}
<dt class="extrafield_dt dt_{{ coach_extra_field.value.getField().getVariable() }}">{{ coach_extra_field.value.getField().getDisplayText() }}</dt> {% set coach_field_value = coach_extra_field.value.value %}
<dd class="extrafield_dd dd_{{ coach_extra_field.value.getField().getVariable() }}">{{ coach_extra_field.value.getValue() }}</dd> {% if not coach_field_value is empty %}
</dl> <dl class="coach-extrafield">
<dt class="extrafield_dt dt_{{ coach_field.variable }}">{{ coach_field.displayText }}</dt>
<dd class="extrafield_dd dd_{{ coach_field.variable }}">{{ coach_extra_field.value.value }}</dd>
</dl>
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}

Write Preview
Loading…
Cancel
Save