diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index cec44fcf..ac4a2a98 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -50,7 +50,14 @@ class EventController extends Controller
             $event->is_mandatory  = 0;
         }
         $event->desc = request('desc');
-        $event->msg = request('msg');
+        if(\request('msg'))
+        {
+            $event->msg = request('msg');
+        }
+        else
+        {
+            $event->msg = "";
+        }
         $event->date_msg = request('date_msg');
         $event->save();
 
diff --git a/app/Http/Controllers/JobController.php b/app/Http/Controllers/JobController.php
index 9562f25a..aaf8c6e0 100644
--- a/app/Http/Controllers/JobController.php
+++ b/app/Http/Controllers/JobController.php
@@ -43,90 +43,22 @@ class JobController extends Controller
     {
         $job = new Job;
 
-        $job->name = request('name');
-        $job->acces_level = request('acces_level');
-        $job->desc = request('desc');
-        
-        if (null !==(request('schedule_see'))) {
-            $job->schedule_see = request('schedule_see');
-        } else {
-            $job->schedule_see = false;
-        }
-
-        if (null !==(request('schedule_edit'))) {
-            $job->schedule_edit = 1;
-        } else {
-            $job->schedule_edit = false;
-        }
-        if (null !==(request('schedule_notify'))) {
-            $job->schedule_notify = 1;
-        } else {
-            $job->schedule_notify = false;
-        }
-        if (null !==(request('message_see'))) {
-            $job->message_see = 1;
-        } else {
-            $job->message_see = false;
-        }
-        if (null !==(request('message_edit'))) {
-            $job->message_edit = 1;
-        } else {
-            $job->message_edit = false;
-        }
-        if (null !==(request('message_notify'))) {
-            $job->message_notify = 1;
-        } else {
-            $job->message_notify = false;
-        }
-        if (null !==(request('paper_edit'))) {
-            $job->paper_edit = 1;
-        } else {
-            $job->paper_edit = false;
-        }
-        if (null !==(request('paper_publish'))) {
-            $job->paper_publish = 1;
-        } else {
-            $job->paper_publish = false;
-        }
-        if (null !==(request('paper_notify'))) {
-            $job->paper_notify = 1;
-        } else {
-            $job->paper_notify = false;
-        }
-        if (null !==(request('inventory_see'))) {
-            $job->inventory_see = 1;
-        } else {
-            $job->inventory_see = false;
-        }
-        if (null !==(request('inventory_edit'))) {
-            $job->inventory_edit = 1;
-        } else {
-            $job->inventory_edit = false;
-        }
-        if (null !==(request('inventory_notify'))) {
-            $job->inventory_notify = 1;
-        } else {
-            $job->inventory_notify = false;
-        }
-        if (null !==(request('user_see'))) {
-            $job->user_see = 1;
-        } else {
-            $job->user_see = false;
-        }
-        if (null !==(request('user_edit'))) {
-            $job->user_edit = 1;
-        } else {
-            $job->user_edit = false;
-        }
-        if (null !==(request('user_notify'))) {
-            $job->user_notify = 1;
-        } else {
-            $job->user_notify = false;
+        $job->name = $request->name;
+        $job->desc = $request->desc;
+
+        $tpermission = [];
+
+        foreach (\App\Permission::all() as $perm)
+        {
+            $tkey = $perm->ckey;
+            $tpermission[$tkey] = $request->$tkey;
         }
 
+        $job->permissions = json_encode($tpermission);
         $job->save();
 
-        return redirect('/admin/config/job/'.$job->id);
+        clog('add','success','Poste ajouté avec succès');
+        return redirect('/admin/config/jobs')->with('success','Poste ajouté avec succès');
     }
 
     /**
@@ -162,19 +94,43 @@ class JobController extends Controller
      * @param  \App\Job  $job
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Job $job)
+    public function update(Request $request, $id)
     {
-        //
+        $job = Job::find($id);
+
+        $job->name = $request->name;
+        $job->desc = $request->desc;
+
+        $tpermission = [];
+
+        foreach (\App\Permission::all() as $perm)
+        {
+            $tkey = $perm->ckey;
+            $tpermission[$tkey] = $request->$tkey;
+        }
+
+        $job->permissions = json_encode($tpermission);
+        $job->save();
+
+        clog('add','success','Poste modifié avec succès');
+        return redirect('/admin/config/jobs')->with('success','Poste modifié avec succès');
     }
 
     /**
      * 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/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c64b3952..b1e66459 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -70,7 +70,7 @@ class UserController extends Controller
 
         $user->avatar = rand(1,16);
         $user->rank_id = request('rank');
-        $user->job = request('job');
+        $user->job_id = request('job');
         $user->password = bcrypt(request('psw'));
         $user->api_token = str_random(60);
 
@@ -142,7 +142,7 @@ class UserController extends Controller
         }
 
         $user->rank_id = request('rank');
-        $user->job = request('job');
+        $user->job_id = request('job');
         if (request('psw') != null) {
             $user->password = bcrypt(request('psw'));
         }
diff --git a/app/News.php b/app/News.php
index c5a44fc5..04ca39e9 100644
--- a/app/News.php
+++ b/app/News.php
@@ -32,7 +32,7 @@ class News extends Model
 
         foreach (\App\Event::future() as $event)
         {
-            if($event->type = 1)
+            if($event->type == 1 && $event->msg != "")
             {
                 if (date('U',strtotime($event->date_msg)) <= time())
                 {
diff --git a/public/js/app.js b/public/js/app.js
index 1ab94bcd..11818cd2 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -49135,13 +49135,13 @@ if (false) {
 /* 43 */
 /***/ (function(module, exports) {
 
-// removed by extract-text-webpack-plugin
+throw new Error("Module build failed: ModuleBuildError: Module build failed: Error: Missing binding /home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/vendor/linux-x64-72/binding.node\nNode Sass could not find a binding for your current environment: Linux 64-bit with Node.js 12.x\n\nFound bindings for the following environments:\n  - Linux 64-bit with Node.js 8.x\n\nThis usually happens because your environment has changed since running `npm install`.\nRun `npm rebuild node-sass` to download the binding for your current environment.\n    at module.exports (/home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/lib/binding.js:15:13)\n    at Object.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/lib/index.js:14:35)\n    at Module._compile (internal/modules/cjs/loader.js:945:30)\n    at Object.Module._extensions..js (internal/modules/cjs/loader.js:962:10)\n    at Module.load (internal/modules/cjs/loader.js:798:32)\n    at Function.Module._load (internal/modules/cjs/loader.js:711:12)\n    at Module.require (internal/modules/cjs/loader.js:838:19)\n    at require (internal/modules/cjs/helpers.js:74:18)\n    at Object.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/sass-loader/lib/loader.js:3:14)\n    at Module._compile (internal/modules/cjs/loader.js:945:30)\n    at Object.Module._extensions..js (internal/modules/cjs/loader.js:962:10)\n    at Module.load (internal/modules/cjs/loader.js:798:32)\n    at Function.Module._load (internal/modules/cjs/loader.js:711:12)\n    at Module.require (internal/modules/cjs/loader.js:838:19)\n    at require (internal/modules/cjs/helpers.js:74:18)\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:18:17)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at runLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:365:2)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:195:19\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:367:11\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:172:11\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:32:11)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at runLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:365:2)\n    at NormalModule.doBuild (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:182:3)\n    at NormalModule.build (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:275:15)\n    at Compilation.buildModule (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/Compilation.js:157:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/Compilation.js:460:10\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:243:5\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:94:13\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/tapable/lib/Tapable.js:268:11\n    at NormalModuleFactory.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/CompatibilityPlugin.js:52:5)\n    at NormalModuleFactory.applyPluginsAsyncWaterfall (/home/etudiant/PhpstormProjects/c-cms/node_modules/tapable/lib/Tapable.js:272:13)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:69:10\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:196:7\n    at processTicksAndRejections (internal/process/task_queues.js:75:11)");
 
 /***/ }),
 /* 44 */
 /***/ (function(module, exports) {
 
-// removed by extract-text-webpack-plugin
+throw new Error("Module build failed: ModuleBuildError: Module build failed: Error: Missing binding /home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/vendor/linux-x64-72/binding.node\nNode Sass could not find a binding for your current environment: Linux 64-bit with Node.js 12.x\n\nFound bindings for the following environments:\n  - Linux 64-bit with Node.js 8.x\n\nThis usually happens because your environment has changed since running `npm install`.\nRun `npm rebuild node-sass` to download the binding for your current environment.\n    at module.exports (/home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/lib/binding.js:15:13)\n    at Object.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/node-sass/lib/index.js:14:35)\n    at Module._compile (internal/modules/cjs/loader.js:945:30)\n    at Object.Module._extensions..js (internal/modules/cjs/loader.js:962:10)\n    at Module.load (internal/modules/cjs/loader.js:798:32)\n    at Function.Module._load (internal/modules/cjs/loader.js:711:12)\n    at Module.require (internal/modules/cjs/loader.js:838:19)\n    at require (internal/modules/cjs/helpers.js:74:18)\n    at Object.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/sass-loader/lib/loader.js:3:14)\n    at Module._compile (internal/modules/cjs/loader.js:945:30)\n    at Object.Module._extensions..js (internal/modules/cjs/loader.js:962:10)\n    at Module.load (internal/modules/cjs/loader.js:798:32)\n    at Function.Module._load (internal/modules/cjs/loader.js:711:12)\n    at Module.require (internal/modules/cjs/loader.js:838:19)\n    at require (internal/modules/cjs/helpers.js:74:18)\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:18:17)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at runLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:365:2)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:195:19\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:367:11\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:172:11\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:32:11)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:165:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:176:18\n    at loadLoader (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/loadLoader.js:47:3)\n    at iteratePitchingLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:169:2)\n    at runLoaders (/home/etudiant/PhpstormProjects/c-cms/node_modules/loader-runner/lib/LoaderRunner.js:365:2)\n    at NormalModule.doBuild (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:182:3)\n    at NormalModule.build (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModule.js:275:15)\n    at Compilation.buildModule (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/Compilation.js:157:10)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/Compilation.js:460:10\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:243:5\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:94:13\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/tapable/lib/Tapable.js:268:11\n    at NormalModuleFactory.<anonymous> (/home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/CompatibilityPlugin.js:52:5)\n    at NormalModuleFactory.applyPluginsAsyncWaterfall (/home/etudiant/PhpstormProjects/c-cms/node_modules/tapable/lib/Tapable.js:272:13)\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:69:10\n    at /home/etudiant/PhpstormProjects/c-cms/node_modules/webpack/lib/NormalModuleFactory.js:196:7\n    at processTicksAndRejections (internal/process/task_queues.js:75:11)");
 
 /***/ })
 /******/ ]);
