From 2eabeb420533e648f40eebc541dc95ddf61e9f64 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Tue, 17 Sep 2019 21:40:55 -0400 Subject: [PATCH 1/7] 3.2.4 --- public/js/calendar.js | 1 + resources/views/admin/article/index.blade.php | 12 ++--- .../views/admin/configs/activity.blade.php | 10 ++--- resources/views/admin/dashboard.blade.php | 2 + .../views/admin/schedule/event/add.blade.php | 1 + .../views/admin/schedule/modal/add.blade.php | 44 ++++++++++++++----- resources/views/admin/user/profil.blade.php | 6 ++- 7 files changed, 52 insertions(+), 24 deletions(-) diff --git a/public/js/calendar.js b/public/js/calendar.js index baca88e2..4a0ea46a 100644 --- a/public/js/calendar.js +++ b/public/js/calendar.js @@ -45,6 +45,7 @@ function switchType(date) { $.get( "/api/schedule/events/add/modal/"+selectInput.val()+"/"+date+"?api_token="+api_token, function( data ) { $( "#container" ).html( data ); console.log( "Loading defaut value for activity type ("+selectInput.val()+")" ); + $('select').selectpicker(); }); } diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php index 7ea11e73..95a9810f 100644 --- a/resources/views/admin/article/index.blade.php +++ b/resources/views/admin/article/index.blade.php @@ -10,7 +10,7 @@
@foreach($activity as $a) -
+

{{$a->name}}

@@ -23,17 +23,17 @@
-
+
@if(\Auth::user()->p('article_edit') == 1) -   Modifier l'article +   Modifier l'article @endif @if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add')) -   Gérer les photos +   Gérer les photos @endif
-
-   Voir l'article +
+   Voir l'article
diff --git a/resources/views/admin/configs/activity.blade.php b/resources/views/admin/configs/activity.blade.php index a9297b14..1ebb03a9 100644 --- a/resources/views/admin/configs/activity.blade.php +++ b/resources/views/admin/configs/activity.blade.php @@ -7,18 +7,18 @@ Configuration Générale
-
+
@foreach ($activities as $activity) -
+
-
+
{{$activity->admin_desc}}
-
+
Modifier - +
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 9db85bbc..5d2cef59 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -9,6 +9,7 @@

Cours à venir

+
@if(\Auth::user()->courses->isEmpty())

Aucun cours à venir

@@ -28,6 +29,7 @@ @endif @endforeach @endif +
diff --git a/resources/views/admin/schedule/event/add.blade.php b/resources/views/admin/schedule/event/add.blade.php index c4d78ef3..a2f7622c 100644 --- a/resources/views/admin/schedule/event/add.blade.php +++ b/resources/views/admin/schedule/event/add.blade.php @@ -49,6 +49,7 @@ $('.datetimepicker').datetimepicker({ close: 'fa fa-remove' } }); +$('select').selectpicker(); @endsection \ No newline at end of file diff --git a/resources/views/admin/schedule/modal/add.blade.php b/resources/views/admin/schedule/modal/add.blade.php index 10a256c1..74522596 100644 --- a/resources/views/admin/schedule/modal/add.blade.php +++ b/resources/views/admin/schedule/modal/add.blade.php @@ -1,3 +1,6 @@ +
+

Information Générale

+
@@ -5,34 +8,34 @@ Veuillez entrer le nom de l'événement
-
+
-
+
-
+
Veuillez entrer le lieu de l'événement
-
+
+
+

Options Supplémentaires

+
+
+ +
@@ -48,6 +64,9 @@
@if ($activity->id == 1) +
+

Horaire d'instruction

+
@for ($i = 1; $i <= \App\Config::getData('admin_level_in_schedule_nb'); $i++) @@ -78,7 +97,11 @@
- + Veuillez entrer le nom de l'instructeur
@@ -111,7 +134,6 @@
@endif - + @endsection \ No newline at end of file diff --git a/resources/views/admin/schedule/modal/add.blade.php b/resources/views/admin/schedule/modal/add.blade.php index 74522596..c19642e9 100644 --- a/resources/views/admin/schedule/modal/add.blade.php +++ b/resources/views/admin/schedule/modal/add.blade.php @@ -27,7 +27,7 @@ Veuillez entrer le lieu de l'événement
-
+
-
-
-
- - +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
- @if ($activity->id == 1)

Horaire d'instruction

