Add career user information BT#16231

main/admin/user_information.php

@@ -251,26 +251,26 @@ foreach ($data as $label => $item) {
  * Show social activity.
  */
 if (api_get_setting('allow_social_tool') === 'true') {
-    $userObject = api_get_user_entity($user['user_id']);
+    $userObject = api_get_user_entity($userId);
     $data = [];
 
     // Calculate values
     if (api_get_setting('allow_message_tool') === 'true') {
-        $messagesSent = SocialManager::getCountMessagesSent($user['user_id']);
+        $messagesSent = SocialManager::getCountMessagesSent($userId);
         $data[] = [get_lang('MessagesSent'), $messagesSent];
-        $messagesReceived = SocialManager::getCountMessagesReceived($user['user_id']);
+        $messagesReceived = SocialManager::getCountMessagesReceived($userId);
         $data[] = [get_lang('MessagesReceived'), $messagesReceived];
     }
-    $wallMessagesPosted = SocialManager::getCountWallPostedMessages($user['user_id']);
+    $wallMessagesPosted = SocialManager::getCountWallPostedMessages($userId);
     $data[] = [get_lang('WallMessagesPosted'), $wallMessagesPosted];
 
-    $friends = SocialManager::getCountFriends($user['user_id']);
+    $friends = SocialManager::getCountFriends($userId);
     $data[] = [get_lang('Friends'), $friends];
 
-    $countSent = SocialManager::getCountInvitationSent($user['user_id']);
+    $countSent = SocialManager::getCountInvitationSent($userId);
     $data[] = [get_lang('InvitationSent'), $countSent];
 
-    $countReceived = SocialManager::get_message_number_invitation_by_user_id($user['user_id']);
+    $countReceived = SocialManager::get_message_number_invitation_by_user_id($userId);
     $data[] = [get_lang('InvitationReceived'), $countReceived];
 
     $userInfo['social'] = [
@@ -600,7 +600,7 @@ if (isset($_GET['action'])) {
         case 'export':
             Export::arrayToCsv(
                 $csvContent,
-                'user_information_'.$user['user_id']
+                'user_information_'.$userId
             );
             exit;
             break;
@@ -700,9 +700,23 @@ echo $courseInformation;
 echo $urlInformation;
 
 echo Tracking::displayUserSkills(
-    $user['user_id'],
+    $userId,
     0,
     0
 );
 
+if (api_get_configuration_value('allow_career_users')) {
+    $careers = UserManager::getUserCareers($userId);
+    if (!empty($careers)) {
+        $table = new HTML_Table(['class' => 'data_table']);
+        $table->setHeaderContents(0, 0, get_lang('Career'));
+        $row = 1;
+        foreach ($careers as $carerData) {
+            $table->setCellContents($row, 0, $carerData['name']);
+            $row++;
+        }
+        echo $table->toHtml();
+    }
+}
+
 Display::display_footer();

main/inc/lib/sessionmanager.lib.php

@@ -5346,13 +5346,12 @@ SQL;
                     $careerList = explode(',' , $careerList);
                     $finalCareerIdList = [];
                     foreach ($careerList as $careerId) {
-                        $careerId = (int) $careerId;
-                        $realCareerIdList = $extraFieldValueCareer->get_item_id_from_field_variable_and_field_value('external_career_id', $careerId);
-                        $realCareerIdList = $realCareerIdList['value'];
-                        if (!empty($realCareerIdList)) {
-                            foreach ($realCareerIdList as $realCareerId) {
-                                $finalCareerIdList[] = $realCareerId;
-                            }
+                        $realCareerIdList = $extraFieldValueCareer->get_item_id_from_field_variable_and_field_value(
+                            'external_career_id',
+                            $careerId
+                        );
+                        if (isset($realCareerIdList['item_id'])) {
+                            $finalCareerIdList[] = $realCareerIdList['item_id'];
                         }
                     }
 

main/inc/lib/usermanager.lib.php

@@ -6636,17 +6636,46 @@ SQL;
         return $url;
     }
 
+    /**
+     * @param int $userId
+     *
+     * @return array
+     */
+    public function getUserCareers($userId)
+    {
+        $table = Database::get_main_table(TABLE_MAIN_USER_CAREER);
+        $tableCareer = Database::get_main_table(TABLE_CAREER);
+        $userId = (int) $userId;
+
+        $sql = "SELECT c.id, c.name 
+                FROM $table uc 
+                INNER JOIN $tableCareer c 
+                ON uc.career_id = c.id 
+                WHERE user_id = $userId 
+                ORDER BY uc.created_at
+                ";
+        $result = Database::query($sql);
+
+        return Database::store_result($result, 'ASSOC');
+    }
+
     /**
      * @param int $userId
      * @param int $careerId
      */
     public static function addUserCareer($userId, $careerId)
     {
+        if (!api_get_configuration_value('allow_career_users')) {
+            return false;
+        }
+
         if (self::userHasCareer($userId, $careerId) === false) {
             $params = ['user_id' => $userId, 'career_id' => $careerId, 'created_at' => api_get_utc_datetime()];
             $table = Database::get_main_table(TABLE_MAIN_USER_CAREER);
             Database::insert($table, $params);
         }
+
+        return true;
     }
 
     /**