From fffc4a9c33981893198930938f42659d7970299f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 29 Nov 2023 22:17:20 +0100 Subject: [PATCH] Fix error on listEvaluation - force default calcDate - Export / UserHelper: handle case when a single user is given, when we expect more than one user --- .changes/unreleased/Fixed-20231129-221501.yaml | 5 +++++ src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php | 5 +++++ .../ChillPersonBundle/Export/Export/ListEvaluation.php | 7 ++++--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .changes/unreleased/Fixed-20231129-221501.yaml diff --git a/.changes/unreleased/Fixed-20231129-221501.yaml b/.changes/unreleased/Fixed-20231129-221501.yaml new file mode 100644 index 000000000..f26209afe --- /dev/null +++ b/.changes/unreleased/Fixed-20231129-221501.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Fix error in ListEvaluation when "handling agents" are alone +time: 2023-11-29T22:15:01.627103072+01:00 +custom: + Issue: "" diff --git a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php b/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php index 46e19c2d1..39fb83c57 100644 --- a/src/Bundle/ChillMainBundle/Export/Helper/UserHelper.php +++ b/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']; diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php b/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php index 6b3eba107..a2bedcddd 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListEvaluation.php +++ b/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