From 014bd53c2ce491dd7093f0985a966ea4b0d84ed3 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Tue, 13 Jun 2017 13:52:25 +0200
Subject: [PATCH] Fix diagram rendering see BT#12861

---
 main/mySpace/my_career.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/main/mySpace/my_career.php b/main/mySpace/my_career.php
index b9f98b98f6..2f2002dba8 100644
--- a/main/mySpace/my_career.php
+++ b/main/mySpace/my_career.php
@@ -19,22 +19,31 @@ foreach ($sessionCategories as $category) {
     $sessions = $category['sessions'];
     foreach ($sessions as $session) {
         $sessionId = $session['session_id'];
-
+        // Getting session extra field 'external_career_id'
         $item = $extraFieldValue->get_values_by_handler_and_field_variable(
             $sessionId,
             'external_career_id'
         );
         if ($item && isset($item['value']) && !empty($item['value'])) {
-            $careerId = $item['value'];
-            $careerInfo = $career->find($careerId);
-            if (!empty($careerInfo)) {
-                $itemCareer = $extraFieldValueCareer->get_values_by_handler_and_field_variable(
-                    $careerId,
-                    'career_diagram'
-                );
-                if ($itemCareer && !empty($itemCareer['value'])) {
-                    $graph = unserialize($itemCareer['value']);
-                    $content .= Career::renderDiagram($careerInfo, $graph);
+            // External career id
+            $externalCareerId = $item['value'];
+            // Getting career id from external career id
+            $itemCareer = $extraFieldValueCareer->get_item_id_from_field_variable_and_field_value(
+                'external_career_id',
+                $externalCareerId
+            );
+            if ($itemCareer && !empty($itemCareer['item_id'])) {
+                $careerId = $itemCareer['item_id'];
+                $careerInfo = $career->find($careerId);
+                if (!empty($careerInfo)) {
+                    $diagram = $extraFieldValueCareer->get_values_by_handler_and_field_variable(
+                        $careerId,
+                        'career_diagram'
+                    );
+                    if ($diagram && !empty($diagram['value'])) {
+                        $graph = unserialize($diagram['value']);
+                        $content .= Career::renderDiagram($careerInfo, $graph);
+                    }
                 }
             }
         }