From 76da75e89174b53114dc8b3e82da1f2197898cbb Mon Sep 17 00:00:00 2001
From: uli <uli@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Tue, 14 Mar 2017 12:19:59 +0000
Subject: [PATCH] =?UTF-8?q?*=20Feedbacks=20in=20der=20Sidebar=20*=20Status?=
 =?UTF-8?q?=201=20(gelb)=20bei=20Reiseprogrammen,=20falls=20der=20Startter?=
 =?UTF-8?q?min=20innerhalb=20der=20n=C3=A4chsten=204=20Wochen=20liegt=20*?=
 =?UTF-8?q?=20Sidebar-Boxen=20auf=20Reiseprogramm-=20und=20Buchungsseiten?=
 =?UTF-8?q?=20ausblenden;=20Suchfilter=20auf=20Buchungsseiten=20ausblenden?=
 =?UTF-8?q?=20*=20Vorauswahl=20der=20Destination=20bei=20Traveltainment-CM?=
 =?UTF-8?q?S-Seiten=20*=20Vorauswahl=20von=20Start-=20und=20Enddatum=20in?=
 =?UTF-8?q?=20den=20Suchmasken=20entfernen,=20da=20Zweck=20des=20Feldes=20?=
 =?UTF-8?q?(durch=20Platzhalter)=20nicht=20mehr=20erkennbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3317 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 trunk/app/Resources/views/base.html.twig            |  1 +
 .../views/default/components/sidebar.html.twig      | 10 ++++++++++
 .../sidebar/textSliderSidebarWidget.html.twig       |  2 +-
 .../views/default/pages/cms/travelProgram.html.twig |  2 +-
 .../Resources/views/default/pages/search.html.twig  |  2 +-
 .../views/default/pages/ttSearch.html.twig          |  1 -
 .../src/AppBundle/Controller/BookingController.php  | 12 +++++++++++-
 trunk/src/AppBundle/Controller/CmsController.php    | 12 ++++++++++--
 .../AppBundle/Controller/ComponentController.php    | 10 ++++++++++
 trunk/src/AppBundle/Entity/PageRepository.php       | 13 +++++++++++++
 trunk/src/AppBundle/Entity/TravelDate.php           |  9 +++++++++
 trunk/src/AppBundle/Form/SearchRequestType.php      |  4 ++--
 trunk/src/AppBundle/Form/TtSearchRequestType.php    | 12 ++++++------
 13 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig
index 09d705cc..7e301b34 100644
--- a/trunk/app/Resources/views/base.html.twig
+++ b/trunk/app/Resources/views/base.html.twig
@@ -135,6 +135,7 @@
                             travel_guide_sidebar_widget_block: block('travel_guide_sidebar_widget') ?? null,
                             travel_magazine_sidebar_widget_block: block('travel_magazine_sidebar_widget') ?? null,
                             offers_sidebar_widget_block: block('offers_sidebar_widget') ?? null,
+                            feedbacks_sidebar_widget_block: block('feedbacks_sidebar_widget') ?? null,
                         } %}
 
                         <div id="content" class="col-md-9 col-sm-8 col-xs-12">
diff --git a/trunk/app/Resources/views/default/components/sidebar.html.twig b/trunk/app/Resources/views/default/components/sidebar.html.twig
index e8b3b3f5..215d855f 100644
--- a/trunk/app/Resources/views/default/components/sidebar.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar.html.twig
@@ -78,4 +78,14 @@
         {% endif %}
     {% endif %}
 
+    {% if (show_feedbacks_sidebar_widget ?? true) and page is defined and page.effectiveCountry is not empty
+        and page.effectiveCountry.feedbackPage is not empty
+    %}
+        {% if feedbacks_sidebar_widget_block is null %}
+            {{ render(controller('AppBundle:Component:feedbacksSidebarWidget', {country: page.effectiveCountry ?? null})) }}
+        {% else %}
+            {{ feedbacks_sidebar_widget_block|raw }}
+        {% endif %}
+    {% endif %}
+
 </div><!-- end col -->
\ No newline at end of file
diff --git a/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
index c365bec0..0a8a8d10 100644
--- a/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar/textSliderSidebarWidget.html.twig
@@ -5,7 +5,7 @@
             {{ slider_title }}
         </div><!-- end title -->
 
-        <div class="box-slider newswidget clearfix">
+        <div class="box-slider newswidget clearfix{{ theme|default('normal') == 'gray-box' ? ' gray-box' }}">
 
             {% for slide in slides %}
                 <a href="{{ slide.urlPath|default('javascript:void(0);') }}" class="slide{{ loop.first ? ' active' }}">
diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
index db0030f8..58e696ab 100644
--- a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
+++ b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
@@ -254,7 +254,7 @@
                                                 } %}
                                             </td>
                                             <td data-title="Verfügbarkeit">
