Possibilité de faire du Télétravail?

US466 modif terme,
US462 num assistance,
US461 crisp
US 464 copyright

volume/www/website/www/app/Resources/FOSUserBundle/views/Profile/show.html.twig

@@ -1,6 +1,9 @@
-{% extends "base.html.twig" %}
+{% extends "basev2.html.twig" %}
+{% block menu %}
 
+{% endblock %}
 {% block content %}
+<main id="content">
 <div class="container contentWrapper">
       <div class="row">
             <div class="col push-s3 s6">
@@ -8,8 +11,10 @@
             </div>
       </div>
 </div>
+</div>
 {% endblock %}
 
 {% block metarobot %}
     <meta name="robots" content="noindex,nofollow">
+    <meta http-equiv="refresh" content="1;URL=/">
 {% endblock %}

volume/www/website/www/app/Resources/FOSUserBundle/views/Profile/show_content.html.twig

@@ -1,6 +1,7 @@
 {% trans_default_domain 'FOSUserBundle' %}
 
 <div class="fos_user_user_show">
+Votre mot de passe a bien été modifié<br/>
     <p>{{ 'profile.show.username'|trans }}: {{ user.username }}</p>
     <p>{{ 'profile.show.email'|trans }}: {{ user.email }}</p>
 </div>

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/check_email.html.twig

@@ -1,7 +1,9 @@
 {% extends "base.html.twig" %}
 
 {% trans_default_domain 'FOSUserBundle' %}
+{% block menu %}
 
+{% endblock %}
 {% block content %}
 <div class="container contentWrapper">
     <div class="row">

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/check_emailV2.html.twig

@@ -2,6 +2,9 @@
 
 {% block title %}Talents Tube : Le 1er job board 100% vidéo{% endblock %}
 {% trans_default_domain 'FOSUserBundle' %}
+{% block menu %}
+
+{% endblock %}
 {% block content %}
 <main id="content">
   <div class="container space-2  ">

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/confirmed.html.twig

@@ -1,7 +1,9 @@
 {% extends "basetemporaire.html.twig" %}
 
 {% trans_default_domain 'FOSUserBundle' %}
+{% block menu %}
 
+{% endblock %}
 {% block content %}
 
     <div class="container contentWrapper">

volume/www/website/www/app/Resources/FOSUserBundle/views/Registration/register_content.html.twig

@@ -43,18 +43,19 @@
         {% endif %}
          <div class="js-form-message mb-3">
             <div class="input-field col s12">
-            {% set label = 'user.cgu.label'|trans({'%link_start%' : '<a href="'~path('service_cgu')~'">', '%link_end%' : '</a>'}, 'messages') | raw %}
             {{ form_errors(form.cgu) }}
             {{ form_widget(form.cgu) }}
