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

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Browse Source
This commit is contained in:
Neerholt
2020-08-17 10:31:41 +02:00
parent fe9eb4fd4d e82c793820
commit 773655c294
24 changed files with 618 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/EventController.php
+9 -2
View File
@@ -73,7 +73,7 @@ class EventController extends Controller
$allEvents = Event::query()->where('name', '=', $request->name)->get();
if(count($allEvents) > 0) {
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
return redirect()->route("events.index", ['events' => $event]);
} else {
if($request->file("resource")) {
$event->resource_id = ResourceController::store($request)->id;
@@ -171,7 +171,7 @@ class EventController extends Controller
$allEvents = Event::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
if(count($allEvents) > 0){
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '<p><b>Der findes allerede et event med det navn!</b></p>');
return redirect()->route("events.index", ['events' => $event]);
}else{
$event->update($data);
$event->save();
@@ -321,6 +321,13 @@ class EventController extends Controller
}
}
public function nameCheckUpdate(Request $request){
$event = Event::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($event) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
}
skolehjem/app/Http/Controllers/GuideController.php
+8 -1
View File
@@ -199,12 +199,19 @@ class GuideController extends Controller
public function nameCheck(Request $request){
public function nameCheck(Request $request) {
$guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
public function nameCheckUpdate(Request $request) {
$guide = Guide::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($guide) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
}
skolehjem/app/Http/Controllers/MenuPlanController.php
+9 -6
View File
@@ -69,7 +69,7 @@ class MenuPlanController extends Controller
$allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->get();
if(count($allMenuPlans) > 0)
return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
return redirect()->route("menu-plans.index");
else {
$menuPlan->save();
$menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
@@ -134,7 +134,7 @@ class MenuPlanController extends Controller
$allMenuPlans = MenuPlan::query()->where('week', '=', $request->week)->where('id', '!=', $id)->get();
if(count($allMenuPlans) > 0){
return redirect()->route("menu-plans.index")->with('WeekExists', '<p><b>Der findes allerede en menuplan for den uge!</b></p>');
return redirect()->route("menu-plans.index");
}else{
$menuplan->update($data);
$menuplan->save();
@@ -180,8 +180,6 @@ class MenuPlanController extends Controller
*/
public function genPDF($Id){
$menuPlan = MenuPlan::query()->where("id", "=", $Id)->first();
//$images = App\Resource::query()->where("id", '=', $menuPlan->resource_id)->first();
//$imagesSize = getimagesize($images->filename);
$pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper');
$data = '<html style="padding: 0; margin: 0; width: 100%; height: 100%;">'.
'<head style="padding: 0; margin: 0; width: 100%; height: 100%;">
@@ -207,8 +205,6 @@ class MenuPlanController extends Controller
}
public function nameCheck(Request $request){
$menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->get();
if(count($menuplan) > 0 && $request->nameCheck !== NULL){
@@ -216,4 +212,11 @@ class MenuPlanController extends Controller
}
}
public function nameCheckUpdate(Request $request){
$menuplan = MenuPlan::query()->where('week', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($menuplan) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
}
skolehjem/app/Http/Controllers/NewsController.php
+6 -1
View File
@@ -154,7 +154,6 @@ class NewsController extends Controller
return redirect()->route("news.index");
}
public function nameCheck(Request $request){
$news = News::query()->where('subname', 'LIKE',$request->nameCheck)->get();
if(count($news) > 0 && $request->nameCheck !== NULL){
@@ -162,4 +161,10 @@ class NewsController extends Controller
}
}
public function nameCheckUpdate(Request $request){
$news = News::query()->where('subname', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($news) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
}
skolehjem/app/Http/Controllers/RolesController.php
+8 -4
View File
@@ -63,7 +63,7 @@ class rolesController extends Controller
// If there already is a role with that name, then don't create
if(count($allRoles) > 0)
return redirect()->route("roles.store")->with('RoleNameExists', '<p><b>Der findes allerede en rolle med det navn!</b></p>');
return redirect()->route("roles.store");
else { // Else - Create it
$role->save();
$roles = Role::query()->paginate($request->input("limit", 20));
@@ -111,7 +111,7 @@ class rolesController extends Controller
$allRoles = Role::query()->where('name', '=', $request->name)->where('id', '!=', $id)->get();
if(count($allRoles) > 0){
return redirect()->route("roles.index", [ "role" => $role ])->with('RoleNameExists', '<p><b>Der findes allerede en rolle med det navn!</b></p>');
return redirect()->route("roles.index", [ "role" => $role ]);
}else{
$role->update($data);
$role->save();
@@ -172,7 +172,6 @@ class rolesController extends Controller
}
}
public function nameCheck(Request $request){
$roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get();
if(count($roles) > 0 && $request->nameCheck !== NULL){
@@ -180,5 +179,10 @@ class rolesController extends Controller
}
}
public function nameCheckUpdate(Request $request){
$roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->where('id', '!=', $request->id)->get();
if(count($roles) > 0 && $request->nameCheck !== NULL){
return 1;
}
}
}