Bug candidatures (sF v1 et web app)

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

@@ -15,7 +15,7 @@
 
   <!-- 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 %}

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

@@ -277,7 +277,8 @@
             "columnDefs": [{
                     "name": "video",
                     "targets": 0,
-                    
+                    "searchable": true,
+                    "orderable": false
                 },
                 {
                     "name": "nom",
@@ -303,19 +304,19 @@
                     "name": "offre",
                     "targets": 4,
                     "searchable": true,
-                    "orderable": true
+                    "orderable": false
                 },
                 {
                     "name": "localisation",
                     "targets": 5,
                     "searchable": true,
-                    "orderable": true
+                    "orderable": false
                 },
                 {
                     "name": "statusReponse",
                     "targets": 6,
                     "searchable": true,
-                    "orderable": true
+                    "orderable": false
                 },
             ],
             "processing": true,

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

@@ -86,42 +86,52 @@
     <!-- START card -->
     <div class="col-lg-12">
         <div class="card card-default container">
+            
             <div class="row">
+                
                 <div class="col-md">
+                    <a href="{{path('company_ad_create')}}">
                     <button class="card-action" type="button">
-                        <a href="{{path('company_ad_create')}}">
+                       
                             <span class="material-icons">movie_creation</span>
                             <div class="row lien-fleche" style="justify-content: center; align-items: center">
                                 <h6 class="col-10">Créer une offre d’emploi vidéo</h6>
                                 <span class="material-icons col-2 fleche">arrow_right_alt</span>
                             </div>
-                        </a>
+                        
                     </button>
+                    </a>
                 </div>
-                <div class="col-md" type="button">
                 
+                
+                <div class="col-md" type="button">
+                    <a href="{{path('company_ad')}}">
                     <button class="card-action" style="" type="button">
-                        <a href="{{path('company_ad')}}">
+                        
                             <span class="material-icons" style="">work</span>
                             <div class="row lien-fleche" style="justify-content: center; align-items: center">
                                 <h6 class="col-10">Gérer mes offres d’emploi</h6>
                                 <span class="material-icons col-2 fleche">arrow_right_alt</span>
                             </div>
-                        </a>
+                        
                     </button>
+                    </a>
                 </div>
+                
+                
                 <div class="col-md" type="button">
+                    <a  href="{{path('company_answer_list')}}">
                     <button class="card-action" style="" type="button">
-                    
-                        <a href="{{path('company_answer_list')}}">
                             <span class="material-icons" style="">face</span>
                             <div class="row lien-fleche" style="justify-content: center; align-items: center">
                                 <h6 class="col-10">Gérer mes candidatures</h6>
                                 <span class="material-icons col-2 fleche">arrow_right_alt</span>
                             </div>
-                        </a>
+                       
                     </button>
+                    </a>
                 </div>
+                 
             </div>
         </div>
     </div>

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

@@ -681,16 +681,14 @@ class AnswerController extends Controller
                             // But if that werent't the case, its value should have been tested
                             // before assigning it to $responseTemp
                 
-                            if($answer->getCompany()){
-                                if($answer->getAd()){
-                                    $responseTemp = $answer->getAd()->getTitle();
-                                }else{
-                                    $responseTemp = "Candidature spontanée";
-                                }
+                            
+                            if($answer->getAd()){
+                                $responseTemp = $answer->getAd()->getTitle();
                             }else{
-                                $responseTemp = "ND";
+                                $responseTemp = "Candidature spontanée";
                             }
                             
+                            
                             break;
                         }
     

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

@@ -35,9 +35,9 @@ class MediaController extends Controller
      */
     public function companyMediaAction(Request $request)
     {
-        $event = new UserEvent($this->getUser());
+        //$event = new UserEvent($this->getUser());
         $company = $this->getUser()->getCompany();
-        $this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROD_UPDATE, $event);
+        //$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);
@@ -66,8 +66,8 @@ class MediaController extends Controller
      */
     public function territoryMediaAction(Request $request)
     {
-        $event = new UserEvent($this->getUser());
-        $this->get('event_dispatcher')->dispatch(PrestashopBridgeEvents::USER_PROD_UPDATE, $event);
+        //$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);

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

@@ -190,12 +190,14 @@ class AnswerRepository extends AbstractRepository
             ->join('a.user', 'user')
             ->leftjoin('a.ad', 'ad')
             ->leftjoin('a.video', 'video')
-            ->leftjoin('a.company', 'company');
+            ->leftjoin('a.company', 'c')
+            ->leftjoin('ad.company', 'company');
         $countQuery
             ->join('a.user', 'user')
             ->leftjoin('a.ad', 'ad')
             ->leftjoin('a.video', 'video')
-            ->leftjoin('a.company', 'company');
+            ->leftjoin('a.company', 'c')
+            ->leftjoin('ad.company', 'company');
         // $countQuery
         //     ->join('town.department', 'department')
         //     ->join('department.region', 'region');
@@ -205,8 +207,8 @@ class AnswerRepository extends AbstractRepository
         {
             // No
             // However, add a "always true" condition to keep an uniform treatment in all cases
-            $query->where("company.id=".$otherConditions);
-            $countQuery->where("company.id=".$otherConditions);
+            $query->where("(company.id=".$otherConditions." OR c.id=".$otherConditions.")");
+            $countQuery->where("(company.id=".$otherConditions." OR c.id=".$otherConditions.")");
             $query->andWhere("a.status='SENDED'");
             $countQuery->andWhere("a.status='SENDED'");
         }else{

volume/www/website/www/web/dashboard/css/style.css

@@ -178,6 +178,11 @@ Créer une offre d'emploi vidéo / Gérer mes offres d'emploi / Gérer mes candi
 	box-shadow: 0px 2px 5px rgb(30 35 39 / 5%);
 	transition: background-color 0.3s;
 	transition: box-shadow 0.5s;
+	color: #fff !important;
+}
+
+.card-action a {
+	color: #fff !important;
 }
 
 .card-action:hover {
@@ -250,4 +255,4 @@ Détails d'une candidature
     border:2px dashed rgba(33, 33, 33, 0.14);
     border-radius:5px;
     padding:20px;
-}
+}