Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

refactor code after review

Browse Source
This commit is contained in:
Julie Lenaerts 2023-09-11 13:53:09 +02:00
parent f770664798
commit efd43c3791
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ final class SingleTaskController extends AbstractController
) { ) {
$this->denyAccessUnlessGranted(TaskVoter::SHOW, null); $this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
$showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 2 ? true : false; $showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
$filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter); $filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
@ -685,12 +685,15 @@ final class SingleTaskController extends AbstractController
} }
if ($includeMissionType) { if ($includeMissionType) {
$missionTypes = $this->singleTaskRepository->findAllTasktypes(); /* $missionTypes = $this->singleTaskRepository->findAllTasktypes();
foreach ($missionTypes as $type) { foreach ($missionTypes as $type) {
$arrayOfTypes[] = $type['type']; $arrayOfTypes[] = $type['type'];
} }*/
$filterBuilder->addCheckbox('missionTypePicker', $arrayOfTypes); // $filterBuilder->addCheckbox('missionTypePicker', $arrayOfTypes);
$filterBuilder->addCheckbox('missionTypePicker', array_map(
fn ($row) => $row['type'], $this->singleTaskRepository->findAllTaskDistinctTypes())
);
} }
return $filterBuilder->build(); return $filterBuilder->build();

2
src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
View File

@ -319,7 +319,7 @@ class SingleTaskRepository extends EntityRepository
->getSingleScalarResult(); ->getSingleScalarResult();
} }
public function findAllTasktypes() public function findAllTaskDistinctTypes()
{ {
$qb = $this->createQueryBuilder('st') $qb = $this->createQueryBuilder('st')
->select('DISTINCT st.type'); ->select('DISTINCT st.type');