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

Apply 3 suggestion(s) to 3 file(s)

Browse Source
This commit is contained in:
Julien Fastré 2023-10-16 15:42:55 +00:00
parent ada28265ee
commit 444f37ad18
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.changes/unreleased/Feature-20231004-120857.yaml
View File

@ -1,6 +1,6 @@
kind: Feature kind: Feature
body: Allow closing motives to be identified as 'canceling the accompanying period' body: Allow closing motives to be identified as 'canceling the accompanying period'
+ don't take canceled accompanying periods into account + don't take canceled accompanying periods into account in exports
time: 2023-10-04T12:08:57.586865276+02:00 time: 2023-10-04T12:08:57.586865276+02:00
custom: custom:
Issue: "146" Issue: "146"

6
src/Bundle/ChillMainBundle/Export/AccompanyingCourseExportHelper.php
View File

@ -17,11 +17,11 @@ final readonly class AccompanyingCourseExportHelper
{ {
public static function addClosingMotiveExclusionClause(QueryBuilder $qb): QueryBuilder public static function addClosingMotiveExclusionClause(QueryBuilder $qb): QueryBuilder
{ {
$qb->leftJoin('acp.closingMotive', 'cm') $qb->leftJoin('acp.closingMotive', 'acpmotive')
->andWhere( ->andWhere(
$qb->expr()->orX( $qb->expr()->orX(
$qb->expr()->eq('cm.isCanceledAccompanyingPeriod', 'false'), $qb->expr()->eq('acpmotive.isCanceledAccompanyingPeriod', 'false'),
$qb->expr()->isNull('acp.closingMotive') $qb->expr()->isNull('acpmotive.closingMotive')
) )
); );

1
src/Bundle/ChillMainBundle/config/services/export.yaml
View File

@ -53,4 +53,3 @@ services:
tags: tags:
- { name: chill.export_formatter, alias: 'csv_pivoted_list' } - { name: chill.export_formatter, alias: 'csv_pivoted_list' }
Chill\MainBundle\Export\AccompanyingCourseExportHelper: ~