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

toolbar dropdown and visibility improvements (#933)

Browse Source
This commit is contained in:
Kevin Papst
2019-07-09 16:34:11 +02:00
committed by GitHub
parent b833e1ce27
commit c33a87a07c
74 changed files with 1317 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Controller/ActivityController.php
View File

@@ -16,6 +16,7 @@ use App\Form\ActivityEditForm;
use App\Form\Toolbar\ActivityToolbarForm;
use App\Form\Type\ActivityType;
use App\Repository\ActivityRepository;
use App\Repository\Query\ActivityFormTypeQuery;
use App\Repository\Query\ActivityQuery;
use Doctrine\ORM\ORMException;
use Pagerfanta\Pagerfanta;
@@ -67,26 +68,19 @@ class ActivityController extends AbstractController
public function indexAction($page, Request $request)
{
$query = new ActivityQuery();
$query
->setOrderBy('name')
->setExclusiveVisibility(true)
->setPage($page)
;
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var ActivityQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
/* @var $entries Pagerfanta */
$entries = $this->getRepository()->findByQuery($query);
$entries = $this->getRepository()->getPagerfantaForQuery($query);
return $this->render('activity/index.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $query->isDirty(),
'toolbarForm' => $form->createView(),
]);
}
@@ -160,16 +154,11 @@ class ActivityController extends AbstractController
->add('activity', ActivityType::class, [
'label' => 'label.activity',
'query_builder' => function (ActivityRepository $repo) use ($activity) {
$query = new ActivityQuery();
$query
->setResultType(ActivityQuery::RESULT_TYPE_QUERYBUILDER)
->setProject($activity->getProject())
->setOrderGlobalsFirst(true)
->addIgnoredEntity($activity)
->setGlobalsOnly(null === $activity->getProject())
;
$query = new ActivityFormTypeQuery();
$query->setProject($activity->getProject());
$query->setActivityToIgnore($activity);
return $repo->findByQuery($query);
return $repo->getQueryBuilderForFormType($query);
},
'required' => false,
])

27
src/Controller/CustomerController.php
View File

@@ -16,9 +16,9 @@ use App\Form\CustomerEditForm;
use App\Form\Toolbar\CustomerToolbarForm;
use App\Form\Type\CustomerType;
use App\Repository\CustomerRepository;
use App\Repository\Query\CustomerFormTypeQuery;
use App\Repository\Query\CustomerQuery;
use Doctrine\ORM\ORMException;
use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Form\FormInterface;
@@ -79,25 +79,18 @@ class CustomerController extends AbstractController
public function indexAction($page, Request $request)
{
$query = new CustomerQuery();
$query
->setOrderBy('name')
->setPage($page)
;
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var CustomerQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
/* @var $entries Pagerfanta */
$entries = $this->getRepository()->findByQuery($query);
$entries = $this->getRepository()->getPagerfantaForQuery($query);
return $this->render('customer/index.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $query->isDirty(),
'toolbarForm' => $form->createView(),
]);
}
@@ -174,12 +167,10 @@ class CustomerController extends AbstractController
->add('customer', CustomerType::class, [
'label' => 'label.customer',
'query_builder' => function (CustomerRepository $repo) use ($customer) {
$query = new CustomerQuery();
$query
->setResultType(CustomerQuery::RESULT_TYPE_QUERYBUILDER)
->addIgnoredEntity($customer);
$query = new CustomerFormTypeQuery();
$query->setCustomerToIgnore($customer);
return $repo->findByQuery($query);
return $repo->getQueryBuilderForFormType($query);
},
'required' => false,
])

29
src/Controller/ExportController.php
View File