\ No newline at end of file
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 3284f7c6..5ba0ee36 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,4 @@
 {
     "/js/app.js": "/js/app.js",
-    "/css/app.css": "/css/app.css",
-    "/css/material-dashboard.css": "/css/material-dashboard.css",
     "/css/custom.css": "/css/custom.css"
 }
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)
                                                 <button disabled class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
                                             @else
-                                                <button class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
+                                                <button class="btn btn-danger btn-just-icon" onclick="deleteJobs({{$job->id}})"><i class="fa fa-close"></i></button>
                                             @endif
                                         </div>
                                     </div>
@@ -46,3 +46,43 @@
         </div>
     </div>
 @endsection
+
+@section('custom_scripts')
+    <script>
+        function deleteJobs(pid){
+            swal({
+                title: 'Êtes vous certain ?',
+                html:
+                    'Vous ne pourrez annuler cette action! <br>' +
+                    '<strong>Veuillez donner un nouveau poste a tous les utilisateurs posédant présentement le poste que vous voulez supprimer</strong>',
+                type: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Oui',
+                cancelButtonText: 'Non'
+            }).then((result) => {
+                if (result.value) {
+
+                    (function($) {
+                        $.post('/api/config/job/delete?api_token='+api_token, { id: pid } , function(data) {
+                            console.log('Delete');
+                        });
+
+
+                    })(jQuery);
+
+                    swal(
+                        'Supprimé!',
+                        "Le poste a été supprimé",
+                        'success'
+                    ).then((result) => {
+                        if (result.value) {
+                            location.reload();
+                        }
+                    })
+                }
+            })
+        }
+    </script>
+@endsection
diff --git a/resources/views/admin/configs/ranks/index.blade.php b/resources/views/admin/configs/ranks/index.blade.php
index a76e4059..c89cdb05 100644
--- a/resources/views/admin/configs/ranks/index.blade.php
+++ b/resources/views/admin/configs/ranks/index.blade.php
@@ -33,7 +33,7 @@
                                             @if($rank->id == 1)
                                                 <button disabled class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
                                             @else
