From 23b2c7a7e852929285fe20e75dd0158ea502568f Mon Sep 17 00:00:00 2001 From: uli Date: Mon, 19 Dec 2016 08:41:15 +0000 Subject: [PATCH] =?UTF-8?q?*=20Suchformular=20auf=20Startseite=20funktioni?= =?UTF-8?q?ert=20nun=20*=20Neueste=20Design-=C3=84nderungen=20aufgenommen?= =?UTF-8?q?=20*=20Sortierung=20auf=20Reise=C3=BCbersichtsseiten=20*=20Fehl?= =?UTF-8?q?er=20bei=20Suche=20behoben?= 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@3285 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- trunk/app/Resources/views/base.html.twig | 4 +- .../views/default/components/slider.html.twig | 28 ++- .../views/default/pages/search.html.twig | 6 +- .../pages/travelProgramOverview.html.twig | 15 +- .../Controller/DefaultController.php | 182 ++++++++++-------- trunk/src/AppBundle/Entity/PageRepository.php | 15 +- trunk/src/AppBundle/Entity/TravelCountry.php | 5 + trunk/src/AppBundle/Entity/TravelDate.php | 2 +- .../Entity/TravelPeriodRepository.php | 16 +- trunk/src/AppBundle/Entity/TravelProgram.php | 14 +- .../AppBundle/Resources/public/css/custom.css | 49 +++++ .../Resources/public/images/star.png | Bin 0 -> 4391 bytes 12 files changed, 217 insertions(+), 119 deletions(-) create mode 100644 trunk/src/AppBundle/Resources/public/images/star.png diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 9e386c51..68a662e8 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -71,7 +71,9 @@
{% block breadcrumb %} - {{ render(controller('AppBundle:Default:breadcrumb', {'page': page})) }} + {% if page is defined %} + {{ render(controller('AppBundle:Default:breadcrumb', {'page': page})) }} + {% endif %} {% endblock %} diff --git a/trunk/app/Resources/views/default/components/slider.html.twig b/trunk/app/Resources/views/default/components/slider.html.twig index 56f40042..0c5016f3 100644 --- a/trunk/app/Resources/views/default/components/slider.html.twig +++ b/trunk/app/Resources/views/default/components/slider.html.twig @@ -58,35 +58,31 @@
-
- +
- + + {% for destination in destinations %} + + {% endfor %}
- +
- +
diff --git a/trunk/app/Resources/views/default/pages/search.html.twig b/trunk/app/Resources/views/default/pages/search.html.twig index 236053d0..dc2a3242 100644 --- a/trunk/app/Resources/views/default/pages/search.html.twig +++ b/trunk/app/Resources/views/default/pages/search.html.twig @@ -37,7 +37,7 @@
{{ travel_program.travelDates|length }} passende{% if travel_program.travelDates|length > 1 %} Termine{% else %}r Termin{% endif %}
-
p.P. ab {{ travel_program.lowestPrice|number_format(2) }} €
+
p.P. ab {{ travel_program.lowestPrice|number_format }} €
{# #TODO #} @@ -76,8 +76,8 @@ {{ travel_date.name }} {{ travel_date.start|date }} {{ travel_date.end|date }} - ab {{ travel_date.prices[3].effectivePrice|number_format(2) }} € - ab {{ travel_date.prices[1].effectivePrice|number_format(2) }} € + ab {{ travel_date.prices[3].effectivePrice|number_format }} € + ab {{ travel_date.prices[1].effectivePrice|number_format }} € - {% for child_page in child_pages if child_page.status == 1 %} + {% for child_page in child_pages if child_page.status == 1 and child_page.travelProgram is defined %} {# @var child_page \AppBundle\Entity\Page #}
- {{ child_page.title }} +
+ {% if child_page.travelProgram.id > 0 and child_page.travelProgram.id <= 10 %} +
{{ child_page.travelProgram.id }}
+ {% endif %} +
ab {{ child_page.travelProgram.lowestPrice|number_format }} € p.P.
+
Frühbucherrabatt
+
+ {% if child_page.travelProgram.previewImage is defined %} + {{ child_page.title }} + {% endif %}
{{ child_page.title }}
diff --git a/trunk/src/AppBundle/Controller/DefaultController.php b/trunk/src/AppBundle/Controller/DefaultController.php index d3671b9b..56da1b91 100644 --- a/trunk/src/AppBundle/Controller/DefaultController.php +++ b/trunk/src/AppBundle/Controller/DefaultController.php @@ -15,83 +15,6 @@ use Symfony\Component\Stopwatch\Stopwatch; class DefaultController extends Controller { - - /* -Suche Kindknoten -Für jeden Kindknoten - ++LFT - Setze LFT - f() - ++LFT - RGT = LFT - Setze RGT -*/ - - /** - * @Route("/create-tree") - */ - public function createTreeAction() - { - set_time_limit(0); - ini_set('memory_limit', '2048M'); - - $em = $this->getEntityManager(); - - foreach ($em->getEventManager()->getListeners() as $event => $listeners) { - foreach ($listeners as $hash => $listener) { - if ($listener instanceof TreeListener) - { - $em->getEventManager()->removeEventListener($event, $listener); - } - } - } - - $em->beginTransaction(); - $lft = 0; - $this->createTree(0, $lft, 0); - $em->commit(); - $em->flush(); - } - - private function createTree($owner, &$lft, $lvl, $root = null) - { - $em = $this->getEntityManager(); - - $qb = $em->createQueryBuilder()->from('AppBundle:Page', 'p')->select('p'); - $qb->where($qb->expr()->eq('p.owner', $owner)); - if ($owner == 0) - { - $qb->orWhere('p.owner IS NULL'); - } - $qb->orderBy('p.title'); - $pages = $qb->getQuery()->execute(); - foreach ($pages as $page) - { - /** @var Page $page */ - - if ($owner == 0) - { - $root = $page->getId(); - } - - ++$lft; - $page->setLft($lft); - $page->setLvl($lvl); - $page->setRoot($em->getReference('AppBundle:Page', $root)); - if ($owner != 0) - { - $page->setParent($em->getReference('AppBundle:Page', $owner)); - } - - $this->createTree($page->getId(), $lft, $lvl + 1, $root); - - ++$lft; - $page->setRgt($lft); - - $em->persist($page); - } - } - /** * @return EntityManager */ @@ -100,11 +23,9 @@ Für jeden Kindknoten return $this->getDoctrine()->getManager(); } - /** - * @Route(path="/{req}", requirements={"req": ".+"}) - */ public function defaultAction(Request $request) { + // #TODO 404 die ("caught"); } @@ -113,8 +34,14 @@ Für jeden Kindknoten */ public function homeAction() { + //$departures = $this->getEntityManager()->getRepository('AppBundle:TravelDeparturePoint')->findAll(); + $destinations = $this->getEntityManager()->getRepository('AppBundle:TravelCountry')->findAll(); + return $this->render('default/pages/home.html.twig', [ - 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, + 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, + 'destinations' => $destinations, + 'startDate' => new \DateTime('+5 day'), + 'endDate' => new \DateTime('+19 day') ]); } @@ -161,14 +88,25 @@ Für jeden Kindknoten /** * @Route("/suche") */ - public function searchAction() + public function searchAction(Request $request) { $stopwatch = $this->get('debug.stopwatch'); + $em = $this->getEntityManager(); + + $destinationsIds = [6,7]; + $destination = $em->getRepository('AppBundle:TravelCountry')->find($request->query->get('c')); + if ($destination) + { + $destinationsIds = [$destination->getId()]; + } + $startDate = $request->query->has('b') + ? \DateTime::createFromFormat('d.m.Y', $request->query->get('b')) + : new \DateTime(); + $endDate = \DateTime::createFromFormat('d.m.Y', $request->query->get('e')); $stopwatch->start('search'); $r = $this->getDoctrine()->getRepository('AppBundle:TravelPeriod')->getTravelProgramsWithTravelDatesForTimePeriod( - //new \DateTime('2014-01-01'), new \DateTime('2017-01-01'), null, true); - new \DateTime(), new \DateTime('2016-12-12'), null, true); + $startDate, $endDate, $destinationsIds, true); $stopwatch->stop('search'); return $this->render('default/pages/search.html.twig', [ @@ -206,8 +144,84 @@ Für jeden Kindknoten ]); } + /* + Suche Kindknoten + Für jeden Kindknoten + ++LFT + Setze LFT + f() + ++LFT + RGT = LFT + Setze RGT + */ + /** + * @Route("/create-tree") + */ + public function createTreeAction() + { + set_time_limit(0); + ini_set('memory_limit', '2048M'); + $em = $this->getEntityManager(); + $em->getConnection()->executeUpdate( + 'UPDATE page SET lvl = NULL, lft = NULL, rgt = NULL, parent_id = NULL, tree_root = NULL'); + foreach ($em->getEventManager()->getListeners() as $event => $listeners) { + foreach ($listeners as $hash => $listener) { + if ($listener instanceof TreeListener) + { + $em->getEventManager()->removeEventListener($event, $listener); + } + } + } + + $em->beginTransaction(); + $lft = 0; + $this->createTree(0, $lft, 0); + $em->commit(); + $em->flush(); + + die("DONE."); + } + + private function createTree($owner, &$lft, $lvl, $root = null) + { + $em = $this->getEntityManager(); + + $qb = $em->createQueryBuilder()->from('AppBundle:Page', 'p')->select('p'); + $qb->where($qb->expr()->eq('p.owner', $owner)); + if ($owner == 0) + { + $qb->orWhere('p.owner IS NULL'); + } + $qb->orderBy('p.title'); + $pages = $qb->getQuery()->execute(); + foreach ($pages as $page) + { + /** @var Page $page */ + + if ($owner == 0) + { + $root = $page->getId(); + } + + ++$lft; + $page->setLft($lft); + $page->setLvl($lvl); + $page->setRoot($em->getReference('AppBundle:Page', $root)); + if ($owner != 0) + { + $page->setParent($em->getReference('AppBundle:Page', $owner)); + } + + $this->createTree($page->getId(), $lft, $lvl + 1, $root); + + ++$lft; + $page->setRgt($lft); + + $em->persist($page); + } + } } diff --git a/trunk/src/AppBundle/Entity/PageRepository.php b/trunk/src/AppBundle/Entity/PageRepository.php index 9757adb1..ca67c344 100644 --- a/trunk/src/AppBundle/Entity/PageRepository.php +++ b/trunk/src/AppBundle/Entity/PageRepository.php @@ -20,12 +20,15 @@ class PageRepository extends NestedTreeRepository public function getChildrenWithTravelProgramsAndDates(Page $page) { $pages = $this->getChildrenQueryBuilder($page) - ->leftJoin('node.travelProgram', 'tp') - ->addSelect('tp') - ->andWhere('tp.status > 0') - ->andWhere('node.status > 0') - ->getQuery() - ->execute(); + ->leftJoin('node.travelProgram', 'tp') + ->addSelect('tp') + ->andWhere('tp.status > 0') + ->andWhere('node.status > 0') + ->orderBy('node.order') + ->addOrderBy('tp.position') + ->addOrderBy('node.title') + ->getQuery() + ->execute(); /** @var Page $childPage */ foreach ($pages as &$childPage) { diff --git a/trunk/src/AppBundle/Entity/TravelCountry.php b/trunk/src/AppBundle/Entity/TravelCountry.php index e0329224..3cf1ad73 100644 --- a/trunk/src/AppBundle/Entity/TravelCountry.php +++ b/trunk/src/AppBundle/Entity/TravelCountry.php @@ -45,6 +45,11 @@ class TravelCountry */ private $feedbackPage; + /** + * @ORM\ManyToMany(targetEntity="AppBundle\Entity\TravelProgram", mappedBy="countries") + */ + private $programs; + /** diff --git a/trunk/src/AppBundle/Entity/TravelDate.php b/trunk/src/AppBundle/Entity/TravelDate.php index f316f704..a4818de1 100644 --- a/trunk/src/AppBundle/Entity/TravelDate.php +++ b/trunk/src/AppBundle/Entity/TravelDate.php @@ -230,7 +230,7 @@ final class TravelDate $lowest = -1; foreach ($this->getPrices() as $price) { - if ($price->getPriceType() == 3) + if ($price->getPriceTypeId() == 3) { // Use double room if available (#1076) return /*$price->getEffectiveDiscountPrice() ??*/ $price->getEffectivePrice(); diff --git a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php index d951d2f2..b3179efc 100644 --- a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php +++ b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php @@ -40,7 +40,10 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository $startDate = $now; } $startDateStr = $startDate->format('Y-m-d'); - $endDateStr = $endDate->format('Y-m-d'); + if ($endDate) + { + $endDateStr = $endDate->format('Y-m-d'); + } $qb = $this->getEntityManager()->createQueryBuilder() ->from('AppBundle:TravelProgram', 'tp', 'tp.id') @@ -64,7 +67,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository { $priceTypeKey = 'price_'. $priceType->getId(); $qb->leftJoin('p.prices', $priceTypeKey, Expr\Join::WITH, - $priceTypeKey .'.priceType = '. $priceType->getId(), null, $priceTypeKey .'.priceType'); + $priceTypeKey .'.priceType = '. $priceType->getId(), $priceTypeKey .'.priceTypeId'); $qb->addSelect($priceTypeKey); } $qb->leftJoin('p.discounts', 'discount'); @@ -77,11 +80,14 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository // Destinations if (!empty($destinationIds) && is_array($destinationIds)) { - $qb->innerJoin('AppBundle:TravelProgramCountry', 'tpc', Expr\Join::WITH, - 'tpc.program = tp AND IDENTITY(tpc.country) IN ('. implode(', ', $destinationIds) .')'); + //$qb->innerJoin('AppBundle:TravelProgramCountry', 'tpc', Expr\Join::WITH, + // 'tpc.program = tp AND IDENTITY(tpc.country) IN ('. implode(', ', $destinationIds) .')'); + $qb->innerJoin('tp.countries', 'tc', Expr\Join::WITH, + 'tc.id IN ('. implode(', ', $destinationIds) .')'); if ($combi) { - $qb->having('COUNT(DISTINCT tpc.country) = '. count($destinationIds)); + //$qb->having('COUNT(DISTINCT tpc.country) = '. count($destinationIds)); + $qb->having('COUNT(DISTINCT tc) = '. count($destinationIds)); } } $qb->groupBy('p.id, p_dep.id, d.id'); diff --git a/trunk/src/AppBundle/Entity/TravelProgram.php b/trunk/src/AppBundle/Entity/TravelProgram.php index c2446fe3..6bd735de 100644 --- a/trunk/src/AppBundle/Entity/TravelProgram.php +++ b/trunk/src/AppBundle/Entity/TravelProgram.php @@ -309,7 +309,7 @@ class TravelProgram private $departures; /** - * @ORM\ManyToMany(targetEntity="AppBundle\Entity\TravelCountry") + * @ORM\ManyToMany(targetEntity="AppBundle\Entity\TravelCountry", inversedBy="programs") * @ORM\JoinTable(name="travel_program_country", * joinColumns={@ORM\JoinColumn(name="program_id", referencedColumnName="id")}, * inverseJoinColumns={@ORM\JoinColumn(name="country_id", referencedColumnName="id")} @@ -1501,4 +1501,16 @@ class TravelProgram { return $this->options; } + + public function getPreviewImage() + { + foreach ($this->getImages() as $image) + { + if ($image->getType() == 2) + { + return $image; + } + } + return $this->getImages()[0]; + } } diff --git a/trunk/src/AppBundle/Resources/public/css/custom.css b/trunk/src/AppBundle/Resources/public/css/custom.css index 55590af5..ec25d5af 100644 --- a/trunk/src/AppBundle/Resources/public/css/custom.css +++ b/trunk/src/AppBundle/Resources/public/css/custom.css @@ -756,6 +756,55 @@ a, .travel-wrapper .item > a.item-button.dobble_line { height: 3.6em; } +.travel-wrapper .lb { + position: relative; +} +.travel-wrapper .lb .cstar_right { + position: absolute; + z-index: 10; + background: url(../images/star.png) no-repeat scroll center center / cover rgba(0, 0, 0, 0); + width: 60px; + height: 60px; + padding-top: 20px; + font-weight: bold; + text-align: center; + right: 4px; + top: 6px; + color: #1a457c; +} +.travel-wrapper .lb .cstar_left { + position: absolute; + z-index: 10; + background: url(../images/star.png) no-repeat scroll center center / cover rgba(0, 0, 0, 0); + width: 60px; + height: 60px; + padding-top: 20px; + font-weight: bold; + text-align: center; + left: 4px; + top: 6px; + color: #1a457c; +} +.travel-wrapper .lb .cprice { + position: absolute; + z-index: 10; + left: 0; + top: 140px; + background-color: #648859; + color: #fff; + padding: 4px 6px 4px 12px; + font-weight: bold; +} +.travel-wrapper .lb .cdiscount { + position: absolute; + z-index: 10; + right: 0; + top: 23px; + background-color: #ffc926; + color: #1a457c; + padding: 4px 12px 4px 6px; + font-weight: bold; +} .travel-wrapper .item .hl5 { text-overflow: ellipsis; word-wrap: break-word; diff --git a/trunk/src/AppBundle/Resources/public/images/star.png b/trunk/src/AppBundle/Resources/public/images/star.png new file mode 100644 index 0000000000000000000000000000000000000000..49410e6f90e8c778edb81db02f9eb3eaf85bcd23 GIT binary patch literal 4391 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