From d6a104458503f26030b077cc30dd71b47c5e8776 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 3 Oct 2023 15:38:59 +0200 Subject: [PATCH] just mark other uses with mainScope and userJob !! --- .../src/Export/Export/ListAsideActivity.php | 2 +- .../ChillMainBundle/Controller/UserExportController.php | 8 ++++---- src/Bundle/ChillMainBundle/Repository/UserRepository.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php index 53e66c6c3..f01c3efc2 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php @@ -190,7 +190,7 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn ->addSelect('aside.updatedAt AS updatedAt') ->addSelect('IDENTITY(aside.agent) AS agent_id') ->addSelect('IDENTITY(aside.createdBy) AS creator_id') - ->addSelect('IDENTITY(agent.mainScope) AS main_scope') + ->addSelect('IDENTITY(agent.mainScope) AS main_scope') /// ->addSelect('IDENTITY(agent.mainCenter) AS main_center') ->addSelect('IDENTITY(aside.type) AS aside_activity_type') ->addSelect('aside.date') diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php index 450be8dd7..04778dfae 100644 --- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php +++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php @@ -59,10 +59,10 @@ final readonly class UserExportController 'label', 'mainCenter_id' , 'mainCenter_name', - 'mainScope_id', - 'mainScope_name', - 'userJob_id', - 'userJob_name', + 'mainScope_id', /// + 'mainScope_name', /// + 'userJob_id', /// + 'userJob_name', /// 'currentLocation_id', 'currentLocation_name', 'mainLocation_id', diff --git a/src/Bundle/ChillMainBundle/Repository/UserRepository.php b/src/Bundle/ChillMainBundle/Repository/UserRepository.php index 230a2b925..a59ddc399 100644 --- a/src/Bundle/ChillMainBundle/Repository/UserRepository.php +++ b/src/Bundle/ChillMainBundle/Repository/UserRepository.php @@ -108,7 +108,7 @@ final readonly class UserRepository implements UserRepositoryInterface LEFT JOIN u.mainScope mainScope LEFT JOIN u.userJob userJob ORDER BY u.label - DQL); + DQL); /// mainScope userJob $query = $this->entityManager->createQuery($dql) ->setHydrationMode(AbstractQuery::HYDRATE_ARRAY)