From 781253a85494cc11c0f0ce988e9333e31740f973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 25 Oct 2022 09:25:30 +0200
Subject: [PATCH] Fixed: correctly show datetime in spreadsheet list

---
 .../Formatter/SpreadsheetListFormatter.php    | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index ab9c2e893..0e5e339ea 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -20,11 +20,12 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
 use function array_keys;
 use function array_map;
@@ -80,7 +81,7 @@ class SpreadsheetListFormatter implements FormatterInterface
      *
      * @uses appendAggregatorForm
      *
-     * @param type $exportAlias
+     * @param string $exportAlias
      */
     public function buildForm(
         FormBuilderInterface $builder,
@@ -144,8 +145,6 @@ class SpreadsheetListFormatter implements FormatterInterface
         $i = 1;
 
         foreach ($result as $row) {
-            $line = [];
-
             if (true === $this->formatterData['numerotation']) {
                 $worksheet->setCellValue('A' . ($i + 1), (string) $i);
             }
@@ -155,13 +154,22 @@ class SpreadsheetListFormatter implements FormatterInterface
             foreach ($row as $key => $value) {
                 $row = $a . ($i + 1);
 
-                if ($value instanceof DateTimeInterface) {
-                    $worksheet->setCellValue($row, Date::PHPToExcel($value));
-                    $worksheet->getStyle($row)
-                        ->getNumberFormat()
-                        ->setFormatCode(NumberFormat::FORMAT_DATE_DDMMYYYY);
+                $formattedValue = $this->getLabel($key, $value);
+
+                if ($formattedValue instanceof DateTimeInterface) {
+                    $worksheet->setCellValue($row, Date::PHPToExcel($formattedValue));
+
+                    if ($formattedValue->format('His') === '000000') {
+                        $worksheet->getStyle($row)
+                            ->getNumberFormat()
+                            ->setFormatCode(NumberFormat::FORMAT_DATE_DDMMYYYY);
+                    } else {
+                        $worksheet->getStyle($row)
+                            ->getNumberFormat()
+                            ->setFormatCode(NumberFormat::FORMAT_DATE_DATETIME);
+                    }
                 } else {
-                    $worksheet->setCellValue($row, $this->getLabel($key, $value));
+                    $worksheet->setCellValue($row, $formattedValue);
                 }
                 ++$a;
             }
@@ -259,6 +267,10 @@ class SpreadsheetListFormatter implements FormatterInterface
         foreach ($keys as $key) {
             // get an array with all values for this key if possible
             $values = array_map(static function ($v) use ($key) {
+                if (!array_key_exists($key, $v)) {
+                    throw new RuntimeException(sprintf('This key does not exists: %s. Available keys are %s', $key, implode(', ', array_keys($v))));
+                }
+
                 return $v[$key];
             }, $this->result);
             // store the label in the labelsCache property