Skip to content

Bugfix #14

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
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Bugfix #14

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4706e6
Removed bugged line
buddy94 Mar 22, 2023
614fb94
Merge branch 'InfyOmLabs:master' into bugfix
buddy94 Jun 17, 2024
802b8f7
Update CalendarEvent.php
buddy94 Jun 17, 2024
eecab6d
Update CalendarEvent.php
buddy94 Jun 17, 2024
5bf9ccb
Tornato al codice originale modificato
buddy94 Jun 19, 2024
3ae7268
Ritorno solo eventi dentro le due date
buddy94 Jun 19, 2024
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
49 changes: 41 additions & 8 deletions src/CalendarEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,17 @@ class CalendarEvent extends BaseDTO
/** @var Carbon */
public $start_date;

/** @var Carbon */
// Added by me
public $start_date_searched;

/** @var Carbon */
public $end_date;

/** @var Carbon */
// Added by me
public $end_date_searched;

/** @var string */
public $start_time;

Expand Down Expand Up @@ -133,7 +141,9 @@ private function applyCount(Rule $rule, $numberOfOccurrences = null): Rule
*/
private function applyStartDate(Rule $rule): Rule
{
$startDate = Carbon::parse($this->start_date)->setTimeFromTimeString($this->start_time);
// $date= $this->start_date_searched?$this->start_date_searched:$this->start_date;
$date = $this->start_date;
$startDate = Carbon::parse($date)->setTimeFromTimeString($this->start_time);
$rule->setStartDate($startDate);

return $rule;
Expand Down Expand Up @@ -260,15 +270,33 @@ public function getNextEvents($numberOfEvents = null): array
$events = [];

foreach ($nextOccurrences as $nextOccurrence) {
$event = clone $this;
$event->start_date = Carbon::parse($nextOccurrence->getStart())->setTimeFromTimeString($this->start_time);
$event->end_date = Carbon::parse($nextOccurrence->getEnd())->setTimeFromTimeString($this->end_time);
$events[] = $event;

// Vuol dire che ho usato la funzione getEventsBetween
if ($this->start_date_searched && $this->end_date_searched) {
// Controllo se l'evento è compreso tra le date cercate
$event = $this->cloneAndUpdateDatesOfEvent($nextOccurrence);
if ($event->start_date->between($this->start_date_searched, $this->end_date_searched) && $event->end_date->between($this->start_date_searched, $this->end_date_searched)) {
$events[] = $event;
}
} else {
$event = $this->cloneAndUpdateDatesOfEvent($nextOccurrence);
$events[] = $event;
}
}

return $events;
}


private function cloneAndUpdateDatesOfEvent($occurrence)
{
$event = clone $this;
$event->start_date = Carbon::parse($occurrence->getStart())->setTimeFromTimeString($this->start_time);
$event->end_date = Carbon::parse($occurrence->getEnd())->setTimeFromTimeString($this->end_time);

return $event;
}

/**
* @param Carbon|\DateTime|string $startDate
* @param Carbon|\DateTime|string $endDate
Expand All @@ -282,13 +310,18 @@ public function getEventsBetween($startDate, $endDate, $numberOfEvents = null):
{
$orgEvent = clone $this;

$this->start_date_searched = Carbon::parse($startDate);
$this->end_date_searched = Carbon::parse($endDate);



if ($this->start_date > $endDate or !empty($this->end_date) and $startDate > $this->end_date) {
return [];
}

if ($startDate > $this->start_date) {
$this->start_date = Carbon::parse($startDate);
}
// if ($startDate > $this->start_date) {
// $this->start_date = Carbon::parse($startDate);
// }

if (empty($this->end_date)) {
$this->end_date = Carbon::parse($endDate);
Expand Down