Просмотр исходного кода

Excel export: write empty date (and time) cells as empty strings instead of zero (0) !

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4120 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 9 лет назад
Родитель
Сommit
29499839c0
1 измененных файлов с 3 добавлено и 7 удалено
  1. 3 7
      application/xlsxwriter.class.php

+ 3 - 7
application/xlsxwriter.class.php

@@ -168,14 +168,10 @@ Class XLSXWriter
 		
 		if (is_int($value) || is_float($value)) {
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value*1).'</v></c>');//int,float, etc
-		} else if ($cell_format=='date') {
+		} else if (($cell_format=='date') && ($value != '')) {
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
-		} else if ($cell_format=='datetime') {
-			if ($value === '') {
-				fwrite($fd,'<c r="'.$cell.'" s="0"/>');
-			} else {
-				fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
-			}			
+		} else if (($cell_format=='datetime') && ($value != '')) {
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
 		} else if ($value==''){
 			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'"/>');
 		} else if ($value{0}=='='){