diff --git a/src/SimpleCalendar.php b/src/SimpleCalendar.php old mode 100644 new mode 100755 index 4a15f2d..9f04033 --- a/src/SimpleCalendar.php +++ b/src/SimpleCalendar.php @@ -168,10 +168,35 @@ public function addDailyHtml( string $html, $startDate, $endDate = null ) : void $working = (new \DateTimeImmutable)->setTimestamp($start->getTimestamp()); + $count_days = ($start->diff($end)->days); + do { $tDate = getdate($working->getTimestamp()); - $this->dailyHtml[$tDate['year']][$tDate['mon']][$tDate['mday']][$htmlCount] = $html; + + + if ($count_days == 1) + { + $this->dailyHtml[$tDate['year']][$tDate['mon']][$tDate['mday']][$htmlCount] = $html; + } + else + { + if ($start->format('Y-n-j') == ($tDate['year'] . '-' . $tDate['mon'] . '-' . $tDate['mday'])) + { + if ($start->format('N') != $this->offset) + { + $this->dailyHtml[$tDate['year']][$tDate['mon']][$tDate['mday']][$htmlCount] = $html; + } + } + elseif ($tDate['wday'] == $this->offset) + { + $this->dailyHtml[$tDate['year']][$tDate['mon']][$tDate['mday']][$htmlCount] = $html; + } + else + { + $this->dailyHtml[$tDate['year']][$tDate['mon']][$tDate['mday']][$htmlCount] = ' '; + } + } $working = $working->add(new \DateInterval('P1D')); } while( $working->getTimestamp() < $end->getTimestamp() + 1 );