improve layout and messages for export

Form/Type/Export/AggregatorType.php

@@ -23,7 +23,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 
 /**
  * 
@@ -48,14 +48,9 @@ class AggregatorType extends AbstractType
         $aggregator = $this->exportManager->getAggregator($options['aggregator_alias']);
         
         $builder
-                ->add('enabled', ChoiceType::class, array(
-                    'choices' => array(
-                        'enabled' => true,
-                        'disabled' => false
-                    ),
-                    'multiple' => false,
-                    'expanded' => true,
-                    'choices_as_values' => true,
+                ->add('enabled', CheckboxType::class, array(
+                    'value' => true,
+                    'required' => false,
                     'data' => false
                 ));
         

Form/Type/Export/FilterType.php

@@ -23,6 +23,7 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Export\ExportManager;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 
 /**
  * 
@@ -47,15 +48,10 @@ class FilterType extends AbstractType
         $filter = $this->exportManager->getFilter($options['filter_alias']);
         
         $builder
-                ->add('enabled', 'choice', array(
-                    'choices' => array(
-                        'enabled' => true,
-                        'disabled' => false
-                    ),
-                    'multiple' => false,
-                    'expanded' => true,
-                    'choices_as_values' => true,
-                    'data' => false
+                ->add('enabled', CheckboxType::class, array(
+                    'value' => true,
+                    'data' => false,
+                    'required' => false
                 ));
         
         $filterFormBuilder = $builder->create('form', null, array(

Resources/public/css/scratch.css

@@ -4005,6 +4005,9 @@ form li label {
 textarea {
   height: 12em; }
 
+span.force-inline-label label {
+  display: inline; }
+
 .sc-button {
   color: #000;
   background: #d9d9d9;

Resources/public/sass/custom/modules/_forms.scss

@@ -2,4 +2,8 @@
 
 textarea {
     height: 12em;
+}
+
+span.force-inline-label label {
+    display: inline;
 }

Resources/translations/messages.fr.yml

@@ -132,14 +132,18 @@ The export will contains only data from the picked centers.: L'export ne contien
 This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
 Go to export options: Vers la préparation de l'export
 # export creation step 'export' : choose aggregators, filtering and formatter
-Formatter: Formatteur
+Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.
 Export parameters: Paramètres d'export
 Filters: Filtres
 Aggregators: Aggrégateurs
-Go to formatter options: Vers les options du formatteur
+Go to formatter options: Vers les options de mise en forme
 #export creation step 'formatter' : choose formatter option
 Generate the report: Générer le rapport
+No options availables. Your report is fully configured.: Pas d'options disponibles. Votre rapport est déjà configuré.
+
+# sans valeur
+without data: sans valeur
 
 
 #CSV List Formatter
@@ -147,4 +151,9 @@ Add a number on first column: La première colonne est un numéro
 Number: Numéro
 # the label which appears in the UI
 CSV vertical list: Liste verticale au format CSV
-CSV horizontal list: Liste horizontale au format CSV
+CSV horizontal list: Liste horizontale au format CSV
+Order: Ordre
+Position: Position
+row: ligne
+column: colonne
+Comma separated values (CSV): Valeurs séparées par des virgules (CSV - tableur)

Resources/views/Export/new.html.twig

@@ -32,9 +32,14 @@
     <div style="clear:both; padding-top: 1.5em;">
         <h2>{{ 'Filters'| trans }}</h2>
         {% for filter_form in form.children.export.children.filters %}
-            {{ form_label(filter_form) }}
-            {{ form_row(filter_form.enabled) }}
-            {{ form_widget(filter_form.form) }}
+            <p>
+                {{ form_widget(filter_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;' } }) }} 
+                <span class="force-inline-label">{{ form_label(filter_form) }}</span>
+            </p>
+            
+            <div>
+                {{ form_widget(filter_form.form) }}
+            </div>
         {% endfor %}
     </div>
     {% else %}
@@ -46,8 +51,11 @@
     <div style="clear:both; padding-top: 1.5em;">
         <h2>{{ 'Aggregators'| trans }}</h2>
         {% for aggregator_form in form.children.export.children.aggregators %}
-            {{ form_label(aggregator_form) }}
-            {{ form_row(aggregator_form.enabled) }}
+            <p>
+                {{ form_widget(aggregator_form.enabled, { 'attr' : { 'style' : 'vertical-align: middle;' } }) }}
+                <span class="force-inline-label">{{ form_label(aggregator_form) }}</span>
+            </p>
+            
             {{ form_widget(aggregator_form.form) }}
         {% endfor %}
     </div>

Resources/views/Export/new_formatter_step.html.twig

@@ -31,9 +31,17 @@
         <h2>{{ 'Formatter'| trans }}</h2>
         
         <div style="clear: both;">
-        {% for input in form.children.formatter.children %}
-        {{ form_row(input) }}
-        {% endfor %}
+        {% if form.children.formatter.children|length == 0 %}
+            <p>
+                <span class="chill-no-data-statement">{{ "No options availables. Your report is fully configured."|trans }}</span>
+            </p>
+            {{ form_widget(form.children.formatter) }}
+        {% else %}
+            {# we always have to render children, to mark as rendered #}        
+            {% for input in form.children.formatter.children %}
+            {{ form_row(input) }}
+            {% endfor %}
+        {% endif %}
         </div>
     </div>