Victoire · gregumo · Apr 21, 2017 · Apr 21, 2017 · Apr 21, 2017 · Apr 21, 2017
diff --git a/Resolver/WidgetFormContentResolver.php b/Resolver/WidgetFormContentResolver.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Victoire\Widget\FormBundle\Resolver;
+
+use Symfony\Component\Intl\DateFormatter\IntlDateFormatter;
+use Victoire\Bundle\CoreBundle\Helper\CurrentViewHelper;
+use Victoire\Bundle\WidgetBundle\Model\Widget;
+use Victoire\Bundle\WidgetBundle\Resolver\BaseWidgetContentResolver;
+use Victoire\Widget\FormBundle\Entity\WidgetForm;
+
+class WidgetFormContentResolver extends BaseWidgetContentResolver
+{
+    protected $currentViewHelper;
+
+    /**
+     * WidgetFormContentResolver constructor.
+     *
+     * @param CurrentViewHelper $currentViewHelper
+     */
+    public function __construct(CurrentViewHelper $currentViewHelper) {
+        $this->currentViewHelper = $currentViewHelper;
+    }
+
+    /**
+     * Get the static content of the widget.
+     *
+     * @param Widget $widget
+     *
+     * @return string
+     */
+    public function getWidgetStaticContent(Widget $widget)
+    {
+        $parameters = parent::getWidgetStaticContent($widget);
+        $parameters = self::addMonthParameters($widget, $parameters);
+
+        return $parameters;
+    }
+
+    protected function addMonthParameters(Widget $widget, $parameters)
+    {
+        $currentView = $this->currentViewHelper->getCurrentView();
+        $locale = $currentView->getCurrentLocale();
+        $formatter = new IntlDateFormatter($locale, 0, 0);
+
+        $months = [];
+        $date = new \DateTime();
+        foreach (range(1, 12) as $monthNumber) {
+            $date->setDate(2012, $monthNumber, 1);
+            $formatter->setPattern('MMMM');
+            $months[$monthNumber] = $formatter->format($date);
+        }
+
+        $parameters = array_merge($parameters, [
+            'months' => $months
+        ]);
+
+        return $parameters;
+    }
+}
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,6 +1,9 @@
 services:
     victoire_core.widget_form_content_resolver:
-        class: Victoire\Bundle\WidgetBundle\Resolver\BaseWidgetContentResolver
+        parent: victoire_widget.base_widget_content_resolver
+        class: Victoire\Widget\FormBundle\Resolver\WidgetFormContentResolver
+        arguments:
+            - '@victoire_core.current_view'
         tags:
             - { name: victoire_widget.widget_content_resolver, alias: Form }
 

