Fix of tour_rooms query 1/2; TourController is still inoperable.

doc/booking_query_1_of_2.all_tour_rooms.sql

@@ -2,22 +2,29 @@
 SELECT   
     qry.tour_id,
     qry.room_id,
-    b.user_id,
+    u.id,
+    u.name,
     qry.capacity,
-    qry.room_name,
     COALESCE(qry.room_name,'Ungebucht') room_name,
     COALESCE(qry.room_name,'ZZZZZZZZZ') room_sort_order
-FROM (
+    
+FROM     
+    (
     SELECT
         tr.tour_id,
         tr.id as room_id,
         tr.capacity,
-         tr.name as room_name
+        tr.name as room_name,
+        b.user_id
     FROM
         tour_rooms tr 
+    LEFT JOIN bookings as b
+        ON b.tour_id = tr.tour_id AND b.room_id = tr.id
     WHERE 
         tr.tour_id= 17
-     ) qry LEFT JOIN bookings as b
-           ON b.tour_id = qry.tour_id AND b.room_id=qry.room_id
-     ORDER BY 6,4
+    ) qry
+    LEFT JOIN users as u
+        ON qry.user_id = u.id
+ORDER BY
+    qry.room_id
 ;

motorradig/app/Http/Controllers/TourController.php

@@ -149,24 +149,29 @@ class TourController extends Controller
      */
 
     private function fetch_rooms($tour_id) {
-        $sql="SELECT    qry.tour_id,
+        // tour_room based display ( Suppresses users without room)
+        $sql="SELECT
+                qry.tour_id,
                 qry.room_id,
-                        qry.user_id,
-                        qry.user_name,
-                        COALESCE(br.name,'Ungebucht') room_name,
-                        COALESCE(br.name,'ZZZZZZZZZ') room_sort_order
+                b.user_id,
+                qry.capacity,
+                qry.room_name,
+                COALESCE(qry.room_name,'Ungebucht') room_name,
+                COALESCE(qry.room_name,'ZZZZZZZZZ') room_sort_order
             FROM (
                  SELECT
-                        bookings.tour_id,
-                        bookings.room_id as room_id,
-                        bookings.user_id as user_id,
-                        users.name as user_name
+                     tr.tour_id,
+                     tr.id as room_id,
+                     tr.capacity,
+                     tr.name as room_name
                  FROM
-                        bookings, users
-                    WHERE bookings.user_id = users.id AND bookings.tour_id = ".$tour_id."
-                    ) qry LEFT JOIN booking_rooms as br
-                          ON br.id = qry.room_id
-                    ORDER BY 6,4;";
+                     tour_rooms tr
+                 WHERE
+                    tr.tour_id= ".$tour_id."
+                 ) qry LEFT JOIN bookings as b
+                       ON b.tour_id = qry.tour_id AND b.room_id=qry.room_id
+                 ORDER BY 6,4
+            ;";
 
         $rooms=DB::select($sql);
         return($rooms);
@@ -248,11 +253,11 @@ class TourController extends Controller
 
     }
 
-
+/*
     public function create_room($tour_id, $capacity) {
         DB::delete("INSERT INTO booking_rooms")
     }
-
+*/
 
     public function upload_gallery(Request $request, Tour $tour){
         dd($request);