diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 660e753e..39e16ac7 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -22,12 +22,9 @@ class LoginController extends Controller protected function redirectTo() { - if(\Auth::User()->getAcces(2)) - { - return '/admin'; - } else if(\Auth::User()->getAcces(1)){ - return '/ecc'; - } + + return '/admin'; + } /** * Where to redirect users after login. diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 87d4cacb..ffdb46d2 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -84,7 +84,7 @@ class EventController extends Controller } } clog('add','success','a ajouté un évènement',null,'App\Event',$event->id); - return redirect('/admin/calendar')->with('success','Événement ajouter à l\'horaire'); + return redirect('/admin/schedule')->with('success','Événement ajouter à l\'horaire'); } /** @@ -175,7 +175,7 @@ class EventController extends Controller } } clog('edit','success','a modifié un évènement',null,'App\Event',$event->id); - return redirect('/admin/calendar')->with('success','Modification à l\'événement sauvegarder à l\'horaire'); + return redirect('/admin/schedule')->with('success','Modification à l\'événement sauvegarder à l\'horaire'); } /** diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php new file mode 100644 index 00000000..3e656a99 --- /dev/null +++ b/app/Http/Controllers/PermissionController.php @@ -0,0 +1,85 @@ + Rank::all()]); } /** @@ -24,7 +24,7 @@ class RankController extends Controller */ public function create() { - // + return view('admin.configs.ranks.add'); } /** @@ -35,7 +35,25 @@ class RankController extends Controller */ public function store(Request $request) { - // + $r = new Rank(); + + $r->name = $request->name; + $r->desc = $request->desc; + $r->acces_level = 1; + + $tpermission = []; + + foreach (\App\Permission::all() as $perm) + { + $tkey = $perm->ckey; + $tpermission[$tkey] = $request->$tkey; + } + + $r->permissions = json_encode($tpermission); + $r->save(); + + clog('add','success','Grade ajouté avec succès'); + return redirect('/admin/config/ranks')->with('success','Grade ajouté avec succès'); } /** @@ -44,9 +62,9 @@ class RankController extends Controller * @param \App\Rank $rank * @return \Illuminate\Http\Response */ - public function show(Rank $rank) + public function show($rank) { - // + return view('admin.configs.ranks.show',['rank' => Rank::find($rank)]); } /** @@ -57,7 +75,7 @@ class RankController extends Controller */ public function edit(Rank $rank) { - // + } /** @@ -67,9 +85,26 @@ class RankController extends Controller * @param \App\Rank $rank * @return \Illuminate\Http\Response */ - public function update(Request $request, Rank $rank) + public function update(Request $request, $rank) { - // + $r = Rank::find($rank); + + $r->name = $request->name; + $r->desc = $request->desc; + + $tpermission = []; + + foreach (\App\Permission::all() as $perm) + { + $tkey = $perm->ckey; + $tpermission[$tkey] = $request->$tkey; + } + + $r->permissions = json_encode($tpermission); + $r->save(); + + clog('edit','success','Grade modifié avec succès'); + return redirect('/admin/config/ranks')->with('success','Grade modifié avec succès'); } /** diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 8c5512fd..c64b3952 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -69,7 +69,7 @@ class UserController extends Controller } $user->avatar = rand(1,16); - $user->rank = request('rank'); + $user->rank_id = request('rank'); $user->job = request('job'); $user->password = bcrypt(request('psw')); $user->api_token = str_random(60); @@ -141,7 +141,7 @@ class UserController extends Controller $user->age = request('age'); } - $user->rank = request('rank'); + $user->rank_id = request('rank'); $user->job = request('job'); if (request('psw') != null) { $user->password = bcrypt(request('psw')); @@ -231,7 +231,7 @@ class UserController extends Controller $user->save(); - return back()->with('success', 'Modification enregistré'); + return redirect('/admin/profil')->with('success', 'Modification enregistré'); } public function UserAdress() @@ -247,7 +247,7 @@ class UserController extends Controller $user->save(); - return back()->with('success', 'Modification enregistré'); + return redirect('/admin/profil')->with('success', 'Modification enregistré'); } public function apiList() diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 76785d61..649e7b55 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -61,5 +61,6 @@ class Kernel extends HttpKernel 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'staff' => \App\Http\Middleware\AccesStaff::class, 'admin' => \App\Http\Middleware\AccesAdmin::class, + 'perm' => \App\Http\Middleware\CheckPerm::class, ]; } diff --git a/app/Http/Middleware/CheckPerm.php b/app/Http/Middleware/CheckPerm.php new file mode 100644 index 00000000..ced3b4df --- /dev/null +++ b/app/Http/Middleware/CheckPerm.php @@ -0,0 +1,25 @@ +p($permission) != 1) + { + clog('navigate','danger','L\'utilisateur n\'est pas autorisé à effectuer cette action',\Auth::user()->id); + return redirect('/admin')->with('error','Vous n\'êtes pas autorisé à effectuer cette action'); + } + return $next($request); + } +} diff --git a/app/Permission.php b/app/Permission.php new file mode 100644 index 00000000..9f60eee4 --- /dev/null +++ b/app/Permission.php @@ -0,0 +1,321 @@ + [ + 'news_see' => [ + 'ckey' => 'news_see', + 'communName' => 'Voir les nouvelles', + 'desc' => 'L\'utilisateur peut-il consulter les nouvelles', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'news_add' => [ + 'ckey' => 'news_add', + 'communName' => 'Ajouter une nouvelles', + 'desc' => 'L\'utilisateur peut-il ajouter une nouvelle', + 'icon' => 'fa-plus', + 'valeur' => 0 + ], + 'news_edit' => [ + 'ckey' => 'news_edit', + 'communName' => 'Modifier une nouvelles', + 'desc' => 'L\'utilisateur peut-il modifier une nouvelle', + 'icon' => 'fa-edit', + 'valeur' => 0 + ], + 'news_delete' => [ + 'ckey' => 'news_delete', + 'communName' => 'Supprimer une nouvelles', + 'desc' => 'L\'utilisateur peut-il supprimer une nouvelle', + 'icon' => 'fa-close', + 'valeur' => 0 + ] + ], + 'message' => [ + 'msg_see' => [ + 'ckey' => 'msg_see', + 'communName' => 'Voir les messages', + 'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'msg_add' => [ + 'ckey' => 'msg_add', + 'communName' => 'Ajouter un message', + 'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'msg_edit' => [ + 'ckey' => 'msg_edit', + 'communName' => 'Modifier un message', + 'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'msg_delete' => [ + 'ckey' => 'msg_delete', + 'communName' => 'Supprimer un message', + 'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] + ], + 'inventory' => [ + 'inventory_see' => [ + 'ckey' => 'inventory_see', + 'communName' => 'Voir l\'inventaire', + 'desc' => 'L\'utilisateur peut-il consulter l\'inventaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'inventory_add' => [ + 'ckey' => 'inventory_add', + 'communName' => 'Ajouter item a l\'inventaire', + 'desc' => 'L\'utilisateur peut-il ajouter un item a l\'inventaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'inventory_edit' => [ + 'ckey' => 'inventory_edit', + 'communName' => 'Modifier un item de l\'inventaire', + 'desc' => 'L\'utilisateur peut-il modifier un item de l\'inventaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'inventory_delete' => [ + 'ckey' => 'inventory_delete', + 'communName' => 'Supprimer un item de l\'inventaire', + 'desc' => 'L\'utilisateur peut-il supprimer un item de l\'inventaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + ], + 'booking' => [ + 'booking_see' => [ + 'ckey' => 'booking_see', + 'communName' => 'Voir les réservations', + 'desc' => 'L\'utilisateur peut-il consulter la liste des réservations', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'booking_add' => [ + 'ckey' => 'booking_add', + 'communName' => 'Ajouter une réservation', + 'desc' => 'L\'utilisateur peut-il ajouter une réservation', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'booking_edit' => [ + 'ckey' => 'booking_edit', + 'communName' => 'Modifier une réservation', + 'desc' => 'L\'utilisateur peut-il modifier une réservation', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'booking_delete' => [ + 'ckey' => 'booking_delete', + 'communName' => 'Supprimer une réservation', + 'desc' => 'L\'utilisateur peut-il supprimer une réservation', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] + ], + 'user' => [ + 'user_see' => [ + 'ckey' => 'user_see', + 'communName' => 'Voir la liste des utilisateurs', + 'desc' => 'L\'utilisateur peut-il consulter la liste des utilisateurs', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'user_add' => [ + 'ckey' => 'user_add', + 'communName' => 'Ajouter un utilisateur', + 'desc' => 'L\'utilisateur peut-il ajouter un autre utilisateur', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'user_edit' => [ + 'ckey' => 'user_edit', + 'communName' => 'Modifier un utilisateur', + 'desc' => 'L\'utilisateur peut-il modifier un autre utilisateur', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'user_delete' => [ + 'ckey' => 'user_delete', + 'communName' => 'Supprimer un utilisateur', + 'desc' => 'L\'utilisateur peut-il supprimer un autre utilisateur', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + ], + 'config' => [ + 'config_see' => [ + 'ckey' => 'config_see', + 'communName' => 'Voir les configurations', + 'desc' => 'L\'utilisateur peut-il consulter les configurations', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit' => [ + 'ckey' => 'config_edit', + 'communName' => 'Modifier les configurations', + 'desc' => 'L\'utilisateur peut-il modifier les configurations', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] + ], + 'statistique' => [ + 'stats_see' => [ + 'ckey' => 'stats_see', + 'communName' => 'Voir les statistiques', + 'desc' => 'L\'utilisateur peut-il consulter les statistiques', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] + ], + 'schedule' => [ + 'schedule_see' => [ + 'ckey' => 'schedule_see', + 'communName' => 'Voir l\'horaire', + 'desc' => 'L\'utilisateur peut-il consulter l\'horaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'schedule_add' => [ + 'ckey' => 'schedule_add', + 'communName' => 'Ajouter un évènement à l\'horaire', + 'desc' => 'L\'utilisateur peut-il ajouter un évènement à l\'horaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'schedule_edit' => [ + 'ckey' => 'schedule_edit', + 'communName' => 'Modifier un évènement à l\'horaire', + 'desc' => 'L\'utilisateur peut-il modifier un évènement à l\'horaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'schedule_delete' => [ + 'ckey' => 'schedule_delete', + 'communName' => 'Supprimer un évènement à l\'horaire', + 'desc' => 'L\'utilisateur peut-il supprimer un évènement à l\'horaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ] + ], + 'article' => [ + 'article_see' => [ + 'ckey' => 'article_see', + 'communName' => 'Voir les articles', + 'desc' => 'L\'utilisateur peut-il consulter les articles', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'article_add' => [ + 'ckey' => 'article_add', + 'communName' => 'Ajouter un article', + 'desc' => 'L\'utilisateur peut-il ajouter un article', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'article_edit' => [ + 'ckey' => 'article_edit', + 'communName' => 'Modifier un article', + 'desc' => 'L\'utilisateur peut-il modifier un évènement à l\'horaire', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'article_delete' => [ + 'ckey' => 'article_delete', + 'communName' => 'Supprimer un article', + 'desc' => 'L\'utilisateur peut-il supprimer un article', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + ], + 'picture' => [ + 'picture_see' => [ + 'ckey' => 'picture_see', + 'communName' => 'Voir les images', + 'desc' => 'L\'utilisateur peut-il consulter les images', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'picture_add' => [ + 'ckey' => 'picture_add', + 'communName' => 'Ajouter une image', + 'desc' => 'L\'utilisateur peut-il ajouter une image', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'picture_edit' => [ + 'ckey' => 'picture_edit', + 'communName' => 'Modifier une image', + 'desc' => 'L\'utilisateur peut-il modifier une image', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'picture_delete' => [ + 'ckey' => 'picture_delete', + 'communName' => 'Supprimer une image', + 'desc' => 'L\'utilisateur peut-il supprimer une image', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + ] + ]; + + public static function all($value = null,$columns = null) + { + + $permissions = collect(); + foreach (self::PERMISSIONS as $key => $cat) + { + foreach ($cat as $c) + { + $p = new Permission(); + $p->ckey = $c['ckey']; + $p->communName = $c['communName']; + $p->desc = $c['desc']; + $p->icon = $c['icon']; + if ($value == null) + { + $p->value = $c['valeur']; + } + else + { + $p->value = $value; + } + $permissions->push($p); + } + } + + return $permissions; + } + + public static function allToArray() + { + return self::PERMISSIONS; + } + + public static function allToString($value = null) + { + $perm = []; + foreach (Permission::all($value) as $p) + { + $perm[$p->ckey] = $p->value; + } + + return \GuzzleHttp\json_encode($perm); + } +} diff --git a/app/Rank.php b/app/Rank.php index 1e74e9cb..92f07c20 100644 --- a/app/Rank.php +++ b/app/Rank.php @@ -6,7 +6,26 @@ use Illuminate\Database\Eloquent\Model; class Rank extends Model { - protected $casts = [ - 'perm' => 'array', - ]; + public function permissions() + { + return collect(json_decode($this->permissions,true)); + } + + public function permission($permission) + { + foreach ($this->permissions() as $perm => $value) + { + if ($permission == $perm) + { + return $value; + } + } + + return 0; + } + + public function p($perm) + { + return $this->permission($perm); + } } diff --git a/app/User.php b/app/User.php index 6fe3f330..32b5fae3 100644 --- a/app/User.php +++ b/app/User.php @@ -27,6 +27,11 @@ class User extends Authenticatable 'password', 'remember_token', ]; + public function rank() + { + return $this->belongsTo('App\Rank'); + } + public function logs() { return $this->hasMany(Log::class); @@ -279,4 +284,14 @@ class User extends Authenticatable { return $this->hasMany('App\News'); } + + public function permission($perm) + { + return $this->rank->permission($perm); + } + + public function p($perm) + { + return $this->permission($perm); + } } diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 6f8f739b..bbb8c931 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -19,7 +19,7 @@ class CreateUsersTable extends Migration $table->string('lastname'); $table->string('email')->unique(); $table->string('password'); - $table->string('rank')->default(1); + $table->string('rank_id')->default(1); $table->string('adress')->default('unknown'); $table->string('telephone')->default('unknown'); $table->string('age'); diff --git a/database/migrations/2018_08_21_094646_create_ranks_table.php b/database/migrations/2018_08_21_094646_create_ranks_table.php index 69bea7da..3d81f0c0 100644 --- a/database/migrations/2018_08_21_094646_create_ranks_table.php +++ b/database/migrations/2018_08_21_094646_create_ranks_table.php @@ -15,23 +15,10 @@ class CreateRanksTable extends Migration { Schema::create('ranks', function (Blueprint $table) { $table->increments('id'); - $table->string('name'); + $table->string('name'); + $table->text('desc'); $table->text('acces_level'); - $table->boolean('schedule_see'); - $table->boolean('schedule_edit'); - $table->boolean('schedule_notify'); - $table->boolean('message_see'); - $table->boolean('message_edit'); - $table->boolean('message_notify'); - $table->boolean('paper_edit'); - $table->boolean('paper_publish'); - $table->boolean('paper_notify'); - $table->boolean('inventory_see'); - $table->boolean('inventory_edit'); - $table->boolean('inventory_notify'); - $table->boolean('user_see'); - $table->boolean('user_edit'); - $table->boolean('user_notify'); + $table->text('permissions'); $table->timestamps(); }); } diff --git a/database/seeds/RanksTableSeeder.php b/database/seeds/RanksTableSeeder.php index e5ca8a9c..170727f4 100644 --- a/database/seeds/RanksTableSeeder.php +++ b/database/seeds/RanksTableSeeder.php @@ -15,174 +15,9 @@ class RanksTableSeeder extends Seeder [ 'name' => "SuperAdmin", 'acces_level' => '2', - 'schedule_see' => true, - 'schedule_edit' => true, - 'schedule_notify' => true, - 'message_see' => true, - 'message_edit' => true, - 'message_notify' => true, - 'paper_edit' => true, - 'paper_publish' => true, - 'paper_notify' => true, - 'inventory_see' => true, - 'inventory_edit' => true, - 'inventory_notify' => true, - 'user_see' => true, - 'user_edit' => true, - 'user_notify' => true - ], - [ - 'name' => "Cadet", - 'acces_level' => '0', - 'schedule_see' => false, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => false, - 'message_edit' => false, - 'message_notify' => false, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => false, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "1er classe", - 'acces_level' => '0', - 'schedule_see' => false, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => false, - 'message_edit' => false, - 'message_notify' => false, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => false, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Caporal", - 'acces_level' => '0', - 'schedule_see' => false, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => false, - 'message_edit' => false, - 'message_notify' => false, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => false, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Caporal de section", - 'acces_level' => '0', - 'schedule_see' => false, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => false, - 'message_edit' => false, - 'message_notify' => false, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => false, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Sergent", - 'acces_level' => '1', - 'schedule_see' => true, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => true, - 'message_edit' => false, - 'message_notify' => true, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => true, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Sergent de section", - 'acces_level' => '1', - 'schedule_see' => true, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => true, - 'message_edit' => false, - 'message_notify' => true, - 'paper_edit' => false, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => true, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => false, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Adjudant 2e Classe", - 'acces_level' => '2', - 'schedule_see' => true, - 'schedule_edit' => false, - 'schedule_notify' => false, - 'message_see' => true, - 'message_edit' => true, - 'message_notify' => true, - 'paper_edit' => true, - 'paper_publish' => false, - 'paper_notify' => false, - 'inventory_see' => true, - 'inventory_edit' => false, - 'inventory_notify' => false, - 'user_see' => true, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Adjudant 1er Classe", - 'acces_level' => '2', - 'schedule_see' => true, - 'schedule_edit' => true, - 'schedule_notify' => true, - 'message_see' => true, - 'message_edit' => true, - 'message_notify' => true, - 'paper_edit' => true, - 'paper_publish' => true, - 'paper_notify' => true, - 'inventory_see' => true, - 'inventory_edit' => true, - 'inventory_notify' => true, - 'user_see' => true, - 'user_edit' => true, - 'user_notify' => true - ], + 'desc' => 'Compte SuperAdmin donne toutes les permissions ne peux être modifié', + 'permissions' => \App\Permission::allToString(1) + ] ]); } } diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php index e5f20ab1..6e303df5 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/database/seeds/UsersTableSeeder.php @@ -17,7 +17,7 @@ class UsersTableSeeder extends Seeder 'lastname' => 'Autre', 'email' => 'visiteur@exvps.ca', 'password' => bcrypt('f329er8kl2jHJGHdEj12567'), - 'rank' => '1', + 'rank_id' => '1', 'adress' => 'Inconnu', 'age' => '99', 'avatar' => '3', @@ -30,7 +30,7 @@ class UsersTableSeeder extends Seeder 'lastname' => 'Administrateur', 'email' => 'admin@exvps.ca', 'password' => bcrypt('SuperAdmin'), - 'rank' => '1', + 'rank_id' => '1', 'adress' => 'Inconnu', 'age' => '99', 'avatar' => '3', diff --git a/public/js/permissions.js b/public/js/permissions.js new file mode 100644 index 00000000..35ca3962 --- /dev/null +++ b/public/js/permissions.js @@ -0,0 +1,40 @@ +function switchPermissionSwitch(rank,valeur) +{ + switch (valeur) { + case 'close': + $('#'+rank).val('-1'); + $('#'+rank+'-close').addClass('btn-danger'); + $('#'+rank+'-close').removeClass('btn-outline-danger'); + + $('#'+rank+'-slash').removeClass('btn-warning'); + $('#'+rank+'-slash').addClass('btn-outline-warning'); + + $('#'+rank+'-plus').addClass('btn-outline-success'); + $('#'+rank+'-plus').removeClass('btn-success'); + break; + + case 'slash': + $('#'+rank).val('0'); + $('#'+rank+'-close').addClass('btn-outline-danger'); + $('#'+rank+'-close').removeClass('btn-danger'); + + $('#'+rank+'-slash').addClass('btn-warning'); + $('#'+rank+'-slash').removeClass('btn-outline-warning'); + + $('#'+rank+'-plus').addClass('btn-outline-success'); + $('#'+rank+'-plus').removeClass('btn-success'); + break; + + case 'plus': + $('#'+rank).val('1'); + $('#'+rank+'-close').addClass('btn-outline-danger'); + $('#'+rank+'-close').removeClass('btn-danger'); + + $('#'+rank+'-slash').removeClass('btn-warning'); + $('#'+rank+'-slash').addClass('btn-outline-warning'); + + $('#'+rank+'-plus').addClass('btn-success'); + $('#'+rank+'-plus').removeClass('btn-outline-success'); + break; + } +} diff --git a/resources/assets/js/permissions.js b/resources/assets/js/permissions.js new file mode 100644 index 00000000..6f33d8cd --- /dev/null +++ b/resources/assets/js/permissions.js @@ -0,0 +1,8 @@ +function switchPermissionSwitch(rank,valeur) +{ + switch (valeur) { + case 'close': + $('#'+rank+'-close').addClass('btn-danger'); + $('#'+rank+'-close').removeClass('btn-danger'); + } +} diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php index cc771dab..7ea11e73 100644 --- a/resources/views/admin/article/index.blade.php +++ b/resources/views/admin/article/index.blade.php @@ -24,8 +24,12 @@
-   Modifier l'article -   Gérer les photos + @if(\Auth::user()->p('article_edit') == 1) +   Modifier l'article + @endif + @if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add')) +   Gérer les photos + @endif
diff --git a/resources/views/admin/configs/ranks/add.blade.php b/resources/views/admin/configs/ranks/add.blade.php new file mode 100644 index 00000000..11409aa2 --- /dev/null +++ b/resources/views/admin/configs/ranks/add.blade.php @@ -0,0 +1,87 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Ajouter un grade

+
+
+
+ @csrf + +
+
+
+ + + Nom du grade +
+
+
+
+ + + Description du grade +
+
+
+
+

Permissions du Grade

+

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

+
+ @foreach(\App\Permission::allToArray() as $key => $cat) +
+ + +
+
+
+ @foreach($cat as $r) +
+ +
{{$r['communName']}}
+
+ + + +
+

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

+
+ @endforeach +
+
+
+
+ @endforeach +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + + +@endsection \ No newline at end of file diff --git a/resources/views/admin/configs/ranks/index.blade.php b/resources/views/admin/configs/ranks/index.blade.php new file mode 100644 index 00000000..87c484c7 --- /dev/null +++ b/resources/views/admin/configs/ranks/index.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Configuration des grades

+
+
+
+ @foreach($ranks as $rank) +
+
+
+

{{$rank->name}}

+
+
+
+ {{$rank->desc}} +
+
+
+ Gérer +
+
+
+
+
+ @endforeach +
+
+
+
+@endsection diff --git a/resources/views/admin/configs/ranks/show.blade.php b/resources/views/admin/configs/ranks/show.blade.php new file mode 100644 index 00000000..839c00e1 --- /dev/null +++ b/resources/views/admin/configs/ranks/show.blade.php @@ -0,0 +1,87 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Configuration du grade {{$rank->name}}

+
+
+
+ @csrf + +
+
+
+ + + Nom du grade +
+
+
+
+ + + Description du grade +
+
+
+
+

Permissions du Grade

+

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

+
+ @foreach(\App\Permission::allToArray() as $key => $cat) +
+ + +
+
+
+ @foreach($cat as $r) +
+ +
{{$r['communName']}}
+
+ + + +
+

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

+
+ @endforeach +
+
+
+
+ @endforeach +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + + +@endsection \ No newline at end of file diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 91344cfb..c7b3dddc 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -1,162 +1,137 @@ @extends('layouts.admin.main') @section('content') -
-
-
-
-

Cours à venir

-
-
- @if(count($userClasse) == 0) -
-
- - Aucun cours à venir -
-
- @endif - @foreach ($userClasse as $classe) -
- @if ($classe['plan_done'] == "on") -
- - Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} est remis.
- @if ($classe['material'] != "") - - Vous avez réservé - @foreach (\App\Item::explodeItems($classe['material']) as $item) - @if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item) - et - @endif - {{$item->name}} - @endforeach - @else - - Aucun matériel réservé - @endif - -
- @else -
- - Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} n'est pas remis.
- @if ($classe['material'] != "") - - Vous avez réservé - @foreach (\App\Item::explodeItems($classe['material']) as $item) - @if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item) - et - @endif - {{$item->name}} - @endforeach - @else - - Aucun matériel réservé - @endif - -
- @endif -
- @endforeach -
-
-
-
-
-
-
-
-

Activité à venir

-
-
-
- @if(count($futureEvent) == 0) -
-
- - Aucune activité à venir -
-
- @endif - @foreach ($futureEvent as $event) -
-
-
-
-

{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}

-
-
- {{$event->name}} -
-
- {{$event->date_begin}} -
-
-
-
- @endforeach -
-
- Afficher plus -
-
-
-
-
-
-

Activité sur le site

-
-
- @foreach (\App\Log::all()->forPage(1,3); as $event) - {{$event->action}}
- @endforeach -
- Afficher plus -
-
-
-
-
-
-

Message publié

-
-
-
- @foreach (\App\Message::all()->forPage(1,4); as $msg) -
- -
{{$msg->title}}
-
-
- {!!$msg->body!!} -
-
- -
- @endforeach +
+
+
+

Cours à venir

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

Aucun cours à venir

+
+ @endif + @foreach (\Auth::user()->courses->take(6) as $course) +
+
+
+

{{$course->ocom}} - {{$course->name}}

+

{{date('Y-m-d',strtotime($course->event->date_begin))}}

+

Période {{$course->periode}}, Niveau {{$course->level}}

+
+
+
+ @endforeach +
+
+
+
+
+
+

Activité à venir

+
+
+
+ @if(count($futureEvent) == 0) +
+

Aucune activité à venir

+
+ @endif + @foreach ($futureEvent as $event) +
+
+
+
+

{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}

+
+
+ {{$event->name}} +
+
+ {{$event->date_begin}} +
+
+
+
+ @endforeach +
+
+ Afficher plus
-
- Afficher plus
-
-
-
- - - -
-
-
-
{{\Auth::User()->fullname()}}
-
{{\App\Rank::find(\Auth::User()->rank)->name}}
+
+
+
+
+ + +
-
-
- Profil +
+
+
{{\Auth::User()->fullname()}}
+
{{\Auth::User()->rank->name}}
+
+
+
+ Profil +
+
+
+
+

Nouvelles

+
+
+
+ @foreach (\App\News::all()->forPage(1,4); as $msg) +
+ +
{{$msg->title}}
+
+
+ {!!$msg->body!!} +
+
+ +
+ @endforeach +
+
+ Afficher plus +
+
+
+ @if(\Auth::user()->p('stats_see') == 1) +
+
+
+

Activité sur le site

+
+
+ @foreach (\App\Log::all()->forPage(1,3); as $log) +
+
+ {{$log->type}} +
+
+ {{$log->user->fullname()}} - {{$log->event}} +
+
+ @endforeach +
+ Afficher plus +
+
+
+ @endif
@endsection diff --git a/resources/views/admin/inventory/index.blade.php b/resources/views/admin/inventory/index.blade.php index e297c198..85c04297 100644 --- a/resources/views/admin/inventory/index.blade.php +++ b/resources/views/admin/inventory/index.blade.php @@ -9,7 +9,9 @@
- Ajouter un item + @if(\Auth::user()->p('inventory_add') == 1) + Ajouter un item + @endif
@@ -35,8 +37,12 @@ diff --git a/resources/views/admin/log/display.blade.php b/resources/views/admin/log/display.blade.php index 66b649f7..b82e7849 100644 --- a/resources/views/admin/log/display.blade.php +++ b/resources/views/admin/log/display.blade.php @@ -8,8 +8,6 @@
- -
{!! $item->desc !!}
+ @if(\Auth::user()->p('inventory_edit') == 1)   Modifier - + @endif + @if(\Auth::user()->p('inventory_delete') == 1) + + @endif
@@ -26,7 +24,7 @@ - + diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php index 636dcef2..ffcb60d0 100644 --- a/resources/views/admin/news/index.blade.php +++ b/resources/views/admin/news/index.blade.php @@ -9,10 +9,17 @@
- Ajouter un nouvelle + @if(\Auth::user()->p('news_add') == 1) + Ajouter un nouvelle + @endif
+ @if($news->isEmpty()) +
+

