Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-30 11:33:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rector/rules-symfony

Browse Source
This commit is contained in:
Julien Fastré
2023-09-27 15:25:29 +02:00
parent d8b0e0671a 48b3ed0a1f
commit 65aa0a1588
106 changed files with 1259 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
View File

@@ -26,6 +26,7 @@ use Chill\TaskBundle\Event\TaskEvent;
use Chill\TaskBundle\Event\UI\UIEvent;
use Chill\TaskBundle\Form\SingleTaskType;
use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
use Chill\TaskBundle\Repository\SingleTaskRepository;
use Chill\TaskBundle\Repository\SingleTaskStateRepository;
use Chill\TaskBundle\Security\Authorization\TaskVoter;
use LogicException;
@@ -57,7 +58,8 @@ final class SingleTaskController extends AbstractController
private readonly TimelineBuilder $timelineBuilder,
private readonly LoggerInterface $logger,
private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
private readonly SingleTaskStateRepository $singleTaskStateRepository
private readonly SingleTaskStateRepository $singleTaskStateRepository,
private readonly SingleTaskRepository $singleTaskRepository,
) {}
/**
@@ -267,7 +269,9 @@ final class SingleTaskController extends AbstractController
) {
$this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
$filterOrder = $this->buildFilterOrder();
$showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
$filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
$filteredUsers = $filterOrder->getUserPickerData('userPicker');
@@ -275,9 +279,15 @@ final class SingleTaskController extends AbstractController
$filterOrder->getCheckboxData('status'),
array_map(static fn ($i) => 'state_' . $i, $filterOrder->hasCheckboxData('states') ? $filterOrder->getCheckboxData('states') : [])
);
if ($showMissionTypeFilter) {
$types = $filterOrder->getCheckboxData('missionTypePicker');
}
$nb = $this->singleTaskAclAwareRepository->countByAllViewable(
$filterOrder->getQueryString(),
$flags,
$types ?? [],
$filteredUsers
);
$paginator = $this->paginatorFactory->create($nb);
@@ -286,6 +296,7 @@ final class SingleTaskController extends AbstractController
$tasks = $this->singleTaskAclAwareRepository->findByAllViewable(
$filterOrder->getQueryString(),
$flags,
$types ?? [],
$filteredUsers,
$paginator->getCurrentPageFirstItemNumber(),
$paginator->getItemsPerPage(),
@@ -631,7 +642,7 @@ final class SingleTaskController extends AbstractController
return $form;
}
private function buildFilterOrder($includeFilterByUser = true): FilterOrderHelper
private function buildFilterOrder($includeFilterByUser = true, $includeMissionType = false): FilterOrderHelper
{
$statuses = ['no-alert', 'warning', 'alert'];
$statusTrans = [
@@ -639,6 +650,7 @@ final class SingleTaskController extends AbstractController
'Tasks near deadline',
'Tasks over deadline',
];
$arrayOfTypes = [];
$filterBuilder = $this->filterOrderHelperFactory
->create(self::class)
@@ -658,6 +670,16 @@ final class SingleTaskController extends AbstractController
->addUserPicker('userPicker', 'Filter by user', ['multiple' => true, 'required' => false]);
}
if ($includeMissionType) {
$filterBuilder->addCheckbox(
'missionTypePicker',
array_map(
fn ($row) => $row['type'],
$this->singleTaskRepository->findAllTaskDistinctTypes()
)
);
}
return $filterBuilder->build();
}