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

Working on Tour Booking

Browse source
This commit is contained in:
TorstenS 2020-10-07 22:18:54 +02:00
parent e9f629db90
commit 30cdeab510
5 changed files with 64 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
motorradig/app/Tour.php
View file

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class Tour extends Model class Tour extends Model
{ {
protected $fillable = [ protected $fillable = [
'id', 'name', 'beschreibung','user_id','start','deadline' 'id', 'name', 'beschreibung','user_id','start','deadline','is_cancelled', 'status'
]; ];
public static function getBookings($tour_id) { public static function getBookings($tour_id) {
@ -15,4 +15,24 @@ class Tour extends Model
$bookings=Booking::where('tour_id',$tour_id)->get(); $bookings=Booking::where('tour_id',$tour_id)->get();
return $bookings; return $bookings;
} }
public static function has_participant($tour_id, $user_id) {
$booking=Booking::where('tour_id', $tour_id)->where('user_id',$user_id)->first();
if($booking) return true;
return false;
}
public static function join($tour_id,$user_id) {
Booking::firstOrCreate(
['tour_id',$tour_id],
['user_id',$user_id],
['updated_at', \Carbon::now()]
);
}
public static function leave($tour_id, $user_id) {
Booking::where('tour_id',$tour_id)->where('user_id',$user_id)->delete();
}
} }

1
motorradig/database/migrations/2020_09_30_082629_create_tours_table.php
View file

@ -22,6 +22,7 @@ class CreateToursTable extends Migration
$table->date('start')->nullable(); $table->date('start')->nullable();
$table->date('deadline')->nullable(); $table->date('deadline')->nullable();
$table->boolean('is_cancelled')->default(false); $table->boolean('is_cancelled')->default(false);
$table->string('status')->default('FINDET STATT');
$table->timestamps(); $table->timestamps();
}); });
} }

3
motorradig/database/seeds/TourSeeder.php
View file

@ -16,6 +16,7 @@ class TourSeeder extends Seeder
'name' => 'Eifeltour1', 'name' => 'Eifeltour1',
'user_id' => 3, 'user_id' => 3,
'start' => Carbon::parse('2020-11-11'), 'start' => Carbon::parse('2020-11-11'),
'deadline' => Carbon::parse('2020-11-01'),
'is_cancelled' => false, 'is_cancelled' => false,
'beschreibung' => 'Hier kann ein sehr langer Text stehen.' 'beschreibung' => 'Hier kann ein sehr langer Text stehen.'
]); ]);
@ -25,6 +26,7 @@ class TourSeeder extends Seeder
'user_id' => 2, 'user_id' => 2,
'beschreibung' => 'Hier kann ein sehr langer Text stehen.', 'beschreibung' => 'Hier kann ein sehr langer Text stehen.',
'start' => Carbon::parse('2020-12-01'), 'start' => Carbon::parse('2020-12-01'),
'deadline' => Carbon::parse('2020-11-02'),
'is_cancelled' => false, 'is_cancelled' => false,
]); ]);
@ -33,6 +35,7 @@ class TourSeeder extends Seeder
'user_id' => 1, 'user_id' => 1,
'beschreibung' => 'Hier kann ein wirklich sehr langer Text stehen. <p>&nbsp;</p> Es sind auch mehrere Abschnitte möglich.', 'beschreibung' => 'Hier kann ein wirklich sehr langer Text stehen. <p>&nbsp;</p> Es sind auch mehrere Abschnitte möglich.',
'start' => Carbon::parse('2020-12-15'), 'start' => Carbon::parse('2020-12-15'),
'deadline' => Carbon::parse('2020-11-15'),
'is_cancelled' => true 'is_cancelled' => true
]); ]);

10
motorradig/resources/views/tour/index.blade.php
View file

