chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add extra_label_class tag, update from ofaj

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent acd9222783
commit d9fa56786c
3 changed files with 187 additions and 85 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 266
      main/inc/lib/extra_field.lib.php
  2. 2
      main/inc/lib/formvalidator/Element/DatePicker.php
  3. 4
      main/inc/lib/formvalidator/Element/DateTimePicker.php

266
main/inc/lib/extra_field.lib.php
Unescape View File

@ -71,15 +71,27 @@ class ExtraField extends Model
public $pageUrl;
public $extraFieldType = 0;
public $table_field_options;
public $table_field_values;
public $table_field_tag;
public $table_field_rel_tag;
public $handler_id;
public $primaryKey;
/**
* @param string $type
*/
public function __construct($type)
{
$this->type = $type;
$this->table = Database::get_main_table(TABLE_EXTRA_FIELD);
$this->table_field_options = Database::get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
$this->table_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
$this->table_field_tag = Database::get_main_table(TABLE_MAIN_TAG);
$this->table_field_rel_tag = Database::get_main_table(TABLE_MAIN_EXTRA_FIELD_REL_TAG);
$this->handler_id = 'item_id';
switch ($this->type) {
@ -95,7 +107,7 @@ class ExtraField extends Model
$this->primaryKey = 'id';
break;
case 'session':
$this->extraFieldType = EntityExtraField::SESSION_FIELD_TYPE;
$this->extraFieldType = EntityExtraField::SESSION_FIELD_TYPE;
$this->primaryKey = 'id';
break;
case 'question':
@ -373,10 +385,19 @@ class ExtraField extends Model
* @param FormValidator $form
* @param int $itemId
* @param array $exclude variables of extra field to exclude
* @param bool $filter
*
* @return array|bool
*/
public function addElements($form, $itemId = 0, $exclude = [])
{
public function addElements(
$form,
$itemId = 0,
$exclude = [],
$filter = false,
$useTagAsSelect = false,
$showOnlyThisFields = [],
$orderFields = []
) {
if (empty($form)) {
return false;
}
@ -392,14 +413,21 @@ class ExtraField extends Model
}
}
$extraFields = $this->get_all(null, 'option_order');
$conditions = [];
if ($filter) {
$conditions = ['filter = ?' => 1];
}
$extraFields = $this->get_all($conditions, 'option_order');
$extra = $this->set_extra_fields_in_form(
$form,
$extraData,
false,
$extraFields,
$itemId,
$exclude
$exclude,
$useTagAsSelect,
$showOnlyThisFields,
$orderFields
);
return $extra;
@ -525,11 +553,11 @@ class ExtraField extends Model
/**
* Converts a string like this:
* France:Paris;Bretagne;Marseilles;Lyon|Belgique:Bruxelles;Namur;Liège;Bruges|Peru:Lima;Piura;
* France:Paris;Bretagne;Marseille;Lyon|Belgique:Bruxelles;Namur;Liège;Bruges|Peru:Lima;Piura;
* into
* array(
* 'France' =>
* array('Paris', 'Bregtane', 'Marseilles'),
* array('Paris', 'Bregtane', 'Marseille'),
* 'Belgique' =>
* array('Namur', 'Liège')
* ), etc
@ -685,6 +713,14 @@ class ExtraField extends Model
*/
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);
@ -702,6 +738,7 @@ class ExtraField extends Model
* @param array $extra
* @param int $itemId
* @param array $exclude variables of extra field to exclude
* @param array
* @return array
*/
public function set_extra_fields_in_form(
@ -710,14 +747,34 @@ class ExtraField extends Model
$admin_permissions = false,
$extra = array(),
$itemId = null,
$exclude = []
$exclude = [],
$useTagAsSelect = false,
$showOnlyThisFields = [],
$orderFields = []
) {
$type = $this->type;
$jquery_ready_content = null;
if (!empty($extra)) {
$newOrder = [];
if (!empty($orderFields)) {
foreach ($orderFields as $order) {
foreach ($extra as $field_details) {
if ($order == $field_details['variable']) {
$newOrder[] = $field_details;
}
}
}
$extra = $newOrder;
}
foreach ($extra as $field_details) {
if (!empty($showOnlyThisFields)) {
if (!in_array($field_details['variable'], $showOnlyThisFields)) {
continue;
}
}
// Getting default value id if is set
$defaultValueId = null;
@ -789,7 +846,7 @@ class ExtraField extends Model
if (isset($field_details['options']) && !empty($field_details['options'])) {
foreach ($field_details['options'] as $option_details) {
$options[$option_details['option_value']] = $option_details['display_text'];
$group[] = $form->createElement(
$group[] = $form->createElement(
'radio',
'extra_'.$field_details['variable'],
$option_details['option_value'],
@ -827,9 +884,7 @@ class ExtraField extends Model
}
} else {
$fieldVariable = "extra_{$field_details['variable']}";
$checkboxAttributes = array();
if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
if (!empty($extraData[$fieldVariable])) {
$checkboxAttributes['checked'] = 1;
@ -873,9 +928,7 @@ class ExtraField extends Model
// Get extra field workflow
$userInfo = api_get_user_info();
$addOptions = array();
$optionsExists = false;
global $app;
// Check if exist $app['orm.em'] object
@ -912,7 +965,7 @@ class ExtraField extends Model
foreach ($field_details['options'] as $option_details) {
$optionList[$option_details['id']] = $option_details;
if ($get_lang_variables) {
$options[$option_details['option_value']] = $option_details['display_text'];
$options[$option_details['option_value']] = get_lang($option_details['display_text']);
} else {
if ($optionsExists) {
// Adding always the default value
@ -1041,7 +1094,7 @@ class ExtraField extends Model
'extra_'.$field_details['variable'],
$field_details['display_text'],
$options,
array('multiple' => 'multiple')
array('multiple' => 'multiple', 'id' => 'extra_'.$field_details['variable'])
);
if (!$admin_permissions) {
if ($field_details['visible'] == 0) {
@ -1105,17 +1158,16 @@ class ExtraField extends Model
});';
$first_id = null;
$second_id = null;
if (!empty($extraData)) {
$first_id = $extraData['extra_'.$field_details['variable']]['extra_'.$field_details['variable']];
$second_id = $extraData['extra_'.$field_details['variable']]['extra_'.$field_details['variable'].'_second'];
if (isset($extraData['extra_'.$field_details['variable']])) {
$first_id = $extraData['extra_'.$field_details['variable']]['extra_'.$field_details['variable']];
}
}
$options = ExtraField::extra_field_double_select_convert_array_to_ordered_array(
$field_details['options']
);
$values = array('' => get_lang('Select'));
$values = array('' => get_lang('Select'));
$second_values = array();
if (!empty($options)) {
@ -1131,7 +1183,7 @@ class ExtraField extends Model
}
}
}
$group = array();
$group = array();
$group[] = $form->createElement(
'select',
'extra_'.$field_details['variable'],
@ -1170,50 +1222,29 @@ class ExtraField extends Model
$variable = $field_details['variable'];
$field_id = $field_details['id'];
//Added for correctly translate the extra_field
$get_lang_variables = false;
if (in_array($variable, ['tags'])) {
$get_lang_variables = true;
}
if ($get_lang_variables) {
$field_details['display_text'] = get_lang($field_details['display_text']);
}
$tagsSelect = $form->addSelect(
"extra_{$field_details['variable']}",
$field_details['display_text']
);
$tagsSelect->setAttribute('class', null);
if ($useTagAsSelect == false) {
$tagsSelect->setAttribute('class', null);
}
$tagsSelect->setAttribute('id', "extra_{$field_details['variable']}");
$tagsSelect->setMultiple(true);
if ($this->type == 'user') {
/* //the magic should be here
$user_tags = UserManager::get_user_tags($user_id, $field_details[0]);
$tag_list = '';
if (is_array($user_tags) && count($user_tags) > 0) {
foreach ($user_tags as $tag) {
$tag_list .= '<option value="'.$tag['tag'].'" class="selected">'.$tag['tag'].'</option>';
}
}
$multi_select = '<select id="extra_'.$field_details[1].'" name="extra_'.$field_details[1].'">
'.$tag_list.'
</select>';
$form->addElement('label', $field_details[3], $multi_select);
$url = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php';
$complete_text = get_lang('StartToType');
//if cache is set to true the jquery will be called 1 time
$jquery_ready_content = <<<EOF
$("#extra_$field_details[1]").fcbkcomplete({
json_url: "$url?a=search_tags&field_id=$field_details[0]",
cache: false,
filter_case: true,
filter_hide: true,
complete_text:"$complete_text",
firstselected: true,
//onremove: "testme",
//onselect: "testme",
filter_selected: true,
newel: true
});
EOF;
break;*/
// The magic should be here
$user_tags = UserManager::get_user_tags($itemId, $field_details['id']);
@ -1236,14 +1267,12 @@ EOF;
'fieldId' => $field_id,
'itemId' => $itemId
]);
foreach ($fieldTags as $fieldTag) {
$tag = $em->find('ChamiloCoreBundle:Tag', $fieldTag->getTagId());
if (empty($tag)) {
continue;
}
$tagsSelect->addOption(
$tag->getTag(),
$tag->getTag(),
@ -1251,9 +1280,42 @@ EOF;
);
}
if ($useTagAsSelect) {
$fieldTags = $em
->getRepository('ChamiloCoreBundle:ExtraFieldRelTag')
->findBy([
'fieldId' => $field_id
]);
$tagsAdded = [];
foreach ($fieldTags as $fieldTag) {
$tag = $em->find('ChamiloCoreBundle:Tag', $fieldTag->getTagId());
if (empty($tag)) {
continue;
}
$tagText = $tag->getTag();
if (in_array($tagText, $tagsAdded)) {
continue;
}
$tagsSelect->addOption(
$tag->getTag(),
$tag->getTag(),
[]
);
$tagsAdded[] = $tagText;
}
}
$url = api_get_path(WEB_AJAX_PATH).'extra_field.ajax.php';
}
if ($useTagAsSelect == false) {
$complete_text = get_lang('StartToType');
//if cache is set to true the jquery will be called 1 time
@ -1270,6 +1332,7 @@ EOF;
newel: true
});
EOF;
}
break;
case ExtraField::FIELD_TYPE_TIMEZONE:
$form->addElement(
@ -1464,6 +1527,16 @@ EOF;
}
break;
case ExtraField::FIELD_TYPE_VIDEO_URL:
//Added for correctly translate the extra_field
$get_lang_variables = false;
if (in_array($field_details['variable'], ['video_url'])) {
$get_lang_variables = true;
}
if ($get_lang_variables) {
$field_details['display_text'] = get_lang($field_details['display_text']);
}
$form->addUrl(
"extra_{$field_details['variable']}",
$field_details['display_text'],
@ -1538,6 +1611,7 @@ EOF;
}
}
}
$return = array();
$return['jquery_ready_content'] = $jquery_ready_content;
@ -1808,14 +1882,14 @@ EOF;
$form->setDefaults($defaults);
// Setting the rules
$form->addRule('display_text', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('field_type', get_lang('ThisFieldIsRequired'), 'required');
return $form;
}
/**
* With this function we can add actions to the jgrid (edit, delete, etc)
* @param string $token
* @param $token
* @return string
*/
public function getJqgridActionLinks($token)
@ -2000,6 +2074,7 @@ JAVASCRIPT;
}
}
}
$options_by_double = array();
foreach ($double_fields as $double) {
$my_options = $extraFieldOption->get_field_options_by_field(
@ -2025,8 +2100,7 @@ JAVASCRIPT;
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 (s.".$this->primaryKey." = fv$counter.".$this->handler_id.") ";
ON (s." . $this->primaryKey . " = fv$counter." . $this->handler_id . ") ";
// Add options
if (isset($extra_field_info['field_type']) && in_array(
$extra_field_info['field_type'],
@ -2039,11 +2113,31 @@ JAVASCRIPT;
) {
$options['where'] = str_replace(
$extra_info['field'],
'fv'.$counter.'.field_id = '.$extra_info['id'].' AND fvo'.$counter.'.option_value',
'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) ";
$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
)
";
} else if (isset($extra_field_info['field_type']) &&
$extra_field_info['field_type'] == ExtraField::FIELD_TYPE_TAG
) {
$options['where'] = str_replace(
$extra_info['field'],
'tag' . $counter . '.tag ',
$options['where']
);
$inject_joins .= "
INNER JOIN $this->table_field_rel_tag tag_rel$counter
ON (tag_rel$counter.field_id = ".$extra_info['id']." AND tag_rel$counter.item_id = s." . $this->primaryKey.")
INNER JOIN $this->table_field_tag tag$counter
ON (tag$counter.id = tag_rel$counter.tag_id)
";
} else {
//text, textarea, etc
$options['where'] = str_replace(
@ -2073,11 +2167,11 @@ JAVASCRIPT;
}
return array(
'order' => $order,
'limit' => $limit,
'where' => $where,
'inject_where' => $inject_where,
'inject_joins' => $inject_joins,
'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,
);
@ -2102,7 +2196,17 @@ JAVASCRIPT;
$val = '%'.$val;
}
if ($oper == 'cn' || $oper == 'nc' || $oper == 'in' || $oper == 'ni') {
$val = '%'.$val.'%';
if (is_array($val)) {
$result = '"%'.implode(';', $val).'%"';
foreach ($val as $item) {
$result .= ' OR '.$col.' LIKE "%'.$item.'%"';
}
$val = $result;
return " $col {$this->ops[$oper]} $val ";
} else {
$val = '%'.$val.'%';
}
}
$val = \Database::escape_string($val);
@ -2132,31 +2236,29 @@ JAVASCRIPT;
$condition_array = array();
foreach ($filters->rules as $rule) {
if (strpos($rule->field, $stringToSearch) === false) {
//normal fields
// normal fields
$field = $rule->field;
if (isset($rule->data) && $rule->data != -1) {
if (isset($rule->data) && is_string($rule->data) && $rule->data != -1) {
$condition_array[] = $this->get_where_clause($field, $rule->op, $rule->data);
}
} else {
// Extra fields
if (strpos($rule->field, '_second') === false) {
//No _second
$original_field = str_replace($stringToSearch, '', $rule->field);
$field_option = $this->get_handler_field_info_by_field_variable($original_field);
if ($field_option['field_type'] == ExtraField::FIELD_TYPE_DOUBLE_SELECT) {
if (isset($double_select[$rule->field])) {
$data = explode('#', $rule->data);
$rule->data = $data[1].'::'.$double_select[$rule->field];
} else {
// only was sent 1 select
$data = explode('#', $rule->data);
$rule->data = $data[1];
if (is_string($rule->data)) {
$data = explode('#', $rule->data);
$rule->data = $data[1];
}
}
if (!isset($rule->data)) {

2
main/inc/lib/formvalidator/Element/DatePicker.php
Unescape View File

@ -148,7 +148,7 @@ class DatePicker extends HTML_QuickForm_text
case FormValidator::LAYOUT_HORIZONTAL:
return '
<div class="form-group {error_class}">
<label {label-for} class="col-sm-'.$size[0].' control-label" >
<label {label-for} class="col-sm-'.$size[0].' control-label {extra_label_class}" >
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>

4
main/inc/lib/formvalidator/Element/DateTimePicker.php
Unescape View File

@ -36,7 +36,7 @@ class DateTimePicker extends HTML_QuickForm_text
if (!empty($value)) {
$value = api_format_date($value, DATE_TIME_FORMAT_LONG_24H);
}
return $this->getElementJS() . '
<div class="input-group">
<span class="input-group-addon">
@ -144,7 +144,7 @@ class DateTimePicker extends HTML_QuickForm_text
case FormValidator::LAYOUT_HORIZONTAL:
return '
<div class="form-group {error_class}">
<label {label-for} class="col-sm-'.$size[0].' control-label" >
<label {label-for} class="col-sm-'.$size[0].' control-label {extra_label_class}" >
<!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
{label}
</label>

Write Preview
Loading…
Cancel
Save