diff --git a/motorradig/app/Http/Controllers/TourController.php b/motorradig/app/Http/Controllers/TourController.php index b439129..9931489 100644 --- a/motorradig/app/Http/Controllers/TourController.php +++ b/motorradig/app/Http/Controllers/TourController.php @@ -159,8 +159,10 @@ class TourController extends Controller u.id as user_id, u.name as user_name, qry.capacity, - COALESCE(qry.room_name,'Ungebucht') room_name, - COALESCE(qry.room_name,'ZZZZZZZZZ') room_sort_order + qry.free_slots, + + COALESCE(qry.room_name,'Ungebucht') as room_name, + COALESCE(qry.room_name,'ZZZZZZZZZ') as room_sort_order FROM ( SELECT @@ -168,7 +170,8 @@ class TourController extends Controller tr.id as room_id, tr.capacity, tr.name as room_name, - b.user_id + b.user_id, + (SELECT tr.capacity - count(*) from bookings where tour_id=tr.tour_id and room_id=tr.id) as free_slots FROM tour_rooms tr LEFT JOIN bookings as b @@ -188,6 +191,7 @@ class TourController extends Controller b.user_id, u.name as user_name, tr.capacity, + '0' as free_slots, COALESCE(tr.name,'Ungebucht') as room_name, COALESCE(tr.name,'ZZZZZZZZZ') as room_sort_order FROM diff --git a/motorradig/resources/views/tour/show.blade.php b/motorradig/resources/views/tour/show.blade.php index b0295e7..ea74b74 100644 --- a/motorradig/resources/views/tour/show.blade.php +++ b/motorradig/resources/views/tour/show.blade.php @@ -92,7 +92,34 @@
@@ -106,6 +133,7 @@