Feat : Mise en place d’un champ type privé pour ad et company #6472 @1h10

volume/www/website/www/app/Resources/views/ad/carrousel_territory.html.twig

@@ -3,7 +3,8 @@
         <div class="row center-align">
             <div class="col s12">
                 <div class="owl-carousel territory-carousel">
-                {% for territory in territories %}
+                    
+                {% for territory in territories if territory.territory.isPrivate != true %}
                     {% set territory = territory.territory %}
                     <div class="item">
                         <h2 class="blue-text no-margin-top">

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

@@ -19,6 +19,7 @@
         <div class="box box-primary">
             <div class="box-header">
                 <h3 class="box-title">{{ ad.title }}</h3>
+                <br/><i class="fa fa-link"></i>Url : {{ path("ad_show",{'alias':ad.alias})}}<br />
             </div>
             <div class="box-body">
                 {{ form_errors(form) }}
@@ -41,7 +42,7 @@
                 <h3 class="box-title">Informations</h3>
             </div>
             <div class="box-body">
-                {{ form_row(form.status) }} {{ form_row(form.isPromoted) }} {{ form_row(form.isVerified) }}
+                {{ form_row(form.status) }} {{ form_row(form.isPromoted) }} {{ form_row(form.isVerified) }} {{ form_row(form.isPrivate) }}
             </div>
         </div>
     </div>

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

@@ -22,9 +22,11 @@
                 <div class="box-header">
                     <h3 class="box-title">{{ company.brandName }}</h3>
                     <br><span>{{ company.mainUser.email }}</span>
+                    <br/><i class="fa fa-link"></i>Url : {{ path("company_show",{'alias':company.alias})}}<br />
                 </div>
                 <div class="box-body">
                     {{ form_errors(form) }}
+                    {{ form_row(form.isPrivate) }}
                     {{ form_row(form.emphasis) }}
                     {{ form_row(form.emphasisOrder) }}
                     {{ form_row(form.brandName) }}

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

@@ -22,9 +22,11 @@
                 <div class="box-header">
                     <h3 class="box-title">{{ territory.brandName }}</h3>
                     <br><span>{{ territory.mainUser.email }}</span>
+                    <br/><i class="fa fa-link"></i>Url : {{ path("territory_show",{'alias':territory.alias})}}<br />
                 </div>
                 <div class="box-body">
                     {{ form_errors(form) }}
+                    {{ form_row(form.isPrivate) }}
                     {{ form_row(form.emphasis) }}
                     {{ form_row(form.emphasisOrder) }}
                     {{ form_row(form.brandName) }}

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

@@ -1,4 +1,4 @@
-{% for a in ads %}
+{% for a in ads if a.isPrivate != true %}
 <div class="col s12">
     <div class="card z-depth-3">
         <div class="card-image">

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

@@ -1,4 +1,4 @@
-{% for a in ads %}
+{% for a in ads if a.isPrivate != true %}
     <div id="adRow" class="row item-list-bis z-depth-2 row-noMargin">
         <div class="col s12 m4 col-noPadding ad-picture">
             <a href="{{ path('ad_show',{'alias': a.alias }) }}" title="{{ a.title }}" class="item-list-media">

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

@@ -1,4 +1,4 @@
-{% for company in companies %}
+{% for company in companies if company.isPrivate != true %}
     <div class="col s12">
         <div class="card z-depth-3 card-company">
             <div class="card-content card-content-company">

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

@@ -37,7 +37,7 @@
             <div class="row m-b-0 p-b-30">
                 <div class="col s12 m12">
                     <div id="liste-resultats">
-                        {% for c in companies %}
+                        {% for c in companies if c.isPrivate != true %}
                             {% if (c.presentationVideo is not null or c.getPublishedAds|length > 0 ) %}
                                 <div class="row item-list-bis z-depth-2 row-noMargin">
 

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

@@ -110,7 +110,7 @@
                         <h2 class="blue-text no-margin-top">Les territoires <span>pour vivre et travailler</span></h2>
                         {% if territories %}
                         <div class="owl-carousel owl-carousel-home territory-carousel">
-                            {% for territory in territories if territory.presentationVideo %}
+                            {% for territory in territories if territory.presentationVideo and territory.isPrivate != true %}
                                 <div class="item">
                                     <div class="embed-responsive embed-responsive-16by9">
                                         <div class="col s12">

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

