diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index b6d10eeac8..0012d941ef 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -1715,21 +1715,6 @@ class ExtraField extends Model
                             $hideGeoLocalizationDetails
                         );
 
-                        /*$form->addElement(
-                            'text',
-                            'extra_'.$field_details['variable'],
-                            $field_details['display_text'],
-                            ['id' => 'extra_'.$field_details['variable']]
-                        );
-                        $form->addHidden(
-                            'extra_'.$field_details['variable'].'_coordinates',
-                            '',
-                            ['id' => 'extra_'.$field_details['variable'].'_coordinates']
-                        );
-
-                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
-                        $form->applyFilter('extra_'.$field_details['variable'], 'trim');*/
-
                         if ($freezeElement) {
                             $form->freeze('extra_'.$field_details['variable']);
                         }
@@ -1759,1842 +1744,1793 @@ class ExtraField extends Model
         return $return;
     }
 
+
+
     /**
-     * @param \FormValidator $form
-     * @param int            $defaultValueId
-     * @param bool           $freezeElement
+     * @param array $options
+     *
+     * @return array
      */
-    private function addSelectElement(FormValidator $form, array $fieldDetails, $defaultValueId, $freezeElement = false)
+    public static function extra_field_double_select_convert_array_to_ordered_array($options)
     {
-        $get_lang_variables = false;
-        if (in_array(
-            $fieldDetails['variable'],
-            ['mail_notify_message', 'mail_notify_invitation', 'mail_notify_group_message']
-        )) {
-            $get_lang_variables = true;
-        }
-
-        // Get extra field workflow
-        $addOptions = [];
-        $optionsExists = false;
-        $options = [];
-
-        $optionList = [];
-        if (!empty($fieldDetails['options'])) {
-            foreach ($fieldDetails['options'] as $option_details) {
-                $optionList[$option_details['id']] = $option_details;
-                if ($get_lang_variables) {
-                    $options[$option_details['option_value']] = $option_details['display_text'];
+        $optionsParsed = [];
+        if (!empty($options)) {
+            foreach ($options as $option) {
+                if (0 == $option['option_value']) {
+                    $optionsParsed[$option['id']][] = $option;
                 } else {
-                    if ($optionsExists) {
-                        // Adding always the default value
-                        if ($option_details['id'] == $defaultValueId) {
-                            $options[$option_details['option_value']] = $option_details['display_text'];
-                        } else {
-                            if (isset($addOptions) && !empty($addOptions)) {
-                                // Parsing filters
-                                if (in_array($option_details['id'], $addOptions)) {
-                                    $options[$option_details['option_value']] = $option_details['display_text'];
-                                }
-                            }
-                        }
-                    } else {
-                        // Normal behaviour
-                        $options[$option_details['option_value']] = $option_details['display_text'];
-                    }
-                }
-            }
-
-            // Setting priority message
-            if (isset($optionList[$defaultValueId])
-                && isset($optionList[$defaultValueId]['priority'])
-            ) {
-                if (!empty($optionList[$defaultValueId]['priority'])) {
-                    $priorityId = $optionList[$defaultValueId]['priority'];
-                    $option = new ExtraFieldOption($this->type);
-                    $messageType = $option->getPriorityMessageType($priorityId);
-                    $form->addElement(
-                        'label',
-                        null,
-                        Display::return_message(
-                            $optionList[$defaultValueId]['priority_message'],
-                            $messageType
-                        )
-                    );
+                    $optionsParsed[$option['option_value']][] = $option;
                 }
             }
         }
 
-        /** @var \HTML_QuickForm_select $slct */
-        $slct = $form->addElement(
-            'select',
-            'extra_'.$fieldDetails['variable'],
-            $fieldDetails['display_text'],
-            [],
-            ['id' => 'extra_'.$fieldDetails['variable']]
-        );
-
-        if (empty($defaultValueId)) {
-            $slct->addOption(get_lang('SelectAnOption'), '');
-        }
+        return $optionsParsed;
+    }
 
-        foreach ($options as $value => $text) {
-            if (empty($value)) {
-                $slct->addOption($text, $value);
-                continue;
-            }
 
-            $valueParts = explode('#', $text);
-            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
+    /**
+     * @return array
+     */
+    public static function tripleSelectConvertArrayToOrderedArray(array $options)
+    {
+        $level1 = self::getOptionsFromTripleSelect($options, 0);
+        $level2 = [];
+        $level3 = [];
 
-            $slct->addOption(implode('', $valueParts), $value, ['data-value' => $dataValue]);
+        foreach ($level1 as $item1) {
+            $level2 += self::getOptionsFromTripleSelect($options, $item1['id']);
         }
 
-        /* Enable this when field_loggeable is introduced as a table field (2.0)
-        if ($optionsExists && $field_details['field_loggeable'] && !empty($defaultValueId)) {
-
-            $form->addElement(
-                'textarea',
-                'extra_' . $field_details['variable'] . '_comment',
-                $field_details['display_text'] . ' ' . get_lang('Comment')
-            );
-
-            $extraFieldValue = new ExtraFieldValue($this->type);
-            $repo = $app['orm.em']->getRepository($extraFieldValue->entityName);
-            $repoLog = $app['orm.em']->getRepository('Gedmo\Loggable\Entity\LogEntry');
-            $newEntity = $repo->findOneBy(
-                array(
-                    $this->handlerEntityId => $itemId,
-                    'fieldId' => $field_details['id']
-                )
-            );
-            // @todo move this in a function inside the class
-            if ($newEntity) {
-                $logs = $repoLog->getLogEntries($newEntity);
-                if (!empty($logs)) {
-                    $html = '<b>' . get_lang('LatestChanges') . '</b><br /><br />';
-
-                    $table = new HTML_Table(array('class' => 'data_table'));
-                    $table->setHeaderContents(0, 0, get_lang('Value'));
-                    $table->setHeaderContents(0, 1, get_lang('Comment'));
-                    $table->setHeaderContents(0, 2, get_lang('ModifyDate'));
-                    $table->setHeaderContents(0, 3, get_lang('Username'));
-                    $row = 1;
-                    foreach ($logs as $log) {
-                        $column = 0;
-                        $data = $log->getData();
-                        $fieldValue = isset($data['fieldValue']) ? $data['fieldValue'] : null;
-                        $comment = isset($data['comment']) ? $data['comment'] : null;
-
-                        $table->setCellContents($row, $column, $fieldValue);
-                        $column++;
-                        $table->setCellContents($row, $column, $comment);
-                        $column++;
-                        $table->setCellContents($row, $column, api_get_local_time($log->getLoggedAt()->format('Y-m-d H:i:s')));
-                        $column++;
-                        $table->setCellContents($row, $column, $log->getUsername());
-                        $row++;
-                    }
-                    $form->addElement('label', null, $html.$table->toHtml());
-                }
-            }
+        foreach ($level2 as $item2) {
+            $level3 += self::getOptionsFromTripleSelect($options, $item2['id']);
         }
-        */
 
-        if ($freezeElement) {
-            $form->freeze('extra_'.$fieldDetails['variable']);
-        }
+        return ['level1' => $level1, 'level2' => $level2, 'level3' => $level3];
     }
 
     /**
-     * @param \FormValidator $form
-     * @param array          $fieldDetails
-     * @param array          $extraData
-     * @param bool           $freezeElement
+     * @param string $type
      *
-     * @return string JavaScript code
+     * @return array
      */
-    private function addDoubleSelectElement(FormValidator $form, $fieldDetails, $extraData, $freezeElement = false)
+    public function get_all_extra_field_by_type($type)
     {
-        $firstSelectId = 'first_extra_'.$fieldDetails['variable'];
-        $secondSelectId = 'second_extra_'.$fieldDetails['variable'];
-
-        $jqueryReadyContent = "
-            $('#$firstSelectId').on('change', function() {
-                var id = $(this).val();
-
-                if (!id) {
-                    $('#$secondSelectId').empty().selectpicker('refresh');
-
-                    return;
-                }
-
-                $.getJSON(_p.web_ajax + 'extra_field.ajax.php?1=1&a=get_second_select_options', {
-                    'type': '{$this->type}',
-                    'field_id': {$fieldDetails['id']},
-                    'option_value_id': id
-                })
-                    .done(function(data) {
-                        $('#$secondSelectId').empty();
-                        $.each(data, function(index, value) {
-                            $('#second_extra_{$fieldDetails['variable']}').append(
-                                $('<option>', {value: index, text: value})
-                            );
-                        });
-                        $('#$secondSelectId').selectpicker('refresh');
-                    });
-            });
-        ";
-
-        $firstId = null;
-        if (!empty($extraData)) {
-            if (isset($extraData['extra_'.$fieldDetails['variable']])) {
-                $firstId = $extraData['extra_'.$fieldDetails['variable']]['extra_'.$fieldDetails['variable']];
-            }
-        }
-
-        $options = $this->extra_field_double_select_convert_array_to_ordered_array($fieldDetails['options']);
-        $values = ['' => get_lang('Select')];
-
-        $second_values = [];
-        if (!empty($options)) {
-            foreach ($options as $option) {
-                foreach ($option as $sub_option) {
-                    if ('0' == $sub_option['option_value']) {
-                        $values[$sub_option['id']] = $sub_option['display_text'];
-
-                        continue;
-                    }
+        // all the information of the field
+        $sql = "SELECT * FROM {$this->table}
+                WHERE
+                    field_type = '".Database::escape_string($type)."' AND
+                    extra_field_type = $this->extraFieldType
+                ";
+        $result = Database::query($sql);
 
-                    if ($firstId === $sub_option['option_value']) {
-                        $second_values[$sub_option['id']] = $sub_option['display_text'];
-                    }
-                }
-            }
+        $return = [];
+        while ($row = Database::fetch_array($result)) {
+            $return[] = $row['id'];
         }
 
-        $form
-            ->defaultRenderer()
-            ->setGroupElementTemplate('<p>{element}</p>', 'extra_'.$fieldDetails['variable']);
-        $group = [];
-        $group[] = $form->createElement(
-            'select',
-            'extra_'.$fieldDetails['variable'],
-            null,
-            $values,
-            ['id' => $firstSelectId]
-        );
-        $group[] = $form->createElement(
-            'select',
-            'extra_'.$fieldDetails['variable'].'_second',
-            null,
-            $second_values,
-            ['id' => $secondSelectId]
-        );
-        $form->addGroup(
-            $group,
-            'extra_'.$fieldDetails['variable'],
-            $fieldDetails['display_text']
-        );
+        return $return;
+    }
 
-        if ($freezeElement) {
-            $form->freeze('extra_'.$fieldDetails['variable']);
+    /**
+     * @param int $id
+     */
+    public function get_field_type_by_id($id)
+    {
+        $types = $this->get_field_types();
+        if (isset($types[$id])) {
+            return $types[$id];
         }
 
-        return $jqueryReadyContent;
+        return null;
     }
 
     /**
-     * @param array $options
-     *
      * @return array
      */
-    public static function extra_field_double_select_convert_array_to_ordered_array($options)
+    public function get_field_types()
     {
-        $optionsParsed = [];
-        if (!empty($options)) {
-            foreach ($options as $option) {
-                if (0 == $option['option_value']) {
-                    $optionsParsed[$option['id']][] = $option;
-                } else {
-                    $optionsParsed[$option['option_value']][] = $option;
-                }
-            }
-        }
-
-        return $optionsParsed;
+        return $this->get_extra_fields_by_handler($this->type);
     }
 
     /**
-     * @param \FormValidator $form
-     * @param bool           $freezeElement Optional
+     * @param string $handler
      *
-     * @return string JavaScript code
+     * @return array
      */
-    private function addSelectWithTextFieldElement(
-        FormValidator $form,
-        array $fieldDetails,
-        $freezeElement = false
-    ) {
-        $firstSelectId = 'slct_extra_'.$fieldDetails['variable'];
-        $txtSelectId = 'txt_extra_'.$fieldDetails['variable'];
-
-        $jqueryReadyContent = "
-            $('#$firstSelectId').on('change', function() {
-                var id = $(this).val();
+    public static function get_extra_fields_by_handler($handler)
+    {
+        $types = [];
+        $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
+        $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
+        $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
+        $types[self::FIELD_TYPE_SELECT] = get_lang('FieldTypeSelect');
+        $types[self::FIELD_TYPE_SELECT_MULTIPLE] = get_lang('FieldTypeSelectMultiple');
+        $types[self::FIELD_TYPE_DATE] = get_lang('FieldTypeDate');
+        $types[self::FIELD_TYPE_DATETIME] = get_lang('FieldTypeDatetime');
+        $types[self::FIELD_TYPE_DOUBLE_SELECT] = get_lang('FieldTypeDoubleSelect');
+        $types[self::FIELD_TYPE_DIVIDER] = get_lang('FieldTypeDivider');
+        $types[self::FIELD_TYPE_TAG] = get_lang('FieldTypeTag');
+        $types[self::FIELD_TYPE_TIMEZONE] = get_lang('FieldTypeTimezone');
+        $types[self::FIELD_TYPE_SOCIAL_PROFILE] = get_lang('FieldTypeSocialProfile');
+        $types[self::FIELD_TYPE_MOBILE_PHONE_NUMBER] = get_lang('FieldTypeMobilePhoneNumber');
+        $types[self::FIELD_TYPE_CHECKBOX] = get_lang('FieldTypeCheckbox');
+        $types[self::FIELD_TYPE_INTEGER] = get_lang('FieldTypeInteger');
+        $types[self::FIELD_TYPE_FILE_IMAGE] = get_lang('FieldTypeFileImage');
+        $types[self::FIELD_TYPE_FLOAT] = get_lang('FieldTypeFloat');
+        $types[self::FIELD_TYPE_FILE] = get_lang('FieldTypeFile');
+        $types[self::FIELD_TYPE_VIDEO_URL] = get_lang('FieldTypeVideoUrl');
+        $types[self::FIELD_TYPE_LETTERS_ONLY] = get_lang('FieldTypeOnlyLetters');
+        $types[self::FIELD_TYPE_ALPHANUMERIC] = get_lang('FieldTypeAlphanumeric');
+        $types[self::FIELD_TYPE_LETTERS_SPACE] = get_lang('FieldTypeLettersSpaces');
+        $types[self::FIELD_TYPE_ALPHANUMERIC_SPACE] = get_lang('FieldTypeAlphanumericSpaces');
+        $types[self::FIELD_TYPE_GEOLOCALIZATION] = get_lang('Geolocalization');
+        $types[self::FIELD_TYPE_GEOLOCALIZATION_COORDINATES] = get_lang('GeolocalizationCoordinates');
+        $types[self::FIELD_TYPE_SELECT_WITH_TEXT_FIELD] = get_lang('FieldTypeSelectWithTextField');
+        $types[self::FIELD_TYPE_TRIPLE_SELECT] = get_lang('FieldTypeTripleSelect');
 
-                if (!id) {
-                    $('#$txtSelectId').val('');
-                }
-            });
-        ";
+        switch ($handler) {
+            case 'course':
+            case 'session':
+            case 'user':
+            case 'skill':
+                break;
+        }
 
-        $options = $this->extra_field_double_select_convert_array_to_ordered_array($fieldDetails['options']);
-        $values = ['' => get_lang('Select')];
+        return $types;
+    }
 
-        if (!empty($options)) {
-            foreach ($options as $option) {
-                foreach ($option as $sub_option) {
-                    if ('0' != $sub_option['option_value']) {
-                        continue;
-                    }
+    /**
+     * @param array $params
+     * @param bool  $show_query
+     *
+     * @return int|bool
+     */
+    public function save($params, $show_query = false)
+    {
+        $fieldInfo = self::get_handler_field_info_by_field_variable($params['variable']);
+        $params = $this->clean_parameters($params);
+        $params['extra_field_type'] = $this->extraFieldType;
 
-                    $values[$sub_option['id']] = $sub_option['display_text'];
-                }
+        if ($fieldInfo) {
+            return $fieldInfo['id'];
+        } else {
+            $id = parent::save($params, $show_query);
+            if ($id) {
+                $fieldOption = new ExtraFieldOption($this->type);
+                $params['field_id'] = $id;
+                $fieldOption->save($params);
             }
+
+            return $id;
         }
+    }
 
-        $form
-            ->defaultRenderer()
-            ->setGroupElementTemplate('<p>{element}</p>', 'extra_'.$fieldDetails['variable']);
-        $group = [];
-        $group[] = $form->createElement(
-            'select',
-            'extra_'.$fieldDetails['variable'],
-            null,
-            $values,
-            ['id' => $firstSelectId]
-        );
-        $group[] = $form->createElement(
-            'text',
-            'extra_'.$fieldDetails['variable'].'_second',
-            null,
-            ['id' => $txtSelectId]
-        );
-        $form->addGroup(
-            $group,
-            'extra_'.$fieldDetails['variable'],
-            $fieldDetails['display_text']
-        );
+    /**
+     * @param string $variable
+     *
+     * @return array|bool
+     */
+    public function get_handler_field_info_by_field_variable($variable)
+    {
+        $variable = Database::escape_string($variable);
+        $sql = "SELECT * FROM {$this->table}
+                WHERE
+                    variable = '$variable' AND
+                    extra_field_type = $this->extraFieldType";
+        $result = Database::query($sql);
+        if (Database::num_rows($result)) {
+            $row = Database::fetch_array($result, 'ASSOC');
+            if ($row) {
+                $row['display_text'] = $this->translateDisplayName(
+                    $row['variable'],
+                    $row['display_text']
+                );
 
-        if ($freezeElement) {
-            $form->freeze('extra_'.$fieldDetails['variable']);
+                // All the options of the field
+                $sql = "SELECT * FROM $this->table_field_options
+                    WHERE field_id='".intval($row['id'])."'
+                    ORDER BY option_order ASC";
+                $result = Database::query($sql);
+                while ($option = Database::fetch_array($result)) {
+                    $row['options'][$option['id']] = $option;
+                }
+
+                return $row;
+            }
         }
 
-        return $jqueryReadyContent;
+        return false;
     }
 
     /**
-     * @param \FormValidator $form
-     * @param bool           $freezeElement
+     * @param array $params
      *
-     * @return string
+     * @return array
      */
-    private function addTripleSelectElement(
-        FormValidator $form,
-        array $fieldDetails,
-        array $extraData,
-        $freezeElement
-    ) {
-        $variable = $fieldDetails['variable'];
-        $id = $fieldDetails['id'];
-        $slctFirstId = "first_extra$variable";
-        $slctSecondId = "second_extra$variable";
-        $slctThirdId = "third_extra$variable";
-        $langSelect = get_lang('Select');
-
-        $js = "
-            (function () {
-                var slctFirst = $('#$slctFirstId'),
-                    slctSecond = $('#$slctSecondId'),
-                    slctThird = $('#$slctThirdId');
-
-                slctFirst.on('change', function () {
-                    slctSecond.empty().selectpicker('refresh');
-                    slctThird.empty().selectpicker('refresh');
+    public function clean_parameters($params)
+    {
+        if (!isset($params['variable']) || empty($params['variable'])) {
+            $params['variable'] = $params['display_text'];
+        }
 
-                    var level = $(this).val();
+        $params['variable'] = trim(strtolower(str_replace(' ', '_', $params['variable'])));
 
-                    if (!level) {
-                        return;
-                    }
+        if (!isset($params['field_order'])) {
+            $max_order = self::get_max_field_order();
+            $params['field_order'] = $max_order;
+        } else {
+            $params['field_order'] = (int) $params['field_order'];
+        }
 
-                    $.getJSON(_p.web_ajax + 'extra_field.ajax.php', {
-                        'a': 'get_second_select_options',
-                        'type': '$this->type',
-                        'field_id': $id,
-                        'option_value_id': level
-                    })
-                        .done(function (data) {
-                            slctSecond.append(
-                                $('<option>', {value: '', text: '$langSelect'})
-                            );
+        return $params;
+    }
 
-                            $.each(data, function (index, value) {
-                                var valueParts = value.split('#'),
-                                    dataValue = valueParts.length > 1 ? valueParts.shift() : '';
+    /**
+     * @return int
+     */
+    public function get_max_field_order()
+    {
+        $sql = "SELECT MAX(field_order)
+                FROM {$this->table}
+                WHERE
+                    extra_field_type = '.$this->extraFieldType.'";
+        $res = Database::query($sql);
 
-                                slctSecond.append(
-                                    $('<option>', {value: index, text: valueParts.join(''), 'data-value': dataValue})
-                                );
-                            });
+        $order = 0;
+        if (Database::num_rows($res) > 0) {
+            $row = Database::fetch_row($res);
+            $order = $row[0] + 1;
+        }
 
-                            slctSecond.selectpicker('refresh');
-                        });
-                });
-                slctSecond.on('change', function () {
-                    slctThird.empty().selectpicker('refresh');
+        return $order;
+    }
 
-                    var level = $(this).val();
+    /**
+     * {@inheritdoc}
+     */
+    public function update($params, $showQuery = false)
+    {
+        $params = $this->clean_parameters($params);
+        if (isset($params['id'])) {
+            $fieldOption = new ExtraFieldOption($this->type);
+            $params['field_id'] = $params['id'];
+            if (empty($params['field_type'])) {
+                $params['field_type'] = $this->type;
+            }
+            $fieldOption->save($params, $showQuery);
+        }
 
-                    if (!level) {
-                        return;
-                    }
+        return parent::update($params, $showQuery);
+    }
 
-                    $.getJSON(_p.web_ajax + 'extra_field.ajax.php', {
-                        'a': 'get_second_select_options',
-                        'type': '$this->type',
-                        'field_id': $id,
-                        'option_value_id': level
-                    })
-                        .done(function (data) {
-                            slctThird.append(
-                                $('<option>', {value: '', text: '$langSelect'})
-                            );
-
-                            $.each(data, function (index, value) {
-                                var valueParts = value.split('#'),
-                                    dataValue = valueParts.length > 1 ? valueParts.shift() : '';
-
-                                slctThird.append(
-                                    $('<option>', {value: index, text: valueParts.join(''), 'data-value': dataValue})
-                                );
-                            });
-
-                            slctThird.selectpicker('refresh');
-                        });
-                });
-            })();
-        ";
-
-        $firstId = isset($extraData["extra_$variable"]["extra_$variable"])
-            ? $extraData["extra_$variable"]["extra_$variable"]
-            : '';
-        $secondId = isset($extraData["extra_$variable"]["extra_{$variable}_second"])
-            ? $extraData["extra_$variable"]["extra_{$variable}_second"]
-            : '';
-
-        $options = $this->tripleSelectConvertArrayToOrderedArray($fieldDetails['options']);
-        $values1 = ['' => $langSelect];
-        $values2 = ['' => $langSelect];
-        $values3 = ['' => $langSelect];
-        $level1 = $this->getOptionsFromTripleSelect($options['level1'], 0);
-        $level2 = $this->getOptionsFromTripleSelect($options['level2'], $firstId);
-        $level3 = $this->getOptionsFromTripleSelect($options['level3'], $secondId);
-        /** @var \HTML_QuickForm_select $slctFirst */
-        $slctFirst = $form->createElement('select', "extra_$variable", null, $values1, ['id' => $slctFirstId]);
-        /** @var \HTML_QuickForm_select $slctFirst */
-        $slctSecond = $form->createElement(
-            'select',
-            "extra_{$variable}_second",
-            null,
-            $values2,
-            ['id' => $slctSecondId]
-        );
-        /** @var \HTML_QuickForm_select $slctFirst */
-        $slctThird = $form->createElement('select', "extra_{$variable}_third", null, $values3, ['id' => $slctThirdId]);
-
-        foreach ($level1 as $item1) {
-            $valueParts = explode('#', $item1['display_text']);
-            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
-            $slctFirst->addOption(implode('', $valueParts), $item1['id'], ['data-value' => $dataValue]);
-        }
-
-        foreach ($level2 as $item2) {
-            $valueParts = explode('#', $item2['display_text']);
-            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
-            $slctSecond->addOption(implode('', $valueParts), $item2['id'], ['data-value' => $dataValue]);
-        }
-
-        foreach ($level3 as $item3) {
-            $valueParts = explode('#', $item3['display_text']);
-            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
-            $slctThird->addOption(implode('', $valueParts), $item3['id'], ['data-value' => $dataValue]);
+    /**
+     * @param $id
+     *
+     * @return bool
+     */
+    public function delete($id)
+    {
+        $em = Database::getManager();
+        $items = $em->getRepository('ChamiloCoreBundle:ExtraFieldSavedSearch')->findBy(['field' => $id]);
+        if ($items) {
+            foreach ($items as $item) {
+                $em->remove($item);
+            }
+            $em->flush();
         }
+        $field_option = new ExtraFieldOption($this->type);
+        $field_option->delete_all_options_by_field_id($id);
 
-        $form
-            ->defaultRenderer()
-            ->setGroupElementTemplate('<p>{element}</p>', "extra_$variable");
-        $form->addGroup([$slctFirst, $slctSecond, $slctThird], "extra_$variable", $fieldDetails['display_text']);
-
-        if ($freezeElement) {
-            $form->freeze('extra_'.$fieldDetails['variable']);
-        }
+        $session_field_values = new ExtraFieldValue($this->type);
+        $session_field_values->delete_all_values_by_field_id($id);
 
-        return $js;
+        return parent::delete($id);
     }
 
     /**
-     * @return array
+     * @param $breadcrumb
+     * @param $action
      */
-    public static function tripleSelectConvertArrayToOrderedArray(array $options)
+    public function setupBreadcrumb(&$breadcrumb, $action)
     {
-        $level1 = self::getOptionsFromTripleSelect($options, 0);
-        $level2 = [];
-        $level3 = [];
-
-        foreach ($level1 as $item1) {
-            $level2 += self::getOptionsFromTripleSelect($options, $item1['id']);
-        }
-
-        foreach ($level2 as $item2) {
-            $level3 += self::getOptionsFromTripleSelect($options, $item2['id']);
+        if ('add' === $action) {
+            $breadcrumb[] = ['url' => $this->pageUrl, 'name' => $this->pageName];
+            $breadcrumb[] = ['url' => '#', 'name' => get_lang('Add')];
+        } elseif ('edit' === $action) {
+            $breadcrumb[] = ['url' => $this->pageUrl, 'name' => $this->pageName];
+            $breadcrumb[] = ['url' => '#', 'name' => get_lang('Edit')];
+        } else {
+            $breadcrumb[] = ['url' => '#', 'name' => $this->pageName];
         }
-
-        return ['level1' => $level1, 'level2' => $level2, 'level3' => $level3];
     }
 
+    //@todo move this in the display_class or somewhere else
+
     /**
-     * @param int $parentId
-     *
-     * @return array
+     * Displays the title + grid.
      */
-    private static function getOptionsFromTripleSelect(array $options, $parentId)
+    public function display()
     {
-        return array_filter(
-            $options,
-            function ($option) use ($parentId) {
-                return $option['option_value'] == $parentId;
-            }
+        // action links
+        echo '<div class="actions">';
+        echo '<a href="../admin/index.php">';
+        echo Display::return_icon(
+            'back.png',
+            get_lang('BackTo').' '.get_lang('PlatformAdmin'),
+            '',
+            ICON_SIZE_MEDIUM
+        );
+        echo '</a>';
+        echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'">';
+        echo Display::return_icon(
+            'add_user_fields.png',
+            get_lang('Add'),
+            '',
+            ICON_SIZE_MEDIUM
         );
+        echo '</a>';
+        echo '</div>';
+        echo Display::grid_html($this->type.'_fields');
     }
 
     /**
-     * @param string $type
-     *
      * @return array
      */
-    public function get_all_extra_field_by_type($type)
+    public function getJqgridColumnNames()
     {
-        // all the information of the field
-        $sql = "SELECT * FROM {$this->table}
-                WHERE
-                    field_type = '".Database::escape_string($type)."' AND
-                    extra_field_type = $this->extraFieldType
-                ";
-        $result = Database::query($sql);
-
-        $return = [];
-        while ($row = Database::fetch_array($result)) {
-            $return[] = $row['id'];
-        }
-
-        return $return;
+        return [
+            get_lang('Name'),
+            get_lang('FieldLabel'),
+            get_lang('Type'),
+            get_lang('FieldChangeability'),
+            get_lang('VisibleToSelf'),
+            get_lang('VisibleToOthers'),
+            get_lang('Filter'),
+            get_lang('FieldOrder'),
+            get_lang('Actions'),
+        ];
     }
 
     /**
-     * @param int $id
+     * @return array
      */
-    public function get_field_type_by_id($id)
+    public function getJqgridColumnModel()
     {
-        $types = $this->get_field_types();
-        if (isset($types[$id])) {
-            return $types[$id];
-        }
-
-        return null;
+        return [
+            [
+                'name' => 'display_text',
+                'index' => 'display_text',
+                'width' => '140',
+                'align' => 'left',
+            ],
+            [
+                'name' => 'variable',
+                'index' => 'variable',
+                'width' => '90',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'field_type',
+                'index' => 'field_type',
+                'width' => '70',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'changeable',
+                'index' => 'changeable',
+                'width' => '35',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'visible_to_self',
+                'index' => 'visible_to_self',
+                'width' => '45',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'visible_to_others',
+                'index' => 'visible_to_others',
+                'width' => '35',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'filter',
+                'index' => 'filter',
+                'width' => '30',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'field_order',
+                'index' => 'field_order',
+                'width' => '25',
+                'align' => 'left',
+                'sortable' => 'true',
+            ],
+            [
+                'name' => 'actions',
+                'index' => 'actions',
+                'width' => '40',
+                'align' => 'left',
+                'formatter' => 'action_formatter',
+                'sortable' => 'false',
+            ],
+        ];
     }
 
     /**
-     * @return array
+     * @param string $url
+     * @param string $action
+     *
+     * @return FormValidator
      */
-    public function get_field_types()
+    public function return_form($url, $action)
     {
-        return $this->get_extra_fields_by_handler($this->type);
-    }
+        $form = new FormValidator($this->type.'_field', 'post', $url);
 
-    /**
-     * @param string $handler
-     *
-     * @return array
-     */
-    public static function get_extra_fields_by_handler($handler)
-    {
-        $types = [];
-        $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
-        $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
-        $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
-        $types[self::FIELD_TYPE_SELECT] = get_lang('FieldTypeSelect');
-        $types[self::FIELD_TYPE_SELECT_MULTIPLE] = get_lang('FieldTypeSelectMultiple');
-        $types[self::FIELD_TYPE_DATE] = get_lang('FieldTypeDate');
-        $types[self::FIELD_TYPE_DATETIME] = get_lang('FieldTypeDatetime');
-        $types[self::FIELD_TYPE_DOUBLE_SELECT] = get_lang('FieldTypeDoubleSelect');
-        $types[self::FIELD_TYPE_DIVIDER] = get_lang('FieldTypeDivider');
-        $types[self::FIELD_TYPE_TAG] = get_lang('FieldTypeTag');
-        $types[self::FIELD_TYPE_TIMEZONE] = get_lang('FieldTypeTimezone');
-        $types[self::FIELD_TYPE_SOCIAL_PROFILE] = get_lang('FieldTypeSocialProfile');
-        $types[self::FIELD_TYPE_MOBILE_PHONE_NUMBER] = get_lang('FieldTypeMobilePhoneNumber');
-        $types[self::FIELD_TYPE_CHECKBOX] = get_lang('FieldTypeCheckbox');
-        $types[self::FIELD_TYPE_INTEGER] = get_lang('FieldTypeInteger');
-        $types[self::FIELD_TYPE_FILE_IMAGE] = get_lang('FieldTypeFileImage');
-        $types[self::FIELD_TYPE_FLOAT] = get_lang('FieldTypeFloat');
-        $types[self::FIELD_TYPE_FILE] = get_lang('FieldTypeFile');
-        $types[self::FIELD_TYPE_VIDEO_URL] = get_lang('FieldTypeVideoUrl');
-        $types[self::FIELD_TYPE_LETTERS_ONLY] = get_lang('FieldTypeOnlyLetters');
-        $types[self::FIELD_TYPE_ALPHANUMERIC] = get_lang('FieldTypeAlphanumeric');
-        $types[self::FIELD_TYPE_LETTERS_SPACE] = get_lang('FieldTypeLettersSpaces');
-        $types[self::FIELD_TYPE_ALPHANUMERIC_SPACE] = get_lang('FieldTypeAlphanumericSpaces');
-        $types[self::FIELD_TYPE_GEOLOCALIZATION] = get_lang('Geolocalization');
-        $types[self::FIELD_TYPE_GEOLOCALIZATION_COORDINATES] = get_lang('GeolocalizationCoordinates');
-        $types[self::FIELD_TYPE_SELECT_WITH_TEXT_FIELD] = get_lang('FieldTypeSelectWithTextField');
-        $types[self::FIELD_TYPE_TRIPLE_SELECT] = get_lang('FieldTypeTripleSelect');
+        $form->addElement('hidden', 'type', $this->type);
+        $id = isset($_GET['id']) ? (int) $_GET['id'] : null;
+        $form->addElement('hidden', 'id', $id);
 
-        switch ($handler) {
-            case 'course':
-            case 'session':
-            case 'user':
-            case 'skill':
-                break;
+        // Setting the form elements
+        $header = get_lang('Add');
+        $defaults = [];
+
+        if ('edit' === $action) {
+            $header = get_lang('Modify');
+            // Setting the defaults
+            $defaults = $this->get($id, false);
         }
 
-        return $types;
-    }
+        $form->addElement('header', $header);
 
-    /**
-     * @param array $params
-     * @param bool  $show_query
-     *
-     * @return int|bool
-     */
-    public function save($params, $show_query = false)
-    {
-        $fieldInfo = self::get_handler_field_info_by_field_variable($params['variable']);
-        $params = $this->clean_parameters($params);
-        $params['extra_field_type'] = $this->extraFieldType;
+        if ('edit' === $action) {
+            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'
+                .http_build_query(['extra_field' => $id]);
+            $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');
 
-        if ($fieldInfo) {
-            return $fieldInfo['id'];
+            $form->addText(
+                'display_text',
+                [get_lang('Name'), $translateButton]
+            );
         } else {
-            $id = parent::save($params, $show_query);
-            if ($id) {
-                $fieldOption = new ExtraFieldOption($this->type);
-                $params['field_id'] = $id;
-                $fieldOption->save($params);
-            }
-
-            return $id;
+            $form->addElement('text', 'display_text', get_lang('Name'));
         }
-    }
 
-    /**
-     * @param string $variable
-     *
-     * @return array|bool
-     */
-    public function get_handler_field_info_by_field_variable($variable)
-    {
-        $variable = Database::escape_string($variable);
-        $sql = "SELECT * FROM {$this->table}
-                WHERE
-                    variable = '$variable' AND
-                    extra_field_type = $this->extraFieldType";
-        $result = Database::query($sql);
-        if (Database::num_rows($result)) {
-            $row = Database::fetch_array($result, 'ASSOC');
-            if ($row) {
-                $row['display_text'] = $this->translateDisplayName(
-                    $row['variable'],
-                    $row['display_text']
+        // Field type
+        $types = self::get_field_types();
+
+        $form->addElement(
+            'select',
+            'field_type',
+            get_lang('FieldType'),
+            $types,
+            ['id' => 'field_type']
+        );
+        $form->addElement('label', get_lang('Example'), '<div id="example">-</div>');
+        $form->addElement('text', 'variable', get_lang('FieldLabel'), ['class' => 'span5']);
+        $form->addElement(
+            'text',
+            'field_options',
+            get_lang('FieldPossibleValues'),
+            ['id' => 'field_options', 'class' => 'span6']
+        );
+
+        $fieldWithOptions = [
+            self::FIELD_TYPE_RADIO,
+            self::FIELD_TYPE_SELECT_MULTIPLE,
+            self::FIELD_TYPE_SELECT,
+            self::FIELD_TYPE_TAG,
+            self::FIELD_TYPE_DOUBLE_SELECT,
+            self::FIELD_TYPE_SELECT_WITH_TEXT_FIELD,
+            self::FIELD_TYPE_TRIPLE_SELECT,
+        ];
+
+        if ('edit' == $action) {
+            if (in_array($defaults['field_type'], $fieldWithOptions)) {
+                $url = Display::url(
+                    get_lang('EditExtraFieldOptions'),
+                    'extra_field_options.php?type='.$this->type.'&field_id='.$id
                 );
+                $form->addElement('label', null, $url);
 
-                // All the options of the field
-                $sql = "SELECT * FROM $this->table_field_options
-                    WHERE field_id='".intval($row['id'])."'
-                    ORDER BY option_order ASC";
-                $result = Database::query($sql);
-                while ($option = Database::fetch_array($result)) {
-                    $row['options'][$option['id']] = $option;
+                if (self::FIELD_TYPE_SELECT == $defaults['field_type']) {
+                    $urlWorkFlow = Display::url(
+                        get_lang('EditExtraFieldWorkFlow'),
+                        'extra_field_workflow.php?type='.$this->type.'&field_id='.$id
+                    );
+                    $form->addElement('label', null, $urlWorkFlow);
                 }
 
-                return $row;
+                $form->freeze('field_options');
             }
         }
+        $form->addElement(
+            'text',
+            'default_value',
+            get_lang('FieldDefaultValue'),
+            ['id' => 'default_value']
+        );
 
-        return false;
-    }
+        $group = [];
+        $group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('Yes'), 1);
+        $group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('No'), 0);
+        $form->addGroup($group, '', get_lang('VisibleToSelf'), null, false);
 
-    /**
-     * @param array $params
-     *
-     * @return array
-     */
-    public function clean_parameters($params)
-    {
-        if (!isset($params['variable']) || empty($params['variable'])) {
-            $params['variable'] = $params['display_text'];
-        }
+        $group = [];
+        $group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('Yes'), 1);
+        $group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('No'), 0);
+        $form->addGroup($group, '', get_lang('VisibleToOthers'), null, false);
 
-        $params['variable'] = trim(strtolower(str_replace(' ', '_', $params['variable'])));
+        $group = [];
+        $group[] = $form->createElement('radio', 'changeable', null, get_lang('Yes'), 1);
+        $group[] = $form->createElement('radio', 'changeable', null, get_lang('No'), 0);
+        $form->addGroup($group, '', get_lang('FieldChangeability'), null, false);
 
-        if (!isset($params['field_order'])) {
-            $max_order = self::get_max_field_order();
-            $params['field_order'] = $max_order;
+        $group = [];
+        $group[] = $form->createElement('radio', 'filter', null, get_lang('Yes'), 1);
+        $group[] = $form->createElement('radio', 'filter', null, get_lang('No'), 0);
+        $form->addGroup($group, '', get_lang('FieldFilter'), null, false);
+
+        /* Enable this when field_loggeable is introduced as a table field (2.0)
+        $group   = array();
+        $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('Yes'), 1);
+        $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('No'), 0);
+        $form->addGroup($group, '', get_lang('FieldLoggeable'), '', false);
+        */
+
+        $form->addElement('text', 'field_order', get_lang('FieldOrder'));
+
+        if ('edit' == $action) {
+            $option = new ExtraFieldOption($this->type);
+            $defaults['field_options'] = $option->get_field_options_by_field_to_string($id);
+            $form->addButtonUpdate(get_lang('Modify'));
         } else {
-            $params['field_order'] = (int) $params['field_order'];
+            $defaults['visible_to_self'] = 0;
+            $defaults['visible_to_others'] = 0;
+            $defaults['changeable'] = 0;
+            $defaults['filter'] = 0;
+            $form->addButtonCreate(get_lang('Add'));
         }
 
-        return $params;
+        /*if (!empty($defaults['created_at'])) {
+            $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+        }
+        if (!empty($defaults['updated_at'])) {
+            $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
+        }*/
+        $form->setDefaults($defaults);
+
+        // Setting the rules
+        $form->addRule('display_text', get_lang('ThisFieldIsRequired'), 'required');
+        $form->addRule('field_type', get_lang('ThisFieldIsRequired'), 'required');
+
+        return $form;
     }
 
     /**
-     * @return int
+     * Gets an element.
+     *
+     * @param int  $id
+     * @param bool $translateDisplayText Optional
+     *
+     * @return array
      */
-    public function get_max_field_order()
+    public function get($id, $translateDisplayText = true)
     {
-        $sql = "SELECT MAX(field_order)
-                FROM {$this->table}
-                WHERE
-                    extra_field_type = '.$this->extraFieldType.'";
-        $res = Database::query($sql);
+        $info = parent::get($id);
 
-        $order = 0;
-        if (Database::num_rows($res) > 0) {
-            $row = Database::fetch_row($res);
-            $order = $row[0] + 1;
+        if ($translateDisplayText) {
+            $info['display_text'] = self::translateDisplayName($info['variable'], $info['display_text']);
         }
 
-        return $order;
+        return $info;
     }
 
     /**
-     * {@inheritdoc}
+     * @param $token
+     *
+     * @return string
      */
-    public function update($params, $showQuery = false)
+    public function getJqgridActionLinks($token)
     {
-        $params = $this->clean_parameters($params);
-        if (isset($params['id'])) {
-            $fieldOption = new ExtraFieldOption($this->type);
-            $params['field_id'] = $params['id'];
-            if (empty($params['field_type'])) {
-                $params['field_type'] = $this->type;
-            }
-            $fieldOption->save($params, $showQuery);
-        }
+        //With this function we can add actions to the jgrid (edit, delete, etc)
+        $editIcon = Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL);
+        $deleteIcon = Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
+        $confirmMessage = addslashes(
+            api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)
+        );
 
-        return parent::update($params, $showQuery);
+        $editButton = <<<JAVASCRIPT
+            <a href="?action=edit&type={$this->type}&id=' + options.rowId + '" class="btn btn-link btn-xs">\
+                $editIcon\
+            </a>
+JAVASCRIPT;
+        $deleteButton = <<<JAVASCRIPT
+            <a \
+                onclick="if (!confirm(\'$confirmMessage\')) {return false;}" \
+                href="?sec_token=$token&type={$this->type}&id=' + options.rowId + '&action=delete" \
+                class="btn btn-link btn-xs">\
+                $deleteIcon\
+            </a>
+JAVASCRIPT;
+
+        return "function action_formatter(cellvalue, options, rowObject) {
+            return '$editButton $deleteButton';
+        }";
     }
 
     /**
-     * @param $id
+     * @param array $columns
+     * @param array $column_model
+     * @param array $extraFields
      *
-     * @return bool
+     * @return array
      */
-    public function delete($id)
+    public function getRules(&$columns, &$column_model, $extraFields = [], $checkExtraFieldExistence = false)
     {
-        $em = Database::getManager();
-        $items = $em->getRepository('ChamiloCoreBundle:ExtraFieldSavedSearch')->findBy(['field' => $id]);
-        if ($items) {
-            foreach ($items as $item) {
-                $em->remove($item);
+        $fields = $this->get_all(
+            [
+                'visible_to_self = ? AND filter = ?' => [1, 1],
+            ],
+            'display_text'
+        );
+        $extraFieldOption = new ExtraFieldOption($this->type);
+
+        $rules = [];
+        if (!empty($fields)) {
+            foreach ($fields as $field) {
+                $search_options = [];
+                $type = 'text';
+                if (in_array($field['field_type'], [self::FIELD_TYPE_SELECT, self::FIELD_TYPE_DOUBLE_SELECT])) {
+                    $type = 'select';
+                    $search_options['sopt'] = ['eq', 'ne']; //equal not equal
+                } else {
+                    $search_options['sopt'] = ['cn', 'nc']; //contains not contains
+                }
+
+                $search_options['searchhidden'] = 'true';
+                $search_options['defaultValue'] = isset($search_options['field_default_value'])
+                    ? $search_options['field_default_value']
+                    : null;
+
+                if (self::FIELD_TYPE_DOUBLE_SELECT == $field['field_type']) {
+                    // Add 2 selects
+                    $options = $extraFieldOption->get_field_options_by_field($field['id']);
+                    $options = self::extra_field_double_select_convert_array_to_ordered_array($options);
+
+                    $first_options = [];
+                    if (!empty($options)) {
+                        foreach ($options as $option) {
+                            foreach ($option as $sub_option) {
+                                if (0 == $sub_option['option_value']) {
+                                    $first_options[] = $sub_option['field_id'].'#'.$sub_option['id'].':'
+                                        .$sub_option['display_text'];
+                                }
+                            }
+                        }
+                    }
+
+                    $search_options['value'] = implode(';', $first_options);
+                    $search_options['dataInit'] = 'fill_second_select';
+
+                    // First
+                    $column_model[] = [
+                        'name' => 'extra_'.$field['variable'],
+                        'index' => 'extra_'.$field['variable'],
+                        'width' => '100',
+                        'hidden' => 'true',
+                        'search' => 'true',
+                        'stype' => 'select',
+                        'searchoptions' => $search_options,
+                    ];
+                    $columns[] = $field['display_text'].' (1)';
+                    $rules[] = [
+                        'field' => 'extra_'.$field['variable'],
+                        'op' => 'cn',
+                    ];
+
+                    // Second
+                    $search_options['value'] = $field['id'].':';
+                    $search_options['dataInit'] = 'register_second_select';
+
+                    $column_model[] = [
+                        'name' => 'extra_'.$field['variable'].'_second',
+                        'index' => 'extra_'.$field['variable'].'_second',
+                        'width' => '100',
+                        'hidden' => 'true',
+                        'search' => 'true',
+                        'stype' => 'select',
+                        'searchoptions' => $search_options,
+                    ];
+                    $columns[] = $field['display_text'].' (2)';
+                    $rules[] = ['field' => 'extra_'.$field['variable'].'_second', 'op' => 'cn'];
+                    continue;
+                } else {
+                    $search_options['value'] = $extraFieldOption->getFieldOptionsToString(
+                        $field['id'],
+                        false,
+                        'display_text'
+                    );
+                }
+                $column_model[] = [
+                    'name' => 'extra_'.$field['variable'],
+                    'index' => 'extra_'.$field['variable'],
+                    'width' => '100',
+                    'hidden' => 'true',
+                    'search' => 'true',
+                    'stype' => $type,
+                    'searchoptions' => $search_options,
+                ];
+                $columns[] = $field['display_text'];
+                $rules[] = [
+                    'field' => 'extra_'.$field['variable'],
+                    'op' => 'cn',
+                    'data' => '',
+                ];
             }
-            $em->flush();
         }
-        $field_option = new ExtraFieldOption($this->type);
-        $field_option->delete_all_options_by_field_id($id);
-
-        $session_field_values = new ExtraFieldValue($this->type);
-        $session_field_values->delete_all_values_by_field_id($id);
 
-        return parent::delete($id);
+        return $rules;
     }
 
-    /**
-     * @param $breadcrumb
-     * @param $action
-     */
-    public function setupBreadcrumb(&$breadcrumb, $action)
+    public function processExtraFieldSearch($values, $form, $alias, $condition = 'OR')
     {
-        if ('add' === $action) {
-            $breadcrumb[] = ['url' => $this->pageUrl, 'name' => $this->pageName];
-            $breadcrumb[] = ['url' => '#', 'name' => get_lang('Add')];
-        } elseif ('edit' === $action) {
-            $breadcrumb[] = ['url' => $this->pageUrl, 'name' => $this->pageName];
-            $breadcrumb[] = ['url' => '#', 'name' => get_lang('Edit')];
-        } else {
-            $breadcrumb[] = ['url' => '#', 'name' => $this->pageName];
+        // Parse params.
+        $fields = [];
+        foreach ($values as $key => $value) {
+            if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
+                continue;
+            }
+            if (!empty($value)) {
+                $fields[$key] = $value;
+            }
         }
-    }
 
-    //@todo move this in the display_class or somewhere else
+        $extraFieldsAll = $this->get_all(
+            ['visible_to_self = ? AND filter = ?' => [1, 1]],
+            'option_order'
+        );
+        $extraFieldsType = array_column($extraFieldsAll, 'field_type', 'variable');
+        $extraFields = array_column($extraFieldsAll, 'variable');
+        $filter = new stdClass();
+        $defaults = [];
+        foreach ($fields as $variable => $col) {
+            $variableNoExtra = str_replace('extra_', '', $variable);
+            if (isset($values[$variable]) && !empty($values[$variable]) &&
+                in_array($variableNoExtra, $extraFields)
+            ) {
+                $rule = new stdClass();
+                $rule->field = $variable;
+                $rule->op = 'in';
+                $data = $col;
+                if (is_array($data) && array_key_exists($variable, $data)) {
+                    $data = $col;
+                }
+                $rule->data = $data;
+                $filter->rules[] = $rule;
+                $filter->groupOp = 'AND';
+
+                if ($extraFieldsType[$variableNoExtra] == ExtraField::FIELD_TYPE_TAG) {
+                    $tagElement = $form->getElement($variable);
+                    $tags = [];
+                    foreach ($values[$variable] as $tag) {
+                        $tag = Security::remove_XSS($tag);
+                        $tags[] = $tag;
+                        $tagElement->addOption(
+                            $tag,
+                            $tag
+                        );
+                    }
+                    $defaults[$variable] = $tags;
+                } else {
+                    if (is_array($data)) {
+                        $defaults[$variable] = array_map(['Security', 'remove_XSS'], $data);
+                    } else {
+                        $defaults[$variable] = Security::remove_XSS($data);
+                    }
+                }
+            }
+        }
+
+        $result = $this->getExtraFieldRules($filter, 'extra_', $condition);
+
+        $conditionArray = $result['condition_array'];
+
+        $whereCondition = '';
+        $extraCondition = '';
+        if (!empty($conditionArray)) {
+            $extraCondition = ' ( ';
+            $extraCondition .= implode(' AND ', $conditionArray);
+            $extraCondition .= ' ) ';
+        }
+        $whereCondition .= $extraCondition;
+        $conditions = $this->parseConditions(
+            [
+                'where' => $whereCondition,
+                'extra' => $result['extra_fields'],
+            ],
+            $alias
+        );
+
+        return ['condition' => $conditions, 'fields' => $fields, 'defaults' => $defaults];
+    }
 
     /**
-     * Displays the title + grid.
+     * @param        $filters
+     * @param string $stringToSearch
+     *
+     * @return array
      */
-    public function display()
+    public function getExtraFieldRules($filters, $stringToSearch = 'extra_', $condition = 'OR')
     {
-        // action links
-        echo '<div class="actions">';
-        echo '<a href="../admin/index.php">';
-        echo Display::return_icon(
-            'back.png',
-            get_lang('BackTo').' '.get_lang('PlatformAdmin'),
-            '',
-            ICON_SIZE_MEDIUM
-        );
-        echo '</a>';
-        echo '<a href="'.api_get_self().'?action=add&type='.$this->type.'">';
-        echo Display::return_icon(
-            'add_user_fields.png',
-            get_lang('Add'),
-            '',
-            ICON_SIZE_MEDIUM
-        );
-        echo '</a>';
-        echo '</div>';
-        echo Display::grid_html($this->type.'_fields');
-    }
+        $extra_fields = [];
+        $condition_array = [];
+
+        // Getting double select if exists
+        $double_select = [];
+        if (is_object($filters) &&
+            property_exists($filters, 'rules') &&
+            is_array($filters->rules) &&
+            !empty($filters->rules)
+        ) {
+            foreach ($filters->rules as $rule) {
+                if (empty($rule)) {
+                    continue;
+                }
+                if (false === strpos($rule->field, '_second')) {
+                } else {
+                    $my_field = str_replace('_second', '', $rule->field);
+                    $double_select[$my_field] = $rule->data;
+                }
+            }
+
+            foreach ($filters->rules as $rule) {
+                if (empty($rule)) {
+                    continue;
+                }
+                if (false === strpos($rule->field, $stringToSearch)) {
+                    // normal fields
+                    $field = $rule->field;
+                    if (isset($rule->data) && is_string($rule->data) && -1 != $rule->data) {
+                        $condition_array[] = $this->get_where_clause($field, $rule->op, $rule->data);
+                    }
+                } else {
+                    // Extra fields
+                    if (false === strpos($rule->field, '_second')) {
+                        // No _second
+                        $original_field = str_replace($stringToSearch, '', $rule->field);
+                        $field_option = $this->get_handler_field_info_by_field_variable($original_field);
+
+                        if (self::FIELD_TYPE_DOUBLE_SELECT == $field_option['field_type']) {
+                            if (isset($double_select[$rule->field])) {
+                                $data = explode('#', $rule->data);
+                                $rule->data = $data[1].'::'.$double_select[$rule->field];
+                            } else {
+                                // only was sent 1 select
+                                if (is_string($rule->data)) {
+                                    $data = explode('#', $rule->data);
+                                    $rule->data = $data[1];
+                                }
+                            }
+
+                            if (!isset($rule->data)) {
+                                $condition_array[] = ' ('
+                                    .$this->get_where_clause($rule->field, $rule->op, $rule->data)
+                                    .') ';
+                                $extra_fields[] = ['field' => $rule->field, 'id' => $field_option['id']];
+                            }
+                        } else {
+                            if (isset($rule->data)) {
+                                if (isset($rule->data) && is_int($rule->data) && -1 == $rule->data) {
+                                    continue;
+                                }
+                                /*var_dump($rule->data);
+                                foreach ($rule->data as $option) {
+                                }*/
+                                $where = $this->get_where_clause($rule->field, $rule->op, $rule->data, 'OR');
+                                $condition_array[] = " ( $where ) ";
+
+                                $extra_fields[] = [
+                                    'field' => $rule->field,
+                                    'id' => $field_option['id'],
+                                    'data' => $rule->data,
+                                ];
+                            }
+                        }
+                    } else {
+                        $my_field = str_replace('_second', '', $rule->field);
+                        $original_field = str_replace($stringToSearch, '', $my_field);
+                        $field_option = $this->get_handler_field_info_by_field_variable($original_field);
+                        $extra_fields[] = [
+                            'field' => $rule->field,
+                            'id' => $field_option['id'],
+                        ];
+                    }
+                }
+            }
+        }
+
+        /*var_dump(
+            [
+                'extra_fields' => $extra_fields,
+                'condition_array' => $condition_array,
+            ]
+        );*/
 
-    /**
-     * @return array
-     */
-    public function getJqgridColumnNames()
-    {
         return [
-            get_lang('Name'),
-            get_lang('FieldLabel'),
-            get_lang('Type'),
-            get_lang('FieldChangeability'),
-            get_lang('VisibleToSelf'),
-            get_lang('VisibleToOthers'),
-            get_lang('Filter'),
-            get_lang('FieldOrder'),
-            get_lang('Actions'),
+            'extra_fields' => $extra_fields,
+            'condition_array' => $condition_array,
         ];
     }
 
     /**
-     * @return array
+     * @param $col
+     * @param $oper
+     * @param $val
+     * @param $conditionBetweenOptions
+     *
+     * @return string
      */
-    public function getJqgridColumnModel()
+    public function get_where_clause($col, $oper, $val, $conditionBetweenOptions = 'OR')
     {
-        return [
-            [
-                'name' => 'display_text',
-                'index' => 'display_text',
-                'width' => '140',
-                'align' => 'left',
-            ],
-            [
-                'name' => 'variable',
-                'index' => 'variable',
-                'width' => '90',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'field_type',
-                'index' => 'field_type',
-                'width' => '70',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'changeable',
-                'index' => 'changeable',
-                'width' => '35',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'visible_to_self',
-                'index' => 'visible_to_self',
-                'width' => '45',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'visible_to_others',
-                'index' => 'visible_to_others',
-                'width' => '35',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'filter',
-                'index' => 'filter',
-                'width' => '30',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'field_order',
-                'index' => 'field_order',
-                'width' => '25',
-                'align' => 'left',
-                'sortable' => 'true',
-            ],
-            [
-                'name' => 'actions',
-                'index' => 'actions',
-                'width' => '40',
-                'align' => 'left',
-                'formatter' => 'action_formatter',
-                'sortable' => 'false',
-            ],
-        ];
+        if (empty($col)) {
+            return '';
+        }
+        $conditionBetweenOptions = in_array($conditionBetweenOptions, ['OR', 'AND']) ? $conditionBetweenOptions : 'OR';
+        if ('bw' === $oper || 'bn' === $oper) {
+            $val .= '%';
+        }
+        if ('ew' === $oper || 'en' === $oper) {
+            $val = '%'.$val;
+        }
+        if ('cn' === $oper || 'nc' === $oper || 'in' === $oper || 'ni' === $oper) {
+            if (is_array($val)) {
+                $result = '"%'.implode(';', $val).'%"';
+                foreach ($val as $item) {
+                    $item = trim($item);
+                    $result .= ' '.$conditionBetweenOptions.' '.$col.' LIKE "%'.$item.'%"';
+                }
+                $val = $result;
+
+                return " $col {$this->ops[$oper]} $val ";
+            } else {
+                if (is_string($val)) {
+                    $val = '%'.$val.'%';
+                } else {
+                    $val = '';
+                }
+            }
+        }
+        $val = \Database::escape_string($val);
+
+        return " $col {$this->ops[$oper]} '$val' ";
     }
 
     /**
-     * @param string $url
-     * @param string $action
+     * @param array  $options
+     * @param string $alias
      *
-     * @return FormValidator
+     * @return array
      */
-    public function return_form($url, $action)
+    public function parseConditions($options, $alias = 's')
     {
-        $form = new FormValidator($this->type.'_field', 'post', $url);
+        $inject_extra_fields = null;
+        $extraFieldOption = new ExtraFieldOption($this->type);
+        $double_fields = [];
 
-        $form->addElement('hidden', 'type', $this->type);
-        $id = isset($_GET['id']) ? (int) $_GET['id'] : null;
-        $form->addElement('hidden', 'id', $id);
+        if (isset($options['extra'])) {
+            $extra_fields = $options['extra'];
+            if (!empty($extra_fields)) {
+                $counter = 1;
+                $extra_field_obj = new ExtraField($this->type);
+                foreach ($extra_fields as &$extra) {
+                    if (!isset($extra['id'])) {
+                        continue;
+                    }
+                    $extra_field_info = $extra_field_obj->get($extra['id']);
+                    if (empty($extra_field_info)) {
+                        continue;
+                    }
+                    $extra['extra_field_info'] = $extra_field_info;
 
-        // Setting the form elements
-        $header = get_lang('Add');
-        $defaults = [];
+                    switch ($extra_field_info['field_type']) {
+                        case self::FIELD_TYPE_SELECT:
+                        case self::FIELD_TYPE_DOUBLE_SELECT:
+                            $inject_extra_fields .= " fvo$counter.display_text as {$extra['field']}, ";
+                            break;
+                        case  self::FIELD_TYPE_TAG:
+                            // If using OR
+                            //$inject_extra_fields .= " tag$counter.tag as {$extra['field']}, ";
+                            // If using AND
+                            $newCounter = 1;
+                            $fields = [];
+                            $tagAlias = $extra['field'];
+                            foreach ($extra['data'] as $data) {
+                                $fields[] = "tag$counter$newCounter.tag";
+                                $newCounter++;
+                            }
+                            $tags = implode(' , " ", ', $fields);
+                            $inject_extra_fields .= " CONCAT($tags) as $tagAlias, ";
+                            break;
+                        default:
+                            $inject_extra_fields .= " fv$counter.value as {$extra['field']}, ";
+                            break;
+                    }
 
-        if ('edit' === $action) {
-            $header = get_lang('Modify');
-            // Setting the defaults
-            $defaults = $this->get($id, false);
+                    if (isset($extra_fields_info[$extra['id']])) {
+                        $info = $extra_fields_info[$extra['id']];
+                    } else {
+                        $info = $this->get($extra['id']);
+                        $extra_fields_info[$extra['id']] = $info;
+                    }
+                    if (isset($info['field_type']) && self::FIELD_TYPE_DOUBLE_SELECT == $info['field_type']) {
+                        $double_fields[$info['id']] = $info;
+                    }
+                    $counter++;
+                }
+            }
         }
 
-        $form->addElement('header', $header);
-
-        if ('edit' === $action) {
-            $translateUrl = api_get_path(WEB_CODE_PATH).'extrafield/translate.php?'
-                .http_build_query(['extra_field' => $id]);
-            $translateButton = Display::toolbarButton(get_lang('TranslateThisTerm'), $translateUrl, 'language', 'link');
-
-            $form->addText(
-                'display_text',
-                [get_lang('Name'), $translateButton]
-            );
-        } else {
-            $form->addElement('text', 'display_text', get_lang('Name'));
+        $options_by_double = [];
+        foreach ($double_fields as $double) {
+            $my_options = $extraFieldOption->get_field_options_by_field($double['id'], true);
+            $options_by_double['extra_'.$double['variable']] = $my_options;
         }
 
-        // Field type
-        $types = self::get_field_types();
-
-        $form->addElement(
-            'select',
-            'field_type',
-            get_lang('FieldType'),
-            $types,
-            ['id' => 'field_type']
-        );
-        $form->addElement('label', get_lang('Example'), '<div id="example">-</div>');
-        $form->addElement('text', 'variable', get_lang('FieldLabel'), ['class' => 'span5']);
-        $form->addElement(
-            'text',
-            'field_options',
-            get_lang('FieldPossibleValues'),
-            ['id' => 'field_options', 'class' => 'span6']
-        );
-
-        $fieldWithOptions = [
-            self::FIELD_TYPE_RADIO,
-            self::FIELD_TYPE_SELECT_MULTIPLE,
-            self::FIELD_TYPE_SELECT,
-            self::FIELD_TYPE_TAG,
-            self::FIELD_TYPE_DOUBLE_SELECT,
-            self::FIELD_TYPE_SELECT_WITH_TEXT_FIELD,
-            self::FIELD_TYPE_TRIPLE_SELECT,
-        ];
-
-        if ('edit' == $action) {
-            if (in_array($defaults['field_type'], $fieldWithOptions)) {
-                $url = Display::url(
-                    get_lang('EditExtraFieldOptions'),
-                    'extra_field_options.php?type='.$this->type.'&field_id='.$id
-                );
-                $form->addElement('label', null, $url);
+        $field_value_to_join = [];
+        //filter can be all/any = and/or
+        $inject_joins = null;
+        $inject_where = null;
+        $where = null;
 
-                if (self::FIELD_TYPE_SELECT == $defaults['field_type']) {
-                    $urlWorkFlow = Display::url(
-                        get_lang('EditExtraFieldWorkFlow'),
-                        'extra_field_workflow.php?type='.$this->type.'&field_id='.$id
-                    );
-                    $form->addElement('label', null, $urlWorkFlow);
+        if (!empty($options['where'])) {
+            if (!empty($options['extra'])) {
+                // Removing double 1=1
+                $options['where'] = str_replace(' 1 = 1  AND', '', $options['where']);
+                // Always OR
+                $counter = 1;
+                foreach ($extra_fields as $extra_info) {
+                    $extra_field_info = $extra_info['extra_field_info'];
+                    $inject_joins .= " INNER JOIN $this->table_field_values fv$counter
+                                       ON ($alias.".$this->primaryKey." = fv$counter.".$this->handler_id.') ';
+                    // Add options
+                    switch ($extra_field_info['field_type']) {
+                        case self::FIELD_TYPE_SELECT:
+                        case self::FIELD_TYPE_DOUBLE_SELECT:
+                            $options['where'] = str_replace(
+                                $extra_info['field'],
+                                'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fvo'.$counter.'.option_value',
+                                $options['where']
+                            );
+                            $inject_joins .= "
+                                 INNER JOIN $this->table_field_options fvo$counter
+                                 ON (
+                                    fv$counter.field_id = fvo$counter.field_id AND
+                                    fv$counter.value = fvo$counter.option_value
+                                 )
+                                ";
+                            break;
+                        case  self::FIELD_TYPE_TAG:
+                            /*$options['where'] = str_replace(
+                                $extra_info['field'],
+                                'tag'.$counter.'.tag ',
+                                $options['where']
+                            );*/
+                            $newCounter = 1;
+                            $whereTag = [];
+                            foreach ($extra['data'] as $data) {
+                                $data = Database::escape_string($data);
+                                $key = $counter.$newCounter;
+                                $whereTag[] = ' tag'.$key.'.tag LIKE "%'.$data.'%" ';
+                                $inject_joins .= "
+                                    INNER JOIN $this->table_field_rel_tag tag_rel$key
+                                    ON (
+                                        tag_rel$key.field_id = ".$extra_info['id']." AND
+                                        tag_rel$key.item_id = $alias.".$this->primaryKey."
+                                    )
+                                    INNER JOIN $this->table_field_tag tag$key
+                                    ON (tag$key.id = tag_rel$key.tag_id)
+                                ";
+                                $newCounter++;
+                            }
+                            $options['where'] = ' ('.implode(' AND ', $whereTag).') ';
+                            break;
+                        default:
+                            // text, textarea, etc
+                            $options['where'] = str_replace(
+                                $extra_info['field'],
+                                'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fv'.$counter.'.value',
+                                $options['where']
+                            );
+                            break;
+                    }
+                    $field_value_to_join[] = " fv$counter.$this->handler_id ";
+                    $counter++;
                 }
-
-                $form->freeze('field_options');
             }
+            $where .= ' AND '.$options['where'];
         }
-        $form->addElement(
-            'text',
-            'default_value',
-            get_lang('FieldDefaultValue'),
-            ['id' => 'default_value']
-        );
-
-        $group = [];
-        $group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('Yes'), 1);
-        $group[] = $form->createElement('radio', 'visible_to_self', null, get_lang('No'), 0);
-        $form->addGroup($group, '', get_lang('VisibleToSelf'), null, false);
-
-        $group = [];
-        $group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('Yes'), 1);
-        $group[] = $form->createElement('radio', 'visible_to_others', null, get_lang('No'), 0);
-        $form->addGroup($group, '', get_lang('VisibleToOthers'), null, false);
-
-        $group = [];
-        $group[] = $form->createElement('radio', 'changeable', null, get_lang('Yes'), 1);
-        $group[] = $form->createElement('radio', 'changeable', null, get_lang('No'), 0);
-        $form->addGroup($group, '', get_lang('FieldChangeability'), null, false);
-
-        $group = [];
-        $group[] = $form->createElement('radio', 'filter', null, get_lang('Yes'), 1);
-        $group[] = $form->createElement('radio', 'filter', null, get_lang('No'), 0);
-        $form->addGroup($group, '', get_lang('FieldFilter'), null, false);
-
-        /* Enable this when field_loggeable is introduced as a table field (2.0)
-        $group   = array();
-        $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('Yes'), 1);
-        $group[] = $form->createElement('radio', 'field_loggeable', null, get_lang('No'), 0);
-        $form->addGroup($group, '', get_lang('FieldLoggeable'), '', false);
-        */
 
-        $form->addElement('text', 'field_order', get_lang('FieldOrder'));
-
-        if ('edit' == $action) {
-            $option = new ExtraFieldOption($this->type);
-            $defaults['field_options'] = $option->get_field_options_by_field_to_string($id);
-            $form->addButtonUpdate(get_lang('Modify'));
-        } else {
-            $defaults['visible_to_self'] = 0;
-            $defaults['visible_to_others'] = 0;
-            $defaults['changeable'] = 0;
-            $defaults['filter'] = 0;
-            $form->addButtonCreate(get_lang('Add'));
+        $order = null;
+        if (!empty($options['order'])) {
+            $order = ' ORDER BY '.$options['order'];
         }
-
-        /*if (!empty($defaults['created_at'])) {
-            $defaults['created_at'] = api_convert_and_format_date($defaults['created_at']);
+        $limit = null;
+        if (!empty($options['limit'])) {
+            $limit = ' LIMIT '.$options['limit'];
         }
-        if (!empty($defaults['updated_at'])) {
-            $defaults['updated_at'] = api_convert_and_format_date($defaults['updated_at']);
-        }*/
-        $form->setDefaults($defaults);
-
-        // Setting the rules
-        $form->addRule('display_text', get_lang('ThisFieldIsRequired'), 'required');
-        $form->addRule('field_type', get_lang('ThisFieldIsRequired'), 'required');
 
-        return $form;
+        return [
+            'order' => $order,
+            'limit' => $limit,
+            'where' => $where,
+            'inject_where' => $inject_where,
+            'inject_joins' => $inject_joins,
+            'field_value_to_join' => $field_value_to_join,
+            'inject_extra_fields' => $inject_extra_fields,
+        ];
     }
 
     /**
-     * Gets an element.
+     * Get the extra fields and their formatted values.
      *
-     * @param int  $id
-     * @param bool $translateDisplayText Optional
+     * @param int|string $itemId   The item ID (It could be a session_id, course_id or user_id)
+     * @param bool       $filter
+     * @param array      $onlyShow (list of extra fields variables to show)
      *
-     * @return array
+     * @return array The extra fields data
      */
-    public function get($id, $translateDisplayText = true)
+    public function getDataAndFormattedValues($itemId, $filter = false, $onlyShow = [])
     {
-        $info = parent::get($id);
-
-        if ($translateDisplayText) {
-            $info['display_text'] = self::translateDisplayName($info['variable'], $info['display_text']);
-        }
-
-        return $info;
-    }
+        $valuesData = [];
+        $fields = $this->get_all();
+        $em = Database::getManager();
 
-    /**
-     * @param $token
-     *
-     * @return string
-     */
-    public function getJqgridActionLinks($token)
-    {
-        //With this function we can add actions to the jgrid (edit, delete, etc)
-        $editIcon = Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL);
-        $deleteIcon = Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL);
-        $confirmMessage = addslashes(
-            api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)
-        );
+        $repoTag = $em->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
 
-        $editButton = <<<JAVASCRIPT
-            <a href="?action=edit&type={$this->type}&id=' + options.rowId + '" class="btn btn-link btn-xs">\
-                $editIcon\
-            </a>
-JAVASCRIPT;
-        $deleteButton = <<<JAVASCRIPT
-            <a \
-                onclick="if (!confirm(\'$confirmMessage\')) {return false;}" \
-                href="?sec_token=$token&type={$this->type}&id=' + options.rowId + '&action=delete" \
-                class="btn btn-link btn-xs">\
-                $deleteIcon\
-            </a>
-JAVASCRIPT;
+        foreach ($fields as $field) {
+            if ('1' != $field['visible_to_self']) {
+                continue;
+            }
 
-        return "function action_formatter(cellvalue, options, rowObject) {
-            return '$editButton $deleteButton';
-        }";
-    }
+            if ($filter && $field['filter'] != 1) {
+                continue;
+            }
 
-    /**
-     * @param array $columns
-     * @param array $column_model
-     * @param array $extraFields
-     *
-     * @return array
-     */
-    public function getRules(&$columns, &$column_model, $extraFields = [], $checkExtraFieldExistence = false)
-    {
-        $fields = $this->get_all(
-            [
-                'visible_to_self = ? AND filter = ?' => [1, 1],
-            ],
-            'display_text'
-        );
-        $extraFieldOption = new ExtraFieldOption($this->type);
+            if (!empty($onlyShow) && !in_array($field['variable'], $onlyShow)) {
+                continue;
+            }
 
-        $rules = [];
-        if (!empty($fields)) {
-            foreach ($fields as $field) {
-                $search_options = [];
-                $type = 'text';
-                if (in_array($field['field_type'], [self::FIELD_TYPE_SELECT, self::FIELD_TYPE_DOUBLE_SELECT])) {
-                    $type = 'select';
-                    $search_options['sopt'] = ['eq', 'ne']; //equal not equal
-                } else {
-                    $search_options['sopt'] = ['cn', 'nc']; //contains not contains
+            $valueAsArray = [];
+            $fieldValue = new ExtraFieldValue($this->type);
+            $valueData = $fieldValue->get_values_by_handler_and_field_id(
+                $itemId,
+                $field['id'],
+                true
+            );
+            if (ExtraField::FIELD_TYPE_TAG == $field['field_type']) {
+                $tags = $repoTag->findBy(['fieldId' => $field['id'], 'itemId' => $itemId]);
+                if ($tags) {
+                    /** @var ExtraFieldRelTag $tag */
+                    $data = [];
+                    foreach ($tags as $extraFieldTag) {
+                        /** @var Tag $tag */
+                        $tag = $em->find('ChamiloCoreBundle:Tag', $extraFieldTag->getTagId());
+                        $data[] = $tag->getTag();
+                    }
+                    $valueData = implode(',', $data);
+                    $valueAsArray = $data;
                 }
+            }
 
-                $search_options['searchhidden'] = 'true';
-                $search_options['defaultValue'] = isset($search_options['field_default_value'])
-                    ? $search_options['field_default_value']
-                    : null;
+            if (!$valueData) {
+                continue;
+            }
+            $displayedValue = get_lang('None');
 
-                if (self::FIELD_TYPE_DOUBLE_SELECT == $field['field_type']) {
-                    // Add 2 selects
-                    $options = $extraFieldOption->get_field_options_by_field($field['id']);
-                    $options = self::extra_field_double_select_convert_array_to_ordered_array($options);
+            switch ($field['field_type']) {
+                case self::FIELD_TYPE_CHECKBOX:
+                    if (false !== $valueData && '1' == $valueData['value']) {
+                        $displayedValue = get_lang('Yes');
+                    } else {
+                        $displayedValue = get_lang('No');
+                    }
+                    break;
+                case self::FIELD_TYPE_DATE:
+                    if (false !== $valueData && !empty($valueData['value'])) {
+                        $displayedValue = api_format_date($valueData['value'], DATE_FORMAT_LONG_NO_DAY);
+                    }
+                    break;
+                case self::FIELD_TYPE_TAG:
+                    if (!empty($valueData)) {
+                        $displayedValue = $valueData;
+                    }
+                    break;
+                case self::FIELD_TYPE_FILE_IMAGE:
+                    if (false === $valueData || empty($valueData['value'])) {
+                        break;
+                    }
 
-                    $first_options = [];
-                    if (!empty($options)) {
-                        foreach ($options as $option) {
-                            foreach ($option as $sub_option) {
-                                if (0 == $sub_option['option_value']) {
-                                    $first_options[] = $sub_option['field_id'].'#'.$sub_option['id'].':'
-                                        .$sub_option['display_text'];
-                                }
-                            }
-                        }
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
+                        break;
                     }
 
-                    $search_options['value'] = implode(';', $first_options);
-                    $search_options['dataInit'] = 'fill_second_select';
+                    $image = Display::img(
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
+                        $field['display_text'],
+                        ['width' => '300']
+                    );
 
-                    // First
-                    $column_model[] = [
-                        'name' => 'extra_'.$field['variable'],
-                        'index' => 'extra_'.$field['variable'],
-                        'width' => '100',
-                        'hidden' => 'true',
-                        'search' => 'true',
-                        'stype' => 'select',
-                        'searchoptions' => $search_options,
-                    ];
-                    $columns[] = $field['display_text'].' (1)';
-                    $rules[] = [
-                        'field' => 'extra_'.$field['variable'],
-                        'op' => 'cn',
-                    ];
+                    $displayedValue = Display::url(
+                        $image,
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
+                        ['target' => '_blank']
+                    );
+                    break;
+                case self::FIELD_TYPE_FILE:
+                    if (false === $valueData || empty($valueData['value'])) {
+                        break;
+                    }
 
-                    // Second
-                    $search_options['value'] = $field['id'].':';
-                    $search_options['dataInit'] = 'register_second_select';
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
+                        break;
+                    }
 
-                    $column_model[] = [
-                        'name' => 'extra_'.$field['variable'].'_second',
-                        'index' => 'extra_'.$field['variable'].'_second',
-                        'width' => '100',
-                        'hidden' => 'true',
-                        'search' => 'true',
-                        'stype' => 'select',
-                        'searchoptions' => $search_options,
-                    ];
-                    $columns[] = $field['display_text'].' (2)';
-                    $rules[] = ['field' => 'extra_'.$field['variable'].'_second', 'op' => 'cn'];
-                    continue;
-                } else {
-                    $search_options['value'] = $extraFieldOption->getFieldOptionsToString(
-                        $field['id'],
-                        false,
-                        'display_text'
+                    $displayedValue = Display::url(
+                        get_lang('Download'),
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
+                        [
+                            'title' => $field['display_text'],
+                            'target' => '_blank',
+                            'class' => 'download_extra_field',
+                        ]
                     );
-                }
-                $column_model[] = [
-                    'name' => 'extra_'.$field['variable'],
-                    'index' => 'extra_'.$field['variable'],
-                    'width' => '100',
-                    'hidden' => 'true',
-                    'search' => 'true',
-                    'stype' => $type,
-                    'searchoptions' => $search_options,
-                ];
-                $columns[] = $field['display_text'];
-                $rules[] = [
-                    'field' => 'extra_'.$field['variable'],
-                    'op' => 'cn',
-                    'data' => '',
-                ];
+                    break;
+                default:
+                    $displayedValue = $valueData['value'];
+                    break;
             }
+
+            $valuesData[] = [
+                'variable' => $field['variable'],
+                'text' => $field['display_text'],
+                'value' => $displayedValue,
+                'value_as_array' => $valueAsArray,
+            ];
         }
 
-        return $rules;
+        return $valuesData;
     }
 
-    public function processExtraFieldSearch($values, $form, $alias, $condition = 'OR')
+    /**
+     * @param int    $fieldId
+     * @param string $tag
+     *
+     * @return array
+     */
+    public function getAllUserPerTag($fieldId, $tag)
     {
-        // Parse params.
-        $fields = [];
-        foreach ($values as $key => $value) {
-            if (substr($key, 0, 6) !== 'extra_' && substr($key, 0, 7) !== '_extra_') {
-                continue;
-            }
-            if (!empty($value)) {
-                $fields[$key] = $value;
-            }
-        }
+        $tagRelUserTable = Database::get_main_table(TABLE_MAIN_USER_REL_TAG);
+        $tag = Database::escape_string($tag);
+        $fieldId = (int) $fieldId;
 
-        $extraFieldsAll = $this->get_all(
-            ['visible_to_self = ? AND filter = ?' => [1, 1]],
-            'option_order'
-        );
-        $extraFieldsType = array_column($extraFieldsAll, 'field_type', 'variable');
-        $extraFields = array_column($extraFieldsAll, 'variable');
-        $filter = new stdClass();
-        $defaults = [];
-        foreach ($fields as $variable => $col) {
-            $variableNoExtra = str_replace('extra_', '', $variable);
-            if (isset($values[$variable]) && !empty($values[$variable]) &&
-                in_array($variableNoExtra, $extraFields)
-            ) {
-                $rule = new stdClass();
-                $rule->field = $variable;
-                $rule->op = 'in';
-                $data = $col;
-                if (is_array($data) && array_key_exists($variable, $data)) {
-                    $data = $col;
-                }
-                $rule->data = $data;
-                $filter->rules[] = $rule;
-                $filter->groupOp = 'AND';
+        $sql = "SELECT user_id
+                FROM {$this->table_field_tag} f INNER JOIN $tagRelUserTable ft
+                ON tag_id = f.id
+                WHERE tag = '$tag' AND f.field_id = $fieldId;
+        ";
 
-                if ($extraFieldsType[$variableNoExtra] == ExtraField::FIELD_TYPE_TAG) {
-                    $tagElement = $form->getElement($variable);
-                    $tags = [];
-                    foreach ($values[$variable] as $tag) {
-                        $tag = Security::remove_XSS($tag);
-                        $tags[] = $tag;
-                        $tagElement->addOption(
-                            $tag,
-                            $tag
-                        );
-                    }
-                    $defaults[$variable] = $tags;
-                } else {
-                    if (is_array($data)) {
-                        $defaults[$variable] = array_map(['Security', 'remove_XSS'], $data);
-                    } else {
-                        $defaults[$variable] = Security::remove_XSS($data);
-                    }
-                }
-            }
-        }
+        $result = Database::query($sql);
 
-        $result = $this->getExtraFieldRules($filter, 'extra_', $condition);
+        return Database::store_result($result, 'ASSOC');
+    }
 
-        $conditionArray = $result['condition_array'];
+    /**
+     * @param int $fieldId
+     * @param int $tagId
+     *
+     * @return array
+     */
+    public function getAllSkillPerTag($fieldId, $tagId)
+    {
+        $skillTable = Database::get_main_table(TABLE_MAIN_SKILL);
+        $tagRelExtraTable = Database::get_main_table(TABLE_MAIN_EXTRA_FIELD_REL_TAG);
+        $fieldId = (int) $fieldId;
+        $tagId = (int) $tagId;
 
-        $whereCondition = '';
-        $extraCondition = '';
-        if (!empty($conditionArray)) {
-            $extraCondition = ' ( ';
-            $extraCondition .= implode(' AND ', $conditionArray);
-            $extraCondition .= ' ) ';
+        $sql = "SELECT s.id
+                FROM $skillTable s INNER JOIN $tagRelExtraTable t
+                ON t.item_id = s.id
+                WHERE tag_id = $tagId AND t.field_id = $fieldId;
+        ";
+
+        $result = Database::query($sql);
+        $result = Database::store_result($result, 'ASSOC');
+
+        $skillList = [];
+        foreach ($result as $index => $value) {
+            $skillList[$value['id']] = $value['id'];
         }
-        $whereCondition .= $extraCondition;
-        $conditions = $this->parseConditions(
-            [
-                'where' => $whereCondition,
-                'extra' => $result['extra_fields'],
-            ],
-            $alias
-        );
 
-        return ['condition' => $conditions, 'fields' => $fields, 'defaults' => $defaults];
+        return $skillList;
     }
 
     /**
-     * @param        $filters
-     * @param string $stringToSearch
+     * @param string $from
+     * @param string $search
+     * @param array  $options
      *
      * @return array
      */
-    public function getExtraFieldRules($filters, $stringToSearch = 'extra_', $condition = 'OR')
+    public function searchOptionsFromTags($from, $search, $options)
     {
-        $extra_fields = [];
-        $condition_array = [];
+        $extraFieldInfo = $this->get_handler_field_info_by_field_variable(
+            str_replace('extra_', '', $from)
+        );
+        $extraFieldInfoTag = $this->get_handler_field_info_by_field_variable(
+            str_replace('extra_', '', $search)
+        );
 
-        // Getting double select if exists
-        $double_select = [];
-        if (is_object($filters) &&
-            property_exists($filters, 'rules') &&
-            is_array($filters->rules) &&
-            !empty($filters->rules)
-        ) {
-            foreach ($filters->rules as $rule) {
-                if (empty($rule)) {
-                    continue;
-                }
-                if (false === strpos($rule->field, '_second')) {
-                } else {
-                    $my_field = str_replace('_second', '', $rule->field);
-                    $double_select[$my_field] = $rule->data;
-                }
-            }
+        if (empty($extraFieldInfo) || empty($extraFieldInfoTag)) {
+            return [];
+        }
 
-            foreach ($filters->rules as $rule) {
-                if (empty($rule)) {
-                    continue;
-                }
-                if (false === strpos($rule->field, $stringToSearch)) {
-                    // normal fields
-                    $field = $rule->field;
-                    if (isset($rule->data) && is_string($rule->data) && -1 != $rule->data) {
-                        $condition_array[] = $this->get_where_clause($field, $rule->op, $rule->data);
-                    }
-                } else {
-                    // Extra fields
-                    if (false === strpos($rule->field, '_second')) {
-                        // No _second
-                        $original_field = str_replace($stringToSearch, '', $rule->field);
-                        $field_option = $this->get_handler_field_info_by_field_variable($original_field);
+        $id = $extraFieldInfo['id'];
+        $tagId = $extraFieldInfoTag['id'];
+
+        $table = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+        $tagRelExtraTable = Database::get_main_table(TABLE_MAIN_EXTRA_FIELD_REL_TAG);
+        $tagTable = Database::get_main_table(TABLE_MAIN_TAG);
+        $optionsTable = Database::get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
+
+        $sql = "SELECT DISTINCT t.*, v.value, o.display_text
+                FROM $tagRelExtraTable te
+                INNER JOIN $tagTable t
+                ON (t.id = te.tag_id AND te.field_id = t.field_id AND te.field_id = $tagId)
+                INNER JOIN $table v
+                ON (te.item_id = v.item_id AND v.field_id = $id)
+                INNER JOIN $optionsTable o
+                ON (o.option_value = v.value)
+                WHERE v.value IN ('".implode("','", $options)."')
+                ORDER BY o.option_order, t.tag
+               ";
+
+        $result = Database::query($sql);
+        $result = Database::store_result($result);
 
-                        if (self::FIELD_TYPE_DOUBLE_SELECT == $field_option['field_type']) {
-                            if (isset($double_select[$rule->field])) {
-                                $data = explode('#', $rule->data);
-                                $rule->data = $data[1].'::'.$double_select[$rule->field];
-                            } else {
-                                // only was sent 1 select
-                                if (is_string($rule->data)) {
-                                    $data = explode('#', $rule->data);
-                                    $rule->data = $data[1];
-                                }
-                            }
+        return $result;
+    }
+    /**
+     * @param \FormValidator $form
+     * @param int            $defaultValueId
+     * @param bool           $freezeElement
+     */
+    private function addSelectElement(FormValidator $form, array $fieldDetails, $defaultValueId, $freezeElement = false)
+    {
+        $get_lang_variables = false;
+        if (in_array(
+            $fieldDetails['variable'],
+            ['mail_notify_message', 'mail_notify_invitation', 'mail_notify_group_message']
+        )) {
+            $get_lang_variables = true;
+        }
 
-                            if (!isset($rule->data)) {
-                                $condition_array[] = ' ('
-                                    .$this->get_where_clause($rule->field, $rule->op, $rule->data)
-                                    .') ';
-                                $extra_fields[] = ['field' => $rule->field, 'id' => $field_option['id']];
-                            }
+        // Get extra field workflow
+        $addOptions = [];
+        $optionsExists = false;
+        $options = [];
+
+        $optionList = [];
+        if (!empty($fieldDetails['options'])) {
+            foreach ($fieldDetails['options'] as $option_details) {
+                $optionList[$option_details['id']] = $option_details;
+                if ($get_lang_variables) {
+                    $options[$option_details['option_value']] = $option_details['display_text'];
+                } else {
+                    if ($optionsExists) {
+                        // Adding always the default value
+                        if ($option_details['id'] == $defaultValueId) {
+                            $options[$option_details['option_value']] = $option_details['display_text'];
                         } else {
-                            if (isset($rule->data)) {
-                                if (isset($rule->data) && is_int($rule->data) && -1 == $rule->data) {
-                                    continue;
+                            if (isset($addOptions) && !empty($addOptions)) {
+                                // Parsing filters
+                                if (in_array($option_details['id'], $addOptions)) {
+                                    $options[$option_details['option_value']] = $option_details['display_text'];
                                 }
-                                /*var_dump($rule->data);
-                                foreach ($rule->data as $option) {
-                                }*/
-                                $where = $this->get_where_clause($rule->field, $rule->op, $rule->data, 'OR');
-                                $condition_array[] = " ( $where ) ";
-
-                                $extra_fields[] = [
-                                    'field' => $rule->field,
-                                    'id' => $field_option['id'],
-                                    'data' => $rule->data,
-                                ];
                             }
                         }
                     } else {
-                        $my_field = str_replace('_second', '', $rule->field);
-                        $original_field = str_replace($stringToSearch, '', $my_field);
-                        $field_option = $this->get_handler_field_info_by_field_variable($original_field);
-                        $extra_fields[] = [
-                            'field' => $rule->field,
-                            'id' => $field_option['id'],
-                        ];
+                        // Normal behaviour
+                        $options[$option_details['option_value']] = $option_details['display_text'];
                     }
                 }
             }
-        }
 
-        /*var_dump(
-            [
-                'extra_fields' => $extra_fields,
-                'condition_array' => $condition_array,
-            ]
-        );*/
+            // Setting priority message
+            if (isset($optionList[$defaultValueId])
+                && isset($optionList[$defaultValueId]['priority'])
+            ) {
+                if (!empty($optionList[$defaultValueId]['priority'])) {
+                    $priorityId = $optionList[$defaultValueId]['priority'];
+                    $option = new ExtraFieldOption($this->type);
+                    $messageType = $option->getPriorityMessageType($priorityId);
+                    $form->addElement(
+                        'label',
+                        null,
+                        Display::return_message(
+                            $optionList[$defaultValueId]['priority_message'],
+                            $messageType
+                        )
+                    );
+                }
+            }
+        }
 
-        return [
-            'extra_fields' => $extra_fields,
-            'condition_array' => $condition_array,
-        ];
-    }
+        /** @var \HTML_QuickForm_select $slct */
+        $slct = $form->addElement(
+            'select',
+            'extra_'.$fieldDetails['variable'],
+            $fieldDetails['display_text'],
+            [],
+            ['id' => 'extra_'.$fieldDetails['variable']]
+        );
 
-    /**
-     * @param $col
-     * @param $oper
-     * @param $val
-     * @param $conditionBetweenOptions
-     *
-     * @return string
-     */
-    public function get_where_clause($col, $oper, $val, $conditionBetweenOptions = 'OR')
-    {
-        if (empty($col)) {
-            return '';
-        }
-        $conditionBetweenOptions = in_array($conditionBetweenOptions, ['OR', 'AND']) ? $conditionBetweenOptions : 'OR';
-        if ('bw' === $oper || 'bn' === $oper) {
-            $val .= '%';
-        }
-        if ('ew' === $oper || 'en' === $oper) {
-            $val = '%'.$val;
+        if (empty($defaultValueId)) {
+            $slct->addOption(get_lang('SelectAnOption'), '');
         }
-        if ('cn' === $oper || 'nc' === $oper || 'in' === $oper || 'ni' === $oper) {
-            if (is_array($val)) {
-                $result = '"%'.implode(';', $val).'%"';
-                foreach ($val as $item) {
-                    $item = trim($item);
-                    $result .= ' '.$conditionBetweenOptions.' '.$col.' LIKE "%'.$item.'%"';
-                }
-                $val = $result;
 
-                return " $col {$this->ops[$oper]} $val ";
-            } else {
-                if (is_string($val)) {
-                    $val = '%'.$val.'%';
-                } else {
-                    $val = '';
-                }
+        foreach ($options as $value => $text) {
+            if (empty($value)) {
+                $slct->addOption($text, $value);
+                continue;
             }
+
+            $valueParts = explode('#', $text);
+            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
+
+            $slct->addOption(implode('', $valueParts), $value, ['data-value' => $dataValue]);
         }
-        $val = \Database::escape_string($val);
 
-        return " $col {$this->ops[$oper]} '$val' ";
+        if ($freezeElement) {
+            $form->freeze('extra_'.$fieldDetails['variable']);
+        }
     }
 
     /**
-     * @param array  $options
-     * @param string $alias
+     * @param \FormValidator $form
+     * @param array          $fieldDetails
+     * @param array          $extraData
+     * @param bool           $freezeElement
      *
-     * @return array
+     * @return string JavaScript code
      */
-    public function parseConditions($options, $alias = 's')
+    private function addDoubleSelectElement(FormValidator $form, $fieldDetails, $extraData, $freezeElement = false)
     {
-        $inject_extra_fields = null;
-        $extraFieldOption = new ExtraFieldOption($this->type);
-        $double_fields = [];
+        $firstSelectId = 'first_extra_'.$fieldDetails['variable'];
+        $secondSelectId = 'second_extra_'.$fieldDetails['variable'];
 
-        if (isset($options['extra'])) {
-            $extra_fields = $options['extra'];
-            if (!empty($extra_fields)) {
-                $counter = 1;
-                $extra_field_obj = new ExtraField($this->type);
-                foreach ($extra_fields as &$extra) {
-                    if (!isset($extra['id'])) {
-                        continue;
-                    }
-                    $extra_field_info = $extra_field_obj->get($extra['id']);
-                    if (empty($extra_field_info)) {
-                        continue;
-                    }
-                    $extra['extra_field_info'] = $extra_field_info;
+        $jqueryReadyContent = "
+            $('#$firstSelectId').on('change', function() {
+                var id = $(this).val();
 
-                    switch ($extra_field_info['field_type']) {
-                        case self::FIELD_TYPE_SELECT:
-                        case self::FIELD_TYPE_DOUBLE_SELECT:
-                            $inject_extra_fields .= " fvo$counter.display_text as {$extra['field']}, ";
-                            break;
-                        case  self::FIELD_TYPE_TAG:
-                            // If using OR
-                            //$inject_extra_fields .= " tag$counter.tag as {$extra['field']}, ";
-                            // If using AND
-                            $newCounter = 1;
-                            $fields = [];
-                            $tagAlias = $extra['field'];
-                            foreach ($extra['data'] as $data) {
-                                $fields[] = "tag$counter$newCounter.tag";
-                                $newCounter++;
-                            }
-                            $tags = implode(' , " ", ', $fields);
-                            $inject_extra_fields .= " CONCAT($tags) as $tagAlias, ";
-                            break;
-                        default:
-                            $inject_extra_fields .= " fv$counter.value as {$extra['field']}, ";
-                            break;
-                    }
+                if (!id) {
+                    $('#$secondSelectId').empty().selectpicker('refresh');
 
-                    if (isset($extra_fields_info[$extra['id']])) {
-                        $info = $extra_fields_info[$extra['id']];
-                    } else {
-                        $info = $this->get($extra['id']);
-                        $extra_fields_info[$extra['id']] = $info;
-                    }
-                    if (isset($info['field_type']) && self::FIELD_TYPE_DOUBLE_SELECT == $info['field_type']) {
-                        $double_fields[$info['id']] = $info;
-                    }
-                    $counter++;
+                    return;
                 }
+
+                $.getJSON(_p.web_ajax + 'extra_field.ajax.php?1=1&a=get_second_select_options', {
+                    'type': '{$this->type}',
+                    'field_id': {$fieldDetails['id']},
+                    'option_value_id': id
+                })
+                    .done(function(data) {
+                        $('#$secondSelectId').empty();
+                        $.each(data, function(index, value) {
+                            $('#second_extra_{$fieldDetails['variable']}').append(
+                                $('<option>', {value: index, text: value})
+                            );
+                        });
+                        $('#$secondSelectId').selectpicker('refresh');
+                    });
+            });
+        ";
+
+        $firstId = null;
+        if (!empty($extraData)) {
+            if (isset($extraData['extra_'.$fieldDetails['variable']])) {
+                $firstId = $extraData['extra_'.$fieldDetails['variable']]['extra_'.$fieldDetails['variable']];
             }
         }
 
-        $options_by_double = [];
-        foreach ($double_fields as $double) {
-            $my_options = $extraFieldOption->get_field_options_by_field($double['id'], true);
-            $options_by_double['extra_'.$double['variable']] = $my_options;
-        }
+        $options = $this->extra_field_double_select_convert_array_to_ordered_array($fieldDetails['options']);
+        $values = ['' => get_lang('Select')];
 
-        $field_value_to_join = [];
-        //filter can be all/any = and/or
-        $inject_joins = null;
-        $inject_where = null;
-        $where = null;
+        $second_values = [];
+        if (!empty($options)) {
+            foreach ($options as $option) {
+                foreach ($option as $sub_option) {
+                    if ('0' == $sub_option['option_value']) {
+                        $values[$sub_option['id']] = $sub_option['display_text'];
 
-        if (!empty($options['where'])) {
-            if (!empty($options['extra'])) {
-                // Removing double 1=1
-                $options['where'] = str_replace(' 1 = 1  AND', '', $options['where']);
-                // Always OR
-                $counter = 1;
-                foreach ($extra_fields as $extra_info) {
-                    $extra_field_info = $extra_info['extra_field_info'];
-                    $inject_joins .= " INNER JOIN $this->table_field_values fv$counter
-                                       ON ($alias.".$this->primaryKey." = fv$counter.".$this->handler_id.') ';
-                    // Add options
-                    switch ($extra_field_info['field_type']) {
-                        case self::FIELD_TYPE_SELECT:
-                        case self::FIELD_TYPE_DOUBLE_SELECT:
-                            $options['where'] = str_replace(
-                                $extra_info['field'],
-                                'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fvo'.$counter.'.option_value',
-                                $options['where']
-                            );
-                            $inject_joins .= "
-                                 INNER JOIN $this->table_field_options fvo$counter
-                                 ON (
-                                    fv$counter.field_id = fvo$counter.field_id AND
-                                    fv$counter.value = fvo$counter.option_value
-                                 )
-                                ";
-                            break;
-                        case  self::FIELD_TYPE_TAG:
-                            /*$options['where'] = str_replace(
-                                $extra_info['field'],
-                                'tag'.$counter.'.tag ',
-                                $options['where']
-                            );*/
-                            $newCounter = 1;
-                            $whereTag = [];
-                            foreach ($extra['data'] as $data) {
-                                $data = Database::escape_string($data);
-                                $key = $counter.$newCounter;
-                                $whereTag[] = ' tag'.$key.'.tag LIKE "%'.$data.'%" ';
-                                $inject_joins .= "
-                                    INNER JOIN $this->table_field_rel_tag tag_rel$key
-                                    ON (
-                                        tag_rel$key.field_id = ".$extra_info['id']." AND
-                                        tag_rel$key.item_id = $alias.".$this->primaryKey."
-                                    )
-                                    INNER JOIN $this->table_field_tag tag$key
-                                    ON (tag$key.id = tag_rel$key.tag_id)
-                                ";
-                                $newCounter++;
-                            }
-                            $options['where'] = ' ('.implode(' AND ', $whereTag).') ';
-                            break;
-                        default:
-                            // text, textarea, etc
-                            $options['where'] = str_replace(
-                                $extra_info['field'],
-                                'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fv'.$counter.'.value',
-                                $options['where']
-                            );
-                            break;
+                        continue;
+                    }
+
+                    if ($firstId === $sub_option['option_value']) {
+                        $second_values[$sub_option['id']] = $sub_option['display_text'];
                     }
-                    $field_value_to_join[] = " fv$counter.$this->handler_id ";
-                    $counter++;
                 }
             }
-            $where .= ' AND '.$options['where'];
         }
 
-        $order = null;
-        if (!empty($options['order'])) {
-            $order = ' ORDER BY '.$options['order'];
-        }
-        $limit = null;
-        if (!empty($options['limit'])) {
-            $limit = ' LIMIT '.$options['limit'];
+        $form
+            ->defaultRenderer()
+            ->setGroupElementTemplate('<p>{element}</p>', 'extra_'.$fieldDetails['variable']);
+        $group = [];
+        $group[] = $form->createElement(
+            'select',
+            'extra_'.$fieldDetails['variable'],
+            null,
+            $values,
+            ['id' => $firstSelectId]
+        );
+        $group[] = $form->createElement(
+            'select',
+            'extra_'.$fieldDetails['variable'].'_second',
+            null,
+            $second_values,
+            ['id' => $secondSelectId]
+        );
+        $form->addGroup(
+            $group,
+            'extra_'.$fieldDetails['variable'],
+            $fieldDetails['display_text']
+        );
+
+        if ($freezeElement) {
+            $form->freeze('extra_'.$fieldDetails['variable']);
         }
 
-        return [
-            'order' => $order,
-            'limit' => $limit,
-            'where' => $where,
-            'inject_where' => $inject_where,
-            'inject_joins' => $inject_joins,
-            'field_value_to_join' => $field_value_to_join,
-            'inject_extra_fields' => $inject_extra_fields,
-        ];
+        return $jqueryReadyContent;
     }
 
     /**
-     * Get the extra fields and their formatted values.
-     *
-     * @param int|string $itemId   The item ID (It could be a session_id, course_id or user_id)
-     * @param bool       $filter
-     * @param array      $onlyShow (list of extra fields variables to show)
+     * @param \FormValidator $form
+     * @param bool           $freezeElement Optional
      *
-     * @return array The extra fields data
+     * @return string JavaScript code
      */
-    public function getDataAndFormattedValues($itemId, $filter = false, $onlyShow = [])
-    {
-        $valuesData = [];
-        $fields = $this->get_all();
-        $em = Database::getManager();
-
-        $repoTag = $em->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
+    private function addSelectWithTextFieldElement(
+        FormValidator $form,
+        array $fieldDetails,
+        $freezeElement = false
+    ) {
+        $firstSelectId = 'slct_extra_'.$fieldDetails['variable'];
+        $txtSelectId = 'txt_extra_'.$fieldDetails['variable'];
 
-        foreach ($fields as $field) {
-            if ('1' != $field['visible_to_self']) {
-                continue;
-            }
+        $jqueryReadyContent = "
+            $('#$firstSelectId').on('change', function() {
+                var id = $(this).val();
 
-            if ($filter && $field['filter'] != 1) {
-                continue;
-            }
+                if (!id) {
+                    $('#$txtSelectId').val('');
+                }
+            });
+        ";
 
-            if (!empty($onlyShow) && !in_array($field['variable'], $onlyShow)) {
-                continue;
-            }
+        $options = $this->extra_field_double_select_convert_array_to_ordered_array($fieldDetails['options']);
+        $values = ['' => get_lang('Select')];
 
-            $valueAsArray = [];
-            $fieldValue = new ExtraFieldValue($this->type);
-            $valueData = $fieldValue->get_values_by_handler_and_field_id(
-                $itemId,
-                $field['id'],
-                true
-            );
-            if (ExtraField::FIELD_TYPE_TAG == $field['field_type']) {
-                $tags = $repoTag->findBy(['fieldId' => $field['id'], 'itemId' => $itemId]);
-                if ($tags) {
-                    /** @var ExtraFieldRelTag $tag */
-                    $data = [];
-                    foreach ($tags as $extraFieldTag) {
-                        /** @var Tag $tag */
-                        $tag = $em->find('ChamiloCoreBundle:Tag', $extraFieldTag->getTagId());
-                        $data[] = $tag->getTag();
+        if (!empty($options)) {
+            foreach ($options as $option) {
+                foreach ($option as $sub_option) {
+                    if ('0' != $sub_option['option_value']) {
+                        continue;
                     }
-                    $valueData = implode(',', $data);
-                    $valueAsArray = $data;
+
+                    $values[$sub_option['id']] = $sub_option['display_text'];
                 }
             }
+        }
+
+        $form
+            ->defaultRenderer()
+            ->setGroupElementTemplate('<p>{element}</p>', 'extra_'.$fieldDetails['variable']);
+        $group = [];
+        $group[] = $form->createElement(
+            'select',
+            'extra_'.$fieldDetails['variable'],
+            null,
+            $values,
+            ['id' => $firstSelectId]
+        );
+        $group[] = $form->createElement(
+            'text',
+            'extra_'.$fieldDetails['variable'].'_second',
+            null,
+            ['id' => $txtSelectId]
+        );
+        $form->addGroup(
+            $group,
+            'extra_'.$fieldDetails['variable'],
+            $fieldDetails['display_text']
+        );
+
+        if ($freezeElement) {
+            $form->freeze('extra_'.$fieldDetails['variable']);
+        }
+
+        return $jqueryReadyContent;
+    }
+
+    /**
+     * @param \FormValidator $form
+     * @param bool           $freezeElement
+     *
+     * @return string
+     */
+    private function addTripleSelectElement(
+        FormValidator $form,
+        array $fieldDetails,
+        array $extraData,
+        $freezeElement
+    ) {
+        $variable = $fieldDetails['variable'];
+        $id = $fieldDetails['id'];
+        $slctFirstId = "first_extra$variable";
+        $slctSecondId = "second_extra$variable";
+        $slctThirdId = "third_extra$variable";
+        $langSelect = get_lang('Select');
+
+        $js = "
+            (function () {
+                var slctFirst = $('#$slctFirstId'),
+                    slctSecond = $('#$slctSecondId'),
+                    slctThird = $('#$slctThirdId');
+
+                slctFirst.on('change', function () {
+                    slctSecond.empty().selectpicker('refresh');
+                    slctThird.empty().selectpicker('refresh');
 
-            if (!$valueData) {
-                continue;
-            }
-            $displayedValue = get_lang('None');
+                    var level = $(this).val();
 
-            switch ($field['field_type']) {
-                case self::FIELD_TYPE_CHECKBOX:
-                    if (false !== $valueData && '1' == $valueData['value']) {
-                        $displayedValue = get_lang('Yes');
-                    } else {
-                        $displayedValue = get_lang('No');
-                    }
-                    break;
-                case self::FIELD_TYPE_DATE:
-                    if (false !== $valueData && !empty($valueData['value'])) {
-                        $displayedValue = api_format_date($valueData['value'], DATE_FORMAT_LONG_NO_DAY);
-                    }
-                    break;
-                case self::FIELD_TYPE_TAG:
-                    if (!empty($valueData)) {
-                        $displayedValue = $valueData;
-                    }
-                    break;
-                case self::FIELD_TYPE_FILE_IMAGE:
-                    if (false === $valueData || empty($valueData['value'])) {
-                        break;
+                    if (!level) {
+                        return;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
-                        break;
-                    }
+                    $.getJSON(_p.web_ajax + 'extra_field.ajax.php', {
+                        'a': 'get_second_select_options',
+                        'type': '$this->type',
+                        'field_id': $id,
+                        'option_value_id': level
+                    })
+                        .done(function (data) {
+                            slctSecond.append(
+                                $('<option>', {value: '', text: '$langSelect'})
+                            );
 
-                    $image = Display::img(
-                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
-                        $field['display_text'],
-                        ['width' => '300']
-                    );
+                            $.each(data, function (index, value) {
+                                var valueParts = value.split('#'),
+                                    dataValue = valueParts.length > 1 ? valueParts.shift() : '';
 
-                    $displayedValue = Display::url(
-                        $image,
-                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
-                        ['target' => '_blank']
-                    );
-                    break;
-                case self::FIELD_TYPE_FILE:
-                    if (false === $valueData || empty($valueData['value'])) {
-                        break;
-                    }
+                                slctSecond.append(
+                                    $('<option>', {value: index, text: valueParts.join(''), 'data-value': dataValue})
+                                );
+                            });
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
-                        break;
-                    }
+                            slctSecond.selectpicker('refresh');
+                        });
+                });
+                slctSecond.on('change', function () {
+                    slctThird.empty().selectpicker('refresh');
 
-                    $displayedValue = Display::url(
-                        get_lang('Download'),
-                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
-                        [
-                            'title' => $field['display_text'],
-                            'target' => '_blank',
-                            'class' => 'download_extra_field',
-                        ]
-                    );
-                    break;
-                default:
-                    $displayedValue = $valueData['value'];
-                    break;
-            }
+                    var level = $(this).val();
 
-            $valuesData[] = [
-                'variable' => $field['variable'],
-                'text' => $field['display_text'],
-                'value' => $displayedValue,
-                'value_as_array' => $valueAsArray,
-            ];
-        }
+                    if (!level) {
+                        return;
+                    }
 
-        return $valuesData;
-    }
+                    $.getJSON(_p.web_ajax + 'extra_field.ajax.php', {
+                        'a': 'get_second_select_options',
+                        'type': '$this->type',
+                        'field_id': $id,
+                        'option_value_id': level
+                    })
+                        .done(function (data) {
+                            slctThird.append(
+                                $('<option>', {value: '', text: '$langSelect'})
+                            );
 
-    /**
-     * @param int    $fieldId
-     * @param string $tag
-     *
-     * @return array
-     */
-    public function getAllUserPerTag($fieldId, $tag)
-    {
-        $tagRelUserTable = Database::get_main_table(TABLE_MAIN_USER_REL_TAG);
-        $tag = Database::escape_string($tag);
-        $fieldId = (int) $fieldId;
+                            $.each(data, function (index, value) {
+                                var valueParts = value.split('#'),
+                                    dataValue = valueParts.length > 1 ? valueParts.shift() : '';
 
-        $sql = "SELECT user_id
-                FROM {$this->table_field_tag} f INNER JOIN $tagRelUserTable ft
-                ON tag_id = f.id
-                WHERE tag = '$tag' AND f.field_id = $fieldId;
+                                slctThird.append(
+                                    $('<option>', {value: index, text: valueParts.join(''), 'data-value': dataValue})
+                                );
+                            });
+
+                            slctThird.selectpicker('refresh');
+                        });
+                });
+            })();
         ";
 
-        $result = Database::query($sql);
+        $firstId = isset($extraData["extra_$variable"]["extra_$variable"])
+            ? $extraData["extra_$variable"]["extra_$variable"]
+            : '';
+        $secondId = isset($extraData["extra_$variable"]["extra_{$variable}_second"])
+            ? $extraData["extra_$variable"]["extra_{$variable}_second"]
+            : '';
 
-        return Database::store_result($result, 'ASSOC');
-    }
+        $options = $this->tripleSelectConvertArrayToOrderedArray($fieldDetails['options']);
+        $values1 = ['' => $langSelect];
+        $values2 = ['' => $langSelect];
+        $values3 = ['' => $langSelect];
+        $level1 = $this->getOptionsFromTripleSelect($options['level1'], 0);
+        $level2 = $this->getOptionsFromTripleSelect($options['level2'], $firstId);
+        $level3 = $this->getOptionsFromTripleSelect($options['level3'], $secondId);
+        /** @var \HTML_QuickForm_select $slctFirst */
+        $slctFirst = $form->createElement('select', "extra_$variable", null, $values1, ['id' => $slctFirstId]);
+        /** @var \HTML_QuickForm_select $slctFirst */
+        $slctSecond = $form->createElement(
+            'select',
+            "extra_{$variable}_second",
+            null,
+            $values2,
+            ['id' => $slctSecondId]
+        );
+        /** @var \HTML_QuickForm_select $slctFirst */
+        $slctThird = $form->createElement('select', "extra_{$variable}_third", null, $values3, ['id' => $slctThirdId]);
 
-    /**
-     * @param int $fieldId
-     * @param int $tagId
-     *
-     * @return array
-     */
-    public function getAllSkillPerTag($fieldId, $tagId)
-    {
-        $skillTable = Database::get_main_table(TABLE_MAIN_SKILL);
-        $tagRelExtraTable = Database::get_main_table(TABLE_MAIN_EXTRA_FIELD_REL_TAG);
-        $fieldId = (int) $fieldId;
-        $tagId = (int) $tagId;
+        foreach ($level1 as $item1) {
+            $valueParts = explode('#', $item1['display_text']);
+            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
+            $slctFirst->addOption(implode('', $valueParts), $item1['id'], ['data-value' => $dataValue]);
+        }
 
-        $sql = "SELECT s.id
-                FROM $skillTable s INNER JOIN $tagRelExtraTable t
-                ON t.item_id = s.id
-                WHERE tag_id = $tagId AND t.field_id = $fieldId;
-        ";
+        foreach ($level2 as $item2) {
+            $valueParts = explode('#', $item2['display_text']);
+            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
+            $slctSecond->addOption(implode('', $valueParts), $item2['id'], ['data-value' => $dataValue]);
+        }
 
-        $result = Database::query($sql);
-        $result = Database::store_result($result, 'ASSOC');
+        foreach ($level3 as $item3) {
+            $valueParts = explode('#', $item3['display_text']);
+            $dataValue = count($valueParts) > 1 ? array_shift($valueParts) : '';
+            $slctThird->addOption(implode('', $valueParts), $item3['id'], ['data-value' => $dataValue]);
+        }
 
-        $skillList = [];
-        foreach ($result as $index => $value) {
-            $skillList[$value['id']] = $value['id'];
+        $form
+            ->defaultRenderer()
+            ->setGroupElementTemplate('<p>{element}</p>', "extra_$variable");
+        $form->addGroup([$slctFirst, $slctSecond, $slctThird], "extra_$variable", $fieldDetails['display_text']);
+
+        if ($freezeElement) {
+            $form->freeze('extra_'.$fieldDetails['variable']);
         }
 
-        return $skillList;
+        return $js;
     }
 
     /**
-     * @param string $from
-     * @param string $search
-     * @param array  $options
+     * @param int $parentId
      *
      * @return array
      */
-    public function searchOptionsFromTags($from, $search, $options)
+    private static function getOptionsFromTripleSelect(array $options, $parentId)
     {
-        $extraFieldInfo = $this->get_handler_field_info_by_field_variable(
-            str_replace('extra_', '', $from)
-        );
-        $extraFieldInfoTag = $this->get_handler_field_info_by_field_variable(
-            str_replace('extra_', '', $search)
+        return array_filter(
+            $options,
+            function ($option) use ($parentId) {
+                return $option['option_value'] == $parentId;
+            }
         );
-
-        if (empty($extraFieldInfo) || empty($extraFieldInfoTag)) {
-            return [];
-        }
-
-        $id = $extraFieldInfo['id'];
-        $tagId = $extraFieldInfoTag['id'];
-
-        $table = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
-        $tagRelExtraTable = Database::get_main_table(TABLE_MAIN_EXTRA_FIELD_REL_TAG);
-        $tagTable = Database::get_main_table(TABLE_MAIN_TAG);
-        $optionsTable = Database::get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
-
-        $sql = "SELECT DISTINCT t.*, v.value, o.display_text
-                FROM $tagRelExtraTable te
-                INNER JOIN $tagTable t
-                ON (t.id = te.tag_id AND te.field_id = t.field_id AND te.field_id = $tagId)
-                INNER JOIN $table v
-                ON (te.item_id = v.item_id AND v.field_id = $id)
-                INNER JOIN $optionsTable o
-                ON (o.option_value = v.value)
-                WHERE v.value IN ('".implode("','", $options)."')
-                ORDER BY o.option_order, t.tag
-               ";
-
-        $result = Database::query($sql);
-        $result = Database::store_result($result);
-
-        return $result;
     }
 }