PHPExcel dateTime support improved

ThaDafinser · Nov 9, 2016 · 64d436a · 64d436a
1 parent ec08a0c
commit 64d436a
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php b/src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php
@@ -103,14 +103,26 @@ public function execute()
                         break;
 
                     case 'ZfcDatagrid\Column\Type\DateTime':
-                        if ($value instanceof \DateTime) {
-                            $value->setTimezone(new \DateTimeZone($col->getType()
-                                ->getOutputTimezone()));
+                        /* @var $dateType \ZfcDatagrid\Column\Type\DateTime */
+                        $dateType = $col->getType();
+
+                        if (! $value instanceof \DateTime && is_scalar($value)) {
+                            $value = \DateTime::createFromFormat($dateType->getSourceDateTimeFormat(), $value);
+                            $value->setTimezone(new \DateTimeZone($dateType->getSourceTimezone()));
                         }
+
+                        $value->setTimezone(new \DateTimeZone($dateType->getOutputTimezone()));
                         $cell->setValue(\PHPExcel_Shared_Date::PHPToExcel($value));
-                        $cell->getStyle()
-                        ->getNumberFormat()
-                        ->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME);
+
+                        if ($dateType->getOutputPattern()) {
+                            $outputPattern = $dateType->getOutputPattern();
+                        } else {
+                            $outputPattern = \PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME;
+                        }
+
+                        $cell->$cell->getStyle()
+                            ->getNumberFormat()
+                            ->setFormatCode($outputPattern);
                         break;
 
                     default: