diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index f5bfd5d..0952bd7 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -82,6 +82,7 @@ class EventController extends Controller $events = Event::query()->get(); if($request->newsoption == true){ + $events = Event::query()->get(); $news = new News(); $news->name = "Ny aktivitet"; @@ -90,6 +91,7 @@ class EventController extends Controller $news->type_id = '3'; $news->content = $event->description; $news->resource_id = $event->resource_id; + $news->news_expiration_date = $events[0]->date; NewsController::storeAndGet($news); } @@ -190,6 +192,7 @@ class EventController extends Controller $news->type_id = '3'; $news->resource_id = $event->resource_id; $news->content = "
" . $this->closetags(substr($event->description, 0, 300)); + $news->news_expiration_date = $event->date; NewsController::storeAndGet($news); } diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index bc06a18..92d26d3 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -38,6 +38,12 @@ class MultipleEventsController extends Controller { $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(); + /* + $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(); + */ return Response::detect("multiple-events.index", [ "multiEvents" => $multiEvents]); } @@ -92,7 +98,11 @@ class MultipleEventsController extends Controller } //creates a new Event model with the given parameter - $event = new MultipleEventsParent($requestBody); + $multiEventsGetEndDate = 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::query()->get(); if($request->newsoption == true){ @@ -103,6 +113,7 @@ class MultipleEventsController extends Controller $news->type_id = '5'; $news->content = "Den ugentlige aktivitets plan for uge ".$request->week." er her!"; $news->resource_id = $request->resource_id; + $news->news_expiration_date = $multiEventsGetEndDate[0]->date; NewsController::storeAndGet($news); } @@ -197,6 +208,13 @@ class MultipleEventsController extends Controller } } + + $multiEventsGetEndDate = 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(); + if ($request->newsoption == true) { $news = new News(); $news->name = "Opdateret ugentlig aktivitet"; @@ -205,6 +223,7 @@ class MultipleEventsController extends Controller $news->type_id = '5'; $news->content = "Den ugentlige aktivitets plan for uge " . $request->week . " er opdateret!"; $news->resource_id = $request->resource_id; + $news->news_expiration_date = $multiEventsGetEndDate[0]->date; NewsController::storeAndGet($news); } diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index b5fc055..0e7d494 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -33,8 +33,12 @@ class NewsController extends Controller */ public function index(Request $request) { - $news = News::query()->orderBy('id', 'desc')->get(); - + //Edit is fuck cuz of my inner join, has to get fixed at som point + $news = News::query() + ->join("news_types", "news.type_id", "=", "news_types.id") + ->orderBy('id', 'desc') + ->select('news.*', 'news_types.type') + ->get(); return Response::detect("news.index", [ "news" => $news ]); } diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index f28236c..8475fc4 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -47,7 +47,11 @@
@foreach($events as $event)Uge | +Multiple events slut dato | @if(auth()->user()->can('event.edit')) @@ -80,9 +85,15 @@ @endif - @foreach(\App\MultipleEventsParent::query()->orderBY('id' , 'desc')->get() as $event) + @foreach(\App\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() as $event) | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ $event->week}} | + @if(\Carbon\Carbon::now() > date("Y-m-d H:i:s", strtotime($event->date))) +[Arkiveret] Ugentligt event for uge {{ $event->week}} | + @else +[Aktiv] Ugentligt event for uge {{ $event->week}} | + @endif +{{date("Y-m-d H:i", strtotime($event->date))}} | +$event->id]) }}"> | $event->id ]) }}" target="_blank"> | diff --git a/skolehjem/resources/views/admin/multiple-events/create.blade.php b/skolehjem/resources/views/admin/multiple-events/create.blade.php index 8a5e8ec..d55d1fd 100644 --- a/skolehjem/resources/views/admin/multiple-events/create.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/create.blade.php @@ -2,7 +2,7 @@ @extends("admin.layout.header") @section("title") - Ugentligt aktivitet - Vis + Ugentligt aktivitet - Opret @endsection @section("path") diff --git a/skolehjem/resources/views/admin/multiple-events/edit.blade.php b/skolehjem/resources/views/admin/multiple-events/edit.blade.php index 2cf5b50..acfb1e8 100644 --- a/skolehjem/resources/views/admin/multiple-events/edit.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/edit.blade.php @@ -2,7 +2,7 @@ @extends("admin.layout.header") @section("title") - Rediger ugentligt aktivitet - Vis + Ugentligt aktivitet - Rediger @endsection @section("path") diff --git a/skolehjem/resources/views/admin/news/index.blade.php b/skolehjem/resources/views/admin/news/index.blade.php index fa80cf7..608a2e5 100644 --- a/skolehjem/resources/views/admin/news/index.blade.php +++ b/skolehjem/resources/views/admin/news/index.blade.php @@ -23,6 +23,7 @@
Navn | +Nyheds type | Udløbsdato | @if(auth()->user()->can('news.edit')) @@ -36,6 +37,7 @@ @foreach($news as $new) |
---|---|---|
{{$new->subname}} | +{{$new->type}} | @if($new->news_expiration_date !== null){{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($new->news_expiration_date))->format('d/m/Y \k\l\. H:i') }} | @else @@ -111,7 +113,7 @@ $(document).ready( function () { $('#table_id').DataTable({ columnDefs: [ - { orderable: false, targets: [-1, -2, -3] } + { orderable: false, targets: [-1, -2, -3, -4] } ] }); }); diff --git a/skolehjem/resources/views/app/multiple-events/index.blade.php b/skolehjem/resources/views/app/multiple-events/index.blade.php index 70ef8e6..19fcec7 100644 --- a/skolehjem/resources/views/app/multiple-events/index.blade.php +++ b/skolehjem/resources/views/app/multiple-events/index.blade.php @@ -88,8 +88,6 @@ - @else -