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

change id, to avoid collision between ListPersonHelper and ListAccompanyingPeriodHelper

Browse Source
This commit is contained in:
Julien Fastré 2023-07-07 09:33:03 +02:00
parent 7ccff61c25
commit 56d9072abe
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillPersonBundle/Export/Helper/ListAccompanyingPeriodHelper.php
View File

@ -32,7 +32,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
final readonly class ListAccompanyingPeriodHelper final readonly class ListAccompanyingPeriodHelper
{ {
public const FIELDS = [ public const FIELDS = [
'id', 'acpId',
'step', 'step',
'stepSince', 'stepSince',
'openingDate', 'openingDate',
@ -219,8 +219,10 @@ final readonly class ListAccompanyingPeriodHelper
public function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void public function addSelectClauses(QueryBuilder $qb, \DateTimeImmutable $calcDate): void
{ {
$qb->addSelect('acp.id AS acpId');
// add the regular fields // add the regular fields
foreach (['id', 'openingDate', 'closingDate', 'confidential', 'emergency', 'intensity', 'createdAt', 'updatedAt'] as $field) { foreach (['openingDate', 'closingDate', 'confidential', 'emergency', 'intensity', 'createdAt', 'updatedAt'] as $field) {
$qb->addSelect(sprintf('acp.%s AS %s', $field, $field)); $qb->addSelect(sprintf('acp.%s AS %s', $field, $field));
} }

7
src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
View File

@ -42,7 +42,7 @@ use function strlen;
class ListPersonHelper class ListPersonHelper
{ {
public const FIELDS = [ public const FIELDS = [
'id', 'personId',
'civility', 'civility',
'firstName', 'firstName',
'lastName', 'lastName',
@ -124,6 +124,11 @@ class ListPersonHelper
} }
switch ($f) { switch ($f) {
case 'personId':
$qb->addSelect('person.id AS personId');
break;
case 'countryOfBirth': case 'countryOfBirth':
case 'nationality': case 'nationality':
$qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $f, $f)); $qb->addSelect(sprintf('IDENTITY(person.%s) as %s', $f, $f));

4
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -997,6 +997,8 @@ notification:
Notify referrer: Notifier le référent Notify referrer: Notifier le référent
Notify any: Notifier d'autres utilisateurs Notify any: Notifier d'autres utilisateurs
personId: Identifiant de l'usager
export: export:
export: export:
acp_stats: acp_stats:
@ -1152,7 +1154,7 @@ export:
Generate a list of accompanying periods, filtered on different parameters.: Génère une liste des parcours d'accompagnement, filtrée sur différents paramètres. Generate a list of accompanying periods, filtered on different parameters.: Génère une liste des parcours d'accompagnement, filtrée sur différents paramètres.
Date of calculation for associated elements: Date de calcul des éléments associés Date of calculation for associated elements: Date de calcul des éléments associés
The associated referree, localisation, and other elements will be valid at this date: Les éléments associés, comme la localisation, le référent et d'autres éléments seront valides à cette date The associated referree, localisation, and other elements will be valid at this date: Les éléments associés, comme la localisation, le référent et d'autres éléments seront valides à cette date
id: Identifiant du parcours acpId: Identifiant du parcours
openingDate: Date d'ouverture du parcours openingDate: Date d'ouverture du parcours
closingDate: Date de fermeture du parcours closingDate: Date de fermeture du parcours
closingMotive: Motif de cloture closingMotive: Motif de cloture