torsten/motorradig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Beautify Show Toom Room/Booking display

Browse source
This commit is contained in:
Torsten 2022-05-13 11:16:49 +02:00
parent 98fd718ef5
commit cb26e3a421
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
motorradig/app/Http/Controllers/TourController.php
View file

@ -120,7 +120,7 @@ class TourController extends Controller
array_push($users, $user); array_push($users, $user);
} }
// Alte Tour anzeigen // Vergangene Tour anzeigen
if($tour->start < Carbon::now()) { if($tour->start < Carbon::now()) {
$tour->start = Tour::toGermanDate($tour->start); $tour->start = Tour::toGermanDate($tour->start);
$tour->deadline = Tour::toGermanDate($tour->deadline); $tour->deadline = Tour::toGermanDate($tour->deadline);
@ -130,6 +130,7 @@ class TourController extends Controller
->with('creator', $creator); ->with('creator', $creator);
} }
// Zukünftige Tour anzeigen
$rooms=$this->fetch_rooms($tour->id); $rooms=$this->fetch_rooms($tour->id);
$tour->start = Tour::toGermanDate($tour->start); $tour->start = Tour::toGermanDate($tour->start);

23
motorradig/resources/views/tour/show.blade.php
View file

@ -91,19 +91,26 @@
<div class="card-body"> <div class="card-body">
<ul> <ul>
<!-- Intentional Asignment ! -->
@if( $room_display_name="-" ) @endif @if ($room_display_name="") @endif
@foreach($rooms as $room) @foreach($rooms as $room)
@if ($room_display_name != $room->room_name) @if ($room_display_name != $room->room_name)
<p>{{$room->room_name}}</p> @if(strlen($room_display_name))
<hr/>
@endif
<ul><b>{{$room->room_name}}</b></ul>
<!-- Intentional Asignment ! --> <!-- Intentional Asignment ! -->
@if ($room_display_name=$room->room_name) @endif @if ($room_display_name=$room->room_name) @endif
@endif @endif
<li> {{ $room->user_name}}
@if(Auth::user()->role=="ADMIN") @if(strlen($room->user_name))
<a href="/tour/{{$tour->id}}/cancelBookingAdmin/{{$room->user_id}}" class="text-primary">(X)</a> <li> {{ $room->user_name}}
@endif @if(Auth::user()->role=="ADMIN")
</li> <a href="/tour/{{$tour->id}}/cancelBookingAdmin/{{$room->user_id}}" class="text-primary">(X)</a>
@endif
</li>
@endif
@endforeach @endforeach
</ul> </ul>