* Suchformular auf Startseite funktioniert nun

* Neueste Design-Änderungen aufgenommen
* Sortierung auf Reiseübersichtsseiten
* Fehler bei Suche behoben

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3285 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2016-12-19 08:41:15 +00:00
parent 99c6715712
commit 23b2c7a7e8
12 changed files with 217 additions and 119 deletions

View file

@ -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);
}
}
}