diff --git a/motorradig/app/Http/Controllers/TourController.php b/motorradig/app/Http/Controllers/TourController.php index 58af425..1074f87 100644 --- a/motorradig/app/Http/Controllers/TourController.php +++ b/motorradig/app/Http/Controllers/TourController.php @@ -50,7 +50,7 @@ class TourController extends Controller */ public function show(Tour $tour) { - // + return view('tour.show')->with('tour',$tour); } /** diff --git a/motorradig/database/migrations/2020_09_30_082629_create_tours_table.php b/motorradig/database/migrations/2020_09_30_082629_create_tours_table.php index 01d79ba..8eb74a4 100644 --- a/motorradig/database/migrations/2020_09_30_082629_create_tours_table.php +++ b/motorradig/database/migrations/2020_09_30_082629_create_tours_table.php @@ -18,7 +18,7 @@ class CreateToursTable extends Migration $table->string('name'); $table->text('beschreibung'); $table->string('user_id'); - $table->string('status'); + $table->boolean('is_cancelled'); $table->date('start')->nullable(); $table->date('deadline')->nullable(); $table->timestamps(); diff --git a/motorradig/database/seeds/TourSeeder.php b/motorradig/database/seeds/TourSeeder.php index b05050a..5e1a147 100644 --- a/motorradig/database/seeds/TourSeeder.php +++ b/motorradig/database/seeds/TourSeeder.php @@ -16,7 +16,7 @@ class TourSeeder extends Seeder 'name' => 'Eifeltour1', 'user_id' => 3, 'start' => Carbon::parse('2020-11-11'), - 'status' => 'FINDET STATT', + 'is_cancelled' => false, 'beschreibung' => 'Hier kann ein sehr langer Text stehen.' ]); @@ -25,7 +25,7 @@ class TourSeeder extends Seeder 'user_id' => 2, 'beschreibung' => 'Hier kann ein sehr langer Text stehen.', 'start' => Carbon::parse('2020-12-01'), - 'status' => 'FINDET STATT', + 'is_cancelled' => false, ]); DB::table('tours')->insert([ @@ -33,7 +33,7 @@ class TourSeeder extends Seeder 'user_id' => 1, 'beschreibung' => 'Hier kann ein wirklich sehr langer Text stehen.

 

Es sind auch mehrere Abschnitte möglich.', 'start' => Carbon::parse('2020-12-15'), - 'status' => 'GECANCELT', + 'is_cancelled' => true ]); } diff --git a/motorradig/resources/views/layouts/app.blade.php b/motorradig/resources/views/layouts/app.blade.php index 8856705..77d2a30 100644 --- a/motorradig/resources/views/layouts/app.blade.php +++ b/motorradig/resources/views/layouts/app.blade.php @@ -19,6 +19,7 @@ +
diff --git a/motorradig/resources/views/tour/index.blade.php b/motorradig/resources/views/tour/index.blade.php index dfc3efa..90da018 100644 --- a/motorradig/resources/views/tour/index.blade.php +++ b/motorradig/resources/views/tour/index.blade.php @@ -9,11 +9,12 @@
.
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+ + + + + + + + + +
+ + + + +@endsection diff --git a/motorradig/routes/web.php b/motorradig/routes/web.php index 0fb11af..7244809 100644 --- a/motorradig/routes/web.php +++ b/motorradig/routes/web.php @@ -29,7 +29,7 @@ Route::get('/activities', 'PageController@page_activities'); Route::get('/become_member', function () { return view('users.become_member'); }); Route::get('/meetings', function () { return view('meetings'); }); -Route::get('/tourplan', function () { return view('tourplan'); }); +Route::get('/tourplan', function () { return view('tourplan'); }); // obsolete, delete Route::resource('/member',UserController::class);