diff --git a/Resources/public/js/validator.js b/Resources/public/js/validator.js
@@ -6,7 +6,7 @@ $(document).ready(function () {
                 var form_group = $(this).parents('.form-group');
                 if(re.test($(this).val()) !== true) {
                     form_group.addClass('has-error');
-                    form_group.find('.help-block').text($(this).val() + ' n\'est pas un email valide').show();
+                    form_group.find('.help-block').text(Translator.trans('victoire_widget_form.email.not.valid', {'email' : $(this).val()})).show();
                     event.preventDefault();
                 } else {
                     form_group.removeClass('has-error');

diff --git a/Resources/translations/messages.en.xliff b/Resources/translations/messages.en.xliff
@@ -66,6 +66,10 @@
         <source>victoire_widget_form.message.admin.newMessage</source>
         <target>New message:</target>
       </trans-unit>
+      <trans-unit id="58e25b0a67145" resname="victoire_widget_form.email.not.valid">
+        <source>victoire_widget_form.email.not.valid</source>
+        <target>%email% is not a valid email</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/translations/messages.es.xliff b/Resources/translations/messages.es.xliff
@@ -66,6 +66,10 @@
         <source>victoire_widget_form.message.admin.newMessage</source>
         <target>Nuevo puesto:</target>
       </trans-unit>
+      <trans-unit id="58e25b0a67145" resname="victoire_widget_form.email.not.valid">
+        <source>victoire_widget_form.email.not.valid</source>
+        <target>%email% no es una dirección de e-mail valida</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/translations/messages.fr.xliff b/Resources/translations/messages.fr.xliff
@@ -66,6 +66,10 @@
         <source>victoire_widget_form.message.admin.newMessage</source>
         <target>Nouveau message:</target>
       </trans-unit>
+      <trans-unit id="58e25b0a67145" resname="victoire_widget_form.email.not.valid">
+        <source>victoire_widget_form.email.not.valid</source>
+        <target>%email% n'est pas un email valide</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/Resources/translations/victoire.en.xliff b/Resources/translations/victoire.en.xliff
@@ -214,23 +214,23 @@
         <source>widget_form.form.choice.style.label.default</source>
         <target>Default</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.primary" id="58e3ad09e9d32">
+      <trans-unit resname="widget_form.form.choice.style.label.primary" id="58e3ad0a06334">
         <source>widget_form.form.choice.style.label.primary</source>
-        <target>Principal</target>
+        <target>Primary</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.success" id="58e3ad09e9e8a">
+      <trans-unit resname="widget_form.form.choice.style.label.success" id="58e3ad0a063b9">
         <source>widget_form.form.choice.style.label.success</source>
-        <target>Succès</target>
+        <target>Succes</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.info" id="58e3ad09e9f29">
+      <trans-unit resname="widget_form.form.choice.style.label.info" id="58e3ad0a06528">
         <source>widget_form.form.choice.style.label.info</source>
-        <target>Informatif</target>
+        <target>Informative</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.warning" id="58e3ad09e9fb2">
+      <trans-unit resname="widget_form.form.choice.style.label.warning" id="58e3ad0a06591">
         <source>widget_form.form.choice.style.label.warning</source>
-        <target>Avertissement</target>
+        <target>Warning</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.danger" id="58e3ad09ea039">
+      <trans-unit resname="widget_form.form.choice.style.label.danger" id="58e3ad0a065fc">
         <source>widget_form.form.choice.style.label.danger</source>
         <target>Danger</target>
       </trans-unit>

diff --git a/Resources/translations/victoire.fr.xliff b/Resources/translations/victoire.fr.xliff
@@ -242,23 +242,23 @@
         <source>widget_form.form.choice.style.label.default</source>
         <target>Par défaut</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.primary" id="58e3ad0a06334">
+      <trans-unit resname="widget_form.form.choice.style.label.primary" id="58e3ad09e9d32">
         <source>widget_form.form.choice.style.label.primary</source>
-        <target>Primary</target>
+        <target>Principal</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.success" id="58e3ad0a063b9">
+      <trans-unit resname="widget_form.form.choice.style.label.success" id="58e3ad09e9e8a">
         <source>widget_form.form.choice.style.label.success</source>
-        <target>Succes</target>
+        <target>Succès</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.info" id="58e3ad0a06528">
+      <trans-unit resname="widget_form.form.choice.style.label.info" id="58e3ad09e9f29">
         <source>widget_form.form.choice.style.label.info</source>
-        <target>Informative</target>
+        <target>Informatif</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.warning" id="58e3ad0a06591">
+      <trans-unit resname="widget_form.form.choice.style.label.warning" id="58e3ad09e9fb2">
         <source>widget_form.form.choice.style.label.warning</source>
-        <target>Warning</target>
+        <target>Avertissement</target>
       </trans-unit>
-      <trans-unit resname="widget_form.form.choice.style.label.danger" id="58e3ad0a065fc">
+      <trans-unit resname="widget_form.form.choice.style.label.danger" id="58e3ad09ea039">
         <source>widget_form.form.choice.style.label.danger</source>
         <target>Danger</target>
       </trans-unit>

diff --git a/Resources/views/formCreatorQuestion.html.twig b/Resources/views/formCreatorQuestion.html.twig
@@ -72,12 +72,12 @@
         </div>
     </div>
     <div class="question_{{ name }}_proposal question_{{ name }}_" style="display: none">
-        <ul id="question_{{ name }}_proposals-form-list"  data-prototype="<div class='vic-input-group'><input type='text' class='vic-form-control' id ='static_widget_form_questions_{{ name }}_proposal__nameProposal__' name='_static_widget_form[questions][{{ name }}][proposal][__nameProposal__]' value=''></div>">
+        <ul id="question_{{ name }}_proposals-form-list"  data-prototype="<div class='vic-input-group'><input type='text' class='vic-form-control' id ='{{ quantum }}_static_widget_form_questions_{{ name }}_proposal__nameProposal__' name='_{{ quantum }}_static_widget_form[questions][{{ name }}][proposal][__nameProposal__]' value=''></div>">
 
             {% for proposal in proposals %}
                 <li class="proposals{{ name }}">
                     <div class='vic-input-group'>
-                        <input type="text" id ="static_widget_form_questions_{{ name }}_proposal_{{ loop.index0 }}" class="vic-form-control" value="{{ proposal }}" name="_static_widget_form[questions][{{ name }}][proposal][{{ loop.index0 }}]">
+                        <input type="text" id ="{{ quantum }}_static_widget_form_questions_{{ name }}_proposal_{{ loop.index0 }}" class="vic-form-control" value="{{ proposal }}" name="_{{ quantum }}_static_widget_form[questions][{{ name }}][proposal][{{ loop.index0 }}]">
                     </div>
                 </li>
             {% endfor %}

diff --git a/Resources/views/new.html.twig b/Resources/views/new.html.twig
@@ -20,12 +20,12 @@
         </div>
         <div class="vic-form-group vic-well">
            {{ form_row(form.successCallback) }}
+            <div id="widget-form-success-notification" {{ (form.successCallback.vars.value == 'notification' or form.successCallback.vars.value  == '') ? '' : 'class="hidden"' }}>
+                {{ form_row(form.successMessage) }}
+            </div>
             <div id="widget-form-success-redirect" {{ form.successCallback.vars.value == 'redirect' ? '' : 'class="hidden"' }}>
                 {{ form_widget(form.link) }}
             </div>
-            <div id="widget-form-success-notification" {{ form.successCallback.vars.value == 'notification' ? '' : 'class="hidden"' }}>
-                {{ form_row(form.successMessage) }}
-            </div>
             {{ form_row(form.targetEmail) }}
             {{ form_row(form.adminSubject) }}
         </div>
@@ -71,13 +71,13 @@
             CKEDITOR.instances[instance].updateElement();
         }
     });
