Get all values from courses extra fields - refs BT#9885 #TMI

main/session/about.php

@@ -30,31 +30,18 @@ $fieldValuesRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldVa
 $fieldTagsRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
 $userRepo = $entityManager->getRepository('ChamiloUserBundle:User');
 
-$videoUrlField = $fieldsRepo->findOneBy([
-    'extraFieldType' => ExtraField::COURSE_FIELD_TYPE,
-    'variable' => 'video_url'
-]);
 $tagField = $fieldsRepo->findOneBy([
     'extraFieldType' => ExtraField::COURSE_FIELD_TYPE,
     'variable' => 'tags'
 ]);
 
 foreach ($sessionCourses as $sessionCourse) {
-    $courseVideo = null;
-    $courseTags = [];
-
-    if (!is_null($videoUrlField)) {
-        $videoUrlValue = $fieldValuesRepo->findOneBy([
-            'field' => $videoUrlField,
-            'itemId' => $sessionCourse->getId()
-        ]);
-
-        if (!is_null($videoUrlValue)) {
-            $essence = \Essence\Essence::instance();
+    $courseFieldValues = $fieldValuesRepo->getVisibleValues(
+        Chamilo\CoreBundle\Entity\ExtraField::COURSE_FIELD_TYPE,
+        $sessionCourse->getId()
+    );
 
-            $courseVideo = $essence->replace($videoUrlValue->getValue());
-        }
-    }
+    $courseTags = [];
 
     if (!is_null($tagField)) {
         $courseTags = $fieldTagsRepo->getTags($tagField, $sessionCourse->getId());
@@ -115,12 +102,12 @@ foreach ($sessionCourses as $sessionCourse) {
 
     $courses[] = [
         'course' => $sessionCourse,
-        'video' => $courseVideo,
         'description' => $courseDescription,
         'tags' => $courseTags,
         'objectives' => $courseObjectives,
         'topics' => $courseTopics,
-        'coaches' => $coachesData
+        'coaches' => $coachesData,
+        'extra_fields' => $courseFieldValues
     ];
 }
 
@@ -136,6 +123,7 @@ $template->assign(
     )
 );
 $template->assign('courses', $courses);
+$template->assign('essence', \Essence\Essence::instance());
 
 $templateFolder = api_get_configuration_value('default_template');
 

main/template/default/session/about.tpl

@@ -6,6 +6,14 @@
     {% endif %}
 
     {% for course_data in courses %}
+        {% set course_video = '' %}
+
+        {% for extra_field in course_data.extra_fields %}
+            {% if extra_field.getField().getVariable() == 'video_url' %}
+                {% set course_video = extra_field.getValue() %}
+            {% endif %}
+        {% endfor %}
+
         {% if courses|length > 1 %}
             <div class="row">
                 <div class="col-xs-12">
@@ -15,15 +23,15 @@
         {% endif %}
 
         <div class="row">
-            {% if course_data.video %}
+            {% if course_video %}
                 <div class="col-sm-6 col-md-7">
                     <div class="embed-responsive embed-responsive-16by9">
-                        {{ course_data.video }}
+                        {{ essence.replace(course_video) }}
                     </div>
                 </div>
             {% endif %}
 
-            <div class="{{ course_data.video ? 'col-sm-6 col-md-5' : 'col-sm-12' }}">
+            <div class="{{ course_video ? 'col-sm-6 col-md-5' : 'col-sm-12' }}">
                 <div class="description-course">
                     {{ course_data.description.getContent }}
                 </div>