Merge pull request #100 from VSVverkeerskunde/feature/VSVGVQ-158

VSVGVQ-158 Alias and url info fields
VSVverkeerskunde · Aug 29, 2018 · 2504b13 · 2504b13
2 parents 474bcec + bb4f55c
commit 2504b13
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 42 deletions.
diff --git a/public/js/handleAliases.js b/public/js/handleAliases.js
@@ -0,0 +1,51 @@
+// Make sure to init the URLs
+handleNlUrlState();
+handleFrUrlState();
+
+// Handle company name change => only when alias empty
+$("#form_companyName").focusout(function () {
+
+    let slug = slugify($("#form_companyName").val());
+
+    if ($("#form_aliasNl").val().trim() === '') {
+        $("#form_aliasNl").val(slug);
+        handleNlUrlState();
+    }
+
+    if ($("#form_aliasFr").val().trim() === '') {
+        $("#form_aliasFr").val(slug);
+        handleFrUrlState();
+    }
+});
+
+// Handle NL alias changes => always update URL
+$("#form_aliasNl").focusout(function () {
+    handleNlUrlState();
+});
+
+// Handle FR alias change => always change URL
+$("#form_aliasFr").focusout(function () {
+    handleFrUrlState();
+});
+
+// Set the Nl URL
+function handleNlUrlState() {
+    let aliasNl = $("#form_aliasNl").val().trim();
+
+    if (aliasNl !== '') {
+        $("#form_alias_url_nl").text('www.degroteverkeersquiz.be/quiz/' + aliasNl);
+    } else {
+        $("#form_alias_url_nl").text('');
+    }
+}
+
+// Set the Fr URL
+function handleFrUrlState() {
+    let aliasFr = $("#form_aliasFr").val().trim();
+
+    if (aliasFr !== '') {
+        $("#form_alias_url_fr").text('www.quizdelaroute.be/quiz/' + aliasFr);
+    } else {
+        $("#form_alias_url_fr").text('');
+    }
+}
diff --git a/src/Company/Forms/CompanyFormType.php b/src/Company/Forms/CompanyFormType.php
@@ -39,7 +39,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder
             ->add(
-                'name',
+                'companyName',
                 TextType::class,
                 [
                     'data' => $company ? $company->getName()->toNative() : null,
@@ -111,7 +111,7 @@ public function newCompanyFromData(
     ): Company {
         return new Company(
             $uuidFactory->uuid4(),
-            new NotEmptyString($data['name']),
+            new NotEmptyString($data['companyName']),
             new PositiveNumber($data['nrOfEmployees']),
             new TranslatedAliases(
                 new TranslatedAlias(
@@ -140,7 +140,7 @@ public function updateCompanyFromData(
     ): Company {
         return new Company(
             $company->getId(),
-            new NotEmptyString($data['name']),
+            new NotEmptyString($data['companyName']),
             new PositiveNumber($data['nrOfEmployees']),
             new TranslatedAliases(
                 new TranslatedAlias(

diff --git a/templates/accounts/register.html.twig b/templates/accounts/register.html.twig
@@ -74,20 +74,7 @@
         </div>
     </div>
 
-    <div class="form-group">
-        <div class="row">
-            <div class="col-sm-6">
-                <label for="form_aliasNl">{% trans %}Alias.dutch{% endtrans %}</label>
-                {{ form_widget(form.aliasNl) }}
-                {{ form_errors(form.aliasNl) }}
-            </div>
-            <div class="col-sm-6">
-                <label for="form_aliasFr">{% trans %}Alias.french{% endtrans %}</label>
-                {{ form_widget(form.aliasFr) }}
-                {{ form_errors(form.aliasFr) }}
-            </div>
-        </div>
-    </div>
+    {% include 'companies/aliases.html.twig' %}
 
     <div class="form-group">
         <button type="submit" class="btn btn-primary">{% trans %}Registration.submit{% endtrans %}</button>
@@ -98,11 +85,5 @@
 {% block javascripts %}
     {{ parent() }}
     <script src="{{ asset('js/slugify.js') }}"></script>
-    <script>
-        $("#form_companyName").focusout(function () {
-            let slug = slugify($("#form_companyName").val());
-            $("#form_aliasNl").val(slug);
-            $("#form_aliasFr").val(slug);
-        });
-    </script>
+    <script src="{{ asset('js/handleAliases.js') }}"></script>
 {% endblock %}
diff --git a/templates/companies/add.html.twig b/templates/companies/add.html.twig
@@ -11,9 +11,9 @@
         <div class="form-group">
             <div class="row">
                 <div class="col-6">
-                    <label for="form_email">{% trans %}Company.name{% endtrans %}</label>
-                    {{ form_widget(form.name) }}
-                    {{ form_errors(form.name) }}
+                    <label for="form_companyName">{% trans %}Company.name{% endtrans %}</label>
+                    {{ form_widget(form.companyName) }}
+                    {{ form_errors(form.companyName) }}
                 </div>
                 <div class="col-6">
                     <label for="form_nrOfEmployees">{% trans %}Employees{% endtrans %}</label>
@@ -23,20 +23,7 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="row">
-                <div class="col-6">
-                    <label for="form_firstName">{% trans %}Alias.dutch{% endtrans %}</label>
-                    {{ form_widget(form.aliasNl) }}
-                    {{ form_errors(form.aliasNl) }}
-                </div>
-                <div class="col-6">
-                    <label for="form_lastName">{% trans %}Alias.french{% endtrans %}</label>
-                    {{ form_widget(form.aliasFr) }}
-                    {{ form_errors(form.aliasFr) }}
-                </div>
-            </div>
-        </div>
+        {% include 'companies/aliases.html.twig' %}
 
         <div class="form-group">
             <a role="button"
@@ -47,3 +34,9 @@
         </div>
     {{ form_end(form) }}
 {% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="{{ asset('js/slugify.js') }}"></script>
+    <script src="{{ asset('js/handleAliases.js') }}"></script>
+{% endblock %}
diff --git a/templates/companies/aliases.html.twig b/templates/companies/aliases.html.twig
@@ -0,0 +1,17 @@
+<div class="form-group">
+    <div class="row">
+        <div class="col-sm-6">
+            <label for="form_aliasNl">{% trans %}Alias.dutch{% endtrans %}</label>
+            {{ form_widget(form.aliasNl) }}
+            {{ form_errors(form.aliasNl) }}
+            <small id="form_alias_url_nl" class="form-text text-muted"></small>
+        </div>
+        <div class="col-sm-6">
+            <label for="form_aliasFr">{% trans %}Alias.french{% endtrans %}</label>
+            {{ form_widget(form.aliasFr) }}
+            {{ form_errors(form.aliasFr) }}
+            <small id="form_alias_url_fr" class="form-text text-muted"></small>
+        </div>
+    </div>
+    <small id="form_alias_info" class="form-text text-muted mt-3">{% trans %}Field.alias.info{% endtrans %}</small>
+</div>
diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml
@@ -165,6 +165,7 @@ Field.year.empty: L'année est obligatoire.
 Field.year.min: L'année doit être {{ limit }} ou plus.
 Field.year.max: L'année doit être {{ limit }} ou moins.
 Field.login.warning: Si vous modifiez ce champ, vous devrez vous reconnecter.
+Field.alias.info: __Via bovenstaande links spelen je collega’s de quiz in het Nederlands of het Frans. Enkel alfanumerieke tekens en een koppeltekens zijn toegestaan in de links.
 
 #Flash 
 Registration.error: Une erreur est survenue lors de votre inscription. Réessayez à nouveau.

diff --git a/translations/messages.nl.yml b/translations/messages.nl.yml
@@ -164,7 +164,8 @@ Field.text.empty: 'De tekst mag niet leeg zijn.'
 Field.year.empty: 'Het jaar mag niet leeg zijn.'
 Field.year.min: 'Het jaar moet {{ limit }} of groter zijn.'
 Field.year.max: 'Het jaar moet {{ limit }} of kleiner zijn.'
-Field.login.warning: 'Als je dit veld wijzigt, moet je opnieuw inloggen.'
+Field.login.warning: 'Als je dit veld wijzigt moet je opnieuw inloggen.'
+Field.alias.info: 'Via bovenstaande links spelen je collega’s de quiz in het Nederlands of het Frans. Enkel alfanumerieke tekens en een koppeltekens zijn toegestaan in de links.'
 
 #Flash messages
 Registration.error: 'Er ging iets mis bij het wegschrijven van de gegevens, gelieve opnieuw te proberen.'