diff --git a/main/inc/lib/course_description.lib.php b/main/inc/lib/course_description.lib.php index 1c5483a615..43f5f05096 100755 --- a/main/inc/lib/course_description.lib.php +++ b/main/inc/lib/course_description.lib.php @@ -84,7 +84,7 @@ class CourseDescription true, true ); - $course_id = api_get_course_int_id(); + $course_id = $this->course_id ?: api_get_course_int_id(); $sql = "SELECT * FROM $table WHERE c_id = $course_id $condition_session ORDER BY id "; diff --git a/main/session/about.php b/main/session/about.php index 90ce7afbff..06f2f1c1f1 100644 --- a/main/session/about.php +++ b/main/session/about.php @@ -80,54 +80,48 @@ foreach ($sessionCourses as $sessionCourse) { $coachesData[] = $coachData; } - $courseDescriptionTools = $em->getRepository('ChamiloCourseBundle:CCourseDescription') - ->findBy( - [ - 'cId' => $sessionCourse->getId(), - 'sessionId' => 0, - ], - [ - 'id' => 'DESC', - 'descriptionType' => 'ASC', - ] - ); - - $courseDescription = ''; - $courseObjectives = ''; - $courseTopics = ''; - $courseMethodology = ''; - $courseMaterial = ''; - $courseResources = ''; - $courseAssessment = ''; + $cd = new CourseDescription(); + $cd->set_course_id($sessionCourse->getId()); + $cd->set_session_id($session->getId()); + $descriptionsData = $cd->get_description_data(); + + $courseDescription = []; + $courseObjectives = []; + $courseTopics = []; + $courseMethodology = []; + $courseMaterial = []; + $courseResources = []; + $courseAssessment = []; $courseCustom = []; - /** @var CCourseDescription $descriptionTool */ - foreach ($courseDescriptionTools as $descriptionTool) { - switch ($descriptionTool->getDescriptionType()) { - case CCourseDescription::TYPE_DESCRIPTION: - $courseDescription = $descriptionTool; - break; - case CCourseDescription::TYPE_OBJECTIVES: - $courseObjectives = $descriptionTool; - break; - case CCourseDescription::TYPE_TOPICS: - $courseTopics = $descriptionTool; - break; - case CCourseDescription::TYPE_METHODOLOGY: - $courseMethodology = $descriptionTool; - break; - case CCourseDescription::TYPE_COURSE_MATERIAL: - $courseMaterial = $descriptionTool; - break; - case CCourseDescription::TYPE_RESOURCES: - $courseResources = $descriptionTool; - break; - case CCourseDescription::TYPE_ASSESSMENT: - $courseAssessment = $descriptionTool; - break; - case CCourseDescription::TYPE_CUSTOM: - $courseCustom[] = $descriptionTool; - break; + if (!empty($descriptionsData['descriptions'])) { + foreach ($descriptionsData['descriptions'] as $descriptionInfo) { + switch ($descriptionInfo['description_type']) { + case CCourseDescription::TYPE_DESCRIPTION: + $courseDescription[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_OBJECTIVES: + $courseObjectives[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_TOPICS: + $courseTopics[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_METHODOLOGY: + $courseMethodology[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_COURSE_MATERIAL: + $courseMaterial[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_RESOURCES: + $courseResources[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_ASSESSMENT: + $courseAssessment[] = $descriptionInfo; + break; + case CCourseDescription::TYPE_CUSTOM: + $courseCustom[] = $descriptionInfo; + break; + } } } diff --git a/main/template/default/session/about.tpl b/main/template/default/session/about.tpl index 68b24f3a26..2568aa5d1c 100644 --- a/main/template/default/session/about.tpl +++ b/main/template/default/session/about.tpl @@ -142,7 +142,9 @@ {% endif %}
- {{ course_data.description.getContent }} + {% for description in course_data.description %} + {{ description.content }} + {% endfor %}
@@ -169,72 +171,84 @@

{{ "CourseInformation"|get_lang }}

{% if course_data.objectives %} -
-

{{ course_data.objectives.getTitle }}

-
- {{ course_data.objectives.getContent }} + {% for objectives in course_data.objectives %} +
+

{{ objectives.title }}

+
+ {{ objectives.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.topics %} -
-

{{ course_data.topics.getTitle }}

-
- {{ course_data.topics.getContent }} + {% for topics in course_data.topics %} +
+

{{ topics.title }}

+
+ {{ topics.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.methodology %} -
-

{{ course_data.methodology.getTitle }}

-
- {{ course_data.methodology.getContent }} + {% for methodology in course_data.methodology %} +
+

{{ methodology.title }}

+
+ {{ methodology.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.material %} -
-

{{ course_data.material.getTitle }}

-
- {{ course_data.material.getContent }} + {% for material in course_data.material %} +
+

{{ material.title }}

+
+ {{ material.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.resources %} -
-

{{ course_data.resources.getTitle }}

-
- {{ course_data.resources.getContent }} + {% for resources in course_data.resources %} +
+

{{ resources.title }}

+
+ {{ resources.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.assessment %} -
-

{{ course_data.assessment.getTitle }}

-
- {{ course_data.assessment.getContent }} + {% for assessment in course_data.assessment %} +
+

{{ assessment.title }}

+
+ {{ assessment.content }} +
-
+ {% endfor %} {% endif %} {% if course_data.custom %} {% for custom in course_data.custom %}
-

{{ custom.getTitle }} +

{{ custom.title }}

- {{ custom.getContent }} + {{ custom.content }}
{% endfor %} @@ -271,10 +285,14 @@
{% endif %} {% for coach_extra_field in coach.extra_fields %} -
-
{{ coach_extra_field.value.getField().getDisplayText() }}
-
{{ coach_extra_field.value.getValue() }}
-
+ {% set coach_field = coach_extra_field.value.field %} + {% set coach_field_value = coach_extra_field.value.value %} + {% if not coach_field_value is empty %} +
+
{{ coach_field.displayText }}
+
{{ coach_extra_field.value.value }}
+
+ {% endif %} {% endfor %}
{% endfor %}