Suppression balise meta pour MEP et analytics

Correction mineure graphique
correction suite a modif de pole emploi
2020-10-15 15:12:29 +02:00 · 2020-10-15 14:45:27 +02:00 · 2020-10-14 21:47:08 +02:00 · 2020-10-14 17:36:33 +02:00
8 changed files with 232 additions and 77 deletions
@@ -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>
@@ -2,20 +2,20 @@
 <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 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> #}
+  </script>
  <!-- Title -->
  <title>{% block title %}{% endblock %}</title>

  <!-- Required Meta Tags Always Come First -->
  <meta charset="utf-8">
-  <meta name="robots" content="noindex,nofollow">
+  {# <meta name="robots" content="noindex,nofollow"> #}
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
  {% block meta %}
  {% endblock %}
@@ -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>
@@ -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 }}
@@ -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 />
@@ -31,36 +31,47 @@ class CompanyController extends FOSRestController
        $data = $this->get('jms_serializer')->serialize($company, 'json', SerializationContext::create()->setGroups(array('company_detail')));
        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",
-                   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"
-                   ),
-               ));
+        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);
-        $err = curl_error($curl);
-       
+        
        curl_close($curl);
-        $token = "";
-        if (!$err)
-        {
-             
-            $obj = json_decode($response);
-            $token = $obj->access_token;
-            // echo $token;
-        }
-        return $token;
+        
+        $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")
@@ -73,37 +84,28 @@ class CompanyController extends FOSRestController
        $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',
-                '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",
-                    
+        $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);

-                ));
-            $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);
    }

    /**
@@ -122,6 +124,7 @@ class CompanyController extends FOSRestController
            $curl = curl_init();
            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
                'Content-Type: application/json',
+                'Accept : application/json',
                'Authorization: Bearer ' . $token
                ));
            curl_setopt_array($curl, array(
@@ -129,12 +132,18 @@ class CompanyController extends FOSRestController
                    CURLOPT_RETURNTRANSFER => true,
                    CURLOPT_ENCODING => "",
                    CURLOPT_MAXREDIRS => 10,
-                    CURLOPT_TIMEOUT => 30,
+                    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)
@@ -166,6 +175,7 @@ class CompanyController extends FOSRestController
            $curl = curl_init();
            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
                'Content-Type: application/json',
+                'Accept : application/json',
                'Authorization: Bearer ' . $token
                ));
            curl_setopt_array($curl, array(
@@ -173,12 +183,15 @@ class CompanyController extends FOSRestController
                    CURLOPT_RETURNTRANSFER => true,
                    CURLOPT_ENCODING => "",
                    CURLOPT_MAXREDIRS => 10,
-                    CURLOPT_TIMEOUT => 30,
+                    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)
@@ -209,6 +222,7 @@ class CompanyController extends FOSRestController
            $curl = curl_init();
            curl_setopt($curl, CURLOPT_HTTPHEADER, array(
                'Content-Type: application/json',
+                'Accept : application/json',
                'Authorization: Bearer ' . $token
                ));
            curl_setopt_array($curl, array(
@@ -216,12 +230,15 @@ class CompanyController extends FOSRestController
                    CURLOPT_RETURNTRANSFER => true,
                    CURLOPT_ENCODING => "",
                    CURLOPT_MAXREDIRS => 10,
-                    CURLOPT_TIMEOUT => 30,
+                    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)
@@ -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,6 +149,7 @@ class Ad
     * @Groups({"ad_detail", "answer_detail"})
     * @Assert\GreaterThanOrEqual("today", groups={"dates"})
     */
+    
    private $publishedAt;

    /**
@@ -665,6 +698,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.
     *
@@ -857,6 +962,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.
     *
@@ -73,7 +73,7 @@ class AnswerRepository extends AbstractRepository
    // 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', time() - 3600 * 1);
+        $hier = date('Y-m-d H:i:s', time() - 3600 * 1);
        $qb = $this
            ->createQueryBuilder('a')
            ->select(['a','c'])
Author	SHA1	Message	Date
llaniau	18d07463ab	Suppression balise meta pour MEP et analytics	2020-10-15 15:12:29 +02:00
llaniau	9f58cf7f58	Correction mineure graphique	2020-10-15 14:45:27 +02:00
llaniau	40688feb88	correction suite a modif de pole emploi	2020-10-14 21:47:08 +02:00
llaniau	2275c6aadd	Correction bug suite recette du 14_10	2020-10-14 17:36:33 +02:00