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

v1.5.17a Update to controller index

This commit is contained in:
Neerholt 2021-04-27 15:23:01 +02:00
parent 7e5c1f8dbe
commit 42de425aba
6 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
skolehjem/app/Http/Controllers/MultipleEventsController.php
View File

@ -33,9 +33,11 @@ class MultipleEventsController extends Controller
*/ */
public function index() public function index()
{ {
// $multiEvents = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->orderBY('multiple_events_parent.id' , 'desc')->get();
return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]);
} }
/** /**
* Show the form for creating a new resource. * Show the form for creating a new resource.
* *
@ -64,6 +66,7 @@ class MultipleEventsController extends Controller
"name.*" => "max:255", "name.*" => "max:255",
"description.*" => "max:255", "description.*" => "max:255",
"accountable.*" => "max:255", "accountable.*" => "max:255",
"date.*" => "max:255"
]); ]);
$multipleParent = new MultipleEventsParent(); $multipleParent = new MultipleEventsParent();
@ -84,7 +87,7 @@ class MultipleEventsController extends Controller
$multi_event->description = $requestBody['description'][$i]; $multi_event->description = $requestBody['description'][$i];
$multi_event->accountable = $requestBody['accountable'][$i]; $multi_event->accountable = $requestBody['accountable'][$i];
$multi_event->name = $requestBody['name'][$i]; $multi_event->name = $requestBody['name'][$i];
$multi_event->event_end = "2021-04-04 16:00:00"; $multi_event->event_end = "2021-27-04 16:00:00";
$multi_event->multiple_events_parent_id = $multipleParent->id; $multi_event->multiple_events_parent_id = $multipleParent->id;
$multi_event->save(); $multi_event->save();
} }
@ -105,7 +108,7 @@ class MultipleEventsController extends Controller
} }
return redirect()->route('events.index'); return redirect()->route('multiple-events.index', ['multiEvents' => $multiEvents]);
} }

3
skolehjem/resources/lang/dk/msg.php
View File

@ -84,5 +84,6 @@ return[
"onsdag" => "Onsdag", "onsdag" => "Onsdag",
"torsdag" => "Torsdag", "torsdag" => "Torsdag",
"aktivitetaflyst" => "Aktivitet Aflyst :(", "aktivitetaflyst" => "Aktivitet Aflyst :(",
"ugentligaktiviteter" => "Ugentlig aktivitet" "ugentligaktiviteter" => "Ugentlig aktivitet",
"dereringenugentligeaktiviteter" => "Der er igen ugentlige aktivitet"
]; ];

3
skolehjem/resources/lang/en/msg.php
View File

@ -86,5 +86,6 @@ return[
"kategori" => "Category", "kategori" => "Category",
"opret" => "Created at: ", "opret" => "Created at: ",
"aktivitetaflyst" => "Event Cancelled :(", "aktivitetaflyst" => "Event Cancelled :(",
"ugentligaktiviteter" => "Weekly activities" "ugentligaktiviteter" => "Weekly activities",
"dereringenugentligeaktiviteter" => "There is no weekly activity"
]; ];

43
skolehjem/resources/views/app/multiple-events/index.blade.php
View File

@ -53,6 +53,10 @@
} }
</style> </style>
<?php
$Week = date('W'); //Current week
?>
<main> <main>
<h1 class="text-center sde-blue mb-2rem">{{ __('msg.ugentligaktiviteter') }}</h1> <h1 class="text-center sde-blue mb-2rem">{{ __('msg.ugentligaktiviteter') }}</h1>
<!--Alert box, display when a event is delete: start--> <!--Alert box, display when a event is delete: start-->
@ -71,33 +75,22 @@
<!--If there is a images to the event do this: Start--> <!--If there is a images to the event do this: Start-->
@if(!$multiEvents->isEmpty()) @if(!$multiEvents->isEmpty())
@foreach($multiEvents as $event) @if($multiEvents->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}}
<div class="card"> @foreach($multiEvents as $multiEvent)
@if($event->resource_id !== null) @if($multiEvent->week == $Week)
<div class="header"> <p>{{$multiEvents->name}}</p>
<img class="w-100" src="{{ asset(\App\Resource::query()->where("id", "=", $event->resource_id)->first()->filename) }}"> <p>{{$multiEvents->accountable}}</p>
</div> <p>{{$multiEvents->description}}</p>
@endif <p>{{$multiEvents->date}}</p>
<div class="container" class="mt-1"> <p>{{$multiEvents->event}}</p>
<p class="m-none">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
<h4 class="m-none">{{ $event->week }}</h4>
<div class="row justify-content-space mt-1"> @endif
@if (count(\App\UserEvent::query()->where('event_id', '=', $event->id)->where('user_id', '=', Auth::user()->id)->get()) > 0)
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.afmeld')}}</a>
@else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}}
<a class="sde-blue text-center m-none p-none bold" href="javascript:void(0);" onclick="ajaxCall({{ $event->id }}, this)" >{{__('msg.tilmeld')}}</a>
@endif
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.show", ["event" => $event->id ])}}">{{__('msg.læsmere')}}</a>
<a class="sde-blue text-center m-none p-none bold" href="{{route("events.accountsignups", ["event" => $event->id ])}}">{{__('msg.sedeltagere')}}</a>
</div>
</div>
</div>
@endforeach @endforeach
@else @else
<p class="text-center mb-auto">{{__('msg.dereringenaktiviteter')}}!</p> <p class="text-center">{{__('msg.dereringenugentligeaktiviteter')}}!</p>
@endif
@endif @endif
<a href="{{ route("userevents.index") }}" class="mt-auto btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
<div id="snackbar"></div>
</main> </main>
@endsection @endsection
@section("scripts") @section("scripts")

2
skolehjem/resources/views/app/news/index.blade.php
View File

@ -220,7 +220,7 @@
<!----> <!---->
@elseif($new->type == 'MultipleEvent') @elseif($new->type == 'MultipleEvent')
<div class="card"> <div class="card">
<div class="img"><a href="{{ route('guides.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Vejledninger:"></a></div> <div class="img"><a href="{{ route('multiple-events.index') }}"><img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="aktiviteter:"></a></div>
<div class="title">Ugenlig aktiviteter for uge {{ $new->subname }} <div class="title">Ugenlig aktiviteter for uge {{ $new->subname }}
<span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span> <span class="createdat">{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}</span>
</div> </div>

1
skolehjem/routes/web.php
View File

@ -39,7 +39,6 @@ Route::get("/settings", "SettingsController@index")->name("settings.index");
Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax"); Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax");
Route::post("/account/mailwants", "UserController@createajax")->name("users.createajax"); Route::post("/account/mailwants", "UserController@createajax")->name("users.createajax");
Route::get("/about", "AboutController@index")->name("about.index"); Route::get("/about", "AboutController@index")->name("about.index");
Route::get("/multiple-events", "MultipleEventsController@index")->name("multiple-events.index");
Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->name("userevents.createajaxcancel"); Route::post("/events/cancelsignup", "UserEventController@createajaxcancel")->name("userevents.createajaxcancel");
Route::post("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel"); Route::post("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel");
Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete"); Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete");