geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-16 13:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of errors that have sneaked into the date code, plus some minor problems in radar/scatter chart examples, and a spurious html comment that had sneaked into spreadsheet

Browse Source
This commit is contained in:
MarkBaker
2016-08-13 13:28:29 +01:00
parent 3886999957
commit 558da2269d
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Examples/33chartcreate-radar.php
+9 -8
View File
@@ -97,14 +97,15 @@ $dataSeriesValues = array(
// Build the dataseries
$series = new \PHPExcel\Chart\DataSeries(
\PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
NULL, // plotGrouping (Radar charts don't have any grouping)
range(0, count($dataSeriesValues)-1), // plotOrder
$dataSeriesLabels, // plotLabel
$xAxisTickValues, // plotCategory
$dataSeriesValues, // plotValues
NULL, // smooth line
\PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle
\PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType
NULL, // plotGrouping (Radar charts don't have any grouping)
range(0, count($dataSeriesValues)-1), // plotOrder
$dataSeriesLabels, // plotLabel
$xAxisTickValues, // plotCategory
$dataSeriesValues, // plotValues
NULL, // plotDirection
NULL, // smooth line
\PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle
);
// Set up a layout object for the Pie chart
Examples/33chartcreate-scatter.php
+1
View File
@@ -89,6 +89,7 @@ $series = new \PHPExcel\Chart\DataSeries(
$dataSeriesLabels, // plotLabel
$xAxisTickValues, // plotCategory
$dataSeriesValues, // plotValues
NULL, // plotDirection
NULL, // smooth line
\PHPExcel\Chart\DataSeries::STYLE_LINEMARKER // plotStyle
);
src/PhpSpreadsheet/Shared/Date.php
+4 -4
View File
@@ -40,7 +40,7 @@ class Date
* @private
* @var int
*/
protected static $excelBaseDate = self::CALENDAR_WINDOWS_1900;
protected static $excelCalendar = self::CALENDAR_WINDOWS_1900;
/*
* Default timezone to use for DateTime objects
@@ -132,7 +132,7 @@ class Date
*/
public static function excelToDateTimeObject($excelTimestamp = 0, $timeZone = null) {
$timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
$baseDate = ($excelTimestamp < 60) ? new \DateTime('1899-12-31', $timeZone) : new \DateTime('1899-12-30', $timeZone);
} else {
$baseDate = new \DateTime('1904-01-01', $timeZone);
@@ -159,7 +159,7 @@ class Date
* @throws \Exception
*/
public static function excelToTimestamp($excelTimestampexcelTimestamp = 0, $timeZone = null) {
return self::excelToTimestamp($excelTimestamp, $timeZone)
return self::excelToDateTimeObject($excelTimestamp, $timeZone)
->format('U');
}
@@ -212,7 +212,7 @@ class Date
*/
public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
{
if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
//
// Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
// This affects every date following 28th February 1900
src/PhpSpreadsheet/Spreadsheet.php
+1 -1
View File
@@ -1,4 +1,4 @@
<!----><?php
<?php
namespace PHPExcel;