@@ -74,7 +74,7 @@ class ExportController extends AbstractController
}
/**
* @Route(path="/", name="export", methods={"GET", "POST"})
* @Route(path="/", name="export", methods={"GET"})
* @Security("is_granted('view_export')")
*
* @param Request $request
@@ -84,13 +84,10 @@ class ExportController extends AbstractController
public function indexAction(Request $request)
{
$query = $this->getDefaultQuery();
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var ExportQuery $query */
$query = $form->getData();
}
$form = $this->getToolbarForm($query, 'GET');
$form->setData($query);
$form->submit($request->query->all(), false);
$entries = $this->getEntries($query);
@@ -103,7 +100,7 @@ class ExportController extends AbstractController
}
/**
* @Route(path="/data", name="export_data", methods={"GET", "POST"})
* @Route(path="/data", name="export_data", methods={"POST"})
* @Security("is_granted('create_export')")
*
* @param Request $request
@@ -113,13 +110,9 @@ class ExportController extends AbstractController
public function export(Request $request)
{
$query = $this->getDefaultQuery();
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var ExportQuery $query */
$query = $form->getData();
}
$form = $this->getToolbarForm($query, 'POST');
$form->handleRequest($request);
$type = $query->getType();
if (null === $type) {
@@ -149,15 +142,11 @@ class ExportController extends AbstractController
return $this->timesheetRepository->getTimesheetsForQuery($query);
}
/**
* @param ExportQuery $query
* @return FormInterface
*/
protected function getToolbarForm(ExportQuery $query): FormInterface
protected function getToolbarForm(ExportQuery $query, string $method): FormInterface
{
return $this->createForm(ExportToolbarForm::class, $query, [
'action' => $this->generateUrl('export', []),
'method' => 'POST',
'method' => $method,
'attr' => [
'id' => 'export-form'
]

25
src/Controller/InvoiceController.php
View File

@@ -21,6 +21,7 @@ use App\Repository\Query\InvoiceQuery;
use App\Repository\TimesheetRepository;
use App\Timesheet\UserDateTimeFactory;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
@@ -75,7 +76,7 @@ class InvoiceController extends AbstractController
}
/**
* @Route(path="/", name="invoice", methods={"GET", "POST"})
* @Route(path="/", name="invoice", methods={"GET"})
* @Security("is_granted('view_invoice')")
*
* @param Request $request
@@ -91,12 +92,11 @@ class InvoiceController extends AbstractController
$entries = [];
$query = $this->getDefaultQuery();
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
$form = $this->getToolbarForm($query, 'GET');
$form->setData($query);
$form->submit($request->query->all(), false);
if ($form->isSubmitted() && $form->isValid()) {
/** @var InvoiceQuery $query */
$query = $form->getData();
if ($form->isValid()) {
$entries = $this->getEntries($query, $repository);
}
@@ -109,7 +109,7 @@ class InvoiceController extends AbstractController
}
/**
* @Route(path="/print", name="invoice_print", methods={"GET", "POST"})
* @Route(path="/print", name="invoice_print", methods={"POST"})
* @Security("is_granted('create_invoice')")
*
* @param Request $request
@@ -123,7 +123,8 @@ class InvoiceController extends AbstractController
}
$query = $this->getDefaultQuery();
$form = $this->getToolbarForm($query);
$form = $this->getToolbarForm($query, 'POST');
$form->handleRequest($request);
if (!$form->isSubmitted() || !$form->isValid()) {
@@ -328,15 +329,11 @@ class InvoiceController extends AbstractController
]);
}
/**
* @param InvoiceQuery $query
* @return \Symfony\Component\Form\FormInterface
*/
protected function getToolbarForm(InvoiceQuery $query)
protected function getToolbarForm(InvoiceQuery $query, string $method): FormInterface
{
return $this->createForm(InvoiceToolbarForm::class, $query, [
'action' => $this->generateUrl('invoice', []),
'method' => 'POST',
'method' => $method,
'attr' => [
'id' => 'invoice-print-form'
],

28
src/Controller/ProjectController.php
View File

@@ -16,6 +16,7 @@ use App\Form\ProjectEditForm;
use App\Form\Toolbar\ProjectToolbarForm;
use App\Form\Type\ProjectType;
use App\Repository\ProjectRepository;
use App\Repository\Query\ProjectFormTypeQuery;
use App\Repository\Query\ProjectQuery;
use Doctrine\ORM\ORMException;
use Pagerfanta\Pagerfanta;
@@ -67,26 +68,19 @@ class ProjectController extends AbstractController
public function indexAction($page, Request $request)
{
$query = new ProjectQuery();
$query
->setOrderBy('name')
->setExclusiveVisibility(true)
->setPage($page)
;
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var ProjectQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
/* @var $entries Pagerfanta */
$entries = $this->getRepository()->findByQuery($query);
$entries = $this->getRepository()->getPagerfantaForQuery($query);
return $this->render('project/index.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $query->isDirty(),
'toolbarForm' => $form->createView(),
]);
}
@@ -161,13 +155,11 @@ class ProjectController extends AbstractController
->add('project', ProjectType::class, [
'label' => 'label.project',
'query_builder' => function (ProjectRepository $repo) use ($project) {
$query = new ProjectQuery();
$query
->setResultType(ProjectQuery::RESULT_TYPE_QUERYBUILDER)
->setCustomer($project->getCustomer())
->addIgnoredEntity($project);
$query = new ProjectFormTypeQuery();
$query->setCustomer($project->getCustomer());
$query->setProjectToIgnore($project);
return $repo->findByQuery($query);
return $repo->getQueryBuilderForFormType($query);
},
'required' => false,
])

9
src/Controller/TagController.php
View File

@@ -38,18 +38,15 @@ class TagController extends AbstractController
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var TagQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
$tags = $repository->getTagCount($query);
return $this->render('tags/index.html.twig', [
'tags' => $tags,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $query->isDirty(),
'toolbarForm' => $form->createView(),
]);
}

27
src/Controller/TimesheetAbstractController.php
View File

@@ -87,10 +87,10 @@ abstract class TimesheetAbstractController extends AbstractController
$query->setPage($page);
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var TimesheetQuery $query */
$query = $form->getData();
$form->setData($query);
$form->submit($request->query->all(), false);
if ($form->isValid()) {
if (null !== $query->getBegin()) {
$query->getBegin()->setTime(0, 0, 0);
}
@@ -99,10 +99,6 @@ abstract class TimesheetAbstractController extends AbstractController
}
}
if (!$this->includeUserInForms()) {
$query->setUser($this->getUser());
}
$tags = $query->getTags(true);
if (!empty($tags)) {
/** @var TagRepository $tagRepo */
@@ -114,13 +110,19 @@ abstract class TimesheetAbstractController extends AbstractController
);
}
$dirtyQuery = $query->isDirty();
if (!$this->includeUserInForms()) {
$query->setUser($this->getUser());
}
$pager = $this->getRepository()->getPagerfantaForQuery($query);
return $this->render($renderTemplate, [
'entries' => $pager,
'page' => $query->getPage(),
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $dirtyQuery,
'toolbarForm' => $form->createView(),
'showSummary' => $this->includeSummary(),
'showStartEndTime' => $this->canSeeStartEndTime()
@@ -235,11 +237,8 @@ abstract class TimesheetAbstractController extends AbstractController
$query = new TimesheetQuery();
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var TimesheetQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
// by default the current month is exported, but it can be overwritten
// this should not be removed, otherwise we would export EVERY available record in the admin section

9
src/Controller/UserController.php
View File

@@ -69,11 +69,8 @@ class UserController extends AbstractController
$query->setOrderBy('username');
$form = $this->getToolbarForm($query);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
/** @var UserQuery $query */
$query = $form->getData();
}
$form->setData($query);
$form->submit($request->query->all(), false);
/* @var $entries Pagerfanta */
$entries = $this->getRepository()->findByQuery($query);
@@ -81,7 +78,7 @@ class UserController extends AbstractController
return $this->render('user/index.html.twig', [
'entries' => $entries,
'query' => $query,
'showFilter' => $form->isSubmitted(),
'showFilter' => $query->isDirty(),
'toolbarForm' => $form->createView(),
]);
}