Aucune nouvelle

+
+ @endif @foreach($news as $n)
@@ -26,8 +33,12 @@
-   Modifier - + @if(\Auth::user()->p('news_edit') == 1) +   Modifier + @endif + @if(\Auth::user()->p('news_delete') == 1) + + @endif
diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php index 4d8ab345..26fd0a0d 100644 --- a/resources/views/admin/update.blade.php +++ b/resources/views/admin/update.blade.php @@ -2,6 +2,113 @@ @section('content')
+
+
+
+
+
+

3.2.3

+

2019-09-13

+
+
+ STABLE +
+
+
+
+ +
+
+

+ Nouveauté +

    +
  • +
    +
    + +
    +
    + La gestion des grades est maintenant possible. +
    +
    +
    • +
  • +
    +
    + +
    +
    + Refonte du code responsable de la gestion des grades +
    +
    +
    • +
  • +
    +
    + +
    +
    + Modernisation de la base de données des grades +
    +
    +
    • + +
  • +
    +
    + +
    +
    + Suppression de L'ECC au profit d'un nouveau systeme de permission. Le grade et les permissions du grade définissent ce que peux faire un utilisateur sur le site. +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout de la possibilité d'imprimer une activité depuis l'horaire +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout de la possibilité de réserver du matériel depuis l'horaire +
    +
    +
    • +
