Feat : Modification listing company #6269 @1h30

volume/www/website/www/app/Resources/views/territory/territory_show.html.twig

@@ -88,10 +88,14 @@
                             <div class="item-detail-description">
                                 <p>{{ company.description|nl2br }}</p>
                             </div>
-                {% if company.descriptionAdmin %}
+                            <h3 class="blue-text">Les mots clés</h3>
+                            {% for tag in company.publicTag %}
+                                <p class="chip">{{ tag }}</p>
+                            {% endfor %}
                         </div>
                     </div>
                 </div>
+                {% if company.descriptionAdmin %}
                 <div class="col s12 m12 l8 xl9 right">
                     <div class="row bg-bordered">
                         <div class="col s12">
@@ -101,17 +105,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="col s12 m12 l8 xl9 right">
-                    <div class="row bg-bordered">
-                        <div class="col s12">
                 {% endif %}
-                            <h3 class="blue-text">Les mots clés</h3>
-                            {% for tag in company.publicTag %}
-                                <p class="chip">{{ tag }}</p>
-                            {% endfor %}
-                        </div>
-                    </div>
-                </div>
                 {% if companyAds|length > 0 %}
                     <div id="offers" class="row">
                         <div class="col s12">

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

@@ -86,9 +86,9 @@ class Company
 
     /**
      * @ORM\OneToOne(targetEntity="AppBundle\Entity\Media", cascade={"persist"})
-     * @ORM\JoinColumn(nullable=true)
+     * @ORM\JoinColumn(name="presentation_video_id", nullable=true)
      */
-    private $presentation_video;
+    private $presentationVideo;
 
     /**
      * @var string
@@ -498,7 +498,7 @@ class Company
      */
     public function setPresentationVideo(\AppBundle\Entity\Media $presentationVideo = null)
     {
-        $this->presentation_video = $presentationVideo;
+        $this->presentationVideo = $presentationVideo;
 
         return $this;
     }
@@ -510,7 +510,7 @@ class Company
      */
     public function getPresentationVideo()
     {
-        return $this->presentation_video;
+        return $this->presentationVideo;
     }
 
     /**

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

@@ -14,6 +14,16 @@ class CompanyRepository extends EntityRepository
 {
     public function getCompanySortByAds()
     {
+        $qb = $this
+            ->createQueryBuilder('c')
+            ->andWhere('c.type = :type')
+            ->setParameter(':type', "COMPANY")
+            ->andWhere('c.presentationVideo IS NOT NULL')
+            ->orderBy('c.cTime', 'DESC');
+
+
+        $badCompany = $qb->getQuery()->getResult();
+
         $qb = $this
             ->createQueryBuilder('c')
             ->from('AppBundle:Ad', 'a')
@@ -21,10 +31,26 @@ class CompanyRepository extends EntityRepository
             ->andWhere('a.status = :status')
             ->orderBy('a.publishedAt', 'DESC')
             ->setParameter(':status', "PUBLISHED");
+        
+        $firstCompany = $qb->getQuery()->getResult();
 
-        return $qb
-            ->getQuery()
-            ->getResult();
+
+        $mergeArray  = array();
+        array_map(function($a, $b) use (&$mergeArray) {
+            if($a){
+                if(!isset($mergeArray[$a->getId()])) {
+                    $mergeArray[$a->getId()] = $a;
+                }
+            }
+            if ($b) {
+                if (!isset($mergeArray[$b->getId()])) {
+                    $mergeArray[$b->getId()] = $b;
+                }
+            }
+        }, $firstCompany, $badCompany);
+       
+        
+        return $mergeArray;
     }
 
     public function getTerritorySortByAds()