-    $vic('#static_widget_form_successCallback').on('change', function() {
+    $vic('#{{ quantum }}_static_widget_form_successCallback').on('change', function() {
         $vic('#widget-form-success-notification, #widget-form-success-redirect').addClass('hidden');
         $vic('#widget-form-success-' + $vic(this).val()).removeClass('hidden');
     });
     $vic(document).ready(function() {
 
-        $vic('#static_widget_form_errorNotification').on('click', function() {
+        $vic('#{{ quantum }}_static_widget_form_errorNotification').on('click', function() {
             $vic('#widget-form-error-messsage').toggleClass('hidden');
         });
     });

diff --git a/Resources/views/show.html.twig b/Resources/views/show.html.twig
@@ -87,7 +87,6 @@
                                 {% if question.prefix %}
                                     </div>
                                 {% endif %}
-                                     {{ question.type }}
                                 </label>
                             </div>
                         {% elseif question.type == "date" %}
@@ -102,7 +101,6 @@
                                     {% endfor %}
                                 </select>
                                 <select class="form-control" style="width: auto;float:left;margin:0 5px;" name="{{ formName }}[questions][{{ questionId }}][Month]"{% if question.required %}required="required"{% endif %}>
-                                    {% set months =  {'1' : 'Janvier','2' : 'Février','3' : 'Mars','4' : 'Avril','5' : "Mai", '6' : "Juin", '7' : "Juillet", '8' : "Aout", '9' : "Septembre", '10' : "Octobre", '11' : "Novembre", '12' : "Décembre"} %}
                                     {% for key, month in months %}
                                         <option value="{{ month }}"{% if key == "now"|date('n') %} selected="selected"{% endif %}>{{ month }}</option>
                                     {% endfor %}

diff --git a/Tests/Context/WidgetContext.php b/Tests/Context/WidgetContext.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Victoire\Widget\FormBundle\Tests\Context;
+
+use Knp\FriendlyContexts\Context\RawMinkContext;
+
+class WidgetContext extends RawMinkContext
+{
+    /**
+     * @When /^I add a question to the form$/
+     */
+    public function iAddAQuestionToTheForm()
+    {
+        $page = $this->getSession()->getPage();
+
+        $link = $page->find('xpath', 'descendant-or-self::a[contains(@class, "add_question_link")]');
+
+        if (null === $link) {
+            $message = 'The link to add a question could not be found.';
+            throw new \Behat\Mink\Exception\ResponseTextException($message, $this->getSession());
+        }
+
+        $link->click();
+    }
+
+    /**
+     * @Then /^I should see submit button "(.+)" with icon "(.+)" and style "(.+)"$/
+     */
+    public function iShouldSeeSubmitButtonWithIconAndStyle($text, $icon, $style)
+    {
+        $page = $this->getSession()->getPage();
+
+        $button = $page->find('xpath', sprintf(
+            'descendant-or-self::button[contains(@class, "btn-%s") and @type = "submit" and  contains(normalize-space(.), "%s")]/span[contains(@class, "%s")]',
+            strtolower($style),
+            $text,
+            $icon
+        ));
+
+        if (null === $button) {
+            $message = sprintf(
+                'Submit button with text "%s", icon "%s" and style "%s" could not be found.',
+                $text,
+                $icon,
+                $style
+            );
+            throw new \Behat\Mink\Exception\ResponseTextException($message, $this->getSession());
+        }
+    }
+
+    /**
+     * @When /^I add a choice for question "(.+)"$/
+     */
+    public function iAddAChoiceForQuestion($questionNb)
+    {
+        $page = $this->getSession()->getPage();
+
+        $link = $page->find('xpath', sprintf(
+            'descendant-or-self::a[contains(@class, "add_proposal%s_link")]',
+            $questionNb
+        ));
+
+        if (null === $link) {
+            $message = 'The link to add a question could not be found.';
+            throw new \Behat\Mink\Exception\ResponseTextException($message, $this->getSession());
+        }
+
+        $link->click();
+    }
+
+    /**
+     * @When /^I should see (a simple input|a textarea|a date input|an email input|a checkbox|a multiple choice|a single choice) for question "(.+)"$/
+     */
+    public function iShouldSeeAFormElementForQuestion($formElement, $questionNb)
+    {
+        $questionNb--;
+
+        $page = $this->getSession()->getPage();
+
+        switch ($formElement) {
+            case 'a simple input':
+                $xpaths = ['descendant-or-self::input[@type = "text" and @name = "cms_form_content[questions][%s][]"]'];
+                break;
+            case 'a textarea':
+                $xpaths = ['descendant-or-self::textarea[@type = "textarea" and @name = "cms_form_content[questions][%s][]"]'];
+                break;
+            case 'a date input':
+                $xpaths = [
+                    'descendant-or-self::select[@name = "cms_form_content[questions][%s][Day]"]',
+                    'descendant-or-self::select[@name = "cms_form_content[questions][%s][Month]"]',
+                    'descendant-or-self::select[@name = "cms_form_content[questions][%s][Year]"]',
+                ];
+                break;
+            case 'an email input':
+                $xpaths = ['descendant-or-self::input[@type = "email" and @name = "cms_form_content[questions][%s][]"]'];
+                break;
+            case 'a checkbox':
+                $xpaths = ['descendant-or-self::input[@type = "checkbox" and @name = "cms_form_content[questions][%s][]"]'];
+                break;
+            case 'a multiple choice':
+                $xpaths = ['descendant-or-self::select[@multiple and @name = "cms_form_content[questions][%s][proposal][]"]'];
+                break;
+            case 'a single choice':
+                $xpaths = ['descendant-or-self::select[not(@multiple) and @name = "cms_form_content[questions][%s][proposal][]"]'];
+                break;
+        }
+
+        foreach ($xpaths as $xpath) {
+            $formElement = $page->find('xpath', sprintf($xpath, $questionNb));
+
+            if (null === $formElement) {
+                $message = sprintf(
+                    'The form element for question %s could not be found.',
+                    $questionNb + 1
+                );
+                throw new \Behat\Mink\Exception\ResponseTextException($message, $this->getSession());
+            }
+        }
+    }
+
+    /**
+     * @When /^I should see choice "(.+)" for (multiple|single) choice "(.+)"$/
+     */
+    public function iShouldSeeMultipleChoiceForQuestion($text, $formElement, $questionNb)
+    {
+        $questionNb--;
+
+        $page = $this->getSession()->getPage();
+
+        switch ($formElement) {
+            case 'multiple':
+                $xpath = 'descendant-or-self::select[@multiple and @name = "cms_form_content[questions][%s][proposal][]"]//option[contains(normalize-space(.), "%s")]';
+                break;
+            case 'single':
+                $xpath = 'descendant-or-self::select[not(@multiple) and @name = "cms_form_content[questions][%s][proposal][]"]//option[contains(normalize-space(.), "%s")]';
+                break;
+        }
+
+        $formElement = $page->find('xpath', sprintf(
+            $xpath,
+            $questionNb,
+            $text
+        ));
+
+        if (null === $formElement) {
+            $message = sprintf(
+                'The choice element for question %s could not be found.',
+                $questionNb + 1
+            );
+            throw new \Behat\Mink\Exception\ResponseTextException($message, $this->getSession());
+        }
+    }
+}