Compare commits

...

6 Commits

Author SHA1 Message Date
julienfastre 68688dd528 Revert "Merge branch 'revert-671bb6d5' into 'master'"
This reverts merge request !732
2024-09-19 13:40:09 +00:00
julienfastre bfd7dc2270 Merge branch 'revert-671bb6d5' into 'master'
Revert "Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'"

See merge request Chill-Projet/chill-bundles!732
2024-09-19 13:32:41 +00:00
julienfastre e4d0705e84 Revert "Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'"
This reverts merge request !586
2024-09-19 13:26:12 +00:00
julienfastre 671bb6d593 Merge branch 'signature-app/wp-576-restorestored-object-version' into 'master'
See the list of stored object and restore some versions

Closes #307

See merge request Chill-Projet/chill-bundles!730
2024-09-19 11:51:41 +00:00
julienfastre 79e26ffeae Merge branch '309-fix-referrer-scope-aggregator' into 'master'
Fix referrer scope date comparison in aggregator

Closes #309

See merge request Chill-Projet/chill-bundles!728
2024-09-16 13:58:58 +00:00
julienfastre be8901a5c4 Fix referrer scope date comparison in aggregator
Correct the date comparison logic to use openingDate instead of closingDate when evaluating user history end dates. This ensures accurate grouping by referrer in the accompanying course aggregators. Added a changelog entry for Issue #309.
2024-09-16 15:52:48 +02:00
2 changed files with 7 additions and 1 deletions
@@ -0,0 +1,6 @@
kind: Fixed
body: |
Correctly compute the grouping by referrer aggregator
time: 2024-09-16T15:51:50.268336979+02:00
custom:
Issue: "309"
@@ -55,7 +55,7 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
$qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
$qb->expr()->orX(
$qb->expr()->isNull("{$p}_userHistory.endDate"),
$qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
$qb->expr()->lt('COALESCE(acp.openingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
)
),
$qb->expr()->andX(