Browse Source

Merge pull request #1612 from jloguercio/cies-12222

Show all CourseDescription in Session about - BT#12222
José Loguercio 8 years ago
parent
commit
e0fce55713
2 changed files with 68 additions and 3 deletions
  1. 21 1
      main/session/about.php
  2. 47 2
      main/template/default/session/about.tpl

+ 21 - 1
main/session/about.php

@@ -74,7 +74,7 @@ foreach ($sessionCourses as $sessionCourse) {
             ]
         );
 
-    $courseDescription = $courseObjectives = $courseTopics = null;
+    $courseDescription = $courseObjectives = $courseTopics = $courseMethodology = $courseMaterial = $courseResources = $courseAssesment = $courseCustom = null;
 
     foreach ($courseDescriptionTools as $descriptionTool) {
         switch ($descriptionTool->getDescriptionType()) {
@@ -87,6 +87,21 @@ foreach ($sessionCourses as $sessionCourse) {
             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_ASSESMENT:
+                $courseAssesment = $descriptionTool;
+                break;
+            case CCourseDescription::TYPE_CUSTOM:
+                $courseCustom = $descriptionTool;
+                break;
         }
     }
 
@@ -96,6 +111,11 @@ foreach ($sessionCourses as $sessionCourse) {
         'tags' => $courseTags,
         'objectives' => $courseObjectives,
         'topics' => $courseTopics,
+        'methodology' => $courseMethodology,
+        'material' => $courseMaterial,
+        'resources' => $courseResources,
+        'assesment' => $courseAssesment,
+        'custom' => $courseCustom,
         'coaches' => $coachesData,
         'extra_fields' => $courseValues->getAllValuesForAnItem($sessionCourse->getId())
     ];

+ 47 - 2
main/template/default/session/about.tpl

@@ -91,7 +91,7 @@
                     <div class="panel-body">
                         {% if course_data.objectives %}
                             <div class="objective-course">
-                                <h4 class="title-info"><em class="fa fa-book"></em> {{ "Objectives"|get_lang }}</h4>
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.objectives.getTitle }}</h4>
                                 <div class="content-info">
                                     {{ course_data.objectives.getContent }}
                                 </div>
@@ -100,12 +100,57 @@
 
                         {% if course_data.topics %}
                             <div class="topics">
-                                <h4 class="title-info"><em class="fa fa-book"></em> {{ "Topics"|get_lang }}</h4>
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.topics.getTitle }}</h4>
                                 <div class="content-info">
                                     {{ course_data.topics.getContent }}
                                 </div>
                             </div>
                         {% endif %}
+
+                        {% if course_data.methodology %}
+                            <div class="topics">
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.methodology.getTitle }}</h4>
+                                <div class="content-info">
+                                    {{ course_data.methodology.getContent }}
+                                </div>
+                            </div>
+                        {% endif %}
+
+                        {% if course_data.material %}
+                            <div class="topics">
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.material.getTitle }}</h4>
+                                <div class="content-info">
+                                    {{ course_data.material.getContent }}
+                                </div>
+                            </div>
+                        {% endif %}
+
+                        {% if course_data.resources %}
+                            <div class="topics">
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.resources.getTitle }}</h4>
+                                <div class="content-info">
+                                    {{ course_data.resources.getContent }}
+                                </div>
+                            </div>
+                        {% endif %}
+
+                        {% if course_data.assesment %}
+                            <div class="topics">
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.assesment.getTitle }}</h4>
+                                <div class="content-info">
+                                    {{ course_data.assesment.getContent }}
+                                </div>
+                            </div>
+                        {% endif %}
+
+                        {% if course_data.custom %}
+                            <div class="topics">
+                                <h4 class="title-info"><em class="fa fa-book"></em> {{ course_data.custom.getTitle }}</h4>
+                                <div class="content-info">
+                                    {{ course_data.custom.getContent }}
+                                </div>
+                            </div>
+                        {% endif %}
                     </div>
                 </div>
             </div>