-                                                <img src="/images/icons/available-{{ travel_date.status }}.png"
+                                                <img src="/images/icons/available-{{ travel_date.effectiveStatus }}.png"
                                                      alt="Verfügbarkeit">
                                             </td>
                                             <td data-title="">
diff --git a/trunk/app/Resources/views/default/pages/search.html.twig b/trunk/app/Resources/views/default/pages/search.html.twig
index 16535031..3d6c944a 100644
--- a/trunk/app/Resources/views/default/pages/search.html.twig
+++ b/trunk/app/Resources/views/default/pages/search.html.twig
@@ -94,7 +94,7 @@
                                         </td>
 
                                         <td data-title="Verfügbarkeit">
-                                            <img src="/images/icons/available-{{ travel_date.status }}.png"
+                                            <img src="/images/icons/available-{{ travel_date.effectiveStatus }}.png"
                                                  alt="Verfügbarkeit">
                                         </td>
 
diff --git a/trunk/app/Resources/views/default/pages/ttSearch.html.twig b/trunk/app/Resources/views/default/pages/ttSearch.html.twig
index 6d8d09a0..33a241b3 100644
--- a/trunk/app/Resources/views/default/pages/ttSearch.html.twig
+++ b/trunk/app/Resources/views/default/pages/ttSearch.html.twig
@@ -14,7 +14,6 @@ TODO: This doesn't work. Form labels are rendered, but widgets themselves not. S
 #}
 
 {% block body %}
-    {% include 'default/components/sidebar/ttSearchSidebarWidget.html.twig' %}
     {% if tt_url is defined %}
         <iframe src="{{ tt_url }}" scrolling="no" width="100%" height="13500"
                 onload="window.parent.parent.scrollTo(0,0);"
diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php
index ce15a3db..263e9419 100644
--- a/trunk/src/AppBundle/Controller/BookingController.php
+++ b/trunk/src/AppBundle/Controller/BookingController.php
@@ -138,6 +138,11 @@ class BookingController extends Controller
                     'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
                     'page' => $travelProgramPage,
                     'breadcrumb_entries' => $breadcrumbEntries,
+                    'show_travel_guide_sidebar_widget' => false,
+                    'show_travel_magazine_sidebar_widget' => false,
+                    'show_offers_sidebar_widget' => false,
+                    'show_search_sidebar_widget' => false,
+                    'show_feedbacks_sidebar_widget' => false,
                     'booking' => $booking,
                     'travel_program' => $travelProgram,
                     'summary' => $htmlSummary,
@@ -148,11 +153,16 @@ class BookingController extends Controller
             return $this->render('default/pages/booking.html.twig', [
                 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
                 'page' => $travelProgramPage,
+                'breadcrumb_entries' => $breadcrumbEntries,
+                'show_travel_guide_sidebar_widget' => false,
+                'show_travel_magazine_sidebar_widget' => false,
+                'show_offers_sidebar_widget' => false,
+                'show_search_sidebar_widget' => false,
+                'show_feedbacks_sidebar_widget' => false,
                 'travel_program' => $travelProgram,
                 'travel_date' => $travelDate,
                 'form' => $form->createView(),
                 'price_type_by_id' => $this->priceTypeById,
-                'breadcrumb_entries' => $breadcrumbEntries,
                 'summary' => $htmlSummary,
                 'total_price' => $totalPrice,
                 'mediator_terms_filename' => $travelProgram->getIsMediated()
diff --git a/trunk/src/AppBundle/Controller/CmsController.php b/trunk/src/AppBundle/Controller/CmsController.php
index 7957e0b5..5d454d54 100644
--- a/trunk/src/AppBundle/Controller/CmsController.php
+++ b/trunk/src/AppBundle/Controller/CmsController.php
@@ -91,13 +91,17 @@ class CmsController extends Controller
 
     public function traveltainmentAction(Page $page)
     {
-        $form = $this->createForm(TtSearchRequestType::class, null, [
+        $destination = array_search($page->getBumaDestination(), TtSearchRequestType::$DESTINATION_CHOICES);
+        $form = $this->createForm(TtSearchRequestType::class, [
+            'topRegion' => $destination ? $destination : null,
+        ], [
             'country' => $page->getCountry(),
         ]);
 
         return $this->render('default/pages/cms/traveltainment.html.twig', [
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
             'page' => $page,
+            'show_search_sidebar_widget' => false,
             'tt_search_form' => $form->createView(),
         ]);
     }
@@ -110,7 +114,11 @@ class CmsController extends Controller
         return $this->render('default/pages/cms/travelProgram.html.twig', [
             'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
             'page' => $page,
-            'travel_program' => $page->getTravelProgram()
+            'show_travel_guide_sidebar_widget' => false,
+            'show_travel_magazine_sidebar_widget' => false,
+            'show_offers_sidebar_widget' => false,
+            'show_feedbacks_sidebar_widget' => false,
+            'travel_program' => $page->getTravelProgram(),
         ]);
     }
 }
\ No newline at end of file
diff --git a/trunk/src/AppBundle/Controller/ComponentController.php b/trunk/src/AppBundle/Controller/ComponentController.php
index 4b14a895..18650937 100644
--- a/trunk/src/AppBundle/Controller/ComponentController.php
+++ b/trunk/src/AppBundle/Controller/ComponentController.php
@@ -168,4 +168,14 @@ class ComponentController extends Controller
             : $repo->findWithTravelProgramsOfCountry($country)
         ;
     }
+
+    public function feedbacksSidebarWidgetAction(TravelCountry $country)
+    {
+        return $this->render(':default/components/sidebar:textSliderSidebarWidget.html.twig', [
+            'slider_title' => 'Kundenfeedback',
+            'slides' => $this->getDoctrine()->getRepository('AppBundle:Page')->findFeedbacks(
+                $country->getFeedbackPage()->getId()),
+            'theme' => 'gray-box',
+        ]);
+    }
 }
