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

v0.9.15h - NameCheck - Fixed Updates

This commit is contained in:
Anders 2020-08-17 10:21:02 +02:00
parent 5f516992d7
commit e6f03ad72b
17 changed files with 320 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
skolehjem/app/Http/Controllers/EventController.php
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;
}
}
}

9
skolehjem/app/Http/Controllers/GuideController.php
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;
}
}
}

15
skolehjem/app/Http/Controllers/MenuPlanController.php
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;
}
}
}

7
skolehjem/app/Http/Controllers/NewsController.php
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;
}
}
}

12
skolehjem/app/Http/Controllers/RolesController.php
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;
}
}
}

59
skolehjem/resources/views/admin/events/edit.blade.php
View File

@ -27,8 +27,9 @@
<form method="post" action="{{route("events.update", ["event" => $event])}}">
@csrf
@method("PUT")
<label for="event_title">Event Titel:</label>
<input value="{{$event->name}}" type="text" name="name" id="event_title" required>
<label for="name">Event Titel:</label>
<label hidden id="error" for="errormesseages">Dette Event navn findes allerede</label>
<input value="{{$event->name}}" type="text" name="name" id="name" required>
<label for="accountable">Event Ansvarlig:</label>
<input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
<label for="description">Beskrivelse</label>
@ -42,7 +43,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@ -83,5 +84,57 @@
}
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#name').on('keyup', function () {
$value = $(this).val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('events.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$event->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

1
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -18,7 +18,6 @@
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
</form>
</div>
{!! session()->get('EventNameExists') !!}
<table class="tbl mt-2">
<tr>

55
skolehjem/resources/views/admin/guides/edit.blade.php
View File

@ -28,6 +28,7 @@
@csrf
@method("PUT")
<label for="title">Navn</label>
<label hidden id="error" for="errormesseages">Navn findes allerede</label>
<input value="{{$guide->name}}" type="text" name="name" id="title" required>
<label for="editor">Vejledning</label>
<div id="editor">{!! $guide->guide_articles !!}</div>
@ -38,7 +39,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@ -79,5 +80,57 @@
}
);
});
$(document).ready(function () {
$value = $('#title').val();
console.log($value);
$.ajax({
type: 'get',
url: '{{route('guides.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$guide->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#title').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('guides.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$guide->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

5
skolehjem/resources/views/admin/menuplans/create.blade.php
View File

@ -108,9 +108,6 @@
}
change();
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#week').val();
@ -162,8 +159,6 @@
}
});
})
</script>
@endsection

55
skolehjem/resources/views/admin/menuplans/edit.blade.php
View File

@ -28,6 +28,7 @@
@csrf
@method("PUT")
<label for="mandag">Uge:</label>
<label hidden id="error" for="errormesseages">Menuplan findes allerede</label>
<input type="number" name="week" id="week" min="1" max="53" value="{{ $menuplan->week }}" required>
<div id="editor">{!! $menuplan->menu !!}</div>
<textarea name="menu" class="d-none" id="hiddenArea"></textarea>
@ -37,7 +38,7 @@
<span class="toggle__text">Opret som nyhed</span>
</span>
</label>
<input type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger Menuplan">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@ -78,5 +79,57 @@
}
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#week').val();
$.ajax({
type: 'get',
url: '{{route('menuplans.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#week').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('menuplans.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id':{{$menuplan->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

1
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -14,7 +14,6 @@
<div class="row align-items-center">
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('menu-plans.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Menuplan</a>
</div>
{!! session()->get('WeekExists') !!}
<table class="tbl mt-2">
<tr>

3
skolehjem/resources/views/admin/news/create.blade.php
View File

@ -67,7 +67,6 @@
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#title').val();
@ -119,7 +118,5 @@
}
});
})
</script>
@endsection

57
skolehjem/resources/views/admin/news/edit.blade.php
View File