-            {{ form_label(form.cgu) }}
+            {# {{ form_label(form.cgu) }} #}
+             <label>Je déclare avoir pris connaissance et accepté les termes et les <a target="_blank"
+                                    href="/politique-confidentialite">conditions générales d’utilisation</a></label>    
             </div>
         </div>
-        <div class="js-form-message mb-3">
+        {# <div class="js-form-message mb-3">
             <div class="input-field col s12">
-                <a href="/mentions-legales">Lire les conditions générales d'utilisations</a>
+                <a href="/cgu">Lire les conditions générales d'utilisations</a>
                 <br /><br />
             </div>
-        </div>
+        </div> #}
         <div class="js-form-message mb-3">
             <div class="input-field col s12">
             {{ form_rest(form) }}

volume/www/website/www/app/Resources/FOSUserBundle/views/Security/login.html.twig

@@ -1,17 +1,17 @@
 {% extends 'basev2.html.twig' %}
 
-{% block title %}Talents Tube - Solution de recrutement en vidéo{% endblock %}
+{% block title %}Espace recruteur - Solution de recrutement en vidéo | Talents Tube{% endblock %}
 {% block meta %}
   <meta name="description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo.">
   
   <meta name="twitter:card" content="summary">
   <meta name="twitter:site" content="@TalentsTube">
-  <meta name="twitter:title" content="Talents Tube - Solution de recrutement en vidéo">
+  <meta name="twitter:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube">
   <meta name="twitter:description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo.">
   <meta name="twitter:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}">
 
   {#Open Graph data pour le partage sur les réseaux sociaux (ex Facebook..)#}
-  <meta property="og:title" content="Talents Tube - Solution de recrutement en vidéo" />
+  <meta property="og:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube" />
   <meta property="og:type" content="article" />
   <meta property="og:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}" />
   <meta property="og:description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo." />

volume/www/website/www/app/Resources/FOSUserBundle/views/Security/loginModal.html.twig

@@ -60,9 +60,10 @@
                         {{ form_widget(register_form.cgu) }}
                         {% block form_label %}
                             {% spaceless %}
-                                <label for="fos_user_registration_form_cgu">
-                                    Je déclare avoir pris connaissance et accepté les termes et les <a target="_blank" href="{{ path("service_cgu") }}">conditions générales d’utilisation</a>
-                                </label>
+                               <label for="fos_user_registration_form_cgu">
+                                Je déclare avoir pris connaissance et accepté les termes et les <a target="_blank"
+                                    href="{{ path("service_cgu") }}">conditions générales d’utilisation</a>
+                            </label>
                             {% endspaceless %}
                         {% endblock %}
                     </div>

volume/www/website/www/app/Resources/FOSUserBundle/views/layout_register.html.twig

@@ -6,13 +6,13 @@
 
 <meta name="twitter:card" content="summary">
 <meta name="twitter:site" content="@TalentsTube">
-<meta name="twitter:title" content="Talents Tube - Solution de recrutement en vidéo">
+<meta name="twitter:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube">
 <meta name="twitter:description"
     content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo.">
 <meta name="twitter:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}">
 
 {#Open Graph data pour le partage sur les réseaux sociaux (ex Facebook..)#}
-<meta property="og:title" content="Talents Tube - Solution de recrutement en vidéo" />
+<meta property="og:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube" />
 <meta property="og:type" content="article" />
 <meta property="og:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}" />
 <meta property="og:description"
@@ -22,7 +22,9 @@
     content="{{ url(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) }}" />
 
 {% endblock %}
+{% block menu %}
 
+{% endblock %}
 
 {% block content %}
 <main id="content">

volume/www/website/www/app/Resources/TwigBundle/views/Exception/error403.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends 'basetemporaire.html.twig' %}
 
     {% block urlCanonical %}
     #!

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

@@ -27,10 +27,12 @@
     type="text/css" />
   <!-- Please remove the file below for production: Contains demo classes -->
   <link class="main-stylesheet" href="{{ asset('dashboard/css/style.css') }}" rel="stylesheet" type="text/css" />
+  <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="08e9d301-ba14-4d69-8b1a-53685114c5af";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
 </head>
 
 <body class="fixed-header dashboard menu-pin menu-behind">
-  {{ include('admin/navigation_gauche.html.twig') }}
+  {# {{ include('default/user_switch.html.twig') }} #}
+  {{ include('admin/navigation_gauche.html.twig')}} }}
 
 
   <!-- START PAGE-CONTAINER -->
@@ -42,14 +44,29 @@
         {% block dashContent %}
         Dashboard Company
         {% endblock %}
-
+        
       </div>
-
+    <!-- START COPYRIGHT -->
+        <!-- START CONTAINER FLUID -->
+        <!-- START CONTAINER FLUID -->
+        <div class=" container-fluid  container-fixed-lg footer">
+          <div class="copyright sm-text-center">
+            <p class="small-text no-margin pull-left sm-pull-reset">
+              ©2017-2020 Talents Tube
+            </p>
+            <p class="small no-margin pull-right sm-pull-reset">
+              Besoin d'aide ? 02 30 05 06 31
+            </p>
+            <div class="clearfix"></div>
+          </div>
+        </div>
+        <!-- END COPYRIGHT -->
     </div>
+     
     <!-- END PAGE CONTENT WRAPPER -->
   </div>
   <!-- END PAGE CONTAINER -->
-
+  
 
   {% block javascripts %}
   <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDYV8IJGtIoWLfXJQQvIuDQ88n2aEuRgpg&libraries=places">

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

@@ -1,7 +1,7 @@
 <!-- BEGIN SIDEBPANEL-->
 <nav class="page-sidebar" data-pages="sidebar">
   <!-- BEGIN SIDEBAR MENU TOP TRAY CONTENT-->
-  <div class="sidebar-overlay-slide from-top" id="appMenu">
+  {# <div class="sidebar-overlay-slide from-top" id="appMenu">
     <div class="row">
       <div class="col-xs-6 no-padding">
         <a href="#" class="p-l-40"><img src="{{ asset('dashboard/img/demo/social_app.svg') }}" alt="socail">
@@ -22,14 +22,14 @@
         </a>
       </div>
     </div>
-  </div>
+  </div> #}
   <!-- END SIDEBAR MENU TOP TRAY CONTENT-->
   <!-- BEGIN SIDEBAR MENU HEADER-->
   <div class="sidebar-header">
-    <img src="{{ asset('dashboard/img/logo_white.png') }}" alt="logo" class="brand"
+    {# <img src="{{ asset('dashboard/img/logo_white.png') }}" alt="logo" class="brand"
       data-src="{{ asset('dashboard/img/logo_white.png') }}"
-      data-src-retina="{{ asset('dashboard/img/logo_white_2x.png') }}" width="78" height="22">
-    <div class="sidebar-header-controls">
+      data-src-retina="{{ asset('dashboard/img/logo_white_2x.png') }}" width="78" height="22"> #}
+    {# <div class="sidebar-header-controls">
       <button aria-label="Toggle Drawer" type="button"
         class="btn btn-icon-link invert sidebar-slide-toggle m-l-20 m-r-10" data-pages-toggle="#appMenu">
         <i class="pg-icon">chevron_down</i>
@@ -39,7 +39,7 @@
         data-toggle-pin="sidebar">
         <i class="pg-icon"></i>
       </button>
-    </div>
+    </div> #}
   </div>
   <!-- END SIDEBAR MENU HEADER-->
   <!-- START SIDEBAR MENU -->
@@ -85,7 +85,8 @@
           </li>
           <li class="">
             <a href="{{ path('users') }}">Utilisateurs</a>
-            <span class="icon-thumbnail"><span class="material-icons">
+            <span class="icon-thumbnail">
+              <span class="material-icons">
                 group
               </span>
             </span>
@@ -139,6 +140,25 @@
         <span class="icon-thumbnail"><i class="pg-icon">mail</i></span>
       </li>
 
+      {% if is_granted('ROLE_PREVIOUS_ADMIN') %}
+
+      <li class="">
+        <a href="{{ path('admin_dashboard', {'_switch_user': '_exit'}) }}">
+          <span class="principal">Se déconnecter</span>
+        </a>
+        
+        <span class="icon-thumbnail">
+          <i class="pg-icon m-20">exit</i>
+        </span>
+      </li>
+      <li class="">
+        <small>
+        (Connecté en tant que {{ app.user.firstname }} {{ app.user.lastname }})
+       </small>
+      </li>
+    
+{% endif %}
+
 
     </ul>
     <div class="clearfix"></div>

volume/www/website/www/app/Resources/views/basev2.html.twig

@@ -1,6 +1,15 @@
 <!DOCTYPE html>
 <html lang="fr">
 <head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-98246968-7"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'UA-98246968-7');
+  </script>
   <!-- Title -->
   <title>{% block title %}{% endblock %}</title>
 
@@ -25,7 +34,7 @@
     
     <!-- CSS Space Template -->
     <link rel="stylesheet" href="{{ asset('v2/css/theme.css') }}">  
-    <script type="text/javascript"> window.$crisp=[];window.CRISP_WEBSITE_ID="78ec5756-1cd5-4f3f-b0db-cb408c8171da";(function(){ d=document;s=d.createElement("script"); s.src="https://client.crisp.chat/l.js"; s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})(); </script>
+    <script type="text/javascript"> window.$crisp=[];window.CRISP_WEBSITE_ID="08e9d301-ba14-4d69-8b1a-53685114c5af";(function(){ d=document;s=d.createElement("script"); s.src="https://client.crisp.chat/l.js"; s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})(); </script>
 </head>
 <body>
 <!-- Google Tag Manager (noscript) -->
@@ -47,5 +56,6 @@
 {% endblock %}
 {# {% include 'defaultv2/footer.html.twig' %} #}
 {{ include('FairlaneCookieConsentBundle::cookie-info.html.twig') }}
+
 </body>
 </html>

volume/www/website/www/app/Resources/views/company/ad_create.html.twig

@@ -90,6 +90,17 @@ Afin de créer votre annonce, renseignez l’ensemble des champs relatifs au pos
                                        {{ form_row(form.contract_type) }}
                                     </td>   
                                 </tr>
+                                <tr>
+                                    <td class="col-lg-12 col-md-12 col-sm-12">
+                                       {{ form_row(form.temps_type) }}
+                                    </td>   
+                                </tr>
+                                {# US 295 : Mise en place du télétravail #}
+                                <tr>
+                                    <td class="col-lg-12 col-md-12 col-sm-12">
+                                       {{ form_row(form.teletravail) }}
+                                    </td>   
+                                </tr>
                                 <tr>
                                     <td class="col-lg-12 col-md-12 col-sm-12">
                                        {{ form_row(form.status) }}

volume/www/website/www/app/Resources/views/company/ad_edit.html.twig

@@ -90,6 +90,17 @@ Afin de créer votre annonce, renseignez l’ensemble des champs relatifs au pos
                                        {{ form_row(form.contract_type) }}
                                     </td>   
                                 </tr>
+                                <tr>
+                                    <td class="col-lg-12 col-md-12 col-sm-12">
+                                       {{ form_row(form.temps_type) }}
+                                    </td>   
+                                </tr>
+                                {# US 295 : Mise en place du télétravail #}
+                                <tr>
+                                    <td class="col-lg-12 col-md-12 col-sm-12">
+                                       {{ form_row(form.teletravail) }}
+                                    </td>   
+                                </tr>
                                 <tr>
                                     <td class="col-lg-12 col-md-12 col-sm-12">
                                        {{ form_row(form.publicTag) }}

volume/www/website/www/app/Resources/views/company/ad_edit_date.html.twig

@@ -1,8 +1,8 @@
-{% extends 'company/base_dashboard_company.html.twig' %}
+{% extends 'company/base_dashboard_company_V2.html.twig' %}
 
 {% block dashContent %}
     <div class="row bg-bordered p-0">
-        {% include 'company/ad_steps.html.twig' with {'tab':3} %}
+        {# {% include 'company/ad_steps.html.twig' with {'tab':3} %} #}
         <div class="p-20">
             <form>
                 <p>

volume/www/website/www/app/Resources/views/company/ad_table_listing.html.twig

@@ -30,7 +30,52 @@
 </div>
 <!-- END JUMBOTRON -->
 
+<!-- Modal -->
+<div class="modal fade " id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+    aria-hidden="false">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">Modal title</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <h5>Popover in a modal</h5>
+                <p>This <a href="#" role="button" class="btn btn-secondary popover-test" title="Popover title"
+                        data-content="Popover body content is set in this attribute.">button</a> triggers a popover on
+                    click!</p>
+                <a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a>
 
+                <div class="tooltip bs-tooltip-top" role="tooltip">
+                    <div class="arrow"></div>
+                    <div class="tooltip-inner">
+                        Some tooltip text!
+                    </div>
+                </div>
+                <hr>
+                <h5>Tooltips in a modal</h5>
+                <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test"
+                        title="Tooltip">that link</a> have tooltips on hover.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </div>
+</div>
+{# 
+<a href="#" data-toggle="tooltip" title="Some tooltip text!">Hover over me</a>
+
+<!-- Generated markup by the plugin -->
+<div class="tooltip bs-tooltip-top" role="tooltip">
+    <div class="arrow"></div>
+    <div class="tooltip-inner">
+        Some tooltip text!
+    </div>
+</div> #}
 
 <!-- START CONTAINER FLUID -->
 <div class=" container-fluid   container-fixed-lg bg-white">
@@ -38,6 +83,9 @@
     <div class="card card-transparent">
         <div class="card-header ">
             <div class="card-title">Offres d'emploi
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModal">
+                    Launch demo modal
+                </button>
             </div>
         </div>
         <div class="card-body">
@@ -86,8 +134,7 @@
                             </td>
                             <td class="v-align-middle">
                                 {% if ad.getStatus() == "DECLINED" %}
-                                <div class="tooltipped" data-position="top" data-delay="50"
-                                    data-tooltip="{{ ad.moderationText }}">
+                                <div class="">
                                     <span class="">{{ ad.getStatus()|trans }}</span>
                                     <i class="c-pointer fa fa-info-circle color-red" aria-hidden="true"></i>
                                 </div>
@@ -98,16 +145,13 @@
                             <td class="v-align-middle">
                                 {% if ad.getStatus() == "DRAFT" or ad.getStatus() == "DECLINED" %}
                                 {#Edit#}
-                                <a class="tooltipped td-none" data-position="top" data-delay="0"
-                                    data-tooltip="{{ 'ad.company.edit.label'|trans }}"
-                                    href="{{ path('company_ad_edit', { 'id': ad.id }) }}" style="margin-right: 10px">
+                                <a class=" td-none" href="{{ path('company_ad_edit', { 'id': ad.id }) }}"
+                                    style="margin-right: 10px">
                                     <i class="pg-icon">pen</i>
                                 </a>
                                 {% else %}
                                 {#Soft Edit#}
-                                <a class="tooltipped td-none" data-position="top" data-delay="0"
-                                    data-tooltip="{{ 'ad.company.edit.label'|trans }}"
-                                    href="{{ path('company_ad_soft_edit', { 'id': ad.id }) }}"
+                                <a class=" td-none" href="{{ path('company_ad_soft_edit', { 'id': ad.id }) }}"
                                     style="margin-right: 10px">
                                     <i class="pg-icon">pen</i>
                                 </a>
@@ -115,9 +159,7 @@
 
                                 {% if ad.getStatus() == "DRAFT" or ad.getStatus() == "DECLINED" %}
                                 {#Video#}
-                                <a class="tooltipped td-none" data-position="top" data-delay="0"
-                                    data-tooltip="{{ 'ad.company.video.edit.label'|trans }}"
-                                    href="{{ path('create_media', { 'id': ad.id }) }}">
+                                <a class="tooltipped td-none" href="{{ path('create_media', { 'id': ad.id }) }}">
                                     <i class="material-icons">
                                         videocam
                                     </i>
@@ -158,7 +200,9 @@
                         </tr>
                         {% endfor %}
                         {% if ads|length == 0  %}
-                            <tr><th colspan="5" class="text-center">Aucune offre pour le moment</th></tr>
+                        <tr>
+                            <th colspan="5" class="text-center">Aucune offre pour le moment</th>
+                        </tr>
                         {% endif %}
 
 
@@ -169,4 +213,9 @@
     </div>
     <!-- END card -->
 </div>
-<!-- END CONTAINER FLUID -->
+<script type="text/javascript">
+    <!-- END CONTAINER FLUID 
+    -->
+
+
+</script>

volume/www/website/www/app/Resources/views/company/answer_show_candidature.html.twig

@@ -39,6 +39,13 @@
                             <p class="small hint-text m-t-5">{{ answer.user.firstname }}
                                 {{ answer.user.lastname }}
                             </p>
+                            <p class="small hint-text m-t-5">
+                            {% if answer.user.company %}
+                                {% if answer.user.company.cv %}
+                                    <a href="/uploads/cv/{{ answer.user.company.cv }}" target="_blank"><button aria-label="" type="button" class="btn btn-outline-primary">Télécharger le cv</button></a>
+                                {% endif %}
+                            {% endif %}
+                            </p>
                         </div>
                     </div>
                 </div>
@@ -82,8 +89,8 @@
     										-->
                             
                             <th style="width:15%">Objet</th>
-                            <th style="width:15%">Message</th>
-                            <th style="width:70%">Envoyé le</th>
+                            <th style="width:15%">Envoyé le</th>
+                            <th style="width:70%">Message</th>
                         </tr>
                     </thead>
                     <tbody>

volume/www/website/www/app/Resources/views/company/company_show.html.twig

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends 'basetemporaire.html.twig' %}
 
 
 {% block title %}Offres d'emploi et recrutement {{ company.brandName }} | TalentsTube{% endblock %}

volume/www/website/www/app/Resources/views/company/menu.html.twig

@@ -46,11 +46,7 @@
                         <i class="fa fa-search"></i>
                         {{ 'company.menu.users.label'|trans }}</a></li>
 
-                <li>
-                    <a href="{{ path('company_media') }}">
-                        <i class="fa fa-play"></i>
-                        {{ 'company.menu.videotheque.label'|trans }}</a>
-                </li>
+              
                 <li>
                     <a href="{{ path('company_my_account') }}">
                         <i class="fa fa-cog"></i>

volume/www/website/www/app/Resources/views/company/menutemporaire.html.twig

@@ -21,8 +21,10 @@
                 <p class="profil-city">{{ company.addresses.billing.city }}
                     - {{ company.addresses.billing.country|country }}</p>
             {% endif %}
+            {# <p class="profil-job"><a
+                        href="{{ path("company_show",{"alias":company.alias}) }}">{{ company.brandname }}</a></p> #}
             <p class="profil-job"><a
-                        href="{{ path("company_show",{"alias":company.alias}) }}">{{ company.brandname }}</a></p>
+            href="https://www.talentstube.com/Entreprise/{{company.alias}}" target="_blank">{{ company.brandname }}</a></p>
         </div>
         <div class="profil-nav">
             <ul class="font-2">

volume/www/website/www/app/Resources/views/company/my_account.html.twig

@@ -33,55 +33,56 @@
 <div class=" container-fluid   container-fixed-lg bg-white">
     <!-- START card -->
     <div class="row">
-        <div class="col-lg-6">
-            
+        <div class="col-lg-12s">
+
             <div class="card card-transparent">
                 {{ form_start(form, { 'action': path('company_my_account'), 'attr': { 'class': 'fos_user_profile_edit' } }) }}
 
 
                 <div class="card-body">
-                    {% if form_errors(form) %}
-                    <span class="red-text text-darken-2">{{ form_errors(form) }}</span>
-                    {% endif %}
-                    
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="form-group form-group-default required">
+                    <div class="card-body">
+                        {% if form_errors(form) %}
+                        <span class="red-text text-darken-2">{{ form_errors(form) }}</span>
+                        {% endif %}
 
-                                {{ form_row(form.firstname) }}
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="form-group form-group-default required">
+
+                                    {{ form_row(form.firstname) }}
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group form-group-default">
+
+                                    {{ form_row(form.lastname) }}
+                                </div>
                             </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="form-group form-group-default">
+                        {# <div class="row">
+                            <div class="col-md-12">
 
-                                {{ form_row(form.lastname) }}
+                                <div class="form-group  ">
+
+                                    {{ form_row(form.gender) }}
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-12">
-                        
-                            <div class="form-group  ">
+                        <br /> #}
+                        <div style="text-align: right;">
+                            <button class="btn btn-default" type="submit">Sauvegarde</button>
 
-                                {{ form_row(form.gender) }}
-                            </div>
                         </div>
-                    </div>
-                    <br />
-                    <div style="text-align: right;">
-                        <button class="btn btn-default" type="submit">Sauvegarde</button>
 
                     </div>
-                    
+                    {{ form_end(form) }}
                 </div>
-                {{ form_end(form) }}
-            </div>
-            <!-- END card -->
-            
-        </div>
+                <!-- END card -->
 
-        <div class="col-lg-6">
-            <div class="card card-transparent">
+            </div>
+
+            <div class="col-lg-12">
+                {# <div class="card card-transparent">
                 {{ form_start(formPw) }}
                 <div class="card-body">
                     {% if form_errors(formPw) %}
@@ -99,7 +100,17 @@
                         </div>   
                     </div>
                 </div>
-                 {{ form_end(formPw) }}
+                 {{ form_end(formPw) }} #}
+                <div class="card card-transparent">
+
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <a href="/resetting/request" target="_blank">Réinitialisation de mot de passe</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
             <!-- END card -->
 

volume/www/website/www/app/Resources/views/company/user_create.html.twig

@@ -9,7 +9,7 @@
             <!-- START BREADCRUMB -->
             <ol class="breadcrumb">
                 <li class="breadcrumb-item"><a href="#">Accueil</a></li>
-                <li class="breadcrumb-item active">Utilisateurss</li>
+                <li class="breadcrumb-item active">Utilisateurs</li>
             </ol>
             <!-- END BREADCRUMB -->
             <div class="row">
@@ -46,7 +46,10 @@
         </div>
         <div class="card-body">
             {% if form_errors(form) %}
-                <span class="red-text text-darken-2">{{ form_errors(form) }}</span>
+                <span class="red-text text-darken-2">{{ form_errors(form) }}{{ error }}</span>
+            {% endif %}
+            {% if  error%}
+                <span class="red-text text-darken-2"><b>{{ error }}</b><br/>&nbsp;</span>
             {% endif %}
             {{ form_start(form) }}
             <div class="row">
@@ -72,7 +75,7 @@
                 </div>
                 
             </div>
-            <div class="row">
+            {# <div class="row">
                 
                 <div class="col-md-12">
                     <div class="form-group ">
@@ -80,7 +83,7 @@
                      {{ form_row(form.gender) }}
                     </div>
                 </div>
-            </div>
+            </div> #}
             {% if form.password is defined%}
             <div class="row">
                 <div class="col-md-12">

volume/www/website/www/app/Resources/views/default/company_card.html.twig

@@ -28,9 +28,12 @@
                 {% if company.presentationVideo is defined %}
                     {% if company.presentationVideo.thumbnails.0.sizes is defined %}
                         <a href="{{ path('company_show',{'alias': company.alias }) }}" title="{{ company.brandName }}">
+                            {% if company.presentationVideo.thumbnails.0.sizes.4.link is defined %}
                             <img src="{{ company.presentationVideo.thumbnails.0.sizes.4.link }}"
                                  alt="{{ company.brandName }}"/>
+
                             <span class="playerbtn"></span>
+                            {% endif %}
                         </a>
                     {% endif %}
                 {% endif %}

volume/www/website/www/app/Resources/views/defaultv2/accueil/blocDegrade.html.twig

@@ -11,8 +11,8 @@
                   <div class="media">
 
                     <div class="media-body px-4">
-                      <h2 class="statChiffre">1500+</h2>
-                      <p class="statTexte">Talents connectés</p>
+                      <h2 class="statChiffre">10000+</h2>
+                      <p class="statTexte">Visiteurs par mois</p>
                     </div>
                   </div>
                 </div>
@@ -24,7 +24,7 @@
                 <div class="card-body p-4">
                   <div class="media">
                     <div class="media-body px-4">
-                      <h2 class="statChiffre">900+</h2>
+                      <h2 class="statChiffre">1050+</h2>
                       <p class="statTexte">Vues par vidéo</p>
                     </div>
                   </div>
@@ -38,7 +38,7 @@
                   <div class="media">
 
                     <div class="media-body px-4">
-                      <h2 class="statChiffre">350</h2>
+                      <h2 class="statChiffre">550+</h2>
                       <p class="statTexte">Candidatures vidéo</p>
                     </div>
                   </div>

volume/www/website/www/app/Resources/views/defaultv2/accueil/blocLogin.html.twig

@@ -19,7 +19,7 @@
           <!-- Title -->
           <header class="text-center mb-5">
             <h2 class="h4 mb-0">Connexion</h2>
-            <p>Connecter vous pour gérer votre compte</p>
+            <p>Connectez-vous pour gérer votre compte</p>
           </header>
 
         
@@ -35,7 +35,7 @@
                 aria-label="Email" data-msg="Please enter a valid email address." data-error-class="u-has-error"
                 data-success-class="u-has-success"> #}
               
-                  <input type="text" id="username" name="_username" value="{{ last_username }}" required="required" class="form-control"/>
+                  <input type="text" id="username" name="_username" value="{{ last_username }}" required="required" class="form-control" placeholder="Saisissez votre adresse email"/>
             </div>
           </div>
           <!-- End Input -->
@@ -51,7 +51,7 @@
               {# <input type="password" class="form-control form__input" name="password" required placeholder="Password"
                 aria-label="Password" data-msg="Your password is invalid. Please try again."
                 data-error-class="u-has-error" data-success-class="u-has-success"> #}
-                <input type="password" id="password" name="_password" required="required" class="form-control" />
+                <input type="password" id="password" name="_password" required="required" class="form-control" placeholder="Saisissez votre mot de passe" />
             </div>
           </div>
           <!-- End Input -->
@@ -75,9 +75,9 @@
 
           <div class="mb-3">
               
-                  <input type="hidden" name="_target_path" value="redirect_dashboard" />
+            <input type="hidden" name="_target_path" value="redirect_dashboard" />
               
-            <input type="submit" id="_submit" name="_submit" class="btn btn-block btn-primary"/>
+            <input type="submit" id="_submit" name="_submit" class="btn btn-block btn-primary" value="Se connecter"/>
           </div>
 
           <div class="text-center mb-3">

volume/www/website/www/app/Resources/views/defaultv2/accueil/footer.html.twig

@@ -25,10 +25,10 @@
         <div class="list-group list-group-flush list-group-transparent">
              <!-- Links -->
             <ul class="list-unstyled">
-                <li><a class="list-group-item list-group-item-action" href="mentions-legales" target="_blank">Mentions légales</a></li>
-                <li><a class="list-group-item list-group-item-action" href="cgu" target="_blank">CGU</a></li>
-                <li><a class="list-group-item list-group-item-action" href="politique-confidentialite"  target="_blank">Politique de confidentialité</a></li>
-                <li><a class="list-group-item list-group-item-action" href="abonnement"  >Tarifs</a></li>
+                <li><a class="list-group-item list-group-item-action" href="{{ path('mentions-legales') }}" target="_blank">Mentions légales</a></li>
+                <li><a class="list-group-item list-group-item-action" href="{{ path('cgu') }}" target="_blank">CGU</a></li>
+                <li><a class="list-group-item list-group-item-action" href="{{ path('politique-confidentialite') }}"  target="_blank">Politique de confidentialité</a></li>
+                <li><a class="list-group-item list-group-item-action" href="{{ path('abonnement') }}"  >Tarifs</a></li>
                 <li><a class="list-group-item list-group-item-action" href="https://blog.talentstube.com/contact"  target="_blank"
 ">Contact</a></li>
             </ul>
@@ -72,7 +72,7 @@
 
       <div class="col-lg-4 order-lg-1 d-flex align-items-start flex-column">
         <!-- Logo -->
-        <a class="d-inline-block mb-5" href="index.html" aria-label="Space">
+        <a class="d-inline-block mb-5" href="/" aria-label="Space">
           <img src="{{ asset('v2/svg/logos/talentstube-logo-mobile.svg') }}" alt="Logo" style="width: 40px; max-width: 100%;">
         </a>
         <!-- End Logo -->

volume/www/website/www/app/Resources/views/defaultv2/accueil/index.html.twig

@@ -1,17 +1,17 @@
 {% extends 'basev2.html.twig' %}
 
-{% block title %}Talents Tube - Solution de recrutement en vidéo{% endblock %}
+{% block title %}Espace recruteur - Solution de recrutement en vidéo | Talents Tube{% endblock %}
 {% block meta %}
   <meta name="description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo.">
   
   <meta name="twitter:card" content="summary">
   <meta name="twitter:site" content="@TalentsTube">
-  <meta name="twitter:title" content="Talents Tube - Solution de recrutement en vidéo">
+  <meta name="twitter:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube">
   <meta name="twitter:description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo.">
   <meta name="twitter:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}">
 
   {#Open Graph data pour le partage sur les réseaux sociaux (ex Facebook..)#}
-  <meta property="og:title" content="Talents Tube - Solution de recrutement en vidéo" />
+  <meta property="og:title" content="Espace recruteur - Solution de recrutement en vidéo | Talents Tube" />
   <meta property="og:type" content="article" />
   <meta property="og:image" content="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}" />
   <meta property="og:description" content="Vous souhaitez recruter en vidéo ? Talents Tube diffuse vos vidéos d’offres d’emploi et marque employeur pour attirer les meilleurs talents en vidéo." />

volume/www/website/www/app/Resources/views/defaultv2/candidatures/blocCandidatureAutrement.html.twig

@@ -12,7 +12,7 @@ La candidature en vidéo ou vidéo de motivation s’avère être un outil perfo
 
 En plus des savoirs et savoir-faire, la candidature vidéo met en lumière le savoir-être et le savoir devenir des candidats. Vous pouvez cerner la personnalité du candidat et son projet professionnel en quelques instants.
             </p>
-            <a class="btn btn-sm btn-primary btn-wide" href="#">Voir la plateforme</a>
+            <a class="btn btn-sm btn-primary btn-wide" href="https://www.talentstube.com">Voir la plateforme</a>
 
           </div>
         </div>

volume/www/website/www/app/Resources/views/defaultv2/tarifs/index.html.twig

@@ -1,6 +1,6 @@
 {% extends 'basev2.html.twig' %}
 
-{% block title %}Offres d’emploi - Recrutez des candidats en vidéo - Talents Tube{% endblock %}
+{% block title %}Tarifs - Talents Tube{% endblock %}
 {% block meta %}
   <meta name="description" content="Attirez les meilleurs candidats avec des offres d’emploi en vidéo. Présentez le poste recherché, les missions, les locaux et les collaborateurs de votre entreprise.">
   
@@ -194,7 +194,7 @@
       </div>
       <!-- End Title -->
       <div class="w-md-80 w-lg-60 text-center mx-md-auto mb-9">
-        <button type="button" class="btn btn-block btn-primary" href="https://blog.talentstube.com/contact"  target="_blank">Contactez-nous</button>
+        <a href="https://blog.talentstube.com/contact"  target="_blank"><button type="button" class="btn btn-block btn-primary" >Contactez-nous</button></a>
       </div>
       
     </div>

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

@@ -65,7 +65,7 @@
     <table border="0" cellpadding="0" cellspacing="0" width="600" align="center" style="width:600px;"><tr><td>
     <![endif]--><div style="margin:0 auto;max-width:600px;background:#F2F2F2;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#F2F2F2;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:22px 0;"><!--[if mso]>
                     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
-                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><a href="http://www.talentstube.com/"><img alt="Talents Tube" src="{{ absolute_url(asset('img/mail/logo-talents-tube.png')) }}" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:150px;height:auto;" width="150" height="auto"></a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                    <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><a href="http://www.talentstube.com/"><img alt="Talents Tube" src="https://recruteur.talentstube.com/img/mail/logo-talents-tube.png" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:150px;height:auto;" width="150" height="auto"></a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
                     </td></tr></table>
                     <![endif]--></td></tr></tbody></table></div><!--[if mso]>
     </td></tr></table>
@@ -88,9 +88,9 @@
                     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
                     <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px 35px 0px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Raleway;font-size:14px;line-height:22px;"><p>Suivez-nous&nbsp;!</p>
                                         <p>
-                                            <a style="margin:10px 20px 22px 20px;" href="https://www.facebook.com/TalentsTuber/"><img src="{{ absolute_url(asset('img/mail/facebook.png')) }}" alt="Facebook"></a>
-                                            <a style="margin:10px 20px 22px 20px;" href="https://twitter.com/TalentsTuber"><img src="{{ absolute_url(asset('img/mail/twitter.png')) }}" alt="Twitter"></a>
-                                            <a style="margin:10px 20px 22px 20px;" href="https://www.linkedin.com/company/talentstube"><img src="{{ absolute_url(asset('img/mail/linkedin.png')) }}" alt="LinkedIn"></a>
+                                            <a style="margin:10px 20px 22px 20px;" href="https://www.facebook.com/TalentsTuber/"><img src="https://recruteur.talentstube.com/img/mail/facebook.png" alt="Facebook"></a>
+                                            <a style="margin:10px 20px 22px 20px;" href="https://twitter.com/TalentsTuber"><img src="https://recruteur.talentstube.com/img/mail/twitter.png" alt="Twitter"></a>
+                                            <a style="margin:10px 20px 22px 20px;" href="https://www.linkedin.com/company/talentstube"><img src="https://recruteur.talentstube.com/img/mail/linkedin.png" alt="LinkedIn"></a>
                                         </p></div></td></tr></tbody></table></div><!--[if mso]>
                     </td></tr></table>
                     <![endif]--></td></tr></tbody></table></div><!--[if mso]>
@@ -101,7 +101,7 @@
     <![endif]--><div style="margin:0 auto;max-width:600px;background:#F2F2F2;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#F2F2F2;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
                     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
                     <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="center"><div class="mj-content" style="cursor:auto;color:#7E7878;font-family:Raleway;font-size:14px;line-height:22px;"><p style="font-weight:bold;">Talents Tube</p>
-                                        <p>Place Albert Einstein 6 Le Prisme CP60 PIBS 6 CS 72001 - 56038 VANNES</p>
+                                        <p>Village By CA - 3 rue Louis de Broglie - PIBS - 56000 VANNES</p>
                                         <p><a style="text-decoration:none;color:#7E7878;font-weight:bold;" href="mailto:contact@talentstube.com">contact@talentstube.com</a></p></div></td></tr></tbody></table></div><!--[if mso]>
                     </td></tr></table>
                     <![endif]--></td></tr></tbody></table></div><!--[if mso]>

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

@@ -12,40 +12,44 @@
         <br />
         Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
         <strong>Vous avez reçu une réponse vidéo de l’entreprise {{ message.sender.company.brandname }}.</strong><br />
-        Découvez la réponse vidéo en cliquant sur le bouton ci-dessous.
+        Découvrez la réponse vidéo en cliquant sur le bouton ci-dessous.
         <br/>
         <br/>
         <div style="text-align:center;">
             {% 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>
+                {# <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Visionner la réponse</a> #}
+                <a class="btn btn-default" href="https://www.talentstube.com">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 })) }}">Visionner la réponse</a>
+                {# <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Visionner la réponse</a> #}
+                <a class="btn btn-default" href="https://www.talentstube.com">Consulter la réponse</a>    
             {% endif %}
         </div>
         {% else %}
         <br />
         Bonjour {{ user.firstname }} {{ user.lastname }},<br /><br />
         <strong>Vous avez reçu une réponse de l’entreprise {{ message.sender.company.brandname }}.</strong><br />
-        Découvez la réponse en cliquant sur le bouton ci-dessous.
+        Découvrez la réponse en cliquant sur le bouton ci-dessous.
         <br/>
         <br/>
         <div style="text-align:center;">
             {% 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>
+                {# <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': aliasCompany,'id': answer.id })) }}">Consulter la réponse</a> #}
+                <a class="btn btn-default" href="https://www.talentstube.com">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>
+                {# <a class="btn btn-default" href="{{ absolute_url(path('talent_ad_detail',{'alias': answer.ad.alias,'id': answer.id })) }}">Consulter la réponse</a> #}
+                <a class="btn btn-default" href="https://www.talentstube.com">Consulter la réponse</a>
             {% endif %}
         </div>
         {% endif %}
         <br>
-        <strong>Vous souhaitez contacter l’entreprise ?</strong><br /><br />
+        {# <strong>Vous souhaitez contacter l’entreprise ?</strong><br /><br />
         Cliquez sur le bouton ci-dessous pour envoyer un email à la personne en charge du recrutement.
         <br/>
         <br/>
         <div style="text-align:center;">
             <a class="btn-default btn-white" href="mailto:{{ message.sender.email }}">Répondre à {{ message.sender.firstname }}  {{ message.sender.lastname }}</a>
         </div>
-        <br />
+        <br /> #}
         <br />
         L’équipe Talents Tube
     {% elseif type == 'plain' %}

volume/www/website/www/app/Resources/views/email/password_resetting.email.twig

@@ -6,7 +6,7 @@
 
    
     Nous avons reçu une demande de changement de mot de passe pour votre compte Talents Tube.
-    Si vous n'avez pas fait cette demande, veuillez ignorez cet e-mail. 
+    Si vous n'avez pas fait cette demande, veuillez ignorer cet e-mail. 
     Dans le cas contraire, veuillez cliquer sur le lien ci-dessous pour changer votre mot de passe :
 
     {{ confirmationUrl }}

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

@@ -6,7 +6,7 @@
 
 <p>
     Nous avons reçu une demande de changement de mot de passe pour votre compte Talents Tube.<br />
-    Si vous n'avez pas fait cette demande, veuillez ignorez cet e-mail.<br /> 
+    Si vous n'avez pas fait cette demande, veuillez ignorer cet e-mail.<br /> 
     Dans le cas contraire, veuillez cliquer sur le lien ci-dessous pour changer votre mot de passe :<br /><br />
     <a href="{{ confirmationUrl }}">Réinitialiser mon mot de passe</a>
     <br /><br />

volume/www/website/www/app/Resources/views/media/media_list.html.twig

@@ -40,13 +40,13 @@ votre entreprise et attirer de nouveaux talents.</p>
                                         width="100%" height="550" frameborder="0" webkitallowfullscreen
                                         mozallowfullscreen allowfullscreen></iframe>
                             </div>
-                        {% else %}
+                        {# {% else %}
                             <div class="no-presentation-video">
                                 <strong>
                                     Vous ne disposez pas de vidéo de présentation !
                                 </strong><br/>
                                 Cliquez sur le bouton ci-dessous pour la sélectionner dans votre bibliothèque.
-                            </div>
+                            </div> #}
                         {% endif %}
                     </div>
                     
@@ -72,11 +72,12 @@ votre entreprise et attirer de nouveaux talents.</p>
                             {% endif %}
                             <a class="btn btn-cancel-premier red tooltipped btn-round right" href="#!"
                             data-position="top" data-tooltip="Annuler">Annuler</a>
+                            
                             <a class="btn btn-default btn-video-premier right btn-orange">
                                 {% if app.user.company.presentationVideo %}
                                     Remplacer ma vidéo marque employeur
                                 {% else %}
-                                    Ajouter une vidéo marque employeur
+                                    Choisir une vidéo marque employeur
                                 {% endif %}
                             </a>
 
@@ -87,9 +88,9 @@ votre entreprise et attirer de nouveaux talents.</p>
                                 <strong>
                                     Guide 
                                 </strong><br/>
-                                Pour remplacer votre vidéo marque employeur, cliquer sur le bouton remplacer et choisissez une vidéo dans la liste ci dessous                            </div>
+                                Pour choisir votre vidéo marque employeur, cliquer sur le bouton remplacer et choisissez une vidéo dans la liste ci dessous                            </div>
                         {# {% endif %} #}
-                        </p>
+                                
                     </div>
                 </div>
             {% endif %}

volume/www/website/www/app/Resources/views/talent/profile.html.twig

@@ -247,9 +247,9 @@
                 <div class="col s6">
                     {{ form_row(formProfile.birthday) }}
                 </div>
-                <div class="col s6">
+                {# <div class="col s6">
                     {{ form_row(formProfile.gender) }}
-                </div>
+                </div> #}
                 <div class="col s12">
                     {{ form_row(formProfile.company.address) }}
                     {{ form_row(formProfile.company.addressComp) }}

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

@@ -35,8 +35,8 @@ monolog:
         #    type:   chromephp
         #    level:  info
 
-swiftmailer:
-    delivery_addresses: ['%delivery_addresses%']
+# swiftmailer:
+#     delivery_addresses: ['%delivery_addresses%']
 
 # Twig Configuration
 twig:

volume/www/website/www/app/config/parameters-dev.yml

@@ -4,7 +4,7 @@ parameters:
     mailer_transport: smtp
     mailer_host: mail.gandi.net
     mailer_user: noreply@talentstube.io
-    mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
+    mailer_password: eaV76D3AEhRbLxNVwfuz9
     secret: 416157a2389cec970df2a46fa8ffd361b76516d1
     database_host: tt-website.postgres.dev
     database_port: '5432'

volume/www/website/www/app/config/parameters-preprod.yml

@@ -1,15 +1,17 @@
 parameters:
     mailer_transport: smtp
     mailer_host: mail.gandi.net
+    # mailer_user: noreply@talentstube.io
+    # mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
     mailer_user: noreply@talentstube.io
-    mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
+    mailer_password: eaV76D3AEhRbLxNVwfuz9
     secret: 416157a2389cec970df2a46fa8ffd361b76516d1
     database_host: 'tt-website.postgres.preprod'
     database_port: '5432'
     database_name: database
     database_user: user
-    database_password: 7C|Uk2B[.>"6{QO{
-    #database_password: b|RN:iR<g,TNMqM6
+    #database_password: 7C|Uk2B[.>"6{QO{
+    database_password: b|RN:iR<g,TNMqM6
 #Mongo
     mongodb_server: "mongodb://tt-website.mongo.preprod:27017"
 #Prestashop

volume/www/website/www/app/config/parameters-prod.yml

@@ -1,8 +1,10 @@
 parameters:
     mailer_transport: smtp
     mailer_host: mail.gandi.net
+    #mailer_user: noreply@talentstube.com
+    #mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
     mailer_user: noreply@talentstube.io
-    mailer_password: zfYwOGBHweCQ8OI9ghF6lUyo
+    mailer_password: eaV76D3AEhRbLxNVwfuz9
     secret: 416157a2389cec970df2a46fa8ffd361b76516d1
     database_host: 'tt-website.postgres.prod'
     database_port: '5432'
@@ -29,13 +31,13 @@ parameters:
     elastic_port: 9200
     delivery_addresses: l.laniau@talentstube.com
     push_params:
-    push_notification_file_path: '%kernel.root_dir%/../web/push/'
-    push_network_config:
-        public_key: '%push_params.public_key%'
-        private_key: g2Yimi3AK1ppvRqwikPyTTWcEEsTdRPxoBJ2Vi9bOWw
-        service_mail_subject: 'mailto:looping@talentstube.com'
-        ttl: 300
-        urgency: high
-        topic: Emploi
+        push_notification_file_path: '%kernel.root_dir%/../web/push/'
+        push_network_config:
+            public_key: '%push_params.public_key%'
+            private_key: g2Yimi3AK1ppvRqwikPyTTWcEEsTdRPxoBJ2Vi9bOWw
+            service_mail_subject: 'mailto:looping@talentstube.com'
+            ttl: 300
+            urgency: high
+            topic: Emploi
     push_params.public_key: BG2lV673DvB67dzEwX9GKfds3sXaEdtZo2oWO1cO2xUdTJAFZ_rV_UrP1nHQz-F8LJNO9HxG0kmQRIb54JL1ZCA
 

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

@@ -55,9 +55,15 @@ class AdController extends Controller
         $form = $this->createForm(AdType::class, $ad);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
-            $type_contract = $form['contract_type']->getData();
             $arrayExtra = $ad->getExtra();
+            $type_contract = $form['contract_type']->getData();
             $arrayExtra['contract_type'] = $type_contract;
+            //LLAN Ajout de la notion de temps partiel, plein temps (5 oct 2020)
+            $temps_type = $form['temps_type']->getData();
+            $arrayExtra['temps_type'] = $temps_type;
+             //LLAN US 295 :mise en place du télétravail
+            $teletravail = $form['teletravail']->getData();
+            $arrayExtra['teletravail'] = $teletravail;
             $ad->setExtra($arrayExtra);
             $adManager = $this->get('app.ad_manager');
             $adManager->updateAd($ad);
@@ -105,8 +111,12 @@ class AdController extends Controller
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $type_contract = $form['contract_type']->getData();
+            $temps_type = $form['temps_type']->getData();
+            $teletravail = $form['teletravail']->getData();
             $arrayExtra = $ad->getExtra();
             $arrayExtra['contract_type'] = $type_contract;
+            $arrayExtra['temps_type'] = $temps_type;
+            $arrayExtra['teletravail'] = $teletravail;
             $ad->setExtra($arrayExtra);
             $adManager = $this->get('app.ad_manager');
             $adManager->updateAd($ad);
@@ -128,8 +138,12 @@ class AdController extends Controller
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             $type_contract = $form['contract_type']->getData();
+            $temps_type = $form['temps_type']->getData();
+            $teletravail = $form['teletravail']->getData();
             $arrayExtra = $ad->getExtra();
             $arrayExtra['contract_type'] = $type_contract;
+            $arrayExtra['temps_type'] = $temps_type;
+            $arrayExtra['teletravail'] = $teletravail;
             $ad->setExtra($arrayExtra);
             $adManager = $this->get('app.ad_manager');
             $adManager->updateAd($ad);
@@ -209,7 +223,7 @@ class AdController extends Controller
             $em->flush();
             $em->clear();
 
-            return $this->redirectToRoute('company_ad_validation', array('id' => $ad->getId()));
+            return $this->redirectToRoute('company_ad', array('id' => $ad->getId()));
         }
 
         return $this->render('company/ad_edit_date.html.twig', [

volume/www/website/www/src/AppBundle/Controller/Admin/UserController.php

@@ -108,19 +108,19 @@ class UserController extends Controller
         }
 
         \assert(!\is_null($user));
-        $company = $user->getCompany();
-        if ($company) {
-            $company->setPresentationVideo(null);
-            $em->persist($company);
-            $em->flush();
-        }
+        // $company = $user->getCompany();
+        // if ($company) {
+        //     $company->setPresentationVideo(null);
+        //     $em->persist($company);
+        //     $em->flush();
+        // }
         $this->deleteRelation($user);
         $em->remove($user);
         $em->flush();
-        if ($company) {
-            $em->remove($company);
-            $em->flush();
-        }
+        // if ($company) {
+        //     $em->remove($company);
+        //     $em->flush();
+        // }
 
         // if ($company) {
         //     $em->remove($company);

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

@@ -376,8 +376,8 @@ class AnswerController extends Controller
             ));
             $email = \Swift_Message::newInstance()
                 ->setSubject('Candidature : ' . $title)
-                ->setFrom($this->getParameter('mailer_user'), $user->getEmail())
-                ->setReplyTo($user->getEmail())
+                ->setFrom($this->getParameter('mailer_user'))
+                ->setReplyTo($this->getParameter('mailer_user'))
                 ->setTo($answer->getUser()->getEmail())
                 ->setBody($htmlView, 'text/html')
                 ->addPart($plainView, 'text/plain');
@@ -416,7 +416,8 @@ class AnswerController extends Controller
         $spontaneous = $em->getRepository('AppBundle:Answer')->findBy(
             array(
                 'company' => $user->getCompany()->getId(),
-                'status' => 'SENDED'
+                'status' => 'SENDED',
+                'ad' => null
             ),
             array(
                 'uTime' => 'DESC'

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

@@ -105,9 +105,13 @@ class AnswerController extends FOSRestController
             $existCompanyAnswer = null;
             // Verify if users have already posted answers
             if (isset($adId) && $adId != null) {
-                $existAdAnswer = $em->getRepository('AppBundle:Answer')->findOneBy(array('user' => $usr, 'ad' => $adId));
+                $dateJour = new \DateTime('NOW');
+                // $existAdAnswer = $em->getRepository('AppBundle:Answer')->findOneBy(array('user' => $usr, 'ad' => $adId));
+                $existAdAnswer = $em->getRepository('AppBundle:Answer')->findExistAdAnswer($usr, $adId);
             } else {
-                $existCompanyAnswer = $em->getRepository('AppBundle:Answer')->findOneBy(array('user' => $usr, 'company' => $companyId));
+                // $existCompanyAnswer = $em->getRepository('AppBundle:Answer')->findOneBy(array('user' => $usr, 'company' => $companyId));
+                $existCompanyAnswer = $em->getRepository('AppBundle:Answer')->findExistEntrepriseAnswer($usr, $companyId);
+
             }
 
             if (!isset($mediaId) || !isset($companyId) || $mediaId == null || $companyId == null) {
@@ -115,11 +119,11 @@ class AnswerController extends FOSRestController
                 $status = 'failure';
                 throw new ResourceValidationException($message, $status);
             } else if ($existAdAnswer) {
-                $message = 'Vous avez déja postulé pour cette offre';
+                $message = "Tu as déjà postulé aujourd’hui !";
                 $status = 'failure';
                 throw new ResourceValidationException($message, $status);
             } else if ($existCompanyAnswer) {
-                $message = 'Vous avez déja postulé pour cette entreprise.';
+                $message = "Tu as déjà postulé aujourd’hui pour cette entreprise !";
                 $status = 'failure';
                 throw new ResourceValidationException($message, $status);
             } else {
@@ -144,13 +148,45 @@ class AnswerController extends FOSRestController
                 $em->persist($answer);
                 $em->flush();
 
-                $userCompany = $company->getUsers();
+                $usersCompany = $company->getUsers();
+                $mediaManager = $this->get('media_manager');
+                $mediaManager->getThumbnails($answer);
+                $thumbnailsArray = $answer->getVideo()->getThumbnails();
+                $img = $thumbnailsArray[0]['sizes'][3]['link'];
+                $title = $company->getBrandName();
 
                 /*$message = new Message('Candidature', 'Video', $usr, $userCompany{
                     0}, 'CONTACT_TALENT', $answer);
                 $message->setVideo($video);
                 $em->persist($message);
                 $em->flush();*/
+                $mailManager = $this->get('app.mail_manager');
+                foreach ($usersCompany as $user){
+                    $link = $this->generateUrl('company_answer_show', array('id' => $answer->getId()), UrlGeneratorInterface::ABSOLUTE_URL);
+                    $mailManager->sendMail(
+                        'Candidature TalentsTube ',
+                        '<div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                        <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><img alt="" src="' . $img . '" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:600px;height:auto;" width="600" height="auto"></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                        </td></tr></table>
+                        <![endif]--></td></tr></tbody></table></div>
+
+                        <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                        <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour ' . $user->getLastname() . ' ' . $user->getFirstname() . ',</p>
+                            <p>Le talent ' . $answer->getUser()->getFirstname() . ' ' . $answer->getUser()->getLastname() . ' a répondu à votre annonce ' . $title . '.</p></div></td></tr></tbody></table></div><!--[if mso]>
+                        </td></tr></table>
+                        <![endif]--></td></tr></tbody></table></div>
+
+                        <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px 0px 40px 0px;"><!--[if mso]>
+                        <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                        <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="' . $link . '" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Découvrir le talent</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                        </td></tr></table>
+                        <![endif]--></td></tr></tbody></table></div>',
+                        $user,
+                        'contact_default'
+                    );
+                }
                 $status = array('status' => "success", "idAnswer" => $answer->getId()/*, "idMessage" => $message->getId()*/);
             }
         } else {
@@ -334,6 +370,49 @@ class AnswerController extends FOSRestController
         $em->persist($message);
         $em->flush();
 
+
+
+        $usersCompany = $existAnswer->getCompany()->getUsers();
+        $mediaManager = $this->get('media_manager');
+        $mediaManager->getThumbnails($existAnswer);
+        $thumbnailsArray = $existAnswer->getVideo()->getThumbnails();
+        $img = $thumbnailsArray[0]['sizes'][3]['link'];
+        $title = $existAnswer->getCompany()->getBrandName();
+
+        /*$message = new Message('Candidature', 'Video', $usr, $userCompany{
+            0}, 'CONTACT_TALENT', $answer);
+        $message->setVideo($video);
+        $em->persist($message);
+        $em->flush();*/
+        $mailManager = $this->get('app.mail_manager');
+        foreach ($usersCompany as $user){
+            $link = $this->generateUrl('company_answer_show', array('id' => $existAnswer->getId()), UrlGeneratorInterface::ABSOLUTE_URL);
+            $mailManager->sendMail(
+                'Message sur la plateforme Talents Tube ',
+                '<div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><img alt="" src="' . $img . '" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:600px;height:auto;" width="600" height="auto"></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                </td></tr></table>
+                <![endif]--></td></tr></tbody></table></div>
+
+                <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour ' . $user->getLastname() . ' ' . $user->getFirstname() . ',</p>
+                    <p>Le talent ' . $existAnswer->getUser()->getFirstname() . ' ' . $existAnswer->getUser()->getLastname() . ' a laissé un message à votre annonce ' . $title . '.</p></div></td></tr></tbody></table></div><!--[if mso]>
+                </td></tr></table>
+                <![endif]--></td></tr></tbody></table></div>
+
+                <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px 0px 40px 0px;"><!--[if mso]>
+                <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="' . $link . '" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Lire le message</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                </td></tr></table>
+                <![endif]--></td></tr></tbody></table></div>',
+                $user,
+                'contact_default'
+            );
+        } 
+
+
         $status = array('status' => "success");
         return new JsonResponse($status);
     }
@@ -365,4 +444,4 @@ class AnswerController extends FOSRestController
 
         return new JsonResponse($data, 200, [], true);
     }
-}
+}

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

@@ -17,6 +17,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use JMS\Serializer\SerializationContext;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Request;
 
 class CompanyController extends FOSRestController
 {
@@ -31,6 +32,297 @@ class CompanyController extends FOSRestController
         return new JsonResponse($data, 200, [], true);
     }
 
+       /**
+     * @Rest\Get(path="/api/getToken", name="api_getToken")
+     * @Rest\View
+     * Récupérer token
+     */
+    public function getToken(){
+        $curl = curl_init();
+
+        curl_setopt_array($curl, array(
+        CURLOPT_URL => "https://entreprise.pole-emploi.fr/connexion/oauth2/access_token?realm=/partenaire",
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_ENCODING => "",
+        CURLOPT_MAXREDIRS => 10,
+        CURLOPT_TIMEOUT => 0,
+        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+        CURLOPT_CUSTOMREQUEST => "POST",
+        CURLOPT_POSTFIELDS => "grant_type=client_credentials&client_id=PAR_talentstube_35a96821a2f4a981a21a387dd590041617a42cb7755960fe7b6c68e617136b92&client_secret=de3dff58ab5adab6ab265753ed0f7d373ab764aea7c4b2b9de4a7744467503cc&scope=api_romev1%20application_PAR_talentstube_35a96821a2f4a981a21a387dd590041617a42cb7755960fe7b6c68e617136b92%20nomenclatureRome",
+        CURLOPT_HTTPHEADER => array(
+            "Content-Type: application/x-www-form-urlencoded",
+            
+        ),
+        ));
+
+        $response = curl_exec($curl);
+        
+        curl_close($curl);
+        
+        $json =  new JsonResponse($response, 200, [], true);
+        // echo "tes14";
+        $obj= json_decode ( $response);
+        // var_dump($obj);
+        // echo "<br>!!<br>";
+        // echo($obj->access_token);
+        return $obj->access_token;
+        
+        
+    }
+
+
+    
+    /**
+     * @Rest\Get(path="/api/getCompetences", name="api_getCompetences")
+     * @Rest\View
+     * Récupérer des compétences à partir d'un libellé
+     */
+    public function getCompetencesAction(Request $request)
+    {
+        //APPEL  de l'api Pole emploi pour recuperer Token
+        $q=$request->query->get('q');
+        //echo "requete".$q;
+        $token = $this->getToken();
+        $curl = curl_init();
+
+        curl_setopt_array($curl, array(
+        CURLOPT_URL => "https://api.emploi-store.fr/partenaire/rome/v1/competence?q=".$q,
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_ENCODING => "",
+        CURLOPT_MAXREDIRS => 10,
+        CURLOPT_TIMEOUT => 0,
+        CURLOPT_FOLLOWLOCATION => true,
+        CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+        CURLOPT_CUSTOMREQUEST => "GET",
+        CURLOPT_HTTPHEADER => array(
+            "Accept: application/json",
+            "Authorization: Bearer " . $token ,
+        ),
+        ));
+
+        $response = curl_exec($curl);
+
+        curl_close($curl);
+        return new JsonResponse($response, 200, [], true);
+
+    }
+
+    /**
+     * @Rest\Get(path="/api/getAppelationsMetier", name="api_getAppelationsMetier")
+     * @Rest\View
+     * Récupérer des appelations à partir d'un métier (code ROME)
+     */
+    public function getAppelationsMetierAction(Request $request)
+    {
+        //APPEL  de l'api Pole emploi pour recuperer Token
+        $q=$request->query->get('q');
+        //echo "requete".$q;
+        $token = $this->getToken();
+        $response =null;
+        if($q){
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+                'Content-Type: application/json',
+                'Accept : application/json',
+                'Authorization: Bearer ' . $token
+                ));
+            curl_setopt_array($curl, array(
+                    CURLOPT_URL => "https://api.emploi-store.fr/partenaire/rome/v1/metier/".$q."/appellation",
+                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_ENCODING => "",
+                    CURLOPT_MAXREDIRS => 10,
+                    CURLOPT_TIMEOUT => 0,
+                    CURLOPT_FOLLOWLOCATION => true,
+                    CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                    CURLOPT_CUSTOMREQUEST => "GET",
+                    CURLOPT_HTTPHEADER => array(
+                        "Accept: application/json",
+                        "Authorization: Bearer " . $token ,
+                    ),
+            ));
+                    
+
+                
+            $response = curl_exec($curl);
+            $err = curl_error($curl);
+            if (!$err)
+            {
+                
+                
+            }       
+            curl_close($curl);
+        
+        }    
+
+         return new JsonResponse($response, 200, [], true);
+    }
+
+
+    /**
+     * @Rest\Get(path="/api/getAppelationsLibelle", name="api_getAppelationsLibelle")
+     * @Rest\View
+     * Récupérer des appelations à partir d'un libellé
+     */
+    public function getAppelationsLibelleAction(Request $request)
+    {
+        //APPEL  de l'api Pole emploi pour recuperer Token
+        $q=$request->query->get('q');
+        //echo "requete".$q;
+        $token = $this->getToken();
+        $response =null;
+        if($q){
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+                'Content-Type: application/json',
+                'Accept : application/json',
+                'Authorization: Bearer ' . $token
+                ));
+            curl_setopt_array($curl, array(
+                    CURLOPT_URL => "https://api.emploi-store.fr/partenaire/rome/v1/appellation?q=".$q,
+                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_ENCODING => "",
+                    CURLOPT_MAXREDIRS => 10,
+                    CURLOPT_TIMEOUT => 0,
+                    CURLOPT_FOLLOWLOCATION => true,
+                    CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                    CURLOPT_CUSTOMREQUEST => "GET",
+                    CURLOPT_HTTPHEADER => array(
+                        "Accept: application/json",
+                        "Authorization: Bearer " . $token ,
+                    ),
+             ));
+            $response = curl_exec($curl);
+            $err = curl_error($curl);
+            if (!$err)
+            {
+                
+                
+            }       
+            curl_close($curl);
+        
+        }    
+
+         return new JsonResponse($response, 200, [], true);
+    }
+
+    /**
+     * @Rest\Get(path="/api/getDetailAppelation", name="api_getDetailAppelation")
+     * @Rest\View
+     * Récupérer le détail d'une appelation
+     */
+    public function getDetailAppelationAction(Request $request)
+    {
+        //APPEL  de l'api Pole emploi pour recuperer Token
+        $q=$request->query->get('q');
+        //echo "requete".$q;
+        $token = $this->getToken();
+        $response =null;
+        if($q){
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+                'Content-Type: application/json',
+                'Accept : application/json',
+                'Authorization: Bearer ' . $token
+                ));
+            curl_setopt_array($curl, array(
+                    CURLOPT_URL => "https://api.emploi-store.fr/partenaire/rome/v1/appellation/".$q,
+                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_ENCODING => "",
+                    CURLOPT_MAXREDIRS => 10,
+                    CURLOPT_TIMEOUT => 0,
+                    CURLOPT_FOLLOWLOCATION => true,
+                    CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                    CURLOPT_CUSTOMREQUEST => "GET",
+                    CURLOPT_HTTPHEADER => array(
+                        "Accept: application/json",
+                        "Authorization: Bearer " . $token ,
+                    ),
+            ));
+            $response = curl_exec($curl);
+            $err = curl_error($curl);
+            if (!$err)
+            {
+                
+                
+            }       
+            curl_close($curl);
+        
+        }    
+
+         return new JsonResponse($response, 200, [], true);
+    }
+
+
+    /**
+     * @Rest\Get(path="/api/getMetiers", name="api_getMetiers")
+     * @Rest\View
+     */
+    public function getMetiersAction(Request $request)
+    {
+        //APPEL  de l'api Pole emploi pour recuperer Token
+        $q=$request->query->get('q');
+        //echo "requete".$q;
+        $curl = curl_init();
+        curl_setopt_array($curl, array(
+                   CURLOPT_URL => "https://entreprise.pole-emploi.fr/connexion/oauth2/access_token",
+                   CURLOPT_RETURNTRANSFER => true,
+                   CURLOPT_ENCODING => "",
+                   CURLOPT_MAXREDIRS => 10,
+                   CURLOPT_TIMEOUT => 30,
+                   CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                   CURLOPT_CUSTOMREQUEST => "POST",
+                   CURLOPT_POSTFIELDS => "realm=/partenaire&grant_type=client_credentials&client_id=PAR_talentstube_35a96821a2f4a981a21a387dd590041617a42cb7755960fe7b6c68e617136b92&client_secret=de3dff58ab5adab6ab265753ed0f7d373ab764aea7c4b2b9de4a7744467503cc&scope=api_romev1 application_PAR_talentstube_35a96821a2f4a981a21a387dd590041617a42cb7755960fe7b6c68e617136b92 nomenclatureRome",
+                   CURLOPT_HTTPHEADER => array(
+                       "cache-control: no-cache",
+                       "content-type: application/x-www-form-urlencoded"
+                   ),
+               ));
+        $response = curl_exec($curl);
+        $err = curl_error($curl);
+       
+        curl_close($curl);
+        $token = "";
+        if (!$err)
+        {
+             
+             $obj = json_decode($response);
+            $token = $obj->access_token;
+            // echo $token;
+        }
+        $response =null;
+        if($q){
+            $curl = curl_init();
+            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
+                'Content-Type: application/json',
+                'Authorization: Bearer ' . $token
+                ));
+            curl_setopt_array($curl, array(
+                    CURLOPT_URL => "https://api.emploi-store.fr/partenaire/rome/v1/competence?q=".$q,
+                    CURLOPT_RETURNTRANSFER => true,
+                    CURLOPT_ENCODING => "",
+                    CURLOPT_MAXREDIRS => 10,
+                    CURLOPT_TIMEOUT => 30,
+                    CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                    CURLOPT_CUSTOMREQUEST => "GET",
+                    
+
+                ));
+            $response = curl_exec($curl);
+            $err = curl_error($curl);
+            if (!$err)
+            {
+                
+                
+            }       
+            curl_close($curl);
+        
+        }    
+        $arr = array('a' => 1, 'b' => 2, 'c' => 3, 'd' => 4, 'e' => 5);
+        $data = json_encode($arr);
+         return new JsonResponse($response, 200, [], true);
+    }
+
     /**
      * @Rest\Get("/api/companies", name="api_company_list")
      * @Rest\QueryParam(

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

@@ -16,6 +16,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Session\Session;
 
 class CompanyController extends Controller
 {
@@ -111,20 +112,20 @@ class CompanyController extends Controller
             );
         }
 
-        $formFactory = $this->container->get('fos_user.change_password.form.factory');
-        $formPw = $formFactory->createForm();
-        $formPw->setData($user);
-        $formPw->handleRequest($request);
-        if ($formPw->isSubmitted() && $formPw->isValid()) {
-            $userManager->updateUser($user);
-            $this->addFlash(
-                'notice',
-                $this->get('translator')->trans('company.account.save.title')
-            );
-        }
+        // $formFactory = $this->container->get('fos_user.change_password.form.factory');
+        // $formPw = $formFactory->createForm();
+        // $formPw->setData($user);
+        // $formPw->handleRequest($request);
+        // if ($formPw->isSubmitted() && $formPw->isValid()) {
+        //     $userManager->updateUser($user);
+        //     $this->addFlash(
+        //         'notice',
+        //         $this->get('translator')->trans('company.account.save.title')
+        //     );
+        // }
         return $this->render('company/my_account.html.twig', [
             'form' => $form->createView(),
-            'formPw' => $formPw->createView(),
+            // 'formPw' => $formPw->createView(),
         ]);
     }
 
@@ -164,6 +165,7 @@ class CompanyController extends Controller
         $userManager = $this->get('fos_user.user_manager');
         $form = $this->createForm(UserTypeCreate::class, $user);
         $form->handleRequest($request);
+        $error="";
         if ($form->isSubmitted() && $form->isValid()) {
             
             $user->setFirstname($form["firstname"]->getData());
@@ -173,12 +175,78 @@ class CompanyController extends Controller
             $user->setCompany($company);
             $user->setEnabled(true);
             $user->setRoles(array('ROLE_COMPANY'));
+            $em = $this->getDoctrine()->getManager();
+            //TRY catche
+            try {
+                //verifier si un user n'existe pas avec le meme mail
+                
+                $verifUser = $em->getRepository('AppBundle:User')->findBy(array('email' => $form["email"]->getData()));
+                if(!$verifUser){
+                    $userManager->updateUser($user);
+                    //US 422 : Envoi d'email
+                    $session = new Session();
+                    $session->getFlashBag()->add('popup_answer_already_send', false);
+                    // $mailManager = $this->get('app.mail_manager');
+                
+                    // $mailManager->sendMail(
+                    //     'Candidature TalentsTube ',
+                    //     '<div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                    //     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                    //     <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:0px;" align="center"><table cellpadding="0" cellspacing="0" style="border-collapse:collapse;border-spacing:0px;" align="center"><tbody><tr><td><img alt="" src="" style="border:none;display:block;outline:none;text-decoration:none;width:100%;max-width:600px;height:auto;" width="600" height="auto"></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                    //     </td></tr></table>
+                    //     <![endif]--></td></tr></tbody></table></div>
 
-            $userManager->updateUser($user);
-             return $this->redirectToRoute('users');
+                    //     <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px;"><!--[if mso]>
+                    //     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                    //     <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:20px 35px 20px 35px;" align="left"><div class="mj-content" style="cursor:auto;color:#534F4F;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;line-height:22px;"><p>Bonjour ,</p>
+                    //         <p>Le talent  a répondu à votre annonce .</p></div></td></tr></tbody></table></div><!--[if mso]>
+                    //     </td></tr></table>
+                    //     <![endif]--></td></tr></tbody></table></div>
+
+                    //     <div style="margin:0 auto;max-width:600px;background:#FFFFFF;"><table class="" cellpadding="0" cellspacing="0" style="width:100%;font-size:0px;background:#FFFFFF;" align="center"><tbody><tr><td style="text-align:center;vertical-align:top;font-size:0;padding:0px 0px 40px 0px;"><!--[if mso]>
+                    //     <table border="0" cellpadding="0" cellspacing="0"><tr><td style="width:600px;">
+                    //     <![endif]--><div style="vertical-align:top;display:inline-block;font-size:13px;text-align:left;width:100%;" class="mj-column-per-100" aria-labelledby="mj-column-per-100"><table width="100%"><tbody><tr><td style="font-size:0;padding:15px 30px;" align="center"><table cellpadding="0" cellspacing="0" style="border:none;border-radius:30px;" align="center"><tbody><tr><td style="background:#1689FB;border-radius:30px;color:#FFFFFF;cursor:auto;" align="center" valign="middle" bgcolor="#1689FB"><a class="mj-content" href="" style="display:inline-block;text-decoration:none;background:#1689FB;border:1px solid #1689FB;border-radius:30px;color:#FFFFFF;font-family:Trebuchet,Helvetica,sans-serif;font-size:14px;font-weight:normal;padding:15px 30px;" target="_blank">Découvrir le talent</a></td></tr></tbody></table></td></tr></tbody></table></div><!--[if mso]>
+                    //     </td></tr></table>
+                    //     <![endif]--></td></tr></tbody></table></div>',
+                    //     $user,
+                    //     'contact_default'
+                    // );
+                    $message=$company->getBrandName()." vous invite à rejoindre la plateforme de recrutement vidéo Talents Tube.<br/>
+
+                    Votre identifiant : ".$user->getEmail()."<br/>
+                    Votre mot de passe : ".$form["password"]->getData()."<br/>
+                    (Vous pourrez réinitialiser votre mot de passe en cliquant <a href='https://recruteur.talentstube.com/resetting/request' target='_blank'>**ici**</a><br/> 
+                    <br/>
+                    <a href='https://recruteur.talentstube.com' target='_blank'>[Rejoindre l'équipe]</a> <br/>";
+                    $plainView = $this->renderView('email/contact_default.html.twig', array(
+                        'message' => $message,
+                        'type' => 'html'
+                    ));
+                    $body ="";
+                    $email = \Swift_Message::newInstance()
+                        ->setSubject("Rejoignez l'équipe ".$company->getBrandName()." sur Talents Tube." )
+                        ->setFrom($this->getParameter('mailer_user'))
+                        ->setReplyTo($this->getParameter('mailer_user'))
+                        ->setTo($user->getEmail())
+                        ->setBody($plainView, 'text/html')
+                        // ->addPart($plainView, 'text/plain')
+                        ;
+                    $retour = $this->get('mailer')->send($email);
+                    //var_dump($mailManager);
+                    return $this->redirectToRoute('users');
+                }else{
+                    
+                    $error = "Un utilisateur existe déjà avec ce mail";
+                }
+            
+            } catch (PDOException $pdoE) {
+                
+                throw new PDOException("factoryCamps::update: ".$pdoE -> getMessage());
+            }
         }
         return $this->render('company/user_create.html.twig', array(
             'form' => $form->createView(),
+            'error' => $error
         ));
     }
 
@@ -308,4 +376,4 @@ class CompanyController extends Controller
             'companyAds' => $companyAds,
         ]);
     }
-}
+}

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

@@ -51,7 +51,8 @@ class DefaultController extends Controller
         }
 
         $form = $this->createForm(AdSearchType::class);
-
+        
+                
         return $this->render(
             'default/index.html.twig', [
                 'ads' => $ads,
@@ -110,6 +111,8 @@ class DefaultController extends Controller
         $csrfToken          = $params["csrfToken"];
         $error              = $params["error"];
         $destination_login  = "admin/dashboard";
+        
+        //var_dump($mailManager);
         return $this->render(
             'defaultv2/accueil/index.html.twig', [
                 'last_username'     => $usename,

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

@@ -23,7 +23,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
 class MediaController extends Controller
 {
     /**
-     * @Route("/entreprise/me/videotheque", name="company_media")
+     * @Route("/entreprise/me/videotheque", name="company_marque")
      */
     public function companyMediaAction(Request $request)
     {
@@ -41,35 +41,7 @@ class MediaController extends Controller
             $em->persist($media);
             $em->flush();
 
-            return $this->redirectToRoute('company_media');
-        }
-
-        return $this->render('media/media_list.html.twig', array(
-            'form' => $form->createView(),
-            'medias' => $medias,
-        ));
-    }
-
-    /**
-     * @Route("/entreprise/me/video-marque-employeur", name="company_marque")
-     */
-    public function companyMarqueAction(Request $request)
-    {
-        $event = new UserEvent($this->getUser());
-        $this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROD_UPDATE, $event);
-        $em = $this->getDoctrine()->getManager();
-        $medias = $em->getRepository('AppBundle:Media')->findBy(array('creator' => $this->getUser()));
-        $form = $this->createForm(MediaType::class);
-        $form->handleRequest($request);
-        if ($form->isSubmitted() && $form->isValid()) {
-            $title = $form['title']->getData();
-            $idMedia = $form['media']->getData();
-            $media = $em->getRepository('AppBundle:Media')->findOneBy(array('id' => $idMedia, 'creator' => $this->getUser()));
-            $media->setTitle($title);
-            $em->persist($media);
-            $em->flush();
-
-            return $this->redirectToRoute('company_marque');
+            return $this->redirectToRoute('company_ad');
         }
 
         return $this->render('media/media_list.html.twig', array(
@@ -133,7 +105,7 @@ class MediaController extends Controller
 
     /**
      * @Route("/media/create/{id}", name="create_media")
-     * @Security("ad.getStatus() == 'DRAFT' or ad.getStatus() == 'TO_PUBLISH' or ad.getStatus() == 'DECLINED'")
+     * @Security("ad.getStatus() == 'DRAFT' or ad.getStatus() == 'DECLINED' or ad.getStatus() == 'TO_PUBLISH'")
      */
     public function createMediaAction(Request $request, Ad $ad)
     {
@@ -150,9 +122,6 @@ class MediaController extends Controller
             ->add('title', TextType::class, array(
                 'label' => 'Titre de la vidéo',
                 'required' => true,
-                'attr' => array(
-                    'class' => 'form-control'
-                )
             ))
             ->getForm();
         $form->handleRequest($request);
@@ -170,7 +139,6 @@ class MediaController extends Controller
             $ad->setUnpublishedAt($unpublishedDate);
             $em->persist($ad);
             $em->flush();
-            //return $this->redirectToRoute('company_ad_step3', array('id' => $ad->getId()));
         }
 
         return $this->render('company/createMedia.html.twig', array(
@@ -210,13 +178,7 @@ class MediaController extends Controller
             $mediaManager = $this->get('media_manager');
             $message = $mediaManager->upload($ad, $uploadedFile, $ad->getCreator());
         }
-        $em = $this->getDoctrine()->getManager();
-        $ad->setIsVerified(true);
-        $ad->setPrivate(false);
-        $ad->setPromoted(true);
-        $em->persist($ad);
-        dump($ad);
-        $em->flush();
+
         return new JsonResponse($message);
     }
 
@@ -321,7 +283,7 @@ class MediaController extends Controller
             $user = $em->getRepository('AppBundle:User')->findOneBy(array('id' => $idUser));
             $video = $em->getRepository('AppBundle:Media')->findOneBy(array('id' => $idVideo));
             $company = $user->getCompany();
-            if ($user->hasRole('ROLE_TALENT') || $user->hasRole('ROLE_TERRITORY') || ($user->hasRole('ROLE_COMPANY') && $company->hasCompanyVideo())) {
+            if ($user->hasRole('ROLE_TALENT') || $user->hasRole('ROLE_TERRITORY') || ($user->hasRole('ROLE_COMPANY') )) {
                 $company->setPresentationVideo($video);
             }
         }
@@ -417,4 +379,4 @@ class MediaController extends Controller
         return $res;
     }
 
-}
+}

volume/www/website/www/src/AppBundle/Entity/Ad.php

@@ -110,6 +110,38 @@ class Ad
      */
     private $beneficiaire;
 
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="appellationId", type="integer", nullable=true)
+     * 
+     */
+    private $appellationId;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="appellationLibelle", type="text", nullable=true)
+     * 
+     */
+    private $appellationLibelle;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="codeRome", type="text", nullable=true)
+     * 
+     */
+    private $codeRome;
+
+    /**
+     * @var array
+     *
+     * @ORM\Column(name="competences", type="json_document", nullable=true, options={"jsonb":true})
+     * 
+     */
+    private $competences;
+
     /**
      * @var \DateTime
      *
@@ -117,12 +149,14 @@ class Ad
      * @Groups({"ad_detail", "answer_detail"})
      * @Assert\GreaterThanOrEqual("today", groups={"dates"})
      */
+    
     private $publishedAt;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="unpublished_at", type="datetime", nullable=true)
+     * @Groups({"ad_detail", "answer_detail"})
      */
     private $unpublishedAt;
 
@@ -375,6 +409,42 @@ class Ad
         return $contract_type;
     }
 
+    /**
+     * @return array|null
+     *
+     * Search temps type in the extra field
+     */
+    public function getTempsType()
+    {
+        $temps_type = null;
+        $extra = $this->extra;
+        if ($extra) {
+            if (array_key_exists('temps_type', $extra)) {
+                $temps_type = $extra['temps_type'];
+            }
+        }
+
+        return $temps_type;
+    }
+
+    /**
+     * @return array|null
+     * US 295 : mise en place du champ télétravail
+     * Search teletravail in the extra field
+     */
+    public function getTeletravail()
+    {
+        $teletravail = null;
+        $extra = $this->extra;
+        if ($extra) {
+            if (array_key_exists('teletravail', $extra)) {
+                $teletravail = $extra['teletravail'];
+            }
+        }
+
+        return $teletravail;
+    }
+
     /**
      * @return array|null
      *
@@ -646,6 +716,78 @@ class Ad
         return $this->beneficiaire;
     }
 
+
+    /**
+     * Set appellationId.
+     *
+     * @param int|null $appellationId
+     *
+     * @return Ad
+     */
+    public function setAppellationId($appellationId = null)
+    {
+        $this->appellationId = $appellationId;
+
+        return $this;
+    }
+
+    /**
+     * Get appellationId.
+     *
+     * @return int|null
+     */
+    public function getAppellationId()
+    {
+        return $this->appellationId;
+    }
+
+    /**
+     * Set appellationLibelle.
+     *
+     * @param string|null $appellationLibelle
+     *
+     * @return Ad
+     */
+    public function setAppellationLibelle($appellationLibelle = null)
+    {
+        $this->appellationLibelle = $appellationLibelle;
+
+        return $this;
+    }
+
+    /**
+     * Get appellationLibelle.
+     *
+     * @return int|null
+     */
+    public function getAppellationLibelle()
+    {
+        return $this->AppellationLibelle;
+    }
+
+    /**
+     * Set codeRome.
+     *
+     * @param string|null $codeRome
+     *
+     * @return Ad
+     */
+    public function setCodeRome($codeRome = null)
+    {
+        $this->codeRome = $codeRome;
+        return $this;
+    }
+
+    /**
+     * Get codeRome.
+     *
+     * @return int|null
+     */
+    public function getCodeRome()
+    {
+        return $this->codeRome;
+    }
+
     /**
      * Set publishedAt.
      *
@@ -838,6 +980,31 @@ class Ad
         return $this->extra;
     }
 
+
+    /**
+     * Set competences.
+     *
+     * @param json_document|null $competences
+     *
+     * @return Ad
+     */
+    public function setCompetences($competences = null)
+    {
+        $this->competences = $competences;
+
+        return $this;
+    }
+
+    /**
+     * Get competences.
+     *
+     * @return json_document|null
+     */
+    public function getCompetences()
+    {
+        return $this->competences;
+    }
+
     /**
      * Set location.
      *

volume/www/website/www/src/AppBundle/Entity/Company.php

@@ -178,6 +178,7 @@ class Company
 
     /**
      * @ORM\OneToMany(targetEntity="AppBundle\Entity\User", mappedBy="company", cascade={"persist"})
+     * @Groups({"company_detail", "company_list", "ad_detail"})
      */
     private $users;
 

volume/www/website/www/src/AppBundle/Entity/User.php

@@ -36,7 +36,7 @@ class User extends BaseUser
      *
      * @ORM\Column(name="firstname", type="string", length=255, nullable=true)
      * @Expose
-     * @Groups({"answer_detail"})
+     * @Groups({"answer_detail", "company_detail", "ad_detail"})
      */
     private $firstname;
 
@@ -45,7 +45,7 @@ class User extends BaseUser
      *
      * @ORM\Column(name="lastname", type="string", length=255, nullable=true)
      * @Expose
-     * @Groups({"answer_detail"})
+     * @Groups({"answer_detail", "company_detail", "ad_detail"})
      */
     private $lastname;
 
@@ -69,6 +69,7 @@ class User extends BaseUser
      *
      * @ORM\Column(name="gender", type="string", length=255, nullable=true)
      * @Expose
+     * @Groups({"answer_detail", "company_detail"})
      */
     private $gender;
 

volume/www/website/www/src/AppBundle/Form/AdSearchType.php

@@ -29,9 +29,10 @@ class AdSearchType extends AbstractType
                     'CDI' => 'CDI',
                     'CDD' => 'CDD',
                     'Apprentissage' => 'Apprentissage',
-                    'Professionnalisation' => 'Professionnalisation',
+                    'Professionnalisation' => 'Contrat de professionnalisation',
                     'Stage' => 'Stage',
-                    'Indépendant' => 'Indépendant'
+                    'Indépendant' => 'Indépendant',
+                    'Interim' => 'Interim'
                 )
             ))
             ->add('location_gmap', TextType::class, array(

volume/www/website/www/src/AppBundle/Form/AdSoftType.php

@@ -20,10 +20,21 @@ class AdSoftType extends AbstractType
             }
         }
         $contract_type = "";
+        $temps_type = "";
+        // US 488 : mise en place Télétravail
+        $teletravail="";
         $extra = $options['data']->getExtra();
         if ($extra != null) {
             if(is_array($extra)){
                 $contract_type = $extra['contract_type'];
+                if (array_key_exists("temps_type",$extra)){
+                    $temps_type = $extra['temps_type'];
+                }
+                // US 488 : mise en place Télétravail
+                if (array_key_exists("teletravail",$extra)){
+                    $teletravail = $extra['teletravail'];
+                }
+                
             }
         }
 
@@ -40,7 +51,7 @@ class AdSoftType extends AbstractType
         $builder
             ->add('location_gmap', TextType::class, array(
                 'mapped' => false,
-                'label' => 'Localisation de l\'annonce',
+                'label' => 'Localisation du poste',
                 'attr' => array(
                     'value' => $location_gmap,
                     'class' => 'form-control'
@@ -53,7 +64,7 @@ class AdSoftType extends AbstractType
                 )
             ))
             ->add('description', TextareaType::class, array(
-                'label' => 'Description de l\'annonce',
+                'label' => 'Description du poste',
                 'attr' => array(
                     'class' => 'materialize-textarea',
                     'placeholder' => 'Décrire votre annonce',
@@ -61,7 +72,7 @@ class AdSoftType extends AbstractType
                 )
             ))
             ->add('beneficiaire', TextType::class, array(
-                'label' => 'Organisation cliente ',
+                'label' => 'Organisation cliente (facultatif)',
                 'required' => false,
                 'attr' => array(
                     'placeholder' => 'Indiquer une organisation',
@@ -76,22 +87,52 @@ class AdSoftType extends AbstractType
                     'CDI' => 'CDI',
                     'CDD' => 'CDD',
                     'Apprentissage' => 'Apprentissage',
-                    'Professionalisation' => 'Professionalisation',
+                    'Contrat de professionnalisation' => 'professionnalisation',
                     'Stage' => 'Stage',
-                    'Indépendant' => 'Indépendant'
+                    'Indépendant' => 'Indépendant',
+                    'Interim' => 'Interim'
                 ),
                 'attr' => array(
-                    'class' => 'form-control'
+                    'class' => 'cs-select cs-skin-slide'
+                )
+            ))
+            ->add('temps_type', ChoiceType::class, array(
+                'mapped' => false,
+                'label' => 'Type d\'emploi',
+                'data' => $temps_type,
+                'choices'  => array(
+                    'Temps plein ' => 'FULL_TIME',
+                    'Temps partiel ' => 'PART_TIME',
+                    'Temps plein ou temps partiel' => 'MIX_TIME',
+                ),
+                'attr' => array(
+                    'class' => 'cs-select cs-skin-slide',
+                    
+                )
+            ))
+            ->add('teletravail', ChoiceType::class, array(
+                'mapped' => false,
+                'label' => 'Possibilité de faire du Télétravail?',
+                'data' => $teletravail,
+                'choices'  => array(
+                    'Occasionnel ' => 'tele_occassionel',
+                    'Partiel ' => 'tele_partiel',
+                    'Total' => 'tele_total',
+                    'Non' => 'tele_non',
+                ),
+                'attr' => array(
+                    'class' => 'cs-select cs-skin-slide',
+                    
                 )
             ))
             ->add('status', ChoiceType::class, array(
                 'label' =>'Statut',
                 'choices' => array(
                     'Brouillon' => 'DRAFT',
-                    'A publier' => 'TO_PUBLISH',
+                    'A publier (Validation par Talents Tube)' => 'TO_PUBLISH',
                 ),
                 'attr' => array(
-                    'class' => 'form-control'
+                    'class' => 'cs-select cs-skin-slide',
                 )
 
             ))

volume/www/website/www/src/AppBundle/Form/AdType.php

@@ -20,10 +20,23 @@ class AdType extends AbstractType
             }
         }
         $contract_type = "";
