diff --git a/motorradig/app/Http/Controllers/TourController.php b/motorradig/app/Http/Controllers/TourController.php index d7a323e..1641844 100644 --- a/motorradig/app/Http/Controllers/TourController.php +++ b/motorradig/app/Http/Controllers/TourController.php @@ -136,7 +136,6 @@ class TourController extends Controller bookings, booking_rooms, users WHERE bookings.user_id=users.id AND bookings.room_id=booking_rooms.id AND bookings.tour_id=".$tour->id ." ORDER BY booking_rooms.name;"; - Log::info("Fetch sql: ".$sql); $rooms=DB::select($sql); Log::info("Rooms query result:"); @@ -168,7 +167,22 @@ class TourController extends Controller $tour->start = Tour::toGermanDate($tour->start); $tour->deadline = Tour::toGermanDate($tour->deadline); - return view('tour.edit')->with('tour', $tour); + $sql="SELECT bookings.room_id as room_id, + booking_rooms.name as room_name, + bookings.user_id as user_id, + users.name as user_name + FROM + bookings, booking_rooms, users + WHERE bookings.user_id=users.id AND bookings.room_id=booking_rooms.id AND bookings.tour_id=".$tour->id + ." ORDER BY booking_rooms.name;"; + Log::info("Fetch sql: ".$sql); + $rooms=DB::select($sql); + Log::info("Rooms query result:"); + Log::info($rooms); + + return view('tour.edit') + ->with('tour', $tour) + ->with('rooms', $rooms); } /** diff --git a/motorradig/resources/views/tour/edit.blade.php b/motorradig/resources/views/tour/edit.blade.php index 18a7487..37680fb 100644 --- a/motorradig/resources/views/tour/edit.blade.php +++ b/motorradig/resources/views/tour/edit.blade.php @@ -80,12 +80,41 @@ - - + +
{{$room->room_name}}
+ + @if ($room_display_name=$room->room_name) @endif + @endif +