Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'master' into upgrade-php82

Browse Source
This commit is contained in:
Julien Fastré
2023-03-20 12:40:58 +01:00
parent 244614a691 1cc80c8e6a
commit 97a4c39941
18 changed files with 133 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Bundle/ChillMainBundle/Form/DataMapper/ExportPickCenterDataMapper.php
View File

@@ -17,6 +17,7 @@ use Chill\MainBundle\Repository\RegroupmentRepository;
use Exception;
use Symfony\Component\Form\DataMapperInterface;
use Symfony\Component\Form\FormInterface;
use function array_key_exists;
use function count;
class ExportPickCenterDataMapper implements DataMapperInterface
@@ -29,7 +30,7 @@ class ExportPickCenterDataMapper implements DataMapperInterface
*
* @throws Exception
*
* @return mixed
* @return void
*/
public function mapDataToForms($data, $forms)
{
@@ -72,10 +73,12 @@ class ExportPickCenterDataMapper implements DataMapperInterface
$centers[spl_object_hash($center)] = $center;
}
foreach ($forms['regroupment']->getData() as $regroupment) {
/** @var Regroupment $regroupment */
foreach ($regroupment->getCenters() as $center) {
$centers[spl_object_hash($center)] = $center;
if (array_key_exists('regroupment', $forms)) {
foreach ($forms['regroupment']->getData() as $regroupment) {
/** @var Regroupment $regroupment */
foreach ($regroupment->getCenters() as $center) {
$centers[spl_object_hash($center)] = $center;
}
}
}

4
src/Bundle/ChillMainBundle/translations/messages.nl.yml
View File

@@ -253,8 +253,8 @@ No options availables. Your report is fully configured.: Geen beschikbare opties
Ungrouped exports: Overige expor
#export download
Download export: Téléchargement du rapport
Waiting for your report: En attente de votre rapport
Download export: Downloaden van rapport
Waiting for your report: Wachten op je rapport
Download your report: Télécharger votre rapport
Problem during download: Problème durant le téléchargement
# sans valeur