{% if is_granted('CHILL_BUDGET_ELEMENT_CREATE', person) %}
diff --git a/src/Bundle/ChillMainBundle/Export/ExportInterface.php b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
index f357a9fdb..a11a51746 100644
--- a/src/Bundle/ChillMainBundle/Export/ExportInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportInterface.php
@@ -97,7 +97,7 @@ interface ExportInterface extends ExportElementInterface
* @param mixed[] $values The values from the result. if there are duplicates, those might be given twice. Example: array('FR', 'BE', 'CZ', 'FR', 'BE', 'FR')
* @param mixed $data The data from the export's form (as defined in `buildForm`)
*
- * @return callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
+ * @return (callable(null|string|int|float|'_header' $value): string|int|\DateTimeInterface) where the first argument is the value, and the function should return the label to show in the formatted file. Example : `function($countryCode) use ($countries) { return $countries[$countryCode]->getName(); }`
*/
public function getLabels($key, array $values, $data);
diff --git a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
index 4e41a1740..51d1b3974 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
@@ -40,7 +40,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
'label' => false,
'required' => false,
'attr' => [
- 'placeholder' => 'activity_filter.Search',
+ 'placeholder' => 'filter_order.Search',
]
]);
}
@@ -48,16 +48,7 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
$checkboxesBuilder = $builder->create('checkboxes', null, ['compound' => true]);
foreach ($helper->getCheckboxes() as $name => $c) {
- $choices = array_combine(
- array_map(static function ($c, $t) {
- if (null !== $t) {
- return $t;
- }
-
- return $c;
- }, $c['choices'], $c['trans']),
- $c['choices']
- );
+ $choices = self::buildCheckboxChoices($c['choices'], $c['trans']);
$checkboxesBuilder->add($name, ChoiceType::class, [
'choices' => $choices,
@@ -148,6 +139,20 @@ final class FilterOrderType extends \Symfony\Component\Form\AbstractType
}
+ public static function buildCheckboxChoices(array $choices, array $trans = []): array
+ {
+ return array_combine(
+ array_map(static function ($c, $t) {
+ if (null !== $t) {
+ return $t;
+ }
+
+ return $c;
+ }, $choices, $trans),
+ $choices
+ );
+ }
+
public function buildView(FormView $view, FormInterface $form, array $options)
{
/** @var FilterOrderHelper $helper */
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
index cd81f36dc..28c597bc0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
@@ -44,13 +44,5 @@ form {
}
.chill_filter_order {
- background: $gray-100; /*
- border: 3px dashed $white;
- background: repeating-linear-gradient(
- -45deg,
- $gray-100,
- $gray-100 2px,
- $white 2px,
- $white 6px
- ); */
+ background: $gray-100;
}
\ No newline at end of file
diff --git a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
index 9a9a11fbd..adf67b81b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/FilterOrder/base.html.twig
@@ -1,110 +1,144 @@
{{ form_start(form) }}
- {% set btnSubmit = 0 %}
-
-
- {% if form.vars.has_search_box %}
-
-
- {{ form_widget(form.q) }}
-
-
-
- {% endif %}
-
- {% if form.dateRanges is defined %}
- {% set btnSubmit = 1 %}
- {% if form.dateRanges|length > 0 %}
- {% for dateRangeName, _o in form.dateRanges %}
-
- {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
- {{ form_label(form.dateRanges[dateRangeName])}}
- {% else %}
-
+
+ {% if form.dateRanges is defined %}
+ {% set btnSubmit = 1 %}
+ {% if form.dateRanges|length > 0 %}
+ {% for dateRangeName, _o in form.dateRanges %}
+
+ {% if form.dateRanges[dateRangeName].vars.label is not same as(false) %}
+ {{ form_label(form.dateRanges[dateRangeName])}}
+ {% else %}
+
- {% endfor %}
+ {% endfor %}
+ {% endif %}
{% endif %}
- {% endif %}
- {% if form.checkboxes is defined %}
- {% set btnSubmit = 1 %}
- {% if form.checkboxes|length > 0 %}
- {% for checkbox_name, options in form.checkboxes %}
-
-
{{ 'activity_filter.By'|trans }}
-
- {% for c in form['checkboxes'][checkbox_name].children %}
- {{ form_widget(c) }}
- {{ form_label(c) }}
- {% endfor %}
-
-
- {% endfor %}
- {% endif %}
- {% endif %}
- {% if form.entity_choices is defined %}
- {% set btnSubmit = 1 %}
- {% if form.entity_choices |length > 0 %}
- {% for checkbox_name, options in form.entity_choices %}
-
- {% if form.entity_choices[checkbox_name].vars.label is not same as(false) %}
- {{ form_label(form.entity_choices[checkbox_name])}}
- {% endif %}
-
- {% for c in form['entity_choices'][checkbox_name].children %}
- {{ form_widget(c) }}
- {{ form_label(c) }}
- {% endfor %}
-
-
- {% endfor %}
- {% endif %}
- {% endif %}
- {% if form.user_pickers is defined %}
- {% set btnSubmit = 1 %}
- {% if form.user_pickers.children|length > 0 %}
- {% for name, options in form.user_pickers %}
-
- {% if form.user_pickers[name].vars.label is not same as(false) %}
- {{ form_label(form.user_pickers[name]) }}
- {% else %}
- {{ form_label(form.user_pickers[name].vars.label) }}
- {% endif %}
-
- {{ form_widget(form.user_pickers[name]) }}
-
-
- {% endfor %}
- {% endif %}
- {% endif %}
- {% if form.single_checkboxes is defined %}
- {% set btnSubmit = 1 %}
- {% for name, _o in form.single_checkboxes %}
+ {% if form.checkboxes is defined %}
+ {% set btnSubmit = 1 %}
+ {% if form.checkboxes|length > 0 %}
+ {% for checkbox_name, options in form.checkboxes %}
+
+
{{ 'filter_order.By'|trans }}
+
+ {% for c in form['checkboxes'][checkbox_name].children %}
+ {{ form_widget(c) }}
+ {{ form_label(c) }}
+ {% endfor %}
+
+
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+
+ {% if form.entity_choices is defined %}
+ {% set btnSubmit = 1 %}
+ {% if form.entity_choices |length > 0 %}
+ {% for checkbox_name, options in form.entity_choices %}
+
+ {% if form.entity_choices[checkbox_name].vars.label is not same as(false) %}
+ {{ form_label(form.entity_choices[checkbox_name])}}
+ {% endif %}
+
+ {% for c in form['entity_choices'][checkbox_name].children %}
+ {{ form_widget(c) }}
+ {{ form_label(c) }}
+ {% endfor %}
+
+
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+
+ {% if form.user_pickers is defined %}
+ {% set btnSubmit = 1 %}
+ {% if form.user_pickers.children|length > 0 %}
+ {% for name, options in form.user_pickers %}
+
+ {% if form.user_pickers[name].vars.label is not same as(false) %}
+ {{ form_label(form.user_pickers[name]) }}
+ {% else %}
+ {{ form_label(form.user_pickers[name].vars.label) }}
+ {% endif %}
+
+ {{ form_widget(form.user_pickers[name]) }}
+
+
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+
+ {% if form.single_checkboxes is defined %}
+ {% set btnSubmit = 1 %}
+ {% for name, _o in form.single_checkboxes %}
+