rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Fix total row count computation to work with filters for outlet list

Browse source
This commit is contained in:
Kendrick Chan 2018-01-14 22:46:16 +08:00
parent b3c056ab23
commit b496767bd1
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Controller/OutletController.php
View file

@ -6,6 +6,7 @@ use App\Ramcar\BaseController;
use App\Entity\Outlet; use App\Entity\Outlet;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
@ -34,14 +35,15 @@ class OutletController extends BaseController
->getRepository(Outlet::class) ->getRepository(Outlet::class)
->createQueryBuilder('q'); ->createQueryBuilder('q');
// count total records
$total = $qb->select('COUNT(q)')
->getQuery()
->getSingleScalarResult();
// get datatable params // get datatable params
$datatable = $req->request->get('datatable'); $datatable = $req->request->get('datatable');
// count total records
$tquery = $qb->select('COUNT(q)');
$this->setQueryFilters($datatable, $tquery);
$total = $tquery->getQuery()
->getSingleScalarResult();
// get current page number // get current page number
$page = $datatable['pagination']['page'] ?? 1; $page = $datatable['pagination']['page'] ?? 1;
@ -60,13 +62,7 @@ class OutletController extends BaseController
// build query // build query
$query = $qb->select('q'); $query = $qb->select('q');
$this->setQueryFilters($datatable, $query);
// check if filter is present
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
$query->where('q.name LIKE :filter')
->orWhere('q.address LIKE :filter')
->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
}
// check if sorting is present, otherwise use default // check if sorting is present, otherwise use default
if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) { if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
@ -81,7 +77,6 @@ class OutletController extends BaseController
->setMaxResults($perpage) ->setMaxResults($perpage)
->getQuery() ->getQuery()
->getResult(); ->getResult();
// Query::HYDRATE_ARRAY);
// process rows // process rows
$rows = []; $rows = [];
@ -94,7 +89,6 @@ class OutletController extends BaseController
$row['time_open'] = $orow->getTimeOpen()->format('h:i A'); $row['time_open'] = $orow->getTimeOpen()->format('h:i A');
$row['time_close'] = $orow->getTimeClose()->format('h:i A'); $row['time_close'] = $orow->getTimeClose()->format('h:i A');
// add row metadata // add row metadata
$row['meta'] = [ $row['meta'] = [
'update_url' => '', 'update_url' => '',
@ -148,6 +142,15 @@ class OutletController extends BaseController
->setCoordinates($point); ->setCoordinates($point);
} }
protected function setQueryFilters($datatable, QueryBuilder $query)
{
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
$query->where('q.name LIKE :filter')
->orWhere('q.address LIKE :filter')
->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
}
}
public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator) public function addSubmit(Request $req, EncoderFactoryInterface $ef, ValidatorInterface $validator)
{ {
$this->denyAccessUnlessGranted('outlet.add', null, 'No access.'); $this->denyAccessUnlessGranted('outlet.add', null, 'No access.');