diff --git a/assets/images/icons.svg b/assets/images/icons.svg index 9983354..7176be2 100644 --- a/assets/images/icons.svg +++ b/assets/images/icons.svg @@ -1,4 +1,7 @@ + + + diff --git a/src/Controller/Admin/Application/DeleteController.php b/src/Controller/Admin/Application/DeleteController.php index f904bc8..012eed3 100644 --- a/src/Controller/Admin/Application/DeleteController.php +++ b/src/Controller/Admin/Application/DeleteController.php @@ -32,7 +32,7 @@ class DeleteController extends AbstractController 'teamer' => (string) $application->getTeamer(), ]); - return $this->redirectToRoute('app_admin_assignment_detail', [ + return $this->redirectToRoute('app_administrative_assignment_detail', [ 'uuid' => $application->getAssignment()->getUuid(), ]); } diff --git a/src/Controller/Admin/Application/DisposeController.php b/src/Controller/Admin/Application/DisposeController.php index ad1558f..7a17d8e 100644 --- a/src/Controller/Admin/Application/DisposeController.php +++ b/src/Controller/Admin/Application/DisposeController.php @@ -44,7 +44,7 @@ class DisposeController extends AbstractController 'teamer' => (string) $application->getTeamer(), ]); - $redirectUrl = $this->generateUrl('app_admin_assignment_detail', [ + $redirectUrl = $this->generateUrl('app_administrative_assignment_detail', [ 'uuid' => $application->getAssignment()->getUuid(), ]); diff --git a/src/Controller/Admin/Application/StatusController.php b/src/Controller/Admin/Application/StatusController.php index 6abec3c..06c99f8 100644 --- a/src/Controller/Admin/Application/StatusController.php +++ b/src/Controller/Admin/Application/StatusController.php @@ -51,7 +51,7 @@ class StatusController extends AbstractController 'teamer' => (string) $application->getTeamer(), ]); - return new HxRedirectResponse($this->generateUrl('app_admin_assignment_detail', [ + return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [ 'uuid' => $application->getAssignment()->getUuid(), ])); } diff --git a/src/Controller/Admin/Disposition/DeleteController.php b/src/Controller/Admin/Disposition/DeleteController.php index ef656fa..fab2703 100644 --- a/src/Controller/Admin/Disposition/DeleteController.php +++ b/src/Controller/Admin/Disposition/DeleteController.php @@ -54,7 +54,7 @@ class DeleteController extends AbstractController $this->entityManager->remove($disposition); $this->entityManager->flush(); - return new HxRedirectResponse($this->generateUrl('app_admin_assignment_detail', [ + return new HxRedirectResponse($this->generateUrl('app_administrative_assignment_detail', [ 'uuid' => $disposition->getAssignment()->getUuid(), ])); } diff --git a/src/Controller/Admin/Teamer/InfoController.php b/src/Controller/Administrative/Teamer/InfoController.php similarity index 73% rename from src/Controller/Admin/Teamer/InfoController.php rename to src/Controller/Administrative/Teamer/InfoController.php index d183524..178f2f5 100644 --- a/src/Controller/Admin/Teamer/InfoController.php +++ b/src/Controller/Administrative/Teamer/InfoController.php @@ -1,6 +1,6 @@ dispositionRepository->findRecentDispositionsByTeamer($teamer); - return $this->render('admin/teamer/modal_info.html.twig', [ + return $this->render('administrative/teamer/modal_info.html.twig', [ 'teamer' => $teamer, 'recentDispositions' => $recentDispositions, ]); diff --git a/src/Form/AssignmentType.php b/src/Form/AssignmentType.php index 7b42e26..c88017c 100644 --- a/src/Form/AssignmentType.php +++ b/src/Form/AssignmentType.php @@ -44,10 +44,10 @@ class AssignmentType extends AbstractType 'label' => 'zu vergeben', 'required' => false, ]) - ->add('showAvailableDispositions', CheckboxType::class, [ - 'label' => 'Anzahl anzeigen', - 'required' => false, - ]) +// ->add('showAvailableDispositions', CheckboxType::class, [ +// 'label' => 'Anzahl anzeigen', +// 'required' => false, +// ]) ->add('destination', AutocompleteEntityType::class, [ 'label' => 'Destination', 'class' => Destination::class, diff --git a/src/Repository/AssignmentRepository.php b/src/Repository/AssignmentRepository.php index 9e73d79..fe29019 100644 --- a/src/Repository/AssignmentRepository.php +++ b/src/Repository/AssignmentRepository.php @@ -33,12 +33,13 @@ class AssignmentRepository extends ServiceEntityRepository $qb = $this->createQueryBuilder('assignment'); $qb - ->select('assignment', 'destination', 'job_profile', 'application', 'disposition') + ->select('assignment', 'destination', 'job_profile', 'application', 'disposition', 'teamer') ->innerJoin('assignment.destination', 'destination') ->innerJoin('assignment.jobProfile', 'job_profile') ->where($qb->expr()->isNull('assignment.deletedAt')) ->leftJoin('assignment.applications', 'application') ->leftJoin('assignment.dispositions', 'disposition') + ->leftJoin('disposition.teamer', 'teamer') ; $this->applyFilterSettings($filterDto, $qb); diff --git a/templates/_partials/_dropdown.html.twig b/templates/_partials/_dropdown.html.twig index 324b531..4649666 100644 --- a/templates/_partials/_dropdown.html.twig +++ b/templates/_partials/_dropdown.html.twig @@ -1,15 +1,13 @@
- -