@@ -89,7 +106,7 @@
- + Veuillez entrer le nom du cours
@@ -109,20 +126,17 @@
- + Veuillez entrer l'OCOM
- + Veuillez entrer le lieux
-
-
- -
+
#
@endfor @@ -137,6 +151,7 @@ \ No newline at end of file From 498c80f404e508567f874b635c84f9823423cd84 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Wed, 2 Oct 2019 09:32:08 -0400 Subject: [PATCH 4/7] MAJ UI Calendar Fix --- resources/views/admin/schedule/print/event.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/schedule/print/event.blade.php b/resources/views/admin/schedule/print/event.blade.php index 5530a19d..d1ba4603 100644 --- a/resources/views/admin/schedule/print/event.blade.php +++ b/resources/views/admin/schedule/print/event.blade.php @@ -45,7 +45,7 @@ Du {{$event->date_begin}} au {{$event->date_end}} {{$course->name}} - {{$course->user->fullname()}} + @if(is_numeric($course->user_id)){{$course->user->fullname()}}@else{{$course->user_id}}@endif {{$course->ocom}} From 799261a7d53ea110cafae347073d4b34910629c7 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Sat, 19 Oct 2019 13:11:42 -0400 Subject: [PATCH 5/7] 3.2.4 --- app/Http/Controllers/EventController.php | 9 +- app/Http/Controllers/JobController.php | 113 +++------ app/Http/Controllers/UserController.php | 4 +- app/News.php | 2 +- public/js/app.js | 4 +- public/mix-manifest.json | 2 - .../views/admin/configs/ranks/index.blade.php | 42 +++- resources/views/admin/job/add.blade.php | 224 ++++++----------- resources/views/admin/job/edit.blade.php | 230 ++++++------------ resources/views/admin/user/edit.blade.php | 2 +- 10 files changed, 233 insertions(+), 399 deletions(-) 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..50e1aa13 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,9 +94,26 @@ 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'); } /** 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. (/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. (/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. (/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. (/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. (/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. (/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/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) @else - + @endif
@@ -46,3 +46,43 @@
@endsection + +@section('custom_scripts') + +@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') -
-
-
- Ajouter un poste - -
-
-
+
+
+
+

Ajouter un poste

+
+
+ + @csrf - @csrf - -
-
+
+
- - - Nom du poste -
-
-
- Description du poste
-
-
-
-
-
- -
-
-
-
L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire
-
- - -
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire
-
- - -
-
-
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.
-
- - -
-
L'utilisateur avec ce poste peut t'il consulter les messages
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles
-
- - -
-
L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles
-
- - -
-
-
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
-
- - -
-
L'utilisateur avec ce poste peut t'il consulter l'inventaire
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.
-
- - -
+ + + Nom du poste
-
- -
-
- -
-
-
-@endsection +
+
+ + + Description du poste +
+
+
+
+

Permissions du poste

+

+ Choisissez quels permissions doivent être associé avec ce poste. +

+
+ @foreach(\App\Permission::allToArray() as $key => $cat) +
+ -@section('breadcrumb') -
-
-
-
-

{{ trans('admin/dashboard.page_title')}}

-
-
-
-
-
-
-
    -
  1. {{ trans('admin/dashboard.breadcrumb')}}
    2. -
-
+
+
+
+ @foreach($cat as $r) +
+ +
{{$r['communName']}}
+
+ + + +
+

+ {{$r['desc']}} +

+
+ @endforeach +
+
+
+
+ @endforeach +
+
+
+ +
+
+
@endsection @section('custom_scripts') - - - + - - -@endsection + +@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') -
-
-
- Modification du poste : {{$job->name}} - -
-
-
-
-
-
-
- Description du poste
+
+
+
+

Configuration du poste {{$job->name}}

+
+
+ + @csrf + +
+
+
+ + + Nom du poste +
+
+
+
+ + + Description du poste +
-
-
-
- -
-
-
-
|| {{$job->schedule_see}} || L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire
-
- - -
-
|| {{$job->schedule_edit}} || L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire
-
- - -
-
-
-
|| {{$job->schedule_notify}} || L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.
-
- - -
-
|| {{$job->message_see}} || L'utilisateur avec ce poste peut t'il consulter les messages
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles
-
- - -
-
L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles
-
- - -
-
-
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
-
- - -
-
L'utilisateur avec ce poste peut t'il consulter l'inventaire
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
-
- - -
-
-
-
L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs
-
- - -
-
L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.
-
- - -
-
-
-
- -
-
- -
-
-
-@endsection +
+

Permissions du poste

+

+ Choisissez quels permissions doivent être associé avec ce poste. +

+
+ @foreach(\App\Permission::allToArray() as $key => $cat) +
+ -@section('breadcrumb') -
-
-
-
-

{{ trans('admin/dashboard.page_title')}}

-
-
-
-
-
-
-
    -
  1. {{ trans('admin/dashboard.breadcrumb')}}
    2. -
-
+
+
+
+ @foreach($cat as $r) +
+ +
{{$r['communName']}}
+
+ + + +
+

+ {{$r['desc']}} +

+
+ @endforeach +
+
+
+
+ @endforeach +
+
+
+ +
+
+
@endsection @section('custom_scripts') - - - -@endsection + + +@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 @@