First Mockup: Show Tourmembers in Rooms
This commit is contained in:
parent
1a8a706b50
commit
0f7b4b6180
3 changed files with 257 additions and 1 deletions
|
|
@ -8,6 +8,7 @@ use App\User;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\File;
|
use Illuminate\Http\File;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Intervention\Image\Facades\Image;
|
use Intervention\Image\Facades\Image;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
@ -127,12 +128,28 @@ class TourController extends Controller
|
||||||
->with('creator', $creator);
|
->with('creator', $creator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$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);
|
||||||
|
|
||||||
|
|
||||||
$tour->start = Tour::toGermanDate($tour->start);
|
$tour->start = Tour::toGermanDate($tour->start);
|
||||||
$tour->deadline = Tour::toGermanDate($tour->deadline);
|
$tour->deadline = Tour::toGermanDate($tour->deadline);
|
||||||
return view('tour.show')
|
return view('tour.show')
|
||||||
->with('tour', $tour)
|
->with('tour', $tour)
|
||||||
->with('users', $users)
|
->with('users', $users)
|
||||||
->with('creator', $creator);
|
->with('creator', $creator)
|
||||||
|
->with('rooms', $rooms);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -105,6 +105,20 @@
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</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}}</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
225
tools/motorradig_2022-05-02_083155.sql
Normal file
225
tools/motorradig_2022-05-02_083155.sql
Normal file
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue