Skip to content

Fix adjusted end day time for event #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fidesio-xavier-masson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix adjusted end day time for event #188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cc31c8
Sets the time for the adjusted end day to 23:59:59
fidesio-xavier-masson Sep 28, 2021
4c89fb0
Fix new DateTime/DatePeriod timezones to use from start/end dates ins…
fidesio-xavier-masson Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/Event/EventItemizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,44 +120,44 @@ public function itemizeEvent() {
// each day is safer.
$interval = new \DateInterval('P1D');

// Set the end date to the last day of the month so that we are sure to get that last month unless
// we are already dealing with the last day of the month
if ($this->event->getEndDate()->format('d') != $this->event->getEndDate()->format('t')) {
$adjusted_end_day = new \DateTime($this->event->getEndDate()->format('Y-n-t'));
}
$start_date = &$this->event->getStartDate();
$start_date_timezone = $start_date->getTimezone();
$end_date = &$this->event->getEndDate();
$end_date_timezone = $end_date->getTimezone();

// Deal with the special case of last day of month and daily granularity where the DatePeriod will not indicate one day unless the time is slightly different
// We add a minute to compensate
elseif (($this->event->getStartDate()->format('Y-m-d H:i') == $this->event->getEndDate()->format('Y-m-d H:i')) && $this->granularity == EventItemizer::BAT_DAILY) {
$adjusted_end_day = new \DateTime($this->event->getEndDate()->add(new \DateInterval('PT1M'))->format('Y-m-d H:i'));
if (($start_date->format('Y-m-d H:i') == $end_date->format('Y-m-d H:i')) && $this->granularity == EventItemizer::BAT_DAILY) {
$adjusted_end_day = new \DateTime($end_date->add(new \DateInterval('PT1M'), $end_date_timezone)->format('Y-m-d H:i'));
}
else {
$adjusted_end_day = new \DateTime($this->event->getEndDate()->format('Y-m-d H:i'));
$adjusted_end_day = new \DateTime($end_date->format('Y-m-d H:i'), $end_date_timezone);
}

$daterange = new \DatePeriod($this->event->getStartDate(), $interval, $adjusted_end_day);
$daterange = new \DatePeriod($start_date, $interval, $adjusted_end_day);

$itemized = array();

$old_month = $this->event->getStartDate()->format('Y-n');
$old_month = $start_date->format('Y-n');

$start = TRUE;

// Cycle through each month
foreach ($daterange as $date) {

// Check if we have
if (($date->format('Y-n') != $old_month) || ($start)) {

$year = $date->format("Y");
$dayinterval = new \DateInterval('P1D');
$date_timezone = $date->getTimezone();

// Handle the first month
if ($this->event->isFirstMonth($date)) {
// If we are in the same month the end date is the end date of the event
if ($this->event->isSameMonth()) {
$dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, new \DateTime($this->event->getEndDate()->format("Y-n-j 23:59:59")));
$dayrange = new \DatePeriod($start_date, $dayinterval, new \DateTime($end_date->format("Y-n-j 23:59:59"), $end_date_timezone));
} else { // alternatively it is the last day of the start month
$dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate()));
$dayrange = new \DatePeriod($start_date, $dayinterval, $this->event->endMonthDate($start_date));
}
foreach ($dayrange as $day) {
$itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
Expand All @@ -166,15 +166,15 @@ public function itemizeEvent() {

// Handle the last month (will be skipped if event is same month)
elseif ($this->event->isLastMonth($date)) {
$dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, $this->event->getEndDate());
$dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1"), $date_timezone), $dayinterval, $end_date);
foreach ($dayrange as $day) {
$itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
}
}

// We are in an in-between month - just cycle through and set dates (time on end date set to ensure it is included)
else {
$dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1")), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59")));
$dayrange = new \DatePeriod(new \DateTime($date->format("Y-n-1"), $date_timezone), $dayinterval, new \DateTime($date->format("Y-n-t 23:59:59"), $date_timezone));
foreach ($dayrange as $day) {
$itemized[EventItemizer::BAT_DAY][$year][$day->format('n')]['d' . $day->format('j')] = $this->event->getValue();
}
Expand Down