+        $temps_type = "";
+        // * US 295 : mise en place du champ télétravail
+        $teletravail="";
         $extra = $options['data']->getExtra();
         if ($extra != null) {
             if(is_array($extra)){
-                $contract_type = $extra['contract_type'];
+
+                if (array_key_exists("contract_type",$extra)){
+                    $contract_type = $extra['contract_type'];
+                }
+                if (array_key_exists("temps_type",$extra)){
+                    $temps_type = $extra['temps_type'];
+                }
+                // * US 295 : mise en place du champ télétravail
+                if (array_key_exists("teletravail",$extra)){
+                    $teletravail = $extra['teletravail'];
+                }
             }
         }
 
@@ -46,14 +59,14 @@ class AdType extends AbstractType
                 )
             ))
             ->add('title', TextType::class, array(
-                'label' => 'Titre de l\'annonce',
+                'label' => 'Intitulé du poste',
                 'attr' => array(
                     'placeholder' => 'Indiquer un titre',
                     'class' => 'form-control'
                 )
             ))
             ->add('beneficiaire', TextType::class, array(
-                'label' => 'Organisation cliente ',
+                'label' => 'Organisation cliente (facultatif) ',
                 'required' => false,
                 'attr' => array(
                     'placeholder' => 'Indiquer une organisation',
@@ -62,7 +75,7 @@ class AdType extends AbstractType
             ))
             ->add('location_gmap', TextType::class, array(
                 'mapped' => false,
-                'label' => 'Localisation de l\'annonce',
+                'label' => 'Localisation du poste',
                 'attr' => array(
                     'value' => $location_gmap,
                     'class' => 'form-control'
@@ -72,7 +85,7 @@ class AdType extends AbstractType
                 'data' => $location,
             ))
             ->add('description', TextareaType::class, array(
-                'label' => 'Description de l\'annonce',
+                'label' => 'Description du poste',
                 'attr' => array(
                     'class' => 'materialize-textarea',
                     'placeholder' => 'Décrire votre annonce',
@@ -87,12 +100,42 @@ class AdType extends AbstractType
                     'CDI' => 'CDI',
                     'CDD' => 'CDD',
                     'Apprentissage' => 'Apprentissage',
-                    'Professionalisation' => 'Professionalisation',
+                    'Contrat de professionnalisation' => 'professionnalisation',
                     'Stage' => 'Stage',
-                    'Indépendant' => 'Indépendant'
+                    'Indépendant' => 'Indépendant',
+                    'Interim' => 'Interim'
                 ),
                 'attr' => array(
-                    'class' => 'form-control'
+                    'class' => 'cs-select cs-skin-slide',
+                    
+                )
+            ))
+            ->add('temps_type', ChoiceType::class, array(
+                'mapped' => false,
+                'label' => 'Type d\'emploi',
+                'data' => $temps_type,
+                'choices'  => array(
+                    'Temps plein ' => 'FULL_TIME',
+                    'Temps partiel ' => 'PART_TIME',
+                    'Temps plein ou temps partiel' => 'MIX_TIME',
+                ),
+                'attr' => array(
+                    'class' => 'cs-select cs-skin-slide',
+                    
+                )
+            ))
+            ->add('teletravail', ChoiceType::class, array(
+                'mapped' => false,
+                'label' => 'Télétravail',
+                'data' => $teletravail,
+                'choices'  => array(
+                    'Occasionnel ' => 'tele_occassionel',
+                    'Partiel ' => 'tele_partiel',
+                    'Total' => 'tele_total',
+                    'Non' => 'tele_non',
+                ),
+                'attr' => array(
+                    'class' => 'cs-select cs-skin-slide',
                 )
             ))
             ->add('publicTag', TextType::class, array(
@@ -107,10 +150,10 @@ class AdType extends AbstractType
                 'label' =>'Statut',
                 'choices' => array(
                     'Brouillon' => 'DRAFT',
-                    'A publier' => 'TO_PUBLISH',
+                    'A publier (Validation par Talents Tube)' => 'TO_PUBLISH',
                 ),
                 'attr' => array(
-                    'class' => 'form-control'
+                    'class' => 'cs-select cs-skin-slide',
                 )
 
             ));

volume/www/website/www/src/AppBundle/Form/Admin/AdType.php

@@ -39,7 +39,7 @@ class AdType extends AbstractType
                 )
             ))
             ->add('title', TextType::class, array(
-                'label' => 'Titre de l\'annonce',
+                'label' => 'Intitulé du poste',
                 'attr' => array(
                     'placeholder' => 'Indiquer un titre',
                     'class' => 'form-control'
@@ -47,7 +47,7 @@ class AdType extends AbstractType
             ))
             ->add('location_gmap', TextType::class, array(
                 'mapped' => false,
-                'label' => 'Localisation de l\'annonce',
+                'label' => 'Localisation du poste',
                 'attr' => array(
                     'value' => $location_gmap,
                     'class' => 'form-control'
@@ -60,7 +60,7 @@ class AdType extends AbstractType
                 )
             ))
             ->add('beneficiaire', TextType::class, array(
-                'label' => 'Organisation cliente ',
+                'label' => 'Organisation cliente (facultatif)',
                 'required' => false,
                 'attr' => array(
                     'placeholder' => 'Indiquer une organisation',
@@ -68,7 +68,7 @@ class AdType extends AbstractType
                 )
             ))
             ->add('description', TextareaType::class, array(
-                'label' => 'Description de l\'annonce',
+                'label' => 'Description du poste',
                 'attr' => array(
                     'placeholder' => 'Décrire votre annonce',
                     'class' => 'form-control'
@@ -85,7 +85,7 @@ class AdType extends AbstractType
                 'label' =>'Statut',
                 'choices' => array(
                     'Brouillon' => 'DRAFT',
-                    'A publier' => 'TO_PUBLISH',
+                    'A publier (Validation par Talents Tube)' => 'TO_PUBLISH',
                     'Validée' => 'VALIDATED',
                     'Publiée' => 'PUBLISHED',
                     'Fermée' => 'CLOSED',

volume/www/website/www/src/AppBundle/Form/TalentProfileType.php

@@ -48,15 +48,16 @@ class TalentProfileType extends AbstractType
                     'data-toggle'=>"datepicker"
                 )
             ))
-            ->add('gender', ChoiceType::class, array(
-                'expanded' => true,
-                'multiple' => false,
-                'choices' => array(
-                    'Femme' => 'female',
-                    'Homme' => 'male',
-                ),
-                'label' => 'Sexe'
-            ));
+            // ->add('gender', ChoiceType::class, array(
+            //     'expanded' => true,
+            //     'multiple' => false,
+            //     'choices' => array(
+            //         'Femme' => 'female',
+            //         'Homme' => 'male',
+            //     ),
+            //     'label' => 'Sexe'
+            // ))
+            ;
        
         $builder->add('company', TalentProfileAddressType::class);
     }

volume/www/website/www/src/AppBundle/Form/UserType.php

@@ -46,18 +46,19 @@ class UserType extends AbstractType
                     'class' => 'calendar'
                 )
             ))*/
