Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
This commit is contained in:
commit
a97cd7cda5
|
|
@ -84,7 +84,7 @@ class EventController extends Controller
|
|||
$news->content = "<p>" . $event->description . "</p>" .
|
||||
'<div class="row align-items-center">'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
|
||||
'</div>';
|
||||
$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 = "<p>" . $event->description . "</p>" .
|
||||
'<div class="row align-items-center">'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event_id" => $event->id ]) .'">Se deltagere</a>'.
|
||||
'<a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event" => $event->id ]) .'">Se deltagere</a>'.
|
||||
'</div>';
|
||||
$news->save();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
</style>
|
||||
<script src="https://cdn.tiny.cloud/1/ikwmbvigw8ass90tn37xiql6mk1gjoks77t3m6tld60hdjov/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
|
||||
<h1>Opret Aktivitet:</h1>
|
||||
<form method="post" action="{{ route("events.store") }}">
|
||||
@csrf
|
||||
|
|
@ -42,13 +49,13 @@
|
|||
</form>
|
||||
|
||||
<script>
|
||||
ClassicEditor
|
||||
.create( document.querySelector( '#editor' ))
|
||||
.then( editor => {
|
||||
console.log( editor );
|
||||
} )
|
||||
.catch( error => {
|
||||
console.error( error );
|
||||
} );
|
||||
tinymce.init({
|
||||
selector: 'textarea',
|
||||
setup: function (editor) {
|
||||
editor.on('change', function () {
|
||||
tinymce.triggerSave();
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -17,7 +17,17 @@
|
|||
.toggle__text::before {
|
||||
border-color: black;
|
||||
}
|
||||
|
||||
.tox-notification {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.tox {
|
||||
border-radius: 4px !important;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
<script src="https://cdn.tiny.cloud/1/ikwmbvigw8ass90tn37xiql6mk1gjoks77t3m6tld60hdjov/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
|
||||
<h1>Rediger Link:</h1>
|
||||
<form method="post" action="{{route("events.update", ["event" => $event])}}">
|
||||
@csrf
|
||||
|
|
@ -27,7 +37,7 @@
|
|||
<label for="accountable">Event Ansvarlig:</label>
|
||||
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
|
||||
<label for="description">Beskrivelse</label>
|
||||
<input value="{!! $event->description !!}" type="text" name="description" id="description" required>
|
||||
<textarea type="text" name="description" id="description" required>{!! $event->description !!}</textarea>
|
||||
<label for="date">Beskrivelse</label>
|
||||
<input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
|
||||
<label class="toggle">
|
||||
|
|
@ -38,4 +48,15 @@
|
|||
</label>
|
||||
<input type="submit" class="btn btn-dark text-white" value="Rediger">
|
||||
</form>
|
||||
|
||||
<script>
|
||||
tinymce.init({
|
||||
selector: 'textarea',
|
||||
setup: function (editor) {
|
||||
editor.on('change', function () {
|
||||
tinymce.triggerSave();
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -24,20 +24,12 @@
|
|||
<table class="tbl mt-2">
|
||||
<tr>
|
||||
<th>Uge</th>
|
||||
<th>Mandag</th>
|
||||
<th>Tirsdag</th>
|
||||
<th>Onsdag</th>
|
||||
<th>Torsdag</th>
|
||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
|
||||
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
|
||||
</tr>
|
||||
@foreach($menuPlans as $menuplan)
|
||||
<tr>
|
||||
<td>{{$menuplan->week}}</td>
|
||||
<td>{{$menuplan->monday}}</td>
|
||||
<td>{{$menuplan->tuesday}}</td>
|
||||
<td>{{$menuplan->wednesday}}</td>
|
||||
<td>{{$menuplan->thursday}}</td>
|
||||
<td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
|
||||
<td><form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100 nostyle">
|
||||
@csrf
|
||||
|
|
|
|||
|
|
@ -48,9 +48,13 @@
|
|||
</style>
|
||||
<main style="min-height: calc(100% - 61.3px)">
|
||||
<table class="tbl" style="margin: 2rem 8px 0px 8px; width: calc(100% - 16px);">
|
||||
<tr>
|
||||
<th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
|
||||
</tr>
|
||||
@if(count($events) == 0)
|
||||
<p class="text-center mt-2">{{__('msg.ingentilmeldte')}}</p>
|
||||
@else
|
||||
<tr>
|
||||
<th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
|
||||
</tr>
|
||||
@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)
|
||||
<tr>
|
||||
|
|
@ -58,9 +62,6 @@
|
|||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
@if(count($events) == 0)
|
||||
<p class="text-center">Der er ingen tilmeldte</p>
|
||||
@endif
|
||||
</table>
|
||||
<button onclick="window.history.back();" style="margin-top: auto; margin-bottom: 8px;" class="btn btn-sde-blue text-white">{{ __('msg.tilbage') }}</button>
|
||||
</main>
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Reference in New Issue