From 134ac6478f0e5079bc937f422f5c91ee6576828a Mon Sep 17 00:00:00 2001 From: Torsten Date: Wed, 11 Jan 2023 20:45:29 +0100 Subject: [PATCH] Tour Room UI update --- doc/readme.txt | 5 + .../app/Http/Controllers/TourController.php | 16 +- .../resources/views/tour/edit.blade.php | 251 ++++++++------ .../resources/views/tour/show.blade.php | 41 +-- tools/motorradig_2023-01-11_165941.sql | 306 ++++++++++++++++++ 5 files changed, 489 insertions(+), 130 deletions(-) create mode 100644 tools/motorradig_2023-01-11_165941.sql diff --git a/doc/readme.txt b/doc/readme.txt index ad15d5e..290c4ac 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -2,3 +2,8 @@ laravel new motorradig cd motorradig composer require laravel/ui --dev + + + + +mysql -ud0304938 -phubbabubba -h motorrad-ig.de d0304938 diff --git a/motorradig/app/Http/Controllers/TourController.php b/motorradig/app/Http/Controllers/TourController.php index 1e93f18..7b138d5 100644 --- a/motorradig/app/Http/Controllers/TourController.php +++ b/motorradig/app/Http/Controllers/TourController.php @@ -162,7 +162,7 @@ class TourController extends Controller qry.free_slots, COALESCE(qry.room_name,'Ungebucht') as room_name, - COALESCE(qry.room_name,'ZZZZZZZZZ') as room_sort_order + COALESCE(qry.room_id,'ZZZZZZZZZ') as room_sort_order FROM ( SELECT @@ -173,15 +173,16 @@ class TourController extends Controller 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 - ON b.tour_id = tr.tour_id AND b.room_id = tr.id + 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= ".$tour_id." + ) qry LEFT JOIN users as u ON qry.user_id = u.id + UNION -- unbooked tour users @@ -205,7 +206,7 @@ class TourController extends Controller b.user_id = u.id AND capacity is null - ORDER BY room_name, user_name + ORDER BY room_sort_order, user_name ; "; @@ -219,6 +220,7 @@ class TourController extends Controller public function edit(Tour $tour) { + if (Auth::user()->role != 'ADMIN') {return redirect('/tour');} error_log("Tour:edit"); if ($tour->startwith('tour', $tour); @@ -229,6 +231,8 @@ class TourController extends Controller $rooms = $this->fetch_rooms($tour->id); + + return view('tour.edit') ->with('tour', $tour) ->with('rooms', $rooms); @@ -361,7 +365,7 @@ class TourController extends Controller Log::info("create_room Controller started"); $user=Auth::user(); - Booking::where('tour_id', $tour_id)->where('room_id', $room_id)->delete(); + DB::update("UPDATE bookings SET room_id=0 WHERE room_id=".$room_id); DB::delete("DELETE FROM tour_rooms WHERE tour_id = ? AND id = ?",[$tour_id, $room_id]); return redirect('tour/'.$tour_id.'/edit'); } diff --git a/motorradig/resources/views/tour/edit.blade.php b/motorradig/resources/views/tour/edit.blade.php index 5a79f03..8631993 100644 --- a/motorradig/resources/views/tour/edit.blade.php +++ b/motorradig/resources/views/tour/edit.blade.php @@ -13,7 +13,8 @@
-
+ @csrf @@ -23,59 +24,75 @@
- - + +
- - + +
- - + +
- - + +
- + @if(file_exists (public_path ('img/tour/'.$tour->id.'.jpg'))) - - + + @else - + @endif - +
- - is_cancelled) - checked + + is_cancelled) + checked @endif >
-
-
Abbrechen
 + +
Abbrechen
+
@@ -85,24 +102,27 @@ + +
- -
-
-
Teilnehmer
- -
-

- - @if ($room_id="") @endif - @foreach($rooms as $room) - @if ($room_id != $room->room_id) - @if(strlen($room_id)) -

- @endif -

[{{$room->room_id}}] {{$room->room_name}} - @if($room->room_id>0) - - (X) Raum Löschen - - @endif -

- - - @if ($room_id=$room->room_id) @endif - @endif - - @if(strlen($room->user_name)) -
  • {{ $room->user_name}} - @if(Auth::user()->role=="ADMIN") - - (-) - Ḱein Raum - - - (Zimmer->) - - @endif -
    • - @endif - - @endforeach - -
    - + Einzelzimmer - -
    -   -
    - + Doppelzimmer - -
    -
    -
    - -
    +
    +
    +
    Teilnehmer
    + +
    + + + @if ($room_id="") @endif + @foreach($rooms as $room) + + @if ($room_id != $room->room_id) + @if($room_id!="") + @if($room->room_name=="Ungebucht") +
    + @else +
    + @endif + @endif + +
    +
    {{$room->room_name}} + @if( $room->room_name != "Ungebucht" ) + + + (X) Raum Löschen + + @endif +
    + + + @if ($room_id=$room->room_id) @endif + @endif + + @if(strlen($room->user_name)) +
      {{ $room->user_name}} + @if( $room->room_name == "Ungebucht" ) + + (+) + Zimmer zuweisen + + @else + + (-) + Zimmer-Zuweisung löschen + + @endif + +
    + @endif + + + @endforeach + +
    + +
    +

    + + Einzelzimmer + erstellen + +

    + +

    + + Doppelzimmer + erstellen + +

    +
    +
    + + + + +