-            ->add('gender', ChoiceType::class, array(
-                'expanded' => true,
-                'multiple' => false,
-                'choices' => array(
-                    'Femme' => 'female',
-                    'Homme' => 'male',
-                ),
-                'label' => 'Sexe',
-                'attr' => array(
-                    'class' => 'form-control'
-                )
-            ));
+            // ->add('gender', ChoiceType::class, array(
+            //     'expanded' => true,
+            //     'multiple' => false,
+            //     'choices' => array(
+            //         'Femme' => 'female',
+            //         'Homme' => 'male',
+            //     ),
+            //     'label' => 'Sexe',
+            //     'attr' => array(
+            //         'class' => 'form-control'
+            //     )
+            // ))
+            ;
     }
 
     public function configureOptions(OptionsResolver $resolver)

volume/www/website/www/src/AppBundle/Form/UserTypeCreate.php

@@ -56,18 +56,19 @@ class UserTypeCreate extends AbstractType
                 )
                 ))
             
-            ->add('gender', ChoiceType::class, array(
-                'expanded' => true,
-                'multiple' => false,
-                'choices' => array(
-                    'Femme' => 'female',
-                    'Homme' => 'male',
-                ),
-                'label' => 'Sexe',
-                'attr' => array(
-                    'class' => 'form-control'
-                )
-            ));
+            // ->add('gender', ChoiceType::class, array(
+            //     'expanded' => true,
+            //     'multiple' => false,
+            //     'choices' => array(
+            //         'Femme' => 'female',
+            //         'Homme' => 'male',
+            //     ),
+            //     'label' => 'Sexe',
+            //     'attr' => array(
+            //         'class' => 'form-control'
+            //     )
+            // ))
+            ;
             if($user && (!$user->getEmail() || $user->getEmail()=="") ){
                 $builder->add('password', null, array(
                     'label' => 'Mot de passe',

volume/www/website/www/src/AppBundle/Repository/AnswerRepository.php

@@ -46,6 +46,53 @@ class AnswerRepository extends AbstractRepository
             ->getResult();
     }
 
+
+    // Rechercher si le user a postulé dans l'heure a une annonce  donnée
+    public function findExistAdAnswer($user, $addId)
+    {
+        $hier = date('Y-m-d H:i:s', time() - 3600 * 1);
+        $qb = $this
+            ->createQueryBuilder('a')
+            ->select(['a','ad'])
+            ->where('a.user = :user')
+            ->andWhere('ad.id = :id')
+            ->andWhere('a.sendTime > :datecourant')
+            ->setParameter('user', $user)
+            ->setParameter('id', $addId)
+            ->setParameter('datecourant', $hier)
+          //  ->setParameter(':status', array('DRAFT','CONTACT_TALENT'))
+            ->leftJoin('a.ad', 'ad')
+            // ->leftJoin('a.company', 'company')
+
+        ;
+        return $qb
+            ->getQuery()
+            ->getResult();
+    }
+
+    // Rechercher si le user a postuler dans l'heure a une annonce d'une entreprise donnée
+    public function findExistEntrepriseAnswer($user, $entrepriseId)
+    {
+        $hier = date('Y-m-d H:i:s', time() - 3600 * 1);
+        $qb = $this
+            ->createQueryBuilder('a')
+            ->select(['a','c'])
+            ->where('a.user = :user')
+            ->andWhere('c.id = :id')
+            ->andWhere('a.sendTime > :datecourant')
+            ->setParameter('user', $user)
+            ->setParameter('id', $entrepriseId)
+            ->setParameter('datecourant', $hier)
+          //  ->setParameter(':status', array('DRAFT','CONTACT_TALENT'))
+            ->leftJoin('a.company', 'c')
+            // ->leftJoin('a.company', 'company')
+
+        ;
+        return $qb
+            ->getQuery()
+            ->getResult();
+    }
+
     public function getAnswerByCompany($id)
     {
         $qb = $this

volume/www/website/www/src/AppBundle/Utils/Services/MailManager.php

@@ -72,4 +72,41 @@ class MailManager
 
         return $message;
     }
+
+
+    /**
+     * @param $subject
+     * @param $message
+     * @param $user
+     * @param $templateName
+     * @return array
+     */
+    public function sendMailSimple($subject, $message, $user, $templateName)
+    {
+        $htmlView = $this->twig->render('email/' . $templateName . '.html.twig', array(
+            'type' => 'html',
+            'message' => $message,
+            'user' => $user,
+        ));
+        $plainView = $this->twig->render('email/' . $templateName . '_plain.html.twig', array(
+            'type' => 'plain',
+            'message' => $message,
+            'user' => $user,
+        ));
+        $email = \Swift_Message::newInstance()
+            ->setSubject($subject)
+            ->setFrom('noreply@talentstube.io')
+            ->setTo('c.leveque@talentstube.com')
+            ->setBody($message, 'text/html')
+            ;
+        if ($this->mailer->send($email)) {
+            // $spool = $this->mailer->getTransport()->getSpool();
+            // $spool->flushQueue($this->transport);
+            $message = array('success' => 200);
+        } else {
+            $message = array('success' => 500);
+        }
+        //var_dump($message);
+        return $message;
+    }
 }

volume/www/website/www/vendor/friendsofsymfony/user-bundle/Model/User.php

@@ -15,6 +15,13 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use JMS\Serializer\Annotation\Type;
 
+
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use JMS\Serializer\Annotation\Expose;
+use Hateoas\Configuration\Annotation as Hateoas;
+use JMS\Serializer\Annotation\Groups;
+
+
 /**
  * Storage agnostic user object.
  *
@@ -41,6 +48,9 @@ abstract class User implements UserInterface, GroupableInterface
 
     /**
      * @var string
+     *
+     * @Expose
+     * @Groups({"answer_detail", "company_detail", "ad_detail"})
      */
     protected $email;
 

volume/www/website/www/web/v2/css/theme.css

@@ -21215,14 +21215,17 @@ button:focus {
   File for your custom SCSS style
 ------------------------------------*/
 .statChiffre {
-  font-size: 4.5rem;
+  font-size: 4rem;
   font-weight : 500; 
   color : #1E2327;
+  padding-left: 0px;
+  margin-left: -40px;
 }
 .statTexte {
   font-size: 1.2rem;
   font-weight: 200;
   color: #1E2327;
+  margin-left: -40px;
 }
 
 /* Au niveau le plus haut du code */