Merge pull request #227 from ThaDafinser/feature/excel-format

better excel format

.travis.yml

@@ -12,10 +12,6 @@ matrix:
 # faster builds on new travis setup not using sudo
 sudo: false
 
-cache:
-  directories:
-    - vendor
-
 before_script:
  - composer self-update
  - composer update --prefer-source -n --verbose

src/ZfcDatagrid/Column/Style/Color.php

@@ -4,6 +4,7 @@
  * general or based on a value
  *
  */
+
 namespace ZfcDatagrid\Column\Style;
 
 class Color extends AbstractColor

src/ZfcDatagrid/Column/Type/Image.php

@@ -2,6 +2,7 @@
 /**
  * Image type
  */
+
 namespace ZfcDatagrid\Column\Type;
 
 use InvalidArgumentException;

src/ZfcDatagrid/DataSource/Doctrine2/Paginator.php

@@ -4,6 +4,7 @@
  * or if we use the "safe" variant by Doctrine2
  *
  */
+
 namespace ZfcDatagrid\DataSource\Doctrine2;
 
 use Doctrine\ORM\QueryBuilder;

src/ZfcDatagrid/PrepareData.php

@@ -196,7 +196,9 @@ public function prepare()
                 /*
                  * Type converting
                  */
-                $row[$col->getUniqueId()] = $col->getType()->getUserValue($row[$col->getUniqueId()]);
+                if ($this->getRendererName() != 'PHPExcel') {
+                    $row[$col->getUniqueId()] = $col->getType()->getUserValue($row[$col->getUniqueId()]);
+                }
 
                 /*
                  * Translate (nach typ convertierung -> PhpArray...)
@@ -221,7 +223,7 @@ public function prepare()
                     array_walk_recursive($row[$col->getUniqueId()], function (&$value) {
                         $value = trim($value);
                     });
-                } else {
+                } elseif (!is_object($row[$col->getUniqueId()])) {
                     $row[$col->getUniqueId()] = trim($row[$col->getUniqueId()]);
                 }
 

src/ZfcDatagrid/Renderer/AbstractExport.php

@@ -3,6 +3,7 @@
  * Methods which can be used in (all) export renderer
  *
  */
+
 namespace ZfcDatagrid\Renderer;
 
 use ZfcDatagrid\Column;

src/ZfcDatagrid/Renderer/Csv/Renderer.php

@@ -53,8 +53,8 @@ public function execute()
 
         $fp = fopen($path . '/' . $saveFilename, 'w');
         // Force UTF-8 for CSV rendering in EXCEL.
-        fprintf($fp, chr(0xEF).chr(0xBB).chr(0xBF));
-        
+        fprintf($fp, chr(0xEF) . chr(0xBB) . chr(0xBF));
+
         /*
          * Save the file
          */

src/ZfcDatagrid/Renderer/PHPExcel/Renderer.php

@@ -86,14 +86,38 @@ public function execute()
         foreach ($this->getData() as $row) {
             $xColumn = 0;
             foreach ($this->getColumnsToExport() as $col) {
+                /* @var $col \ZfcDatagrid\Column\AbstractColumn */
+
                 $value = $row[$col->getUniqueId()];
                 if (is_array($value)) {
                     $value = implode(PHP_EOL, $value);
                 }
 
                 /* @var $column \ZfcDatagrid\Column\AbstractColumn */
                 $currentColumn = PHPExcel_Cell::stringFromColumnIndex($xColumn);
-                $sheet->getCell($currentColumn . $yRow)->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
+                $cell          = $sheet->getCell($currentColumn . $yRow);
+
+                switch (get_class($col->getType())) {
+
+                    case 'ZfcDatagrid\Column\Type\Number':
+                        $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                        break;
+
+                    case 'ZfcDatagrid\Column\Type\DateTime':
+                        if ($value instanceof \DateTime) {
+                            $value->setTimezone(new \DateTimeZone($col->getType()
+                                ->getOutputTimezone()));
+                        }
+                        $cell->setValue(\PHPExcel_Shared_Date::PHPToExcel($value));
+                        $cell->getStyle()
+                        ->getNumberFormat()
+                        ->setFormatCode(\PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME);
+                        break;
+
+                    default:
+                        $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
+                        break;
+                }
 
                 $columnStyle = $sheet->getStyle($currentColumn . $yRow);
                 $columnStyle->getAlignment()->setWrapText(true);