@ -6,12 +6,20 @@
<a href="/pdf/tourenplan.pdf" class="text-center text-light">Download</a> <a href="/pdf/tourenplan.pdf" class="text-center text-light">Download</a>
<div class="container text-primary"> <div class="container text-primary" style="display:flex">
.<ul class="list-group offset-2 col-8"> .<ul class="list-group offset-2 col-8">
@foreach($tours as $tour) @foreach($tours as $tour)
<a href="/tour/{{$tour->id}}"> <a href="/tour/{{$tour->id}}">
<li class="list-group-item d-flex justify-content-between align-items-center"> <li class="list-group-item d-flex justify-content-between align-items-center">
{{ $tour->start }} - {{ $tour->name }} [?/?] {{ $tour->start }} - {{ $tour->name }} [?/?]
@if(App\Tour::has_participant($tour->id, Auth::user()->id)==true)
<i class="fas fa-biking"></i>
@endif
<span class="badge {{ $tour->status=="FINDET STATT" ? "badge-success" : "badge-danger" }} badge-pill">{{ $tour->status }}</span> <span class="badge {{ $tour->status=="FINDET STATT" ? "badge-success" : "badge-danger" }} badge-pill">{{ $tour->status }}</span>
</li> </li>
</a> </a>

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

@ -3,7 +3,7 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-8"> <div class="col-md-8 mt-2">
<div class="card mt-4"> <div class="card mt-4">
<div class="card-header">{{ $tour->name }}</div> <div class="card-header">{{ $tour->name }}</div>
@ -12,27 +12,34 @@
<form style="background-color: #fff;" class="text-dark" method="post" action="" enctype="multipart/form-data"> <form style="background-color: #fff;" class="text-dark" method="post" action="" enctype="multipart/form-data">
@csrf @csrf
<div class="form-group" style="display:flex;"> <div class="" style="display:flex;">
<!-- label class="ml-2 mt-4 col-form-label col-form-label-sm" style="width:150px; text-align:left;" for="name"><h4>Name:</h4></label> --> <!-- label class="ml-2 mt-4 col-form-label col-form-label-sm" style="width:150px; text-align:left;" for="name"><h4>Name:</h4></label> -->
<label class="ml-2 mt-3 col-form-label col-form-label-sm" style="width:180px; text-align:left;font-size:18px;" for="name">Name:</label> <label class="ml-2" style="width:180px; text-align:left;font-size:18px;" for="name">Name:</label>
<input class="mt-3 mr-2 form-control input-sm" type="text" id="name" name="name" value="{{ old('name') ?? $tour->name }}" readonly > <input class="mr-1 form-control" type="text" id="name" name="name" value="{{ old('name') ?? $tour->name }}" readonly >
</div> </div>
<div class="form-group" style="display:flex;"> <div class="mt-1" style="display:flex;">
<label class="ml-2 mt-3" style="width:180px; text-align:left;font-size:18px;" for="name">Start:</label> <label class="ml-2" style="width:180px; text-align:left;font-size:18px;" for="name">Start:</label>
<input class="mt-3 mr-2 form-control input-sm" type="text" id="start" name="start" value="{{ old('start') ?? $tour->start }}" readonly > <input class="mr-1 form-control" type="text" id="start" name="start" value="{{ old('start') ?? $tour->start }}" readonly >
</div> </div>
<div class="form-group" style="display:flex;"> <div class="mt-1" style="display:flex;">
<label class="ml-2 mt-4" style="width:180px; text-align:left;font-size:18px;" for="name">Anmeldeschluss:</label> <label class="ml-2" style="width:180px; text-align:left;font-size:18px;" for="name">Anmeldeschluss:</label>
<input class="mt-3 mr-2 form-control" type="text" id="anmeldeschluss" style="font-size:16px;" name="start" value="{{ old('anmeldeschluss') ?? $tour->deadline }}" readonly > <input class="mr-1 form-control" type="text" id="anmeldeschluss" style="font-size:16px;" name="start" value="{{ old('anmeldeschluss') ?? $tour->deadline }}" readonly >
</div> </div>
<div class="form-group" style="display:flex;"> <div class="mt-1" style="display:flex;">
<label class="ml-2 mt-4" style="width:180px; text-align:left;font-size:18px;" for="name">Max Teilnehmer:</label> <label class="ml-2" style="width:180px; text-align:left;font-size:18px;" for="name">Max Teilnehmer:</label>
<input class="mt-3 mr-2 form-control" type="text" id="max_participants" style="font-size:16px;" name="max_participants" value="{{ old('max_participants') ?? $tour->max_participants }}" required > <input class="mr-1 form-control" type="text" id="max_participants" style="font-size:16px;" name="max_participants" value="{{ old('max_participants') ?? $tour->max_participants }}" required >
</div> </div>
@if(App\Tour::has_participant($tour->id, Auth::user()->id))
<label>Du nimmst teil.</label>
@else
<label>Du nimmst nicht teil.</label>
@endif
@if(file_exists (public_path ('img/tour/'.$tour->id.'.jpg'))) @if(file_exists (public_path ('img/tour/'.$tour->id.'.jpg')))
<!--File exists --> <!--File exists -->
<a href="/img/tour/{{$tour->id}}_gross.jpg" data-lightbox="{{$tour->id}}_gross.jpg" data-title="{{ $tour->name }}"> <a href="/img/tour/{{$tour->id}}_gross.jpg" data-lightbox="{{$tour->id}}_gross.jpg" data-title="{{ $tour->name }}">
@ -42,25 +49,25 @@
<img src="/img/placeholder/tour128x100.jpg" class="mt-3 ml-3" > <img src="/img/placeholder/tour128x100.jpg" class="mt-3 ml-3" >
@endif @endif
<div class="form-group" style="display:flex;"> <div class="mt-1" style="display:flex;">
<label class="ml-2 mt-3" style="width:140px; text-align:left;font-size:18px;" for="name">Storniert:</label> <label class="ml-2" style="width:140px; text-align:left;font-size:18px;" for="name">Storniert:</label>
<input class="mt-3 mr-2 form-control" type="checkbox" id="anmeldeschluss" style="font-size:10px;width:20px;" name="anmeldeschluss" value="{{ old('anmeldeschluss') ?? $tour->deadline }}" onclick="return false;" > <input class="mr-1 form-control" type="checkbox" id="anmeldeschluss" style="font-size:10px;width:20px;" name="anmeldeschluss" value="{{ old('anmeldeschluss') ?? $tour->deadline }}" onclick="return false;" >
</div> </div>
<div class="form-group" style="display:flex;"> <div class="mt-1" style="display:flex;">
<label class="ml-2 mt-3" style="width:140px; text-align:left;font-size:18px;" for="name">Teilnehmer:</label> <label class="ml-2" style="width:140px; text-align:left;font-size:18px;" for="name">Teilnehmer:</label>
<a href="#" class="mt-3 mr-2 form-control" id="max_participants" style="font-size:16px;width:36px;" name="max_participants" onclick="return false;">{{ old('max_participants') ?? count(\App\Tour::getBookings($tour->id)) }}</a> <a href="#" class="mr-1 form-control" id="max_participants" style="font-size:16px;width:36px;" name="max_participants" onclick="return false;">{{ old('max_participants') ?? count(\App\Tour::getBookings($tour->id)) }}</a>
</div> </div>
<div class="form-group"> <div class="mt-1">
<textarea class="col-12" name="beschreibung" rows="10" cols="50" readonly>{{ $tour->beschreibung }} <textarea class="col-12" name="beschreibung" rows="10" cols="50" readonly>{{ $tour->beschreibung }}
</textarea> </textarea>
</div> </div>
<a href="/tour/{{$tour->id}}/edit"><div type="submit" class="btn btn-danger col-2 mb-2 float-left mr-2">Bearbeiten</div></a> <a href="/tour/{{$tour->id}}/edit"><div type="submit" class="btn btn-danger col-3 mb-2 float-left mr-2">Bearbeiten</div></a>
<a href="/tour" type="submit" class="btn btn-success col-2 mb-2 float-right mr-2">Ok</a> <a href="/tour" type="submit" class="btn btn-success col-3 mb-2 float-right mr-2">Ok</a>
<a href="#" type="submit" class="btn btn-danger col-2 mb-2 float-right mr-2">Teilnehmen</a> <a href="#" type="submit" class="btn btn-danger col-3 mb-2 float-right mr-2">Teilnehmen</a>
</form> </form>