Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-09 13:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix calendar month calculation

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-08-11 20:09:12 +02:00
parent 4e769fc979
commit 5950c1fcf4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Datatypes/SmartDateTime.php
View File

@ -15,7 +15,7 @@ declare(strict_types=1);
namespace phpOMS\Datatypes; namespace phpOMS\Datatypes;
use phpOMS\Math\Functions; use phpOMS\Math\Functions\Functions;
/** /**
* SmartDateTime. * SmartDateTime.
@ -290,7 +290,7 @@ class SmartDateTime extends \DateTime
// add difference to $weekStartsWith counting backwards from days of previous month (reorder so that lowest value first) // add difference to $weekStartsWith counting backwards from days of previous month (reorder so that lowest value first)
for($i = $daysPreviousMonth - $diffToWeekStart; $i < $daysPreviousMonth; $i++) { for($i = $daysPreviousMonth - $diffToWeekStart; $i < $daysPreviousMonth; $i++) {
$days[] = $i; $days[] = $i+1;
} }
// add normal count of current days // add normal count of current days
@ -300,10 +300,11 @@ class SmartDateTime extends \DateTime
} }
// add remaining days to next month (7*6 - difference+count of current month) // add remaining days to next month (7*6 - difference+count of current month)
for($i = 42 - $daysPreviousMonth - $daysMonth; $i < 42; $i++) { $remainingDays = 42 - $diffToWeekStart - $daysMonth;
for($i = 1; $i <= $remainingDays; $i++) {
$days[] = $i; $days[] = $i;
} }
return $days; return $days;
} }
} }