@@ -36,7 +36,7 @@
             <div class="row m-b-0 p-b-30">
                 <div class="col s12 m12">
                     <div id="liste-resultats">
-                        {% for c in companies %}
+                        {% for c in companies if c.isPrivate != true %}
                             {% if (c.presentationVideo is not null or c.getPublishedAds|length > 0 ) %}
                                 <div class="row item-list-bis z-depth-2 row-noMargin">
 

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

@@ -97,6 +97,13 @@ class Ad
      */
     private $isPromoted;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="is_private", type="boolean", nullable=true, options={"comment":"Annonce privé, non listée en front"})
+     */
+    private $isPrivate;
+
     /**
      * @var boolean
      *
@@ -1076,4 +1083,64 @@ class Ad
     {
         return $this->territories;
     }
+
+    /**
+     * Set isPrivate.
+     *
+     * @param bool|null $isPrivate
+     *
+     * @return Ad
+     */
+    public function setIsPrivate($isPrivate = null)
+    {
+        $this->isPrivate = $isPrivate;
+
+        return $this;
+    }
+
+    /**
+     * Get isPrivate.
+     *
+     * @return bool|null
+     */
+    public function getIsPrivate()
+    {
+        return $this->isPrivate;
+    }
+
+    /**
+     * Add bookmarkAd.
+     *
+     * @param \AppBundle\Entity\BookmarkAd $bookmarkAd
+     *
+     * @return Ad
+     */
+    public function addBookmarkAd(\AppBundle\Entity\BookmarkAd $bookmarkAd)
+    {
+        $this->bookmarkAds[] = $bookmarkAd;
+
+        return $this;
+    }
+
+    /**
+     * Remove bookmarkAd.
+     *
+     * @param \AppBundle\Entity\BookmarkAd $bookmarkAd
+     *
+     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
+     */
+    public function removeBookmarkAd(\AppBundle\Entity\BookmarkAd $bookmarkAd)
+    {
+        return $this->bookmarkAds->removeElement($bookmarkAd);
+    }
+
+    /**
+     * Get bookmarkAds.
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getBookmarkAds()
+    {
+        return $this->bookmarkAds;
+    }
 }

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

@@ -120,6 +120,13 @@ class Company
      */
     private $searchable;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="is_private", type="boolean", nullable=true, options={"comment":"Company privé, non listée en front"})
+     */
+    private $isPrivate;
+
     /***********************
      * OneToMany Array's
      ***********************/
@@ -803,4 +810,28 @@ class Company
     {
         return $this->descriptionAdmin;
     }
+
+    /**
+     * Set isPrivate.
+     *
+     * @param bool|null $isPrivate
+     *
+     * @return Company
+     */
+    public function setIsPrivate($isPrivate = null)
+    {
+        $this->isPrivate = $isPrivate;
+
+        return $this;
+    }
+
+    /**
+     * Get isPrivate.
+     *
+     * @return bool|null
+     */
+    public function getIsPrivate()
+    {
+        return $this->isPrivate;
+    }
 }

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

@@ -82,6 +82,10 @@ class AdType extends AbstractType
             ->add('isVerified', CheckboxType::class, array(
                 'label' => 'Vérifiée',
                 'required' => false
+            ))
+            ->add('isPrivate', CheckboxType::class, array(
+                'label' => 'Annonce privé ( non listée en front )',
+                'required' => false
             ));
 
                     // Emphasis

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

@@ -37,6 +37,10 @@ class CompanyAdminType extends AbstractType
             ))
             ->add('size', TextType::class, array(
                 'label' => 'profile.company.size',
+            ))
+            ->add('isPrivate', CheckboxType::class, array(
+                'label' => 'Page entreprise privé ( non listée en front )',
+                'required' => false
             ));
         // Addresses fields
         $builder

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

@@ -87,6 +87,10 @@ class TerritoryAdminType extends AbstractType
                 'label' => 'Ordre',
                 'required' => false
             ));
+        $builder->add('isPrivate', CheckboxType::class, array(
+            'label' => 'Page territoire privé ( non listée en front )',
+            'required' => false
+        ));
     }
 
     public function configureOptions(OptionsResolver $resolver)

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

@@ -96,7 +96,7 @@ class AdSearcher
     {
         $ads = array();
         foreach ($result as $ad) {
-            if ($ad->getStatus() == "PUBLISHED") {
+            if ($ad->getStatus() == "PUBLISHED" && $ad->getIsPrivate() != true) {
                 $ads[] = $ad;
             }
         }