-                                                <button class="btn btn-danger btn-just-icon"><i class="fa fa-close"></i></button>
+                                                <button class="btn btn-danger btn-just-icon" onclick="deleteRanks({{$rank->id}})"><i class="fa fa-close"></i></button>
                                             @endif
                                         </div>
                                     </div>
@@ -46,3 +46,43 @@
         </div>
     </div>
 @endsection
+
+@section('custom_scripts')
+<script>
+    function deleteRanks(pid){
+        swal({
+            title: 'Êtes vous certain ?',
+            html:
+                'Vous ne pourrez annuler cette action! <br>' +
+                '<strong>Veuillez donner un nouveau grade a tous les utilisateurs posédant présentement le grade que vous voulez supprimer</strong>',
+            type: 'warning',
+            showCancelButton: true,
+            confirmButtonColor: '#3085d6',
+            cancelButtonColor: '#d33',
+            confirmButtonText: 'Oui',
+            cancelButtonText: 'Non'
+        }).then((result) => {
+            if (result.value) {
+
+                (function($) {
+                    $.post('/api/config/rank/delete?api_token='+api_token, { id: pid } , function(data) {
+                        console.log('Delete');
+                    });
+
+
+                })(jQuery);
+
+                swal(
+                    'Supprimé!',
+                    "Le grade a été supprimé",
+                    'success'
+                ).then((result) => {
+                    if (result.value) {
+                        location.reload();
+                    }
+                })
+            }
+        })
+    }
+</script>
+@endsection
diff --git a/resources/views/admin/job/add.blade.php b/resources/views/admin/job/add.blade.php
index 0c603416..dae2cd85 100644
--- a/resources/views/admin/job/add.blade.php
+++ b/resources/views/admin/job/add.blade.php
@@ -1,167 +1,87 @@
 @extends('layouts.admin.main')
 
 @section('content')
