diff --git a/app/Http/Controllers/JobController.php b/app/Http/Controllers/JobController.php
index 50e1aa13..aaf8c6e0 100644
--- a/app/Http/Controllers/JobController.php
+++ b/app/Http/Controllers/JobController.php
@@ -119,11 +119,18 @@ class JobController extends Controller
/**
* Remove the specified resource from storage.
*
- * @param \App\Job $job
- * @return \Illuminate\Http\Response
*/
- public function destroy(Job $job)
+ public function destroy(Request $request)
{
- //
+ $job = Job::find($request->id);
+ foreach (\App\User::all() as $user)
+ {
+ if($user->job->id == $job->id)
+ {
+ $user->job_id = 1;
+ $user->save();
+ }
+ }
+ $job->delete();
}
}
diff --git a/app/Http/Controllers/RankController.php b/app/Http/Controllers/RankController.php
index eb809eb5..b0c99500 100644
--- a/app/Http/Controllers/RankController.php
+++ b/app/Http/Controllers/RankController.php
@@ -109,12 +109,18 @@ class RankController extends Controller
/**
* Remove the specified resource from storage.
- *
- * @param \App\Rank $rank
- * @return \Illuminate\Http\Response
*/
- public function destroy(Rank $rank)
+ public function destroy(Request $request)
{
- //
+ $rank = Rank::find($request->id);
+ foreach (\App\User::all() as $user)
+ {
+ if($user->rank->id == $rank->id)
+ {
+ $user->rank_id = 1;
+ $user->save();
+ }
+ }
+ $rank->delete();
}
}
diff --git a/resources/views/admin/configs/jobs/index.blade.php b/resources/views/admin/configs/jobs/index.blade.php
index 0914fc4d..2a57bdd9 100644
--- a/resources/views/admin/configs/jobs/index.blade.php
+++ b/resources/views/admin/configs/jobs/index.blade.php
@@ -33,7 +33,7 @@
@if($job->id == 1)
@else
-
+
@endif
@@ -46,3 +46,43 @@
@endsection
+
+@section('custom_scripts')
+
+@endsection
diff --git a/routes/api.php b/routes/api.php
index bf10442a..8949722c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -51,6 +51,12 @@ Route::middleware('auth:api')->group(function () {
Route::post('/config/general/save', 'ConfigController@update')->middleware('perm:config_edit');
Route::post('/config/activity/delete', 'ComplementaryActivityController@destroy')->middleware('perm:config_delete');
+ /** Rank Route */
+ Route::post('/config/rank/delete','RankController@destroy')->middleware('perm:config_edit');
+
+ /** Job Route */
+ Route::post('/config/job/delete','JobController@destroy')->middleware('perm:config_edit');
+
Route::get('/user/perm/{id}', function($id) {
$user = \App\User::find($id);
return $user->getPerm("schedule_edit");