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

added basic invoice rendering #97 #93 (#99)

Browse Source
This commit is contained in:
Kevin Papst
2018-01-21 22:50:46 +01:00
committed by GitHub
parent 9a161b8fd9
commit 4cbc5391c0
73 changed files with 2986 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Controller/Admin/UserController.php
View File

@@ -20,7 +20,6 @@ use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -35,29 +34,6 @@ use Symfony\Component\HttpFoundation\Request;
class UserController extends AbstractController
{
/**
* @param Request $request
* @return UserQuery
*/
protected function getQueryForRequest(Request $request)
{
$visibility = $request->get('visibility', UserQuery::SHOW_VISIBLE);
if (strlen($visibility) == 0 || (int)$visibility != $visibility) {
$visibility = UserQuery::SHOW_BOTH;
}
$pageSize = (int) $request->get('pageSize');
$userRole = $request->get('role');
$query = new UserQuery();
$query
->setPageSize($pageSize)
->setVisibility($visibility)
->setRole($userRole)
;
return $query;
}
/**
* @Route("/", defaults={"page": 1}, name="admin_user")
* @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_user_paginated")
@@ -65,16 +41,23 @@ class UserController extends AbstractController
*/
public function indexAction($page, Request $request)
{
$query = $this->getQueryForRequest($request);
$query = new UserQuery();
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var UserQuery $query */
$query = $form->getData();
}
/* @var $entries Pagerfanta */
$entries = $this->getDoctrine()->getRepository(User::class)->findByQuery($query);
return $this->render('admin/user.html.twig', [
'entries' => $entries,
'query' => $query,
'toolbarForm' => $this->getToolbarForm($query)->createView(),
'toolbarForm' => $form->createView(),
]);
}
@@ -120,16 +103,12 @@ class UserController extends AbstractController
*/
protected function getToolbarForm(UserQuery $query)
{
return $this->createForm(
UserToolbarForm::class,
$query,
[
'action' => $this->generateUrl('admin_user_paginated', [
'page' => $query->getPage(),
]),
'method' => 'GET',
]
);
return $this->createForm(UserToolbarForm::class, $query, [
'action' => $this->generateUrl('admin_user_paginated', [
'page' => $query->getPage(),
]),
'method' => 'GET',
]);
}
/**
@@ -138,13 +117,9 @@ class UserController extends AbstractController
*/
private function createEditForm(User $user)
{
return $this->createForm(
UserCreateType::class,
$user,
[
'action' => $this->generateUrl('admin_user_create'),
'method' => 'POST'
]
);
return $this->createForm(UserCreateType::class, $user, [
'action' => $this->generateUrl('admin_user_create'),
'method' => 'POST'
]);
}
}