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

just mark other uses with mainScope and userJob !!

Browse Source
This commit is contained in:
Mathieu Jaumotte 2023-10-03 15:38:59 +02:00
parent c6a06ebaf9
commit d6a1044585
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
View File

@ -190,7 +190,7 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
->addSelect('aside.updatedAt AS updatedAt') ->addSelect('aside.updatedAt AS updatedAt')
->addSelect('IDENTITY(aside.agent) AS agent_id') ->addSelect('IDENTITY(aside.agent) AS agent_id')
->addSelect('IDENTITY(aside.createdBy) AS creator_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(agent.mainCenter) AS main_center')
->addSelect('IDENTITY(aside.type) AS aside_activity_type') ->addSelect('IDENTITY(aside.type) AS aside_activity_type')
->addSelect('aside.date') ->addSelect('aside.date')

8
src/Bundle/ChillMainBundle/Controller/UserExportController.php
View File

@ -59,10 +59,10 @@ final readonly class UserExportController
'label', 'label',
'mainCenter_id' , 'mainCenter_id' ,
'mainCenter_name', 'mainCenter_name',
'mainScope_id', 'mainScope_id', ///
'mainScope_name', 'mainScope_name', ///
'userJob_id', 'userJob_id', ///
'userJob_name', 'userJob_name', ///
'currentLocation_id', 'currentLocation_id',
'currentLocation_name', 'currentLocation_name',
'mainLocation_id', 'mainLocation_id',

2
src/Bundle/ChillMainBundle/Repository/UserRepository.php
View File

@ -108,7 +108,7 @@ final readonly class UserRepository implements UserRepositoryInterface
LEFT JOIN u.mainScope mainScope LEFT JOIN u.mainScope mainScope
LEFT JOIN u.userJob userJob LEFT JOIN u.userJob userJob
ORDER BY u.label ORDER BY u.label
DQL); DQL); /// mainScope userJob
$query = $this->entityManager->createQuery($dql) $query = $this->entityManager->createQuery($dql)
->setHydrationMode(AbstractQuery::HYDRATE_ARRAY) ->setHydrationMode(AbstractQuery::HYDRATE_ARRAY)