diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index eef016d..6343551 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -84,7 +84,7 @@ class EventController extends Controller $news->content = "

" . $event->description . "

" . '
'. ' $event->id ]) .'">Tilmeld'. - ' $event->id ]) .'">Se deltagere'. + ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); } @@ -114,7 +114,7 @@ class EventController extends Controller public function signups(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')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event_id)->get(); + $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get(); if (count($events) == 0) $events = Event::where('id', $request->event)->get(); @@ -122,6 +122,20 @@ class EventController extends Controller return Response::detect("events.signups", [ "events" => $events ]); } + /** + * 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. - This is only being showed on App + $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get(); + + return Response::detect("events.signups", [ "events" => $events ]); + } + /** * Show the form for editing the specified resource.- * @@ -164,7 +178,7 @@ class EventController extends Controller $news->content = "

" . $event->description . "

" . '
'. ' $event->id ]) .'">Tilmeld'. - ' $event->id ]) .'">Se deltagere'. + ' $event->id ]) .'">Se deltagere'. '
'; $news->save(); } diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php index ec04a1b..37e71eb 100644 --- a/skolehjem/resources/lang/dk/msg.php +++ b/skolehjem/resources/lang/dk/msg.php @@ -14,6 +14,7 @@ return[ "dereringenaktiviteter" => "Der er ingen aktiviteter", "setilmeldteaktiviteter" => "Se Tilmeldte Aktiviteter", "tilmeldtesnavn" => "Tilmeldtes navn", + "ingentilmeldte" => "Der er ingen tilmeldte", "dinereservationer" => "Dine reservationer", "duharingenreservationer" => "Du har ingen reservationer", "reservervaskemaskine" => "Reserver vaskemaskine", diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php index 6042799..ec7a5dc 100644 --- a/skolehjem/resources/lang/en/msg.php +++ b/skolehjem/resources/lang/en/msg.php @@ -21,6 +21,7 @@ return[ "setilmeldteaktiviteter" => "See Registered Activities", "tilmeldteaktiviteter" => "Your Registered Activities", "tilmeldtesnavn" => "Participants", + "ingentilmeldte" => "There are no participants", "duharikketilmeldtdignogenaktiviteter" => "You have not signed up for any activities", "afmeld" => "Cancel", "tilbage" => "Go Back", diff --git a/skolehjem/resources/views/admin/events/create.blade.php b/skolehjem/resources/views/admin/events/create.blade.php index a3806ff..3cf2cb9 100644 --- a/skolehjem/resources/views/admin/events/create.blade.php +++ b/skolehjem/resources/views/admin/events/create.blade.php @@ -17,10 +17,17 @@ .toggle__text::before { border-color: black; } - .ck-editor__main { + + .tox-notification { + display: none !important; + } + + .tox { + border-radius: 4px !important; margin-bottom: 1rem; } +

Opret Aktivitet:

@csrf @@ -42,13 +49,13 @@
@endsection diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 2f01f5d..3d329c2 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -17,7 +17,17 @@ .toggle__text::before { border-color: black; } + + .tox-notification { + display: none !important; + } + + .tox { + border-radius: 4px !important; + margin-bottom: 1rem; + } +

Rediger Link:

$event])}}"> @csrf @@ -27,7 +37,7 @@ - +
+ + @endsection diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index dfab8fe..a747f4b 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -24,20 +24,12 @@ - - - - @foreach($menuPlans as $menuplan) - - - -
UgeMandagTirsdagOnsdagTorsdag Update Delete
{{$menuplan->week}}{{$menuplan->monday}}{{$menuplan->tuesday}}{{$menuplan->wednesday}}{{$menuplan->thursday}} $menuplan ]) }}">Update
$menuplan ]) }}" class="w-100 nostyle"> @csrf diff --git a/skolehjem/resources/views/app/events/signups.blade.php b/skolehjem/resources/views/app/events/signups.blade.php index e1a0340..0175c46 100644 --- a/skolehjem/resources/views/app/events/signups.blade.php +++ b/skolehjem/resources/views/app/events/signups.blade.php @@ -48,9 +48,13 @@
- - - + @if(count($events) == 0) +

{{__('msg.ingentilmeldte')}}

+ @else + + + + @endif @foreach($events as $UE) @if ($UE->name_first != null && $UE->name_last != null && $UE->phone != null && $UE->event_id != null && $UE->user_id != null) @@ -58,9 +62,6 @@ @endif @endforeach - @if(count($events) == 0) -

Der er ingen tilmeldte

- @endif
{{ __('msg.tilmeldtesnavn') }}
{{ __('msg.tilmeldtesnavn') }}
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 778c22c..fcae0ff 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -26,6 +26,7 @@ Route::get("/account/edit", "UserController@accountedit")->name("users.accounted Route::get("/account/editpass", "UserController@accounteditpass")->name("users.accounteditpass"); Route::put("/account/update", "UserController@accountupdate")->name("users.accountupdate"); Route::get("/events/signups", "EventController@signups")->name("events.signups"); +Route::get("/events/accountsignups", "EventController@accountsignups")->name("events.accountsignups"); Route::get("phones", "PhoneController@index")->name("phones.index"); Route::get("/washing-reservationsapi", "WashingReservationController@api")->name("washing-reservations.api"); Route::get("/app/washing-reservations", "WashingReservationController@appindex")->name("washing-reservations.appindex");