Release v2.24.1

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.

.changes/v2.24.1.md

@@ -0,0 +1,5 @@
+## v2.24.1 - 2024-10-02
+### Fixed
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
+ 

CHANGELOG.md

@@ -6,6 +6,12 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v2.24.1 - 2024-10-02
+### Fixed
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
+ 
+
 ## v2.24.0 - 2024-09-11
 ### Feature
 * ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -394,7 +394,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     }
 
     /**
-     * @return ReadableCollection<int, User>
+     * Retrieves a collection of current referrers.
+     *
+     * This method filters the referrer history to get only those entries
+     * where the end date is null, maps them to their associated users,
+     * and returns them as a new ReadableCollection.
+     *
+     * @return ReadableCollection<int, User> collection of active referrers
      *
      * @Serializer\Groups({"accompanying_period_work:edit"})
      */
@@ -408,6 +414,18 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return new ArrayCollection(array_values($users));
     }
 
+    /**
+     * @return ReadableCollection<int, AccompanyingPeriodWorkReferrerHistory>
+     */
+    public function getReferrersHistoryCurrent(): ReadableCollection
+    {
+        return new ArrayCollection(
+            $this->getReferrersHistory()
+                ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => null === $h->getEndDate())
+                ->getValues()
+        );
+    }
+
     /**
      * @return Collection<int, AccompanyingPeriodWorkReferrerHistory>
      */

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php

@@ -56,7 +56,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(

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_item.html.twig

@@ -83,10 +83,10 @@
                 </div>
                 <div class="wl-col list">
                     {%- if w.referrers|length > 0 -%}
-                        {% for r in w.referrersHistory %}
+                        {% for r in w.referrersHistoryCurrent %}
                             <span class="wl-item">
                                 <span class="badge-user">{{ r.user|chill_entity_render_box({'at_date': r.startDate}) }}</span>
-                                {% if not loop.last %}, {% endif %}
+                                {%- if not loop.last %}, {% endif %}
                             </span>
                         {% endfor %}
                     {% else %}