refactor code after review

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

View File

@ -278,7 +278,7 @@ final class SingleTaskController extends AbstractController
) {
$this->denyAccessUnlessGranted(TaskVoter::SHOW, null);
$showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 2 ? true : false;
$showMissionTypeFilter = $this->singleTaskRepository->countByDistinctTypes() > 1;
$filterOrder = $this->buildFilterOrder(true, $showMissionTypeFilter);
@ -685,12 +685,15 @@ final class SingleTaskController extends AbstractController
}
if ($includeMissionType) {
$missionTypes = $this->singleTaskRepository->findAllTasktypes();
/* $missionTypes = $this->singleTaskRepository->findAllTasktypes();
foreach ($missionTypes as $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();

View File

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