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

fix random shift button, again, again

This commit is contained in:
msquare 2023-12-29 16:05:18 +01:00
parent 4a0c0994f0
commit 8603d47fe0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Controllers/ShiftsController.php
View File

@ -124,13 +124,11 @@ class ShiftsController extends BaseController
{ {
$query->select('id') $query->select('id')
->from('shift_entries') ->from('shift_entries')
->where('shift_entries.shift_id', $query->raw('shifts.id'))
->where(function (Builder $query): void { ->where(function (Builder $query): void {
$query->where('shift_entries.shift_id', $query->raw('needed_angel_types.shift_id')) $query->where('shift_entries.angel_type_id', $query->raw('needed_angel_types.angel_type_id'))
->where('shift_entries.angel_type_id', $query->raw('needed_angel_types.angel_type_id')); ->orWhere('shift_entries.angel_type_id', $query->raw('nas.angel_type_id'))
}) ->orWhere('shift_entries.angel_type_id', $query->raw('nast.angel_type_id'));
->orWhere(function (Builder $query): void {
$query->where('shift_entries.shift_id', $query->raw('nas.shift_id'))
->where('shift_entries.angel_type_id', $query->raw('nas.angel_type_id'));
}) })
->groupBy(['shift_entries.shift_id', 'shift_entries.angel_type_id']); ->groupBy(['shift_entries.shift_id', 'shift_entries.angel_type_id']);
} }