Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-29 05:26:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix export of all users and mapping of columns in user csv export (admin zone)

Browse Source
This commit is contained in:
Julien Fastré 2023-10-16 16:20:09 +02:00
parent 93b189b091
commit c62495a280
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ final readonly class UserExportController
fn (string $e) => $this->translator->trans('admin.users.export.' . $e),
[
'id',
'username',
// 'username',
'email',
'enabled',
'civility_id',

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

@ -109,15 +109,12 @@ final readonly class UserRepository implements UserRepositoryInterface
LEFT JOIN chill_main_civility civility ON u.civility_id = civility.id
LEFT JOIN centers mainCenter ON u.maincenter_id = mainCenter.id
LEFT JOIN chill_main_user_job_history userJobHistory ON u.id = userJobHistory.user_id
LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id
LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id
LEFT JOIN chill_main_user_job userJob ON userJobHistory.job_id = userJob.id AND tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
LEFT JOIN chill_main_user_scope_history userScopeHistory ON u.id = userScopeHistory.user_id AND tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
LEFT JOIN scopes mainScope ON userScopeHistory.scope_id = mainScope.id
LEFT JOIN chill_main_location currentLocation ON u.currentlocation_id = currentLocation.id
LEFT JOIN chill_main_location mainLocation ON u.mainlocation_id = mainLocation.id
WHERE
tstzrange(userScopeHistory.startdate, userScopeHistory.enddate) @> NOW()
AND
tstzrange(userJobHistory.startdate, userJobHistory.enddate) @> NOW()
ORDER BY u.label, u.id
SQL);
$query = $this->connection->prepare($sql);