jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Added toolbar to project screen #1 (#50)

Browse Source 
* fixed annotation #1
* added default label #1
* added project toolbar #1
This commit is contained in:
Kevin Papst
2018-01-07 22:32:28 +01:00
committed by GitHub
parent 79e87ecdbe
commit bb61ee8b86
11 changed files with 149 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/TimesheetBundle/Controller/Admin/CustomerController.php
View File

@@ -68,14 +68,11 @@ class CustomerController extends AbstractController
/* @var $entries Pagerfanta */
$entries = $this->getDoctrine()->getRepository(Customer::class)->findByQuery($query);
return $this->render(
'TimesheetBundle:admin:customer.html.twig',
[
'entries' => $entries,
'query' => $query,
'toolbarForm' => $this->getToolbarForm($query)->createView(),
]
);
return $this->render('TimesheetBundle:admin:customer.html.twig', [
'entries' => $entries,
'query' => $query,
'toolbarForm' => $this->getToolbarForm($query)->createView(),
]);
}
/**

60
src/TimesheetBundle/Controller/Admin/ProjectController.php
View File

@@ -14,6 +14,7 @@ namespace TimesheetBundle\Controller\Admin;
use AppBundle\Controller\AbstractController;
use Pagerfanta\Pagerfanta;
use Symfony\Component\HttpFoundation\Request;
use TimesheetBundle\Entity\Activity;
use TimesheetBundle\Entity\Customer;
use TimesheetBundle\Entity\Project;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -21,6 +22,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
use TimesheetBundle\Form\ProjectEditForm;
use TimesheetBundle\Form\ProjectToolbarForm;
use TimesheetBundle\Repository\Query\ProjectQuery;
/**
@@ -33,22 +35,54 @@ use TimesheetBundle\Repository\Query\ProjectQuery;
*/
class ProjectController extends AbstractController
{
/**
* @param Request $request
* @return ProjectQuery
*/
protected function getQueryForRequest(Request $request)
{
$visibility = $request->get('visibility');
if (strlen($visibility) == 0 || (int)$visibility != $visibility) {
$visibility = ProjectQuery::SHOW_BOTH;
}
$pageSize = (int) $request->get('pageSize');
$customer = $request->get('customer');
$customer = !empty(trim($customer)) ? trim($customer) : null;
if ($customer !== null) {
$repo = $this->getDoctrine()->getRepository(Customer::class);
$customer = $repo->getById($customer);
}
$query = new ProjectQuery();
$query
->setPageSize($pageSize)
->setVisibility($visibility)
->setCustomer($customer)
;
return $query ;
}
/**
* @Route("/", defaults={"page": 1}, name="admin_project")
* @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated")
* @Method("GET")
* @Cache(smaxage="10")
*/
public function indexAction($page)
public function indexAction($page, Request $request)
{
$query = new ProjectQuery();
$query->setVisibility(ProjectQuery::SHOW_BOTH);
$query = $this->getQueryForRequest($request);
$query->setPage($page);
/* @var $entries Pagerfanta */
$entries = $this->getDoctrine()->getRepository(Project::class)->findByQuery($query);
return $this->render('TimesheetBundle:admin:project.html.twig', ['entries' => $entries]);
return $this->render('TimesheetBundle:admin:project.html.twig', [
'entries' => $entries,
'query' => $query,
'toolbarForm' => $this->getToolbarForm($query)->createView(),
]);
}
/**
@@ -100,6 +134,24 @@ class ProjectController extends AbstractController
);
}
/**
* @param ProjectQuery $query
* @return \Symfony\Component\Form\FormInterface
*/
protected function getToolbarForm(ProjectQuery $query)
{
return $this->createForm(
ProjectToolbarForm::class,
$query,
[
'action' => $this->generateUrl('admin_project_paginated', [
'page' => $query->getPage(),
]),
'method' => 'GET',
]
);
}
/**
* @param Project $project
* @return \Symfony\Component\Form\FormInterface