-<div class="col-md-12">
-    <div class="card">
-        <div class="card-header">
-            <strong class="card-title">Ajouter un poste <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
-            </a></strong>
-        </div>
-        <div class="card-body">
-            <form action="/admin/config/job/add" method="post">
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Ajouter un poste</h4>
+            </div>
+            <div class="card-body mt-5">
+                <form method="post" action="/admin/config/jobs/add">
+                    @csrf
 
-                @csrf
-
-                <div id="myTabContent">
-                        <div id="name" role="tabpanel">
+                    <div class="row">
+                        <div class="col-md-12">
                             <div class="form-group">
-                              <label for="name">Nom du poste</label>
-                              <input type="text" class="form-control" name="name" id="name" aria-describedby="helpId" placeholder="" required>
-                              <small id="helpId" class="form-text text-muted">Nom du poste</small>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col-12"><textarea name="desc" id="desc" rows="9" class="form-control" required></textarea>
-                                <small class="form-text text-muted">Description du poste</small></div>
-                            </div>
-                            <hr>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Niveau d'accès</label></div>
-                                <div class="col col-md-3">
-                                    <select name="acces_level" id="acces_level" class="form-control" required>
-                                        <option value="0">Cadet</option>
-                                        <option value="regular">Staff</option>
-                                        <option value="pilotage">Officer</option>                  
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Horaire détaillé</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="schedule_see" name="schedule_see" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification horaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="schedule_edit" name="schedule_edit" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation horaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="schedule_notify" name="schedule_notify" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Consultation messages</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il consulter les messages</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="message_see" name="message_see" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification messages</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="message_edit" name="message_edit" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation messages</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="message_notify" name="message_notify" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification article</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="paper_edit" name="paper_edit" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Publication articles</label><small class="form-text text-muted"> L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="paper_publish" name="paper_publish" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation articles</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="paper_notify" name="paper_notify" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Consultation inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il consulter l'inventaire</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="inventory_see" name="inventory_see" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="inventory_edit" name="inventory_edit" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="inventory_notify" name="inventory_notify" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                            </div>
-                            <div class="row form-group">
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification utilisateur</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="user_edit" name="user_edit" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
-                                <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation utilisateur</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.</small></div>
-                                <div class="col col-md-3" style="margin: auto;">
-                                    <label for="disabled-input" class=" form-control-label"></label>
-                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input id="user_notify" name="user_notify" class="switch-input"  type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                                </div>
+                                <label>Nom</label>
+                                <input class="form-control" type="text" name="name">
+                                <small class="form-text text-muted">Nom du poste</small>
                             </div>
                         </div>
