vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.5.20 - Removed event_end & Updated Migration

Browse Source 
Updated Delete of multiple event
Started on deletion of single event & multiple-event edit
Removed userevent $key variable
Updated multipdf
Fixed web.php
This commit is contained in:
Anders
2021-05-04 12:32:24 +02:00
parent c617012187
commit 6cc43257b7
11 changed files with 138 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/MultipleEventsController.php
+18 -22
View File
@@ -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 ]);
}