Room View on Edit Page

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);
     }
 
     /**

motorradig/resources/views/tour/edit.blade.php

@@ -80,12 +80,41 @@
                             <button type="submit" class="btn btn-danger col-2 mb-2 float-right mr-2">Speichern</button>
 
                         </form>
+                    </div>
+                </div>
+            </div>
 
+            <div class="col-md-3 mt-2">
+                <div class="card mt-4">
+                    <div class="card-header"><h5>Teilnehmer</h5></div>
+
+                    <div class="card-body">
+                        <ul>
+
+                            @if( $room_display_name="-" ) @endif
+                            @foreach($rooms as $room)
+                                @if ($room_display_name != $room->room_name)
+                                    <p>{{$room->room_name}}</p>
+                                    <!-- Intentional Asignment ! -->
+                                    @if ($room_display_name=$room->room_name) @endif
+                                @endif
+                                <li> {{ $room->user_name}}
+                                    @if(Auth::user()->role=="ADMIN")
+                                        <a href="/tour/{{$tour->id}}/cancelBookingAdmin/{{$room->user_id}}" class="text-primary">(X)</a>
+                                    @endif
+                                </li>
+
+                            @endforeach
+                        </ul>
+                        <div class="card-header">
+                            <button type="submit" class="btn">+ Raum hinzufügen</button>
+                        </div>
+                    </div>
+                </div>
 
             </div>
         </div>
-            </div>
-        </div>
+
     </div>
 
     <script>

motorradig/resources/views/tour/show.blade.php

@@ -91,20 +91,6 @@
                 <div class="card mt-4">
                     <div class="card-header"><h5>Teilnehmer</h5></div>
 
-                    <div class="card-body">
-
-                       <ul>
-                           @foreach($users as $user)
-                               <li>{{ $user->name }} &nbsp;
-                                   @if(Auth::user()->role=="ADMIN")
-                                    <a href="/tour/{{$tour->id}}/cancelBookingAdmin/{{$user->id}}" class="text-primary">(X)</a>
-                                   @endif
-                               </li>
-                           @endforeach
-                       </ul>
-
-
-                    </div>
                     <div class="card-body">
                         <ul>
 
@@ -115,7 +101,12 @@
                                     <!-- Intentional Asignment ! -->
                                     @if ($room_display_name=$room->room_name) @endif
                                 @endif
-                                <li> {{ $room->user_name}}</li>
+                                <li> {{ $room->user_name}}
+                                    @if(Auth::user()->role=="ADMIN")
+                                        <a href="/tour/{{$tour->id}}/cancelBookingAdmin/{{$room->user_id}}" class="text-primary">(X)</a>
+                                    @endif
+                                </li>
+
                             @endforeach
                         </ul>
                     </div>