added toolbar to customer screen #28 (#49)

* fixed filter query #28
* fixed annotation #28
* merge message files #28
* added page size type #28
* added visibility type #28
* added filter toolbar to customer screen #28
This commit is contained in:
Kevin Papst
2018-01-07 21:42:27 +01:00
committed by GitHub
parent c5c9f37de7
commit 79e87ecdbe
17 changed files with 289 additions and 87 deletions

View File

@@ -20,6 +20,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
use TimesheetBundle\Form\CustomerEditForm;
use TimesheetBundle\Form\CustomerToolbarForm;
use TimesheetBundle\Repository\Query\CustomerQuery;
/**
@@ -32,22 +33,49 @@ use TimesheetBundle\Repository\Query\CustomerQuery;
*/
class CustomerController extends AbstractController
{
/**
* @param Request $request
* @return CustomerQuery
*/
protected function getQueryForRequest(Request $request)
{
$visibility = $request->get('visibility');
if (strlen($visibility) == 0 || (int)$visibility != $visibility) {
$visibility = CustomerQuery::SHOW_BOTH;
}
$pageSize = (int) $request->get('pageSize');
$query = new CustomerQuery();
$query
->setPageSize($pageSize)
->setVisibility($visibility);
return $query ;
}
/**
* @Route("/", defaults={"page": 1}, name="admin_customer")
* @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_customer_paginated")
* @Method("GET")
* @Cache(smaxage="10")
*/
public function indexAction($page)
public function indexAction($page, Request $request)
{
$query = new CustomerQuery();
$query->setVisibility(CustomerQuery::SHOW_BOTH);
$query = $this->getQueryForRequest($request);
$query->setPage($page);
/* @var $entries Pagerfanta */
$entries = $this->getDoctrine()->getRepository(Customer::class)->findByQuery($query);
return $this->render('TimesheetBundle:admin:customer.html.twig', ['entries' => $entries]);
return $this->render(
'TimesheetBundle:admin:customer.html.twig',
[
'entries' => $entries,
'query' => $query,
'toolbarForm' => $this->getToolbarForm($query)->createView(),
]
);
}
/**
@@ -99,6 +127,24 @@ class CustomerController extends AbstractController
);
}
/**
* @param CustomerQuery $query
* @return \Symfony\Component\Form\FormInterface
*/
protected function getToolbarForm(CustomerQuery $query)
{
return $this->createForm(
CustomerToolbarForm::class,
$query,
[
'action' => $this->generateUrl('admin_customer_paginated', [
'page' => $query->getPage(),
]),
'method' => 'GET',
]
);
}
/**
* @param Customer $customer
* @return \Symfony\Component\Form\FormInterface