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

v0.9.4 - Added email notification when news gets added

This commit is contained in:
frederikpyt 2020-08-13 07:38:14 +02:00
parent 5c871c3fb7
commit aef8aa5d2c
5 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skolehjem/app/Http/Controllers/EventController.php
View File

@ -90,7 +90,8 @@ class EventController extends Controller
$news->type_id = '3'; $news->type_id = '3';
$news->content = $event->description; $news->content = $event->description;
$news->resource_id = $event->resource_id; $news->resource_id = $event->resource_id;
$news->save();
NewsController::storeAndGet($news);
} }
return redirect()->route('events.index', ['events' => $events]); return redirect()->route('events.index', ['events' => $events]);
@ -189,7 +190,8 @@ class EventController extends Controller
'<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'. '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
'<a style="margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'. '<a style="margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
'</div>'; '</div>';
$news->save();
NewsController::storeAndGet($news);
} }
return redirect()->route("events.index", ['events' => $events]); return redirect()->route("events.index", ['events' => $events]);

21
skolehjem/app/Http/Controllers/GuideController.php
View File

@ -10,8 +10,6 @@ use tidy;
class GuideController extends Controller class GuideController extends Controller
{ {
public function __construct() public function __construct()
{ {
$this->middleware([ "auth" ]); $this->middleware([ "auth" ]);
@ -63,30 +61,33 @@ class GuideController extends Controller
"guide_articles" => "required", "guide_articles" => "required",
]); ]);
$guide = new Guide($requestGuide); $guide = new Guide($requestGuide);
if($request->file("resource")) { if($request->file("resource")) {
$guide->resource_id = ResourceController::store($request)->id; $guide->resource_id = ResourceController::store($request)->id;
} }
$saved = $guide->save(); $saved = $guide->save();
if(!$saved){ if(!$saved) {
return redirect()->route("guides.store"); return redirect()->route("guides.store");
}else{ } else {
$guides = Guide::query()->paginate($request->input("limit", 20)); $guides = Guide::query()->paginate($request->input("limit", 20));
if($request->newsoption == true){ if($request->newsoption == true){
$news = new News(); $news = new News();
$news->name = "Ny Vejledning"; $news->name = "Ny vejledning";
$news->subname = $guide->name; $news->subname = $guide->name;
$news->arrangement_id = $guide->id; $news->arrangement_id = $guide->id;
$news->type_id = '4'; $news->type_id = '4';
$news->content = $guide->guide_articles; $news->content = $guide->guide_articles;
if($guide->resource_id !== null)
$news->resource_id = $guide->resource_id; $news->resource_id = $guide->resource_id;
$news->save(); NewsController::storeAndGet($news);
} }
return redirect()->route("guides.index", ['guides' => $guides]); return redirect()->route("guides.index", ['guides' => $guides]);
@ -137,7 +138,7 @@ class GuideController extends Controller
if(!$saved){ if(!$saved){
return redirect()->route("guides.update", [ "guide" => $guide ]); return redirect()->route("guides.update", [ "guide" => $guide ]);
}else{ }else{
$guide = Guide::query()->paginate($request->input("limit", 20)); $guides = Guide::query()->paginate($request->input("limit", 20));
if($request->newsoption == true){ if($request->newsoption == true){
$news = new News(); $news = new News();
@ -149,10 +150,10 @@ class GuideController extends Controller
$news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>'; $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
$news->save(); NewsController::storeAndGet($news);
} }
return redirect()->route("guides.index", ['guides' => $guide]); return redirect()->route("guides.index", ['guides' => $guides]);
} }
} }

15
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -79,15 +79,15 @@ class MenuPlanController extends Controller
$news->name = "Ny menuplan"; $news->name = "Ny menuplan";
$news->subname = "Uge " . $menuPlan->week; $news->subname = "Uge " . $menuPlan->week;
$news->arrangement_id = $menuPlan->id;
$news->type_id = '2';
$news->content = $menuPlan->menu; $news->content = $menuPlan->menu;
$news->type_id = '2';
$news->arrangement_id = $menuPlan->id;
if($request->file("resource")) { if($request->file("resource")) {
$news->resource_id = ResourceController::store($request)->id; $news->resource_id = ResourceController::store($request)->id;
} }
$news->save(); NewsController::storeAndGet($news);
} }
return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]); return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
@ -142,18 +142,15 @@ class MenuPlanController extends Controller
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
if($request->newsoption == true){ if($request->newsoption == true){
$news = [ $news = new News();
"name" => "Opdateret menuplan",
"subname" => "Uge " . $menuplan->week,
"content" => $menuplan->menu
];
//Sæt ind i $news array'et
$news->name = "Opdateret menuplan"; $news->name = "Opdateret menuplan";
$news->subname = "Uge " . $menuplan->week; $news->subname = "Uge " . $menuplan->week;
$news->arrangement_id = $menuplan->id; $news->arrangement_id = $menuplan->id;
$news->type_id = '2'; $news->type_id = '2';
$news->content = $menuplan->menu; $news->content = $menuplan->menu;
NewsController::storeAndGet($news); NewsController::storeAndGet($news);
} }

22
skolehjem/app/Http/Controllers/NewsController.php
View File

@ -73,10 +73,8 @@ class NewsController extends Controller
* *
* @return News * @return News
*/ */
public static function storeAndGet($request) public static function storeAndGet(News $news)
{ {
$news = new News($request);
$news->name = "";
$news->save(); $news->save();
Helpers::sendNewsNotification($news, User::all()); Helpers::sendNewsNotification($news, User::all());
@ -122,9 +120,27 @@ class NewsController extends Controller
$news->update($data); $news->update($data);
Helpers::sendNewsNotification($news, User::all());
return redirect()->route("news.index"); return redirect()->route("news.index");
} }
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\News $news
* @return RedirectResponse
*/
public static function updateAndGet(News $news)
{
$news->update();
Helpers::sendNewsNotification($news, User::all());
return $news;
}
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *

0
skolehjem/database/migrations/2020_08_11_092000_create_news_type.php → skolehjem/database/migrations/2020_08_05_092000_create_news_type.php
View File