When only free shifts should be shown: filter for selected angel types
closes #556 (shifts shown, where not selected angeltype is free)
This commit is contained in:
parent
1fefe93bc8
commit
d208cab1ac
|
@ -492,6 +492,13 @@ function shiftCalendarRendererByShiftFilter(ShiftsFilter $shiftsFilter)
|
|||
foreach ($needed_angeltypes[$shift['SID']] as $needed_angeltype) {
|
||||
$taken = 0;
|
||||
|
||||
if (
|
||||
!in_array(ShiftsFilter::FILLED_FILLED, $shiftsFilter->getFilled())
|
||||
&& !in_array($needed_angeltype['angel_type_id'], $shiftsFilter->getTypes())
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($shift_entries[$shift['SID']] as $shift_entry) {
|
||||
if (
|
||||
$needed_angeltype['angel_type_id'] == $shift_entry['TID']
|
||||
|
|
Loading…
Reference in New Issue