diff --git a/trunk/src/AppBundle/Entity/PageRepository.php b/trunk/src/AppBundle/Entity/PageRepository.php
index 8ab2313d..c29b5088 100644
--- a/trunk/src/AppBundle/Entity/PageRepository.php
+++ b/trunk/src/AppBundle/Entity/PageRepository.php
@@ -112,6 +112,19 @@ class PageRepository extends NestedTreeRepository
             ;
     }
 
+    public function findFeedbacks($rootPageId)
+    {
+        $qb = $this->createQueryBuilder('node');
+        return $qb
+            ->where($qb->expr()->eq('node.parent', $rootPageId))
+            ->andWhere('node.showInNavi = 1')
+            ->andWhere('node.status = 1')
+            ->orderBy('node.date')
+            ->getQuery()
+            ->execute()
+            ;
+    }
+
     /**
      * @param Page $page
      *
diff --git a/trunk/src/AppBundle/Entity/TravelDate.php b/trunk/src/AppBundle/Entity/TravelDate.php
index 38cc0010..950e5b11 100644
--- a/trunk/src/AppBundle/Entity/TravelDate.php
+++ b/trunk/src/AppBundle/Entity/TravelDate.php
@@ -174,6 +174,15 @@ final class TravelDate
         return $this->travelPeriod->getStatus();
     }
 
+    public function getEffectiveStatus()
+    {
+        if ($this->getStatus() == 2 && $this->getStart()->getTimestamp() < time() + 2419200)
+        {
+            return 1;
+        }
+        return $this->getStatus();
+    }
+
     public function getDepartures()
     {
         if ($this->departures === null)
diff --git a/trunk/src/AppBundle/Form/SearchRequestType.php b/trunk/src/AppBundle/Form/SearchRequestType.php
index c22a17c7..f2ddc7c1 100644
--- a/trunk/src/AppBundle/Form/SearchRequestType.php
+++ b/trunk/src/AppBundle/Form/SearchRequestType.php
@@ -24,11 +24,11 @@ class SearchRequestType extends AbstractType
         $builder
             ->add('b', StDateType::class, [
                 'required' => false,
-                'data' => new \DateTime('+5 day'),
+                //'data' => new \DateTime('+5 day'),
             ])
             ->add('e', StDateType::class, [
                 'required' => false,
-                'data' => new \DateTime('+19 day'),
+                //'data' => new \DateTime('+19 day'),
             ])
             ->add('c', EntityType::class, [
                 'required' => false,
diff --git a/trunk/src/AppBundle/Form/TtSearchRequestType.php b/trunk/src/AppBundle/Form/TtSearchRequestType.php
index 03fe1b4c..eb088804 100644
--- a/trunk/src/AppBundle/Form/TtSearchRequestType.php
+++ b/trunk/src/AppBundle/Form/TtSearchRequestType.php
@@ -100,20 +100,20 @@ class TtSearchRequestType extends AbstractType
         {
             $childChoices[$i .' Jahre'] = $i;
         }
-        $defaultStartDate = new \DateTime('+5 day');
-        $defaultEndDate = new \DateTime('+19 day');
+        //$defaultStartDate = new \DateTime('+5 day');
+        //$defaultEndDate = new \DateTime('+19 day');
 
         $builder->setMethod('GET');
         $builder
             ->add('termin', StDateType::class, [
                 'required' => false,
-                'empty_data' => $defaultStartDate->format('d.m.Y'),
-                'data' => $defaultStartDate,
+                //'empty_data' => $defaultStartDate->format('d.m.Y'),
+                //'data' => $defaultStartDate,
             ])
             ->add('ruecktermin', StDateType::class, [
                 'required' => false,
-                'empty_data' => $defaultEndDate->format('d.m.Y'),
-                'data' => $defaultEndDate,
+                //'empty_data' => $defaultEndDate->format('d.m.Y'),
+                //'data' => $defaultEndDate,
             ])
             ->add('dauer', ChoiceType::class, [
                 'required' => false,