+

+
+
+

+ Bug +

    +
  • +
    +
    + +
    +
    + Correction de 4 bugs +
    +
    +
    • +
+

+
+
+
+
+
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php index 7ba19dbb..12d462df 100644 --- a/resources/views/admin/user/edit.blade.php +++ b/resources/views/admin/user/edit.blade.php @@ -95,7 +95,7 @@
- +
{{$item->created_at}} {{$item->type}}Success{{$item->result}} {{\App\User::find($item->user_id)->fullname()}} {{$item->event}}
{{$item->id}} {{$item->fullname()}}{{\App\Rank::find($item->rank)->name}}{{$item->rank->name}} {{\App\Job::find($item->job)->name}} edit diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php index a780b09e..5a8df742 100644 --- a/resources/views/admin/user/profil.blade.php +++ b/resources/views/admin/user/profil.blade.php @@ -10,7 +10,7 @@
Card image cap
{{\Auth::User()->fullname()}}
-
{{\App\Rank::find(\Auth::User()->rank)->name}}
+
{{\Auth::User()->rank->name}}
diff --git a/resources/views/admin/user/profil/password.blade.php b/resources/views/admin/user/profil/password.blade.php index 6549efb7..8b9a4ea2 100644 --- a/resources/views/admin/user/profil/password.blade.php +++ b/resources/views/admin/user/profil/password.blade.php @@ -24,11 +24,11 @@
- +
- +
diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php index 70c93f50..a79c59b4 100644 --- a/resources/views/layouts/admin/alert.blade.php +++ b/resources/views/layouts/admin/alert.blade.php @@ -64,6 +64,13 @@ }, false); @endif + @if (session('danger')) + + @endif @if (session('warning'))