Browse Source

Show user's work place on About Session page - refs BT#9889 #TMI

Angel Fernando Quiroz Campos 9 years ago
parent
commit
4a83416105
2 changed files with 32 additions and 4 deletions
  1. 28 3
      main/session/about.php
  2. 4 1
      main/template/default/session/about.tpl

+ 28 - 3
main/session/about.php

@@ -28,6 +28,7 @@ $entityManager = Database::getManager();
 $fieldsRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraField');
 $fieldValuesRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldValues');
 $fieldTagsRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
+$sessionsRepo = $entityManager->getRepository('ChamiloCoreBundle:Session');
 
 $videoUrlField = $fieldsRepo->findOneBy([
     'extraFieldType' => ExtraField::COURSE_FIELD_TYPE,
@@ -38,6 +39,11 @@ $tagField = $fieldsRepo->findOneBy([
     'variable' => 'tags'
 ]);
 
+$workOrStudyPlaceField = $fieldsRepo->findOneBy([
+    'extraFieldType' => ExtraField::USER_FIELD_TYPE,
+    'variable' => 'work_or_study_place'
+]);
+
 foreach ($sessionCourses as $sessionCourse) {
     $courseVideo = null;
     $courseTags = [];
@@ -59,8 +65,27 @@ foreach ($sessionCourses as $sessionCourse) {
         $courseTags = $fieldTagsRepo->getTags($tagField, $sessionCourse->getId());
     }
 
-    $courseCoaches = $entityManager->getRepository('ChamiloCoreBundle:Session')
-        ->getCourseCoachesForCoach($session, $sessionCourse);
+    $courseCoaches = $sessionsRepo->getCourseCoachesForCoach($session, $sessionCourse);
+    $coachesData = [];
+
+    foreach ($courseCoaches as $courseCoach) {
+        $coachData = [
+            'complete_name' => $courseCoach->getCompleteName()
+        ];
+
+        if (!is_null($workOrStudyPlaceField)) {
+            $workOrStudyPlaceValue = $fieldValuesRepo->findOneBy([
+                'field' => $workOrStudyPlaceField,
+                'itemId' => $courseCoach->getId()
+            ]);
+
+            if (!is_null($workOrStudyPlaceValue)) {
+                $coachData['work_or_study_place'] = $workOrStudyPlaceValue->getValue();
+            }
+        }
+
+        $coachesData[] = $coachData;
+    }
 
     $courseDescriptionTools = $entityManager->getRepository('ChamiloCourseBundle:CCourseDescription')
         ->findBy(
@@ -97,7 +122,7 @@ foreach ($sessionCourses as $sessionCourse) {
         'tags' => $courseTags,
         'objectives' => $courseObjectives,
         'topics' => $courseTopics,
-        'coaches' => $courseCoaches
+        'coaches' => $coachesData
     ];
 }
 

+ 4 - 1
main/template/default/session/about.tpl

@@ -78,7 +78,10 @@
                             <ul>
                                 {% for coach in course_data.coaches %}
                                     <li>
-                                        {{ coach.getCompleteName }}
+                                        <p>{{ coach.complete_name }}</p>
+                                        {% if coach.work_or_study_place %}
+                                            <p>{{ coach.work_or_study_place }}</p>
+                                        {% endif %}
                                     </li>
                                 {% endfor %}
                             </ul>