SimpleExcel.php

[Pman.Core] / SimpleExcel.php

diff --git a/SimpleExcel.php b/SimpleExcel.php
index bbfe41b..65f126f 100644 (file)
--- a/SimpleExcel.php
+++ b/SimpleExcel.php
@@ -254,7 +254,7 @@ class Pman_Core_SimpleExcel extends Pman
             $data->find();
             
             while($data->fetch()) {
-                $hasRenderRow = $this->addLine($cfg['workbook'], $clo);
+                $hasRenderRow = $this->addLine($cfg['workbook'], $data);
                 $hasRender = ($hasRender  || $hasRenderRow) ? true : false;
             }
             $start_row += $count;
@@ -377,7 +377,17 @@ class Pman_Core_SimpleExcel extends Pman
             $format = isset($col_cfg['format'])  && isset($formats[$col_cfg['format']] )   ? $formats[$col_cfg['format']] : false;
           //  print_R(array($start_row+$r, $c, $v, $format));exit;
           // handle 0 prefixes..
-            if ( (is_numeric($v) &&  strlen($v) > 1 && substr($v,0,1) == '0' && substr($v,1,1) != '.') 
+          
+            if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) {
+                $dataFormat = 'date';
+                $format = empty($format) ? 'YYYY-MM-DD' : $format;
+                $ut_to_ed_diff = 86400 * 25569;
+
+                $v = (strtotime($v) + $ut_to_ed_diff) / 86400;
+                var_Dump(array($format, $v));
+            }
+          
+            if ( (is_numeric($v) &&  strlen($v) > 1 && substr($v,0,1) == '0' && substr($v,1,1) != '.' )
                     || 
                     $dataFormat == 'string' ) {
                 $worksheet->writeString($start_row+$r, $c, $v, $format);