-                    <div class="card-footer">
-                        <button type="submit" class="btn btn-primary btn-sm">
-                            <i class="fa fa-dot-circle-o"></i> Submit
-                        </button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-@endsection
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea id="desc" name="desc"></textarea>
+                                <small class="form-text text-muted">Description du poste</small>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="col-md-12">
+                            <h3>Permissions du poste</h3>
+                            <p>
+                                Choisissez quels permissions doivent être associé avec ce poste.
+                            </p>
+                            <div id="accordion" role="tablist">
+                                @foreach(\App\Permission::allToArray() as $key => $cat)
+                                    <div class="card card-collapse">
+                                        <div class="card-header" role="tab" id="headingOne">
+                                            <h5 class="mb-0">
+                                                <a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}"  @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
+                                                    {{$key}}
+                                                    <i class="material-icons">keyboard_arrow_down</i>
+                                                </a>
+                                            </h5>
+                                        </div>
 
-@section('breadcrumb')
-    <div class="breadcrumbs">
-        <div class="col-sm-4">
-            <div class="page-header float-left">
-                <div class="page-title">
-                    <h1>{{ trans('admin/dashboard.page_title')}}</h1>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-8">
-            <div class="page-header float-right">
-                <div class="page-title">
-                    <ol class="breadcrumb text-right">
-                        <li class="active">{{ trans('admin/dashboard.breadcrumb')}}</li>
-                    </ol>
-                </div>
+                                        <div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
+                                            <div class="card-body">
+                                                <div class="row">
+                                                    @foreach($cat as $r)
+                                                        <div class="col text-center">
+                                                            <input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
+                                                            <h5>{{$r['communName']}}</h5>
+                                                            <div class="btn-group">
+                                                                <button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
+                                                                <button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>
+                                                                <button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
+                                                            </div>
+                                                            <p>
+                                                                <small>{{$r['desc']}}</small>
+                                                            </p>
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                        <div class="col-md-12 mt-5">
+                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                        </div>
+                    </div>
+                </form>
             </div>
         </div>
     </div>
 @endsection
 
 @section('custom_scripts')
