Release 2.14.1

- force default calcDate
- Export / UserHelper: handle case when a single user is given, when we expect more than one user

.changes/unreleased/Fixed-20231127-210138.yaml

@@ -1,5 +0,0 @@
-kind: Fixed
-body: 'Export: fix list person with custom fields'
-time: 2023-11-27T21:01:38.260730706+01:00
-custom:
-  Issue: ""

.changes/v2.14.1.md

@@ -0,0 +1,5 @@
+## v2.14.1 - 2023-11-29
+### Fixed
+* Export: fix list person with custom fields 
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
+* Fix error in ListEvaluation when "handling agents" are alone 

package.json

@@ -15,7 +15,7 @@
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
     "bindings": "^1.5.0",
-    "bootstrap": "^5.3.0",
+    "bootstrap": "^5.0.1",
     "chokidar": "^3.5.1",
     "fork-awesome": "^1.1.7",
     "jquery": "^3.6.0",

src/Bundle/ChillBudgetBundle/Controller/Admin/ChargeKindController.php

@@ -23,6 +23,6 @@ class ChargeKindController extends CRUDController
         /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
-        return $query;
+        return parent::orderQuery($action, $query, $request, $paginator);
     }
 }

src/Bundle/ChillBudgetBundle/Controller/Admin/ResourceKindController.php

@@ -23,6 +23,6 @@ class ResourceKindController extends CRUDController
         /* @var QueryBuilder $query */
         $query->addOrderBy('e.ordering', 'ASC');
 
-        return $query;
+        return parent::orderQuery($action, $query, $request, $paginator);
     }
 }

src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php

@@ -92,6 +92,11 @@ class UserHelper
             }
             $asStrings = [];
 
+            if (array_key_exists('uid', $decoded) || is_numeric($decoded)) {
+                // this is a single value. We have to wrap it into an array
+                $decoded = [$decoded];
+            }
+
             foreach ($decoded as $userId) {
                 if (is_array($userId)) {
                     $uid = $userId['uid'];

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss

@@ -11,7 +11,6 @@
 
 // 3. Include remainder of required Bootstrap stylesheets
 @import "bootstrap/scss/variables";
-@import "bootstrap/scss/variables-dark";
 
 // 4. Include any default map overrides here
 @import "custom/_maps";

src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php

@@ -193,6 +193,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
+        $calcDate = $data['calc_date'] ?? new RollingDate(RollingDate::T_TODAY);
 
         $qb = $this->entityManager->createQueryBuilder();
 
@@ -208,7 +209,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
             ->andWhere('acppart.startDate != acppart.endDate OR acppart.endDate IS NULL')
             // get participants at the given date
             ->andWhere('acppart.startDate <= :calc_date AND (acppart.endDate > :calc_date OR acppart.endDate IS NULL)')
-            ->setParameter('calc_date', $this->rollingDateConverter->convert($data['calc_date']));
+            ->setParameter('calc_date', $this->rollingDateConverter->convert($calcDate));
 
         if ($this->filterStatsByCenters) {
             $qb
@@ -224,7 +225,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
 
         AccompanyingCourseExportHelper::addClosingMotiveExclusionClause($qb);
 
-        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($data['calc_date']));
+        $this->addSelectClauses($qb, $this->rollingDateConverter->convert($calcDate));
 
         return $qb;
     }
@@ -278,7 +279,7 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
         // referrers => at date XXXX
         $qb
             ->addSelect('(SELECT JSON_BUILD_OBJECT(\'uid\', IDENTITY(history.user), \'d\', history.startDate) FROM '.UserHistory::class.' history '.
-                'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS referrers');
+                'WHERE history.accompanyingPeriod = acp AND history.startDate <= :calc_date AND (history.endDate IS NULL OR history.endDate > :calc_date)) AS acpw_referrers');
 
         // persons
         $qb