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

v1.5.23a - Fix of multiple events

Browse Source
This commit is contained in:
Anders
2021-05-11 12:47:44 +02:00
parent d1b083bae1
commit be09caaf34
5 changed files with 19 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/MultipleEventsController.php
+18 -13
View File
@@ -36,7 +36,7 @@ class MultipleEventsController extends Controller
*/
public function index()
{
$multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events_parent_id')->orderBy('multiple_events.date', 'desc')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
$multiEvents = MultipleEventsParent::join("multiple_events", "multiple_events.multiple_events_parent_id", '=', 'multiple_events_parent.id')->groupBy('multiple_events.multiple_events_parent_id', 'multiple_events_parent.id', 'multiple_events_parent.week', 'multiple_events_parent.resource_id', 'multiple_events_parent.created_at', 'multiple_events_parent.updated_at')->selectRaw('multiple_events_parent.*, max(date) as date')->get();
return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
}
@@ -124,6 +124,23 @@ class MultipleEventsController extends Controller
return Response::detect("multiple-events.show", [ "week" => $multiEventParent->week, "multiEvents" => $multiEvents]);
}
/**
* Display signups for event.
*
* @param int $id
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function accountsignups(Request $request)
{
// Find every event you have clicked on. And find all users to that event, and the event name itself.
$events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->where('multiple_event_id', $request->multiEvent)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get();
if (count($events) == 0)
$events = Event::where('id', $request->event)->get();
return Response::detect("multiple-events.signups", [ "multiEvent" => $events ]);
}
/**
* Show the form for editing the specified resource.-
*
@@ -197,18 +214,6 @@ class MultipleEventsController extends Controller
return Response::detect("events.index", [ "events" => $events]);
}
public function accountsignups(Request $request)
{
// Find every event you have clicked on. And find all users to that event, and the event name itself.
$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->multiEvent)->get();
if (count($multiEvents) == 0)
$multiEvents = Event::where('id', $request->event)->get();
return Response::detect("multiple-events.signups", [ "multiEvent" => $multiEvents ]);
}
/**
* Remove the specified resource from storage.
*