Skip to content

Fix blackout buffer conflicts #3

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

Fix blackout buffer conflicts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02b4969
Update fr_fr.php
arnaudbore Oct 7, 2021
54141c2
Update en_us.php
arnaudbore Oct 7, 2021
e549954
Update ReservationConflictIdentifier.php
bpinsard Nov 17, 2022
907a864
fix blackout conflict handling
bpinsard Nov 21, 2022
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
4 changes: 2 additions & 2 deletions lang/en_us.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ protected function _LoadStrings()
$strings['LogIn'] = 'Log In';
$strings['ManageReservations'] = 'Reservations';
$strings['AwaitingActivation'] = 'Awaiting Activation';
$strings['PendingApproval'] = 'Pending Approval';
$strings['PendingApproval'] = 'Pending Reservation';
$strings['ManageSchedules'] = 'Schedules';
$strings['ManageResources'] = 'Resources';
$strings['ManageAccessories'] = 'Accessories';
Expand Down Expand Up @@ -1099,4 +1099,4 @@ protected function _GetHtmlLangCode()
{
return 'en';
}
}
}
2 changes: 1 addition & 1 deletion lang/fr_fr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ protected function _LoadStrings()
$strings['LogIn'] = 'Connexion';
$strings['ManageReservations'] = 'Réservations';
$strings['AwaitingActivation'] = 'En attente d\'Activation';
$strings['PendingApproval'] = 'En attente d\'Approbation';
$strings['PendingApproval'] = 'En attente de dépistage';
$strings['ManageSchedules'] = 'Plannings';
$strings['ManageResources'] = 'Ressources';
$strings['ManageAccessories'] = 'Accessoires';
Expand Down
7 changes: 5 additions & 2 deletions lib/Application/Reservation/ReservationConflictIdentifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public function GetConflicts($reservationSeries)
$reservation->StartDate());

$instanceConflicts[] = new IdentifiedConflict($reservation, $existingItem);
$anyConflictsAreBlackouts = $anyConflictsAreBlackouts || $existingItem->GetReferenceNumber() == "";
}
$anyConflictsAreBlackouts = $anyConflictsAreBlackouts || $existingItem->GetReferenceNumber() == "";
}

$totalConflicts = $this->GetMaxConcurrentConflicts($instanceConflicts);
Expand All @@ -151,6 +151,9 @@ protected function IsInConflict(Reservation $instance, ReservationSeries $series

if (array_key_exists($existingItem->GetResourceId(), $keyedResources))
{
if ($existingItem->GetReferenceNumber() == "") {
return $existingItem->Date->Overlaps($instance->Duration());
}
return $existingItem->BufferedTimes()->Overlaps($instance->Duration());
}

Expand Down Expand Up @@ -275,4 +278,4 @@ public function AllowReservation($numberOfConflictsSkipped = 0)
{
return !$this->areAnyConflictsBlackouts && (($this->maxConcurrentConflicts-$numberOfConflictsSkipped) < $this->maxConcurrentReservations);
}
}
}