Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-19 23:33:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX Timezone problems

Browse Source 
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
This commit is contained in:
Laurent Destailleur
2021-02-28 22:44:11 +01:00
parent 5406de13ee
commit 490faec547
2 changed files with 49 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
test/phpunit/DateLibTest.php
View File

@@ -69,7 +69,13 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$this->savlangs=$langs;
$this->savdb=$db;
$langs->load("admin");
print __METHOD__." db->type=".$db->type." user->id=".$user->id;
print "\n".$langs->trans("CurrentTimeZone").' : '.getServerTimeZoneString();
print "\n".$langs->trans("CurrentHour").' : '.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver');
//print " - db ".$db->db;
print "\n";
}
@@ -139,8 +145,8 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$db=$this->savdb;
// With same hours
$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
$date2=dol_mktime(0, 0, 0, 1, 2, 2012);
$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
$date2=dol_mktime(0, 0, 0, 1, 2, 2012, 'gmt');
$result=num_between_day($date1, $date2, 1);
print __METHOD__." result=".$result."\n";
@@ -151,8 +157,8 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$this->assertEquals(1, $result);
// With different hours
$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
$date2=dol_mktime(12, 0, 0, 1, 2, 2012);
$date1=dol_mktime(0, 0, 0, 1, 1, 2012, 'gmt');
$date2=dol_mktime(12, 0, 0, 1, 2, 2012, 'gmt');
$result=num_between_day($date1, $date2, 1);
print __METHOD__." result=".$result."\n";
@@ -190,26 +196,27 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
// With same hours - Tuesday/Wednesday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 1, 2013);
$date2=dol_mktime(0, 0, 0, 1, 2, 2013);
$date3=dol_mktime(0, 0, 0, 1, 3, 2013);
// With same hours - Tuesday/Wednesday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
$result=num_public_holiday($date1, $date2, 'FR', 1);
print __METHOD__." result=".$result."\n";
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
$result=num_public_holiday($date1, $date2, 'FR', 1);
print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for FR result=".$result."\n";
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
$result=num_public_holiday($date1, $date2, 'XX', 1);
print __METHOD__." result=".$result."\n";
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
$result=num_public_holiday($date1, $date2, 'XX', 1);
print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for XX result=".$result."\n";
$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
$result=num_public_holiday($date2, $date3, 'FR', 1);
print __METHOD__." result=".$result."\n";
$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
print '----'."\n";
$result=num_public_holiday($date2, $date3, 'FR', 1);
print __METHOD__." for Wednesday 2 - Thursday 3 jan 2013 for FR result=".$result."\n";
$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
// Check with easter monday
$date1=dol_mktime(0, 0, 0, 4, 21, 2019);
$date2=dol_mktime(0, 0, 0, 4, 23, 2019);
// Check with easter monday
$date1=dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
$date2=dol_mktime(0, 0, 0, 4, 23, 2019, 'gmt');
$result=num_public_holiday($date1, $date2, 'XX', 1);
print __METHOD__." result=".$result."\n";
@@ -219,9 +226,9 @@ class DateLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR'); // 1 opened day, 2 closed days (sunday + easter monday)
// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
$date1=dol_mktime(0, 0, 0, 1, 4, 2013);
$date2=dol_mktime(0, 0, 0, 1, 6, 2013);
// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
$result=num_public_holiday($date1, $date2, 'FR', 1);
print __METHOD__." result=".$result."\n";
@@ -257,10 +264,10 @@ class DateLibTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
// With same hours - Tuesday/Wednesday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 1, 2013);
$date2=dol_mktime(0, 0, 0, 1, 2, 2013);
$date3=dol_mktime(0, 0, 0, 1, 3, 2013);
// With same hours - Tuesday/Wednesday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');
$date2=dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');
$date3=dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');
$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
print __METHOD__." result=".$result."\n";
@@ -274,9 +281,9 @@ class DateLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR'); // 2 opened days
// With same hours - Friday/Sunday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 4, 2013);
$date2=dol_mktime(0, 0, 0, 1, 6, 2013);
// With same hours - Friday/Sunday jan 2013
$date1=dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
$date2=dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');
$result=num_open_day($date1, $date2, 0, 1, 0, 'FR');
print __METHOD__." result=".$result."\n";
@@ -328,7 +335,6 @@ class DateLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertSame('1 '.$langs->trans("Day"), $result);
return $result;
}