-
-   <script src="https://cloud.tinymce.com/stable/tinymce.min.js?apiKey=r82pabvd9arn3fjb1e2fsolf2xpixuv4hwfwart4cf1fb7mx"></script>
-       <script>
-        tinymce.init({
-        selector: '#desc',
-        branding: false,
-        menubar: 'edit view format'
+    <script src="/js/permissions.js"></script>
+    <script>
+        $('#desc').trumbowyg({
+            lang: 'fr'
         });
-        </script>
-
-   
-@endsection
+    </script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/job/edit.blade.php b/resources/views/admin/job/edit.blade.php
index ae932e91..811abfe0 100644
--- a/resources/views/admin/job/edit.blade.php
+++ b/resources/views/admin/job/edit.blade.php
@@ -1,167 +1,87 @@
 @extends('layouts.admin.main')
 
 @section('content')
-<div class="col-md-12">
-    <div class="card">
-        <div class="card-header">
-            <strong class="card-title">Modification du poste : {{$job->name}}<a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
-            </a></strong>
-        </div>
-        <div class="card-body">
-            <form>
-                <div class="tab-content pl-3 p-1" id="myTabContent">
-                    <div id="{{$job->name}}" role="tabpanel" aria-labelledby="{{$job->name}}-tab">
-                        <div class="row form-group">
-                            <div class="col-12"><textarea name="{{$job->id}}_desc" name="{{$job->id}}_desc" rows="9" class="form-control"></textarea>
-                            <small class="form-text text-muted">Description du poste</small></div>
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Configuration du poste {{$job->name}}</h4>
+            </div>
+            <div class="card-body mt-5">
+                <form method="post" action="">
+                    @csrf
+
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Nom</label>
+                                <input class="form-control" type="text" name="name" value="{{$job->name}}">
+                                <small class="form-text text-muted">Nom du poste</small>
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea id="desc" name="desc">{!! $job->desc !!}</textarea>
+                                <small class="form-text text-muted">Description du poste</small>
+                            </div>
                         </div>
                         <hr>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Niveau d'accès</label></div>
-                            <div class="col col-md-3">
-                                <select name="{{$job->id}}_event_type" name="{{$job->id}}_event_type" class="form-control">
-                                    @switch($job->acces_level)
-                                        @case(1)
-                                            <option value="1">Staff</option>
-                                            @break
-                                        @case(2)
-                                            <option value="2">Officer</option>
-                                            @break
-                                        @default
-                                            <option value="0">Cadet</option>    
-                                    @endswitch
-                                    <option value="0">Cadet</option>
-                                    <option value="1">Staff</option>
-                                    <option value="2">Officer</option>                  
-                                </select>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Horaire détaillé</label><small class="form-text text-muted">|| {{$job->schedule_see}} || L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_schedule_see" name="{{$job->id}}_schedule_see" class="switch-input" @if($job->schedule_see == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification horaire</label><small class="form-text text-muted">|| {{$job->schedule_edit}} || L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_schedule_edit" name="{{$job->id}}_schedule_edit" class="switch-input" @if($job->schedule_edit == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation horaire</label><small class="form-text text-muted">|| {{$job->schedule_notify}} || L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_schedule_notify" name="{{$job->id}}_schedule_notify" class="switch-input" @if($job->schedule_notify == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Consultation messages</label><small class="form-text text-muted">|| {{$job->message_see}} || L'utilisateur avec ce poste peut t'il consulter les messages</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_message_see" name="{{$job->id}}_message_see" class="switch-input" @if($job->message_see == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification messages</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_message_edit" name="{{$job->id}}_message_edit" class="switch-input" @if($job->message_edit == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation messages</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_message_notify" name="{{$job->id}}_message_notify" class="switch-input" @if($job->message_notify == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification article</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_paper_edit" name="{{$job->id}}_paper_edit" class="switch-input" @if($job->paper_edit == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Publication articles</label><small class="form-text text-muted"> L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_paper_publish" name="{{$job->id}}_paper_publish" class="switch-input" @if($job->paper_publish == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation articles</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_paper_notify" name="{{$job->id}}_paper_notify" class="switch-input" @if($job->paper_notify == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Consultation inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il consulter l'inventaire</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_inventory_see" name="{{$job->id}}_inventory_see" class="switch-input" @if($job->inventory_see == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_inventory_edit" name="{{$job->id}}_inventory_edit" class="switch-input" @if($job->inventory_edit == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation inventaire</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_inventory_notify" name="{{$job->id}}_inventory_notify" class="switch-input" @if($job->inventory_notify == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                        <div class="row form-group">
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Modification utilisateur</label><small class="form-text text-muted"> L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_user_edit" name="{{$job->id}}_user_edit" class="switch-input" @if($job->user_edit == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                            <div class="col col-md-3"><label for="text-input" class=" form-control-label">Notifiation utilisateur</label><small class="form-text text-muted"> L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.</small></div>
-                            <div class="col col-md-3" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;"><input name="{{$job->id}}_user_notify" name="{{$job->id}}_user_notify" class="switch-input" @if($job->user_notify == "1") checked="true" @endif type="checkbox"><span class="switch-label"></span><span class="switch-handle"></span></label>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="card-footer">
-                        <button type="submit" class="btn btn-primary btn-sm">
-                            <i class="fa fa-dot-circle-o"></i> Submit
-                        </button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
-@endsection
+                        <div class="col-md-12">
+                            <h3>Permissions du poste</h3>
+                            <p>
+                                Choisissez quels permissions doivent être associé avec ce poste.
+                            </p>
+                            <div id="accordion" role="tablist">
+                                @foreach(\App\Permission::allToArray() as $key => $cat)
+                                    <div class="card card-collapse">
+                                        <div class="card-header" role="tab" id="headingOne">
+                                            <h5 class="mb-0">
+                                                <a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}"  @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
+                                                    {{$key}}
+                                                    <i class="material-icons">keyboard_arrow_down</i>
+                                                </a>
+                                            </h5>
+                                        </div>
 
-@section('breadcrumb')
-    <div class="breadcrumbs">
-        <div class="col-sm-4">
-            <div class="page-header float-left">
-                <div class="page-title">
-                    <h1>{{ trans('admin/dashboard.page_title')}}</h1>
-                </div>
-            </div>
-        </div>
-        <div class="col-sm-8">
-            <div class="page-header float-right">
-                <div class="page-title">
-                    <ol class="breadcrumb text-right">
-                        <li class="active">{{ trans('admin/dashboard.breadcrumb')}}</li>
-                    </ol>
-                </div>
+                                        <div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
+                                            <div class="card-body">
+                                                <div class="row">
+                                                    @foreach($cat as $r)
+                                                        <div class="col text-center">
+                                                            <input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}" value="{{$job->p($r['ckey'])}}">
+                                                            <h5>{{$r['communName']}}</h5>
+                                                            <div class="btn-group">
+                                                                <button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon @if($job->p($r['ckey']) != -1) btn-outline-danger @else btn-danger @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
+                                                                <button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon @if($job->p($r['ckey']) == 0) btn-warning @else btn-outline-warning @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>
+                                                                <button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon @if($job->p($r['ckey']) != 1) btn-outline-success @else btn-success @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
+                                                            </div>
+                                                            <p>
+                                                                <small>{{$r['desc']}}</small>
+                                                            </p>
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                        <div class="col-md-12 mt-5">
+                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                        </div>
+                    </div>
+                </form>
             </div>
         </div>
     </div>
 @endsection
 
 @section('custom_scripts')
-<script src="https://cloud.tinymce.com/stable/tinymce.min.js?apiKey=r82pabvd9arn3fjb1e2fsolf2xpixuv4hwfwart4cf1fb7mx"></script>
-<script>
-    tinymce.init({
-    selector: '#<?php echo $job->id?>_desc',
-    branding: false,
-    menubar: 'edit view format'
-    });
-</script>
-   
-@endsection
+    <script src="/js/permissions.js"></script>
+    <script>
+        $('#desc').trumbowyg({
+            lang: 'fr'
+        });
+    </script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php
index 12d462df..db3bbba0 100644
--- a/resources/views/admin/user/edit.blade.php
+++ b/resources/views/admin/user/edit.blade.php
@@ -107,7 +107,7 @@
                         <div class="form-group">
                         <label for="job">Poste</label>
                         <select class="form-control" name="job" id="job" required>
-                            <option value={{$user->job}}>{{\App\Job::find($user->job)->name}}</option>
+                            <option value={{$user->job->id}}>{{$user->job->name}}</option>
                             @foreach ($JobsList as $job)
                                 <option value="{{$job->id}}">{{$job->name}}</option>                                   
                             @endforeach    
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");