@ -21,10 +21,11 @@
@csrf
@method("PUT")
<label for="title">Navn</label>
<input value="{{$news->name}}" type="text" name="subname" id="title" required>
<label hidden id="error" for="errormesseages">Dette navn findes allerede</label>
<input value="{{$news->subname}}" type="text" name="subname" id="title" required>
<div id="editor">{!! $news->content !!}</div>
<textarea name="content" class="d-none" id="hiddenArea"></textarea>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<input id="disable" type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
<script src="https://cdn.quilljs.com/1.3.6/quill.js"></script>
@ -65,5 +66,57 @@
}
);
});
//Dont delete me, if the user reloads the pages with text in the text-box this code runs.
$(document).ready(function () {
$value = $('#title').val();
$.ajax({
type: 'get',
url: '{{route('news.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$news->id}}},
success:function (data) {
console.log(data);
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#title').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('news.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$news->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

5
skolehjem/resources/views/admin/roles/create.blade.php
View File

@ -14,7 +14,7 @@
<form method="post" action="{{ route("roles.store") }}">
@csrf
<label for="name">Navn:</label>
<label hidden id="error" for="errormesseages">Role navnet findes allerede</label>
<label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
<input type="text" name="name" id="name" placeholder="Admin" required>
<label for="name">Beskrivelse:</label>
<input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" required>
@ -32,8 +32,6 @@
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
@ -83,6 +81,5 @@
}
});
})
</script>
@endsection

53
skolehjem/resources/views/admin/roles/edit.blade.php
View File

@ -15,10 +15,11 @@
@csrf
@method("put")
<label for="name">Navn:</label>
<label hidden id="error" for="errormesseages">Rolle navnet findes allerede</label>
<input type="text" name="name" id="name" placeholder="Admin" value="{{ $role->name }}" required>
<label for="name">Beskrivelse:</label>
<input type="text" name="description" id="description" placeholder="Admin rollen bruges til administratorene" value="{{ $role->description }}" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
<input type="submit" id="disable" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
@section("scripts")
@ -31,5 +32,55 @@
}
);
});
$(document).ready(function () {
$value = $('#name').val();
$.ajax({
type: 'get',
url: '{{route('roles.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$role->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
});
$('#name').on('keyup', function () {
$value = $(this).val();
$.ajax({
type: 'get',
url: '{{route('roles.nameCheckUpdate')}}',
data: {'nameCheck':$value, 'id': {{$role->id}}},
success:function (data) {
if(data){
$("#error").show(100);
$("#error").css('color', 'red');
$("#disable").prop('disabled', true);
$('#disable').css('cursor','not-allowed');
}else{
$("#error").hide();
$("#disable").prop('disabled', false);
$('#disable').css('cursor','pointer');
}
},
error:function (data) {
console.log(data);
}
});
})
</script>
@endsection

1
skolehjem/resources/views/admin/roles/index.blade.php
View File

@ -18,7 +18,6 @@
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg efter navn"></input>
</form>
</div>
{!! session()->get('RoleNameExists') !!}
<table class="tbl mt-2">
<tr>

9
skolehjem/routes/web.php
View File

@ -55,7 +55,7 @@ Route::get("/darkmode", "UserController@setDarkMode")->name("users.setDarkMode")
//Convert to PDF
Route::get("/pdf/{menuPlan}", "MenuPlanController@genPDF")->name("pdf.genPDF")->hasParameter("Id");
//Check name adminpanle
//Check name adminpanel
Route::get("/eventCheck", "EventController@nameCheck")->name("events.nameCheck");
Route::get("/roleCheck", "RolesController@nameCheck")->name("roles.nameCheck");
Route::get("/usersCheck", "UserController@nameCheck")->name("users.nameCheck");
@ -63,6 +63,13 @@ Route::get("/guidesCheck", "GuideController@nameCheck")->name("guides.nameCheck"
Route::get("/newsCheck", "NewsController@nameCheck")->name("news.nameCheck");
Route::get("/menuplanCheck", "MenuPlanController@nameCheck")->name("menuplans.nameCheck");
//Check name update adminpanel
Route::get("/eventCheckUpdate", "EventController@nameCheckUpdate")->name("events.nameCheckUpdate");
Route::get("/roleCheckUpdate", "RolesController@nameCheckUpdate")->name("roles.nameCheckUpdate");
Route::get("/guidesCheckUpdate", "GuideController@nameCheckUpdate")->name("guides.nameCheckUpdate");
Route::get("/newsCheckUpdate", "NewsController@nameCheckUpdate")->name("news.nameCheckUpdate");
Route::get("/menuplanCheckUpdate", "MenuPlanController@nameCheckUpdate")->name("menuplans.nameCheckUpdate");
Route::resource("contacts", "ContactController");