|
|
@ -139,7 +139,11 @@ class FreeShiftList(ShiftList):
|
|
|
|
help_wanted = Q(required_helpers__gt=F("reg_count")) | Q(
|
|
|
|
help_wanted = Q(required_helpers__gt=F("reg_count")) | Q(
|
|
|
|
required_helpers=0
|
|
|
|
required_helpers=0
|
|
|
|
) & Q(room__required_helpers__gt=F("reg_count"))
|
|
|
|
) & Q(room__required_helpers__gt=F("reg_count"))
|
|
|
|
return Shift.with_reg_count().filter(
|
|
|
|
return (
|
|
|
|
help_wanted,
|
|
|
|
Shift.with_reg_count()
|
|
|
|
start_at__gt=timezone.now(),
|
|
|
|
.filter(
|
|
|
|
|
|
|
|
help_wanted,
|
|
|
|
|
|
|
|
start_at__gt=timezone.now(),
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
.order_by("start_at", "room_id")
|
|
|
|
)
|
|
|
|
)
|
|
|
|