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

added multi-select for customer, project and activity (#1557)

Browse Source
This commit is contained in:
Kevin Papst
2020-03-16 14:06:26 +01:00
committed by GitHub
parent 6eeb01ad48
commit 4b1cfa5840
74 changed files with 1262 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Controller/ActivityController.php
View File

@@ -241,7 +241,7 @@ final class ActivityController extends AbstractController
'label' => 'label.activity',
'query_builder' => function (ActivityRepository $repo) use ($activity) {
$query = new ActivityFormTypeQuery();
$query->setProject($activity->getProject());
$query->addProject($activity->getProject());
$query->setActivityToIgnore($activity);
return $repo->getQueryBuilderForFormType($query);

2
src/Controller/CustomerController.php
View File

@@ -244,7 +244,7 @@ final class CustomerController extends AbstractController
$query->setCurrentUser($this->getUser());
$query->setPage($page);
$query->setPageSize(5);
$query->setCustomer($customer);
$query->addCustomer($customer);
/* @var $entries Pagerfanta */
$entries = $projectRepository->getPagerfantaForQuery($query);

2
src/Controller/InvoiceController.php
View File

@@ -313,7 +313,7 @@ final class InvoiceController extends AbstractController
protected function getEntries(InvoiceQuery $query): array
{
// customer needs to be defined, as we need the currency for the invoice
if (null === $query->getCustomer()) {
if (!$query->hasCustomers()) {
return [];
}

4
src/Controller/ProjectController.php
View File

@@ -249,7 +249,7 @@ final class ProjectController extends AbstractController
$query->setCurrentUser($this->getUser());
$query->setPage($page);
$query->setPageSize(5);
$query->setProject($project);
$query->addProject($project);
$query->setExcludeGlobals(true);
/* @var $entries Pagerfanta */
@@ -405,7 +405,7 @@ final class ProjectController extends AbstractController
'label' => 'label.project',
'query_builder' => function (ProjectRepository $repo) use ($project) {
$query = new ProjectFormTypeQuery();
$query->setCustomer($project->getCustomer());
$query->addCustomer($project->getCustomer());
$query->setProjectToIgnore($project);
$query->setUser($this->getUser());