Krautspace/calcifer
Archived
2
0
Fork 0
Code Issues 11 Pull requests 2 Activity

Show only events which are in the future.

Browse source
This commit is contained in:
Tim Schumacher 2014-07-08 12:59:34 +02:00
parent 29ac5c81cb
commit d12c8d6aeb
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Hackspace/Bundle/CalciferBundle/Controller/EventController.php
View file

@ -3,6 +3,7 @@
namespace Hackspace\Bundle\CalciferBundle\Controller; namespace Hackspace\Bundle\CalciferBundle\Controller;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\QueryBuilder;
use Hackspace\Bundle\CalciferBundle\Entity\Location; use Hackspace\Bundle\CalciferBundle\Entity\Location;
use Hackspace\Bundle\CalciferBundle\Entity\Tag; use Hackspace\Bundle\CalciferBundle\Entity\Tag;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
@ -32,7 +33,14 @@ class EventController extends Controller
{ {
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('CalciferBundle:Event')->findBy([],['startdate' => 'ASC']); /** @var QueryBuilder $qb */
$qb = $em->createQueryBuilder();
$qb ->select(array('e'))
->from('CalciferBundle:Event', 'e')
->where('e.startdate >= :startdate')
->orderBy('e.startdate')
->setParameter('startdate',new \DateTime());
$entities = $qb->getQuery()->execute();
return array( return array(
'entities' => $entities, 'entities' => $entities,

13
src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php
View file

@ -2,7 +2,7 @@
namespace Hackspace\Bundle\CalciferBundle\Controller; namespace Hackspace\Bundle\CalciferBundle\Controller;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder;
use Hackspace\Bundle\CalciferBundle\Entity\Location; use Hackspace\Bundle\CalciferBundle\Entity\Location;
use Hackspace\Bundle\CalciferBundle\Entity\Tag; use Hackspace\Bundle\CalciferBundle\Entity\Tag;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
@ -50,7 +50,16 @@ class LocationController extends Controller
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();
$entities = $em->getRepository('CalciferBundle:Event')->findBy(['locations_id' => $location->getId()],['startdate' => 'ASC']); /** @var QueryBuilder $qb */
$qb = $em->createQueryBuilder();
$qb ->select(array('e'))
->from('CalciferBundle:Event', 'e')
->where('e.startdate >= :startdate')
->andWhere('e.locations_id = :location')
->orderBy('e.startdate')
->setParameter('startdate',new \DateTime())
->setParameter('location',$location->getId());
$entities = $qb->getQuery()->execute();
return array( return array(
'entities' => $entities, 'entities' => $entities,

5
src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
View file

@ -22,6 +22,7 @@ use Jsvrcek\ICS\Model\Relationship\Organizer;
use Jsvrcek\ICS\Utility\Formatter; use Jsvrcek\ICS\Utility\Formatter;
use Jsvrcek\ICS\CalendarStream; use Jsvrcek\ICS\CalendarStream;
use Jsvrcek\ICS\CalendarExport; use Jsvrcek\ICS\CalendarExport;
use Symfony\Component\Validator\Constraints\DateTime;
/** /**
* Tag controller. * Tag controller.
@ -53,7 +54,9 @@ class TagController extends Controller
$qb ->select(array('e')) $qb ->select(array('e'))
->from('CalciferBundle:Event', 'e') ->from('CalciferBundle:Event', 'e')
->join('e.tags', 't', 'WITH', $qb->expr()->in('t.id', $tag->getId())) ->join('e.tags', 't', 'WITH', $qb->expr()->in('t.id', $tag->getId()))
->orderBy('e.startdate'); ->where('e.startdate >= :startdate')
->orderBy('e.startdate')
->setParameter('startdate',new \DateTime());
$entities = $qb->getQuery()->execute(); $entities = $qb->getQuery()->execute();
return array( return array(