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

v1.5.24 Added archive function

Browse Source
This commit is contained in:
Neerholt
2021-05-17 10:15:15 +02:00
parent f865213763
commit ad3a1e7570
9 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+3
View File
@@ -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 = "<p>" . $this->closetags(substr($event->description, 0, 300));
$news->news_expiration_date = $event->date;
NewsController::storeAndGet($news);
}
skolehjem/app/Http/Controllers/MultipleEventsController.php
+20 -1
View File
@@ -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);
}
skolehjem/app/Http/Controllers/NewsController.php
+6 -2
View File
@@ -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 ]);
}