diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php
index fd59cc9..7e7df4a 100644
--- a/skolehjem/app/Http/Controllers/MultipleEventsController.php
+++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php
@@ -33,9 +33,11 @@ class MultipleEventsController extends Controller
*/
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.
*
@@ -64,6 +66,7 @@ class MultipleEventsController extends Controller
"name.*" => "max:255",
"description.*" => "max:255",
"accountable.*" => "max:255",
+ "date.*" => "max:255"
]);
$multipleParent = new MultipleEventsParent();
@@ -84,7 +87,7 @@ 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-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->save();
}
@@ -105,7 +108,7 @@ class MultipleEventsController extends Controller
}
- return redirect()->route('events.index');
+ return redirect()->route('multiple-events.index', ['multiEvents' => $multiEvents]);
}
diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php
index 5a63f8b..40ae977 100644
--- a/skolehjem/resources/lang/dk/msg.php
+++ b/skolehjem/resources/lang/dk/msg.php
@@ -84,5 +84,6 @@ return[
"onsdag" => "Onsdag",
"torsdag" => "Torsdag",
"aktivitetaflyst" => "Aktivitet Aflyst :(",
- "ugentligaktiviteter" => "Ugentlig aktivitet"
+ "ugentligaktiviteter" => "Ugentlig aktivitet",
+ "dereringenugentligeaktiviteter" => "Der er igen ugentlige aktivitet"
];
diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php
index 640f2df..42f3d36 100644
--- a/skolehjem/resources/lang/en/msg.php
+++ b/skolehjem/resources/lang/en/msg.php
@@ -86,5 +86,6 @@ return[
"kategori" => "Category",
"opret" => "Created at: ",
"aktivitetaflyst" => "Event Cancelled :(",
- "ugentligaktiviteter" => "Weekly activities"
+ "ugentligaktiviteter" => "Weekly activities",
+ "dereringenugentligeaktiviteter" => "There is no weekly activity"
];
diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php
index 68167bb..24110ae 100644
--- a/skolehjem/resources/views/app/multiple-events/index.blade.php
+++ b/skolehjem/resources/views/app/multiple-events/index.blade.php
@@ -53,6 +53,10 @@
}
+
+
{{ __('msg.ugentligaktiviteter') }}
@@ -71,33 +75,22 @@
@if(!$multiEvents->isEmpty())
- @foreach($multiEvents as $event)
-
- @if($event->resource_id !== null)
-
- @endif
-
-
+ @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 --}}
+ @foreach($multiEvents as $multiEvent)
+ @if($multiEvent->week == $Week)
+ {{$multiEvents->name}}
+ {{$multiEvents->accountable}}
+ {{$multiEvents->description}}
+ {{$multiEvents->date}}
+ {{$multiEvents->event}}
+
+
+ @endif
@endforeach
- @else
- {{__('msg.dereringenaktiviteter')}}!
+ @else
+ {{__('msg.dereringenugentligeaktiviteter')}}!
+ @endif
@endif
- {{__('msg.setilmeldteaktiviteter')}}
-
@endsection
@section("scripts")
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index 5fddd59..406e99a 100644
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@@ -220,7 +220,7 @@
@elseif($new->type == 'MultipleEvent')
-
+
Ugenlig aktiviteter for uge {{ $new->subname }}
{{__('msg.opret')}}{{ date('Y-m-d H:i:s', strtotime($new->created_at))}}
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 5a0765d..8dce0d2 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -39,7 +39,6 @@ Route::get("/settings", "SettingsController@index")->name("settings.index");
Route::post("/events/signup", "UserEventController@createajax")->name("userevents.createajax");
Route::post("/account/mailwants", "UserController@createajax")->name("users.createajax");
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("/account/cancelmailwants", "UserController@createajaxcancel")->name("users.createajaxcancel");
Route::delete("/notifications/delete", "EventController@deleteNotifications")->name("notifications.delete");