From 6cc43257b7ce75bf7326692de1752aca34a499af Mon Sep 17 00:00:00 2001 From: Anders Date: Tue, 4 May 2021 12:32:24 +0200 Subject: [PATCH] v1.5.20 - Removed event_end & Updated Migration Updated Delete of multiple event Started on deletion of single event & multiple-event edit Removed userevent $key variable Updated multipdf Fixed web.php --- .../Controllers/MultipleEventsController.php | 40 ++++---- skolehjem/app/MultipleEvents.php | 2 +- ...21_04_20_142356_create_multiple_events.php | 1 - .../views/admin/events/index.blade.php | 7 +- .../views/admin/events/signups.blade.php | 40 +++++++- .../admin/multiple-events/edit.blade.php | 41 ++------- .../admin/multiple-events/index.blade.php | 2 +- .../admin/multiple-events/signups.blade.php | 91 +++++++++++++------ .../views/app/events/yourevents.blade.php | 1 - .../views/multipdf/multipleevent.blade.php | 3 - skolehjem/routes/web.php | 2 +- 11 files changed, 138 insertions(+), 92 deletions(-) diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index 55e3d75..8874906 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -83,7 +83,6 @@ class MultipleEventsController extends Controller $multi_event->description = $requestBody['description'][$i]; $multi_event->accountable = $requestBody['accountable'][$i]; $multi_event->name = $requestBody['name'][$i]; - $multi_event->event_end = "2021-27-04 16:00:00"; $multi_event->multiple_events_parent_id = $multipleParent->id; $multi_event->save(); } @@ -127,20 +126,20 @@ class MultipleEventsController extends Controller */ public function edit($id) { - $multiEvent = MultipleEvents::find($id); - return Response::detect("multiple-events.edit", ["multiEvent" => $multiEvent]); + $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get(); + return Response::detect("multiple-events.edit", ["multiEvents" => $multiEvents, "parentEvent" => $id]); } /** * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param \App\MultipleEvents $multipleeventsController + * @param int $id * @return \Illuminate\Http\Response */ - public function update(Request $request, MultipleeventsController $multipleeventsController) + public function update(Request $request, $id) { - // + dd($request); } @@ -161,18 +160,17 @@ class MultipleEventsController extends Controller * @param \App\MultipleEvents $multipleeventsController * @return \Illuminate\Http\Response */ - public function destroy(Request $request, MultipleeventsController $multipleeventsController) + public function destroy(Request $request, $id) { if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event - $UserEvent = UserEvent::query()->where('user_id', "=", $request->signup)->where('multiple_event_id', "=", $multipleeventsController); - + $UserEvent = UserEvent::find($id); $UserEvent->delete(); - return redirect()->route("multiple-events.signups", [ "event" => $multipleeventsController ]); + return 1; } else { // Else if you are deleting an event. Then delete all the sign ups AND the event - $userEvents = UserEvent::where('multiple_event_id', "=", $multipleeventsController)->get(); - $multiparent = MultipleEventsParent::where('id', '=', $multipleeventsController)->get(); - $multievent = MultipleEvents::where('multiple_events_parent_id', '=', $multiparent->id)->get(); + $userEvents = UserEvent::where('multiple_event_id', "=", $id)->get(); + $multiparent = MultipleEventsParent::find($id); + $multievent = MultipleEvents::where('multiple_events_parent_id', '=', $id)->get(); foreach ($userEvents as $userEvent) { $userEvent->delete(); @@ -181,13 +179,12 @@ class MultipleEventsController extends Controller foreach ($multievent as $me) { $me->delete(); } - - $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "MultipleEvent")->where("arrangement_id", "=", $multipleeventsController); + $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "MultipleEvent")->where("arrangement_id", "=", $id); $news->delete(); $multiparent->delete(); - return redirect()->route("multiple-events.index"); + return 1; } } @@ -197,7 +194,7 @@ class MultipleEventsController extends Controller $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get(); } else {*/ //$multipleEventsParent = MultipleEventsParent::find($request->preview); - $multipleEventsParent = MultipleEventsParent::leftJoin('resources', 'resources.id', '=', 'multiple_events_parent.resource_id')->where('multiple_events_parent.id', '=', $request->preview)->first(); + $multipleEventsParent = MultipleEventsParent::leftJoin('resources', 'resources.id', '=', 'multiple_events_parent.resource_id')->where('multiple_events_parent.id', '=', $request->preview)->select('multiple_events_parent.*', 'resources.filename')->first(); $multipleEvents = MultipleEvents::where('multiple_events_parent_id', '=', $multipleEventsParent->id)->get(); //} @@ -213,7 +210,6 @@ class MultipleEventsController extends Controller $multiEvent->accountable = substr($multiEvent->accountable, 0, $var); $multiEvent->description = substr($multiEvent->description, 0, $var); $multiEvent->date = substr($multiEvent->date, 0, $var); - $multiEvent->event_end = substr($multiEvent->event_end, 0, $var); $pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]); @@ -225,12 +221,12 @@ class MultipleEventsController extends Controller public function signups(Request $request) { - dd("K"); // Find every event you have clicked on. And find all users to that event, and the event name itself. - $multiEvents = MultipleEvents::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_event', 'multiple_event_id.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', $request->event)->get(); + //$multiEvents = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('multiple_events', 'multiple_events.id', '=', 'user_events.multiple_event_id')->where('multiple_event_id', '=', $request->multipleEvent)->get(); - if (count($multiEvents) == 0) - $multiEvents = MultipleEvents::where('id', $request->event)->get(); + $multiEvents = MultipleEvents::where('multiple_events_parent_id', '=', $request->multipleEvent)->get(); + //if (count($multiEvents) == 0) + // $multiEvents = MultipleEvents::where('id', '=', $request->multipleEvent)->get(); return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]); } diff --git a/skolehjem/app/MultipleEvents.php b/skolehjem/app/MultipleEvents.php index 815bb12..cd7e30c 100644 --- a/skolehjem/app/MultipleEvents.php +++ b/skolehjem/app/MultipleEvents.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class MultipleEvents extends Model { protected $fillable = [ - 'date', 'event_end', 'event_name', 'accountable', 'week', 'description', 'multiple_events_parent_id' + 'date', 'event_name', 'accountable', 'week', 'description', 'multiple_events_parent_id' ]; } diff --git a/skolehjem/database/migrations/2021_04_20_142356_create_multiple_events.php b/skolehjem/database/migrations/2021_04_20_142356_create_multiple_events.php index 61850c5..73e5c03 100644 --- a/skolehjem/database/migrations/2021_04_20_142356_create_multiple_events.php +++ b/skolehjem/database/migrations/2021_04_20_142356_create_multiple_events.php @@ -20,7 +20,6 @@ class CreateMultipleEvents extends Migration $table->string("accountable"); $table->longText("description"); $table->dateTime("date"); - $table->dateTime('event_end'); $table->timestamps(); }); } diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 66a5bdb..33faf5c 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -85,7 +85,7 @@ @foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event) {{ $event->week}} - id) }}">Show + $event->id]) }}">Show preview $event->id ]) }}" target="_blank">Print @if(auth()->user()->can('event.edit')) @@ -132,6 +132,7 @@ @endsection @section('scripts') + @endsection diff --git a/skolehjem/resources/views/admin/multiple-events/edit.blade.php b/skolehjem/resources/views/admin/multiple-events/edit.blade.php index 41fafa8..d5d12ef 100644 --- a/skolehjem/resources/views/admin/multiple-events/edit.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/edit.blade.php @@ -34,48 +34,27 @@

Opret ugentligt aktivitet: [Vi er i uge ]

-
- + @csrf + @method("PUT") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @foreach($multiEvents as $multiEvent) + + + + + + + @endforeach
Ugedag Aktivitets navn Aktivitets beskrivelse Tovholder Tidsrum (Start)
Mandag
Tirsdag
Onsdag
Torsdag