iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

random shift: check for schedule load flag

This commit is contained in:
Igor Scheller 2023-12-28 00:48:51 +01:00 committed by msquare
parent b229d697a3
commit 57862ba722
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Controllers/ShiftsController.php
View File

@ -73,18 +73,21 @@ class ShiftsController extends BaseController
$freeShifts = Shift::query() $freeShifts = Shift::query()
->select('shifts.*') ->select('shifts.*')
// Load needed from shift if no schedule configured, else from room // Load needed from shift if no schedule configured, else from room
->leftJoin('schedule_shift', 'schedule_shift.shift_id', '=', 'shifts.id') ->leftJoin('schedule_shift', 'schedule_shift.shift_id', 'shifts.id')
->leftJoin('schedules', 'schedules.id', 'schedule_shift.schedule_id')
->leftJoin('needed_angel_types', function (JoinClause $query): void { ->leftJoin('needed_angel_types', function (JoinClause $query): void {
$query->on('needed_angel_types.shift_id', '=', 'shifts.id') $query->on('needed_angel_types.shift_id', 'shifts.id')
->whereNull('schedule_shift.shift_id'); ->whereNull('schedule_shift.shift_id');
}) })
->leftJoin('needed_angel_types AS nast', function (JoinClause $query): void { ->leftJoin('needed_angel_types AS nast', function (JoinClause $query): void {
$query->on('nast.shift_type_id', '=', 'shifts.shift_type_id') $query->on('nast.shift_type_id', 'shifts.shift_type_id')
->whereNotNull('schedule_shift.shift_id'); ->whereNotNull('schedule_shift.shift_id')
->where('schedules.needed_from_shift_type', true);
}) })
->leftJoin('needed_angel_types AS nas', function (JoinClause $query): void { ->leftJoin('needed_angel_types AS nas', function (JoinClause $query): void {
$query->on('nas.location_id', '=', 'shifts.location_id') $query->on('nas.location_id', 'shifts.location_id')
->whereNotNull('schedule_shift.shift_id'); ->whereNotNull('schedule_shift.shift_id')
->where('schedules.needed_from_shift_type', false);
}) })
// Not already signed in // Not already signed in
->whereNotIn('shifts.id', $shiftEntries->pluck('shift_id')) ->whereNotIn('shifts.id', $shiftEntries->pluck('shift_id'))