fix : sendtime + message video + contact_talent

volume/www/website/www/app/Resources/views/admin/company_edit.html.twig

@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block content %}
-    {{ form_start(formUser) }}
+    {{ form_start(formUser, {'id': 'formUser'}) }}
     <div class="row">
         <div class="col-xs-8">
             <div class="box box-primary">
@@ -31,13 +31,11 @@
     </div>
     <div class="row">
         <div class="col-xs-6">
-            <button class="btn btn-success" type="submit">Enregistrer</button>
+            <button class="btn btn-success edit-email-user" data-toggle="tooltip" type="submit">Enregistrer</button>
         </div>
     </div>
     {{ form_end(formUser) }}
-    
     <br/>
-
     {{ form_start(form) }}
     <div class="row">
         <div class="col-xs-8">
@@ -88,3 +86,33 @@
     {{ form_end(form) }}
 
 {% endblock %}
+
+
+{% block javascripts %}
+    <script>
+        $(document).ready(function () {
+            $('[data-toggle="popover"]').popover();
+
+            $(".edit-email-user").confirm({
+                title: "Êtes vous sûr de modifier l'adresse mail de cet utilisateur ?",
+                content: "Si une erreur de saisie est présente, l'utilisateur ne pourra plus recevoir vos mails.",
+                type: 'ored',
+                boxWidth: '30%',
+                useBootstrap: false,
+                buttons: {
+                    confirm: {
+                        text: 'Confirmer',
+                        action: function() {
+                            $("[name='user_company']").submit();
+                            return true;
+                        }
+                    },
+                    cancel: {
+                        text: 'Annuler'
+                    }
+                }
+            });
+        });
+    </script>
+
+{% endblock %}

volume/www/website/www/app/Resources/views/email/contact_talent.html.twig

@@ -16,7 +16,11 @@
         <br/>
         <br/>
         <div style="text-align:center;">
-            <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Visionner la réponse vidéo</a>
+            {% if answer.ad.alias is null %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Visionner la réponse</a>
+            {% else %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Visionner la réponse</a>
+            {% endif %}
         </div>
         {% else %}
         <br />
@@ -26,7 +30,11 @@
         <br/>
         <br/>
         <div style="text-align:center;">
-            <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Consulter la réponse</a>
+            {% if answer.ad.alias is null %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Consulter la réponse</a>
+            {% else %}
+                <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Consulter la réponse</a>
+            {% endif %}
         </div>
         {% endif %}
         <br>

volume/www/website/www/app/config/config.yml

@@ -106,7 +106,7 @@ fos_user:
         email:
             template:   email/password_resetting.email.twig
     from_email:
-        address: noreply@talentstube.com
+        address: noreply@talentstube.io
         sender_name: talentstube.com
     service:
         mailer: fos_user.mailer.twig_swift

volume/www/website/www/app/config/services.yml

@@ -15,9 +15,9 @@ services:
         class: AppBundle\Utils\Services\AfterLoginRedirection
         arguments: ['@router']
 
-    #app.ad_searcher:
-    #    class: AppBundle\Utils\Services\AdSearcher
-    #    arguments: ['@fos_elastica.finder.ads.adfr']
+    app.ad_searcher:
+        class: AppBundle\Utils\Services\AdSearcher
+        arguments: ['@fos_elastica.finder.ads.adfr']
     
     app.ad_tags_searcher:
         class: AppBundle\Utils\Services\AdSearcher

volume/www/website/www/src/AppBundle/Controller/AdController.php

@@ -309,8 +309,8 @@ class AdController extends Controller
             } else {
                 $session->remove('contratSearch');
             }
-            //$adSearcher = $this->get('app.ad_searcher');
-            $ads = array();//$adSearcher->process($data);
+            $adSearcher = $this->get('app.ad_searcher');
+            $ads = $adSearcher->process($data);
             if(empty($ads)){
                 $ads = $this->getPublishedAds($promoted);
                 $noResults = true;

volume/www/website/www/src/AppBundle/Controller/AnswerController.php

@@ -327,9 +327,11 @@ class AnswerController extends Controller
         if ($answer->getAd() == null) {
             $type = 'spontaneous';
             $title = $answer->getCompany()->getBrandName();
+            $aliasCompany = $answer->getCompany()->getAlias();
         } else {
             $type = 'answer';
             $title = $answer->getAd()->getTitle();
+            $aliasCompany = '';
         }
         $user = $this->getUser();
         $form = $this->createForm(ContactTalentType::class);
@@ -365,6 +367,7 @@ class AnswerController extends Controller
                 'user' => $answer->getUser(),
                 'video' => $message->getVideo(),
                 'message' => $message,
+                'aliasCompany' => $aliasCompany
             ));
 
             $plainView = $this->renderView('email/contact_talent_plain.html.twig', array(

volume/www/website/www/src/AppBundle/Controller/Api/AnswerController.php

@@ -22,6 +22,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use JMS\Serializer\SerializationContext;
 use AppBundle\Exception\ResourceValidationException;
 use AppBundle\Exception\UnknownUserException;
+use \DateTime;
 
 class AnswerController extends FOSRestController
 {
@@ -136,21 +137,21 @@ class AnswerController extends FOSRestController
                     $ad = $em->getRepository('AppBundle:Ad')->find($adId);
                     $answer->setAd($ad);
                 }
-
-                $answer->setVideo($video)
-                    ->setCompany($company);
+                $answer ->setVideo($video)
+                        ->setCompany($company)
+                        ->setSendTime(new \DateTime());
 
                 $em->persist($answer);
                 $em->flush();
 
                 $userCompany = $company->getUsers();
 
-                $message = new Message('Candidature', 'Video', $usr, $userCompany{
+                /*$message = new Message('Candidature', 'Video', $usr, $userCompany{
                     0}, 'CONTACT_TALENT', $answer);
                 $message->setVideo($video);
                 $em->persist($message);
-                $em->flush();
-                $status = array('status' => "success", "idAnswer" => $answer->getId(), "idMessage" => $message->getId());
+                $em->flush();*/
+                $status = array('status' => "success", "idAnswer" => $answer->getId()/*, "idMessage" => $message->getId()*/);
             }
         } else {
             $message = 'Vous n\'êtes pas connecté en tant qu\'utilisateur.';