diff --git a/app/Course.php b/app/Course.php index cadf4d75..d0c7493b 100644 --- a/app/Course.php +++ b/app/Course.php @@ -13,7 +13,7 @@ class Course extends Model public function user() { - return $this->belongsTo('App\User'); + return $this->belongsTo('App\User'); } public function event() diff --git a/app/Event.php b/app/Event.php index 1f3d3af8..d3dcf87c 100644 --- a/app/Event.php +++ b/app/Event.php @@ -18,7 +18,7 @@ class Event extends Model public function user() { - return $this->belongsTo('App\User'); + return $this->belongsTo('App\User'); } public function course($p,$l) @@ -40,4 +40,18 @@ class Event extends Model { return $this->morphMany('App\Log', 'logable'); } + + public static function future() + { + $events = collect(); + + foreach (Event::all() as $event) + { + if (date('U',strtotime($event->date_begin)) >= time()) + { + $events->push($event); + } + } + return $events; + } } diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index ffdb46d2..ac4a2a98 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -50,7 +50,15 @@ class EventController extends Controller $event->is_mandatory = 0; } $event->desc = request('desc'); - + if(\request('msg')) + { + $event->msg = request('msg'); + } + else + { + $event->msg = ""; + } + $event->date_msg = request('date_msg'); $event->save(); if ($event->type == 1) { @@ -60,7 +68,7 @@ class EventController extends Controller $course = new \App\Course(); $users = \App\User::all(); - $instructor = 1; + $instructor = request('instruc_n'.$l.'_p'.$p); foreach ($users as $user) { if($user->fullname() == request('instruc_n'.$l.'_p'.$p)) @@ -130,6 +138,7 @@ class EventController extends Controller $event->is_mandatory = 0; } $event->desc = request('desc'); + $event->msg = \request('msg'); $event->save(); @@ -151,7 +160,7 @@ class EventController extends Controller } $users = \App\User::all(); - $instructor = 1; + $instructor = request('instruc_n'.$l.'_p'.$p); foreach ($users as $user) { if($user->fullname() == request('instruc_n'.$l.'_p'.$p)) diff --git a/app/Http/Controllers/JobController.php b/app/Http/Controllers/JobController.php index 4cbef7ca..f68180be 100644 --- a/app/Http/Controllers/JobController.php +++ b/app/Http/Controllers/JobController.php @@ -20,7 +20,7 @@ class JobController extends Controller $jobs = $jobs_sorted->values(); - return view('admin.job.index', ['jobs' => $jobs]); + return view('admin.configs.jobs.index', ['jobs' => $jobs]); } /** @@ -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,44 @@ 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(); + } + } + clog('delete','success','Poste supprimé avec succès'); + $job->delete(); } } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 76c006f1..c88b8db4 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -14,13 +14,13 @@ class NewsController extends Controller */ public function index() { - return view('public.allnews',['news' => News::where('publish','=','1')->paginate(9)]); + return view('public.allnews',['news' => News::allWithWeeklyMsg()->where('publish','=','1')->sortByDesc('updated_at')->paginate(9)]); } public function indexAdmin() { clogNav('a consulté les nouvelles'); - return view('admin.news.index',['news' => \App\News::paginate(9)]); + return view('admin.news.index',['news' => News::allWithWeeklyMsg()->sortByDesc('updated_at')->paginate(9)]); } /** @@ -69,8 +69,14 @@ class NewsController extends Controller */ public function show($id) { - clog('see','success','a consulté une nouvelle',null,'App\News',$id); - return view('public.news', ['new' => \App\News::find($id)]); + if (\request('type') == 'msg') + { + return view('public.news', ['new' => \App\News::getWeeklyMsg(\App\Event::find($id))]); + } + else + { + return view('public.news', ['new' => \App\News::find($id)]); + } } /** diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index 7dca49f0..23bd9d4d 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\News; use Illuminate\Http\Request; class PublicController extends Controller @@ -14,7 +15,7 @@ class PublicController extends Controller public function index() { return view('public.index',[ - 'news' => \App\News::all()->where('publish','1')->sortByDesc('created_at')->take(3), + 'news' => \App\News::allWithWeeklyMsg()->where('publish','=','1')->sortByDesc('created_at')->take(3), 'activities' => \App\ComplementaryActivity::all()->where('is_promoted','1'), 'pictures' => \App\Picture::all()->sortByDesc('created_at')->take(\App\Config::getData('nb_activity_public')) ]); diff --git a/app/Http/Controllers/RankController.php b/app/Http/Controllers/RankController.php index eb809eb5..18cb6d1e 100644 --- a/app/Http/Controllers/RankController.php +++ b/app/Http/Controllers/RankController.php @@ -109,12 +109,19 @@ 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(); + } + } + clog('delete','success','Grade supprimé avec succès'); + $rank->delete(); } } diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index e382ac57..ad0bef3e 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -213,10 +213,14 @@ class ScheduleController extends Controller $activity = \App\ComplementaryActivity::find($type); $begin_time = $date." ".$activity->begin_time; $end_time = $date." ".$activity->end_time; + + $msg_time = Date('c',strtotime($begin_time.'-4day')); + return view('admin.schedule.modal.add',[ 'activity' => \App\ComplementaryActivity::find($type), 'begin_time' => $begin_time, - 'end_time' => $end_time + 'end_time' => $end_time, + 'msg_time' => $msg_time ]); } 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/Job.php b/app/Job.php index 73a19e40..1006fa7e 100644 --- a/app/Job.php +++ b/app/Job.php @@ -6,7 +6,26 @@ use Illuminate\Database\Eloquent\Model; class Job 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/News.php b/app/News.php index 10e4e734..04ca39e9 100644 --- a/app/News.php +++ b/app/News.php @@ -6,6 +6,10 @@ use Illuminate\Database\Eloquent\Model; class News extends Model { + protected $casts = [ + 'tags' => 'array', + ]; + public function user() { return $this->belongsTo('App\User'); @@ -20,4 +24,39 @@ class News extends Model { return $this->morphMany('App\Log', 'logable'); } + + public static function allWithWeeklyMsg() + { + + $news = \App\News::all(); + + foreach (\App\Event::future() as $event) + { + if($event->type == 1 && $event->msg != "") + { + if (date('U',strtotime($event->date_msg)) <= time()) + { + $news->push(self::getWeeklyMsg($event)); + } + } + } + + return $news; + } + + public static function getWeeklyMsg(\App\Event $event) + { + $n = new News(); + + $n->event_id = $event->id; + $n->title = 'Message de la semaine du '.date('Y-m-d',strtotime($event->date_begin)); + $n->body = $event->msg; + $n->user_id = $event->user_id; + $n->publish = 1; + $n->created_at = $event->created_at; + $n->updated_at = $event->updated_at; + $n->tags = ['message de la semaine','Important']; + + return $n; + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 6e1d8d35..dc914cc9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,7 +3,9 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Collection; +use Illuminate\Pagination\LengthAwarePaginator; class AppServiceProvider extends ServiceProvider { @@ -15,6 +17,29 @@ class AppServiceProvider extends ServiceProvider public function boot() { Schema::defaultStringLength(191); + + /** + * Paginate a standard Laravel Collection. + * + * @param int $perPage + * @param int $total + * @param int $page + * @param string $pageName + * @return array + */ + Collection::macro('paginate', function($perPage, $total = null, $page = null, $pageName = 'page') { + $page = $page ?: LengthAwarePaginator::resolveCurrentPage($pageName); + return new LengthAwarePaginator( + $this->forPage($page, $perPage), + $total ?: $this->count(), + $perPage, + $page, + [ + 'path' => LengthAwarePaginator::resolveCurrentPath(), + 'pageName' => $pageName, + ] + ); + }); } /** diff --git a/app/User.php b/app/User.php index 32b5fae3..481c08ab 100644 --- a/app/User.php +++ b/app/User.php @@ -32,6 +32,11 @@ class User extends Authenticatable return $this->belongsTo('App\Rank'); } + public function job() + { + return $this->belongsTo('App\Job'); + } + public function logs() { return $this->hasMany(Log::class); @@ -287,7 +292,14 @@ class User extends Authenticatable public function permission($perm) { - return $this->rank->permission($perm); + if ($this->job->permission($perm) == 0) + { + return $this->rank->permission($perm); + } + else + { + return $this->job->permission($perm); + } } public function p($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 bbb8c931..6678198d 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -25,23 +25,7 @@ class CreateUsersTable extends Migration $table->string('age'); $table->string('avatar')->default('1'); $table->string('sexe'); - $table->string('job')->default(6); - $table->string('acces_level')->default('unknown'); - $table->string('schedule_see')->default('unknown'); - $table->string('schedule_edit')->default('unknown'); - $table->string('schedule_notify')->default('unknown'); - $table->string('message_see')->default('unknown'); - $table->string('message_edit')->default('unknown'); - $table->string('message_notify')->default('unknown'); - $table->string('paper_edit')->default('unknown'); - $table->string('paper_publish')->default('unknown'); - $table->string('paper_notify')->default('unknown'); - $table->string('inventory_see')->default('unknown'); - $table->string('inventory_edit')->default('unknown'); - $table->string('inventory_notify')->default('unknown'); - $table->string('user_see')->default('unknown'); - $table->string('user_edit')->default('unknown'); - $table->string('user_notify')->default('unknown'); + $table->string('job_id')->default(6); $table->string('api_token', 60)->unique()->default(str_shuffle(str_random(60))); $table->rememberToken(); $table->timestamps(); diff --git a/database/migrations/2018_08_21_094628_create_jobs_table.php b/database/migrations/2018_08_21_094628_create_jobs_table.php index d2747004..fce5dd49 100644 --- a/database/migrations/2018_08_21_094628_create_jobs_table.php +++ b/database/migrations/2018_08_21_094628_create_jobs_table.php @@ -17,22 +17,7 @@ class CreateJobsTable extends Migration $table->increments('id'); $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/migrations/2019_07_19_171303_create_news_table.php b/database/migrations/2019_07_19_171303_create_news_table.php index 27907a05..6e6829c3 100644 --- a/database/migrations/2019_07_19_171303_create_news_table.php +++ b/database/migrations/2019_07_19_171303_create_news_table.php @@ -19,6 +19,7 @@ class CreateNewsTable extends Migration $table->text('body'); $table->integer('user_id'); $table->boolean('publish'); + $table->string('tags')->default("[]"); $table->timestamps(); }); } diff --git a/database/migrations/2019_08_17_102431_create_events_table.php b/database/migrations/2019_08_17_102431_create_events_table.php index ad681b15..d46edc27 100644 --- a/database/migrations/2019_08_17_102431_create_events_table.php +++ b/database/migrations/2019_08_17_102431_create_events_table.php @@ -23,6 +23,8 @@ class CreateEventsTable extends Migration $table->string('location'); $table->boolean('is_mandatory'); $table->text('desc'); + $table->text('msg'); + $table->string('date_msg'); $table->timestamps(); }); } diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php index d7ae4183..f098f221 100644 --- a/database/seeds/ConfigsTableSeeder.php +++ b/database/seeds/ConfigsTableSeeder.php @@ -221,6 +221,11 @@ class ConfigsTableSeeder extends Seeder 'name' => 'public_index_img_url', 'state' => 0, 'data' => '["./assets/img/bg2.jpg"]' + ], + [ + 'name' => 'default_weekly_msg', + 'state' => 0, + 'data' => "[\"/* Nom de l'évènement */
Heure (Cadets):
Lieu:
Tenue:
Matériel:
/* Commentaire */\"]" ] ]; diff --git a/database/seeds/JobsTableSeeder.php b/database/seeds/JobsTableSeeder.php index c3f05fe4..242c2c19 100644 --- a/database/seeds/JobsTableSeeder.php +++ b/database/seeds/JobsTableSeeder.php @@ -15,82 +15,7 @@ class JobsTableSeeder extends Seeder [ 'name' => "Indéterminé", 'desc' => "Aucun poste", - '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' => "Cadet Commandant", - 'desc' => "Description a modifier ...", - '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' => false, - 'inventory_see' => true, - 'inventory_edit' => true, - 'inventory_notify' => false, - 'user_see' => true, - 'user_edit' => true, - 'user_notify' => false - ], - [ - 'name' => "Chef Instructeur", - 'desc' => "Description a modifier ...", - 'acces_level' => '2', - 'schedule_see' => true, - 'schedule_edit' => true, - 'schedule_notify' => false, - 'message_see' => true, - 'message_edit' => true, - 'message_notify' => true, - 'paper_edit' => true, - 'paper_publish' => true, - 'paper_notify' => false, - 'inventory_see' => true, - 'inventory_edit' => true, - 'inventory_notify' => false, - 'user_see' => true, - 'user_edit' => false, - 'user_notify' => false - ], - [ - 'name' => "Adjudant Maitre d'Escadron", - 'desc' => "Description a modifier ...", - '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' => true, - 'paper_notify' => false, - 'inventory_see' => true, - 'inventory_edit' => true, - 'inventory_notify' => false, - 'user_see' => true, - 'user_edit' => false, - 'user_notify' => false + 'permissions' => \App\Permission::allToString(0) ] ]); } diff --git a/database/seeds/RanksTableSeeder.php b/database/seeds/RanksTableSeeder.php index 170727f4..6fe2973d 100644 --- a/database/seeds/RanksTableSeeder.php +++ b/database/seeds/RanksTableSeeder.php @@ -15,7 +15,7 @@ class RanksTableSeeder extends Seeder [ 'name' => "SuperAdmin", 'acces_level' => '2', - 'desc' => 'Compte SuperAdmin donne toutes les permissions ne peux être modifié', + '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 6e303df5..6603e464 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/database/seeds/UsersTableSeeder.php @@ -22,7 +22,7 @@ class UsersTableSeeder extends Seeder 'age' => '99', 'avatar' => '3', 'sexe' => 'm', - 'job' => '1', + 'job_id' => '1', 'api_token' => str_shuffle(str_random(60)), ], [ @@ -35,7 +35,7 @@ class UsersTableSeeder extends Seeder 'age' => '99', 'avatar' => '3', 'sexe' => 'm', - 'job' => '1', + 'job_id' => '1', 'api_token' => str_shuffle(str_random(60)), ] ]); diff --git a/public/css/custom.css b/public/css/custom.css index b5ee2e06..885c2533 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -2,6 +2,14 @@ margin-top: 50px; } +.news-title { + height: 3.2rem; +} + +.news-tags { + height: 1.5rem; +} + .news-body-small { height: 15rem; overflow: hidden; @@ -53,6 +61,33 @@ height: 3rem; overflow: hidden; } +.autocomplete-items { + position: absolute; + border: 1px solid #d4d4d4; + border-bottom: none; + border-top: none; + z-index: 99; + /*position the autocomplete items to be the same width as the container:*/ + top: 64%; + left: 0; + right: 0; +} + +.autocomplete-items div { + padding: 10px; + cursor: pointer; + background-color: #fff; + border-bottom: 1px solid #d4d4d4; +} +.autocomplete-items div:hover { + /*when hovering an item:*/ + background-color: #e9e9e9; +} +.autocomplete-active { + /*when navigating through the items using the arrow keys:*/ + background-color: DodgerBlue !important; + color: #ffffff; +} @media only screen and (max-width: 800px) { .calendar-container { 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/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/public/js/plugins/autocomplete.js b/public/js/plugins/autocomplete.js new file mode 100644 index 00000000..2102ed7e --- /dev/null +++ b/public/js/plugins/autocomplete.js @@ -0,0 +1,106 @@ +function autocomplete(inp, arr) { + /*the autocomplete function takes two arguments, + the text field element and an array of possible autocompleted values:*/ + var currentFocus; + /*execute a function when someone writes in the text field:*/ + inp.addEventListener("input", function(e) { + var a, b, i, val = this.value; + /*close any already open lists of autocompleted values*/ + closeAllLists(); + if (!val) { return false;} + currentFocus = -1; + /*create a DIV element that will contain the items (values):*/ + a = document.createElement("DIV"); + a.setAttribute("id", this.id + "autocomplete-list"); + a.setAttribute("class", "autocomplete-items"); + /*append the DIV element as a child of the autocomplete container:*/ + this.parentNode.appendChild(a); + /*for each item in the array...*/ + for (i = 0; i < arr.length; i++) { + /*check if the item starts with the same letters as the text field value:*/ + if (arr[i].substr(0, val.length).toUpperCase() == val.toUpperCase()) { + /*create a DIV element for each matching element:*/ + b = document.createElement("DIV"); + /*make the matching letters bold:*/ + b.innerHTML = "" + arr[i].substr(0, val.length) + ""; + b.innerHTML += arr[i].substr(val.length); + /*insert a input field that will hold the current array item's value:*/ + b.innerHTML += ""; + /*execute a function when someone clicks on the item value (DIV element):*/ + b.addEventListener("click", function(e) { + /*insert the value for the autocomplete text field:*/ + inp.value = this.getElementsByTagName("input")[0].value; + /*close the list of autocompleted values, + (or any other open lists of autocompleted values:*/ + closeAllLists(); + }); + a.appendChild(b); + } + } + }); + /*execute a function presses a key on the keyboard:*/ + inp.addEventListener("keydown", function(e) { + var x = document.getElementById(this.id + "autocomplete-list"); + if (x) x = x.getElementsByTagName("div"); + if (e.keyCode == 40) { + /*If the arrow DOWN key is pressed, + increase the currentFocus variable:*/ + currentFocus++; + /*and and make the current item more visible:*/ + addActive(x); + } else if (e.keyCode == 38) { //up + /*If the arrow UP key is pressed, + decrease the currentFocus variable:*/ + currentFocus--; + /*and and make the current item more visible:*/ + addActive(x); + } else if (e.keyCode == 13) { + /*If the ENTER key is pressed, prevent the form from being submitted,*/ + e.preventDefault(); + if (currentFocus > -1) { + /*and simulate a click on the "active" item:*/ + if (x) x[currentFocus].click(); + } + } + }); + function addActive(x) { + /*a function to classify an item as "active":*/ + if (!x) return false; + /*start by removing the "active" class on all items:*/ + removeActive(x); + if (currentFocus >= x.length) currentFocus = 0; + if (currentFocus < 0) currentFocus = (x.length - 1); + /*add class "autocomplete-active":*/ + x[currentFocus].classList.add("autocomplete-active"); + } + function removeActive(x) { + /*a function to remove the "active" class from all autocomplete items:*/ + for (var i = 0; i < x.length; i++) { + x[i].classList.remove("autocomplete-active"); + } + } + function closeAllLists(elmnt) { + /*close all autocomplete lists in the document, + except the one passed as an argument:*/ + var x = document.getElementsByClassName("autocomplete-items"); + for (var i = 0; i < x.length; i++) { + if (elmnt != x[i] && elmnt != inp) { + x[i].parentNode.removeChild(x[i]); + } + } + } + /*execute a function when someone clicks in the document:*/ + document.addEventListener("click", function (e) { + closeAllLists(e.target); + }); +} + +function initAutoComplete(htmlClass) +{ + $.get('/api/user/list?api_token='+api_token, function ( data ) { + var users = JSON.parse(data); + $("."+htmlClass).each(function ( index ) { + autocomplete(document.getElementById(this.id), users); + }) + }); +} \ 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/custom.css b/resources/custom.css index b5ee2e06..885c2533 100644 --- a/resources/custom.css +++ b/resources/custom.css @@ -2,6 +2,14 @@ margin-top: 50px; } +.news-title { + height: 3.2rem; +} + +.news-tags { + height: 1.5rem; +} + .news-body-small { height: 15rem; overflow: hidden; @@ -53,6 +61,33 @@ height: 3rem; overflow: hidden; } +.autocomplete-items { + position: absolute; + border: 1px solid #d4d4d4; + border-bottom: none; + border-top: none; + z-index: 99; + /*position the autocomplete items to be the same width as the container:*/ + top: 64%; + left: 0; + right: 0; +} + +.autocomplete-items div { + padding: 10px; + cursor: pointer; + background-color: #fff; + border-bottom: 1px solid #d4d4d4; +} +.autocomplete-items div:hover { + /*when hovering an item:*/ + background-color: #e9e9e9; +} +.autocomplete-active { + /*when navigating through the items using the arrow keys:*/ + background-color: DodgerBlue !important; + color: #ffffff; +} @media only screen and (max-width: 800px) { .calendar-container { 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/booking/index.blade.php b/resources/views/admin/booking/index.blade.php index eeb585b6..39a59915 100644 --- a/resources/views/admin/booking/index.blade.php +++ b/resources/views/admin/booking/index.blade.php @@ -25,7 +25,11 @@ {{$event->fulldesc}}
- {{$event->user->fullname()}} + @if(is_numeric($event->user_id)) + {{$event->user->fullname()}} + @else + {{$event->user_id}} + @endif
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/configs/jobs/index.blade.php b/resources/views/admin/configs/jobs/index.blade.php new file mode 100644 index 00000000..2a57bdd9 --- /dev/null +++ b/resources/views/admin/configs/jobs/index.blade.php @@ -0,0 +1,88 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Configuration des postes

+
+
+
+
+ Ajouter un poste +
+ @foreach($jobs as $job) +
+
+
+

{{$job->name}}

+
+
+
+ {!! $job->desc!!} +
+
+
+ @if($job->id == 1) + + @else + Gérer + @endif +
+
+ @if($job->id == 1) + + @else + + @endif +
+
+
+
+
+ @endforeach +
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/configs/ranks/index.blade.php b/resources/views/admin/configs/ranks/index.blade.php index 87c484c7..c89cdb05 100644 --- a/resources/views/admin/configs/ranks/index.blade.php +++ b/resources/views/admin/configs/ranks/index.blade.php @@ -8,6 +8,9 @@
+
+ Ajouter un grade +
@foreach($ranks as $rank)
@@ -16,11 +19,22 @@
- {{$rank->desc}} + {!! $rank->desc!!}
-
- Gérer +
+ @if($rank->id == 1) + + @else + Gérer + @endif +
+
+ @if($rank->id == 1) + + @else + + @endif
@@ -32,3 +46,43 @@
@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 9db85bbc..6875b102 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 +
@@ -94,7 +96,7 @@
- @foreach (\App\News::all()->forPage(1,4); as $msg) + @foreach (\App\News::all()->forPage(1,3) as $msg)
{{$msg->title}}
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/news/create.blade.php b/resources/views/admin/news/create.blade.php index ce4bcb68..927d3630 100644 --- a/resources/views/admin/news/create.blade.php +++ b/resources/views/admin/news/create.blade.php @@ -15,7 +15,7 @@
- + Titre de la nouvelle à publier
@@ -33,7 +33,7 @@
- +
diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php index ffcb60d0..ec5ff447 100644 --- a/resources/views/admin/news/index.blade.php +++ b/resources/views/admin/news/index.blade.php @@ -3,14 +3,14 @@ @section('content')
-
+
Nouvelles
@if(\Auth::user()->p('news_add') == 1) - Ajouter un nouvelle + Ajouter un nouvelle @endif
@@ -24,8 +24,19 @@
-

{{$n->title}}

+

{{$n->title}}

{{$n->user->fullname()}} - {{$n->created_at}} +

+ @if($n->tags != []) + @foreach($n->tags as $tag) + @if($tag == "Important") + {{$tag}} + @else + {{$tag}} + @endif + @endforeach + @endif +
@if($n->publish == 0) Brouillon @endif

@@ -33,10 +44,12 @@
- @if(\Auth::user()->p('news_edit') == 1) + @if(\Auth::user()->p('news_edit') == 1 && !isset($n->event_id))   Modifier + @else +   Modifier @endif - @if(\Auth::user()->p('news_delete') == 1) + @if(\Auth::user()->p('news_delete') == 1 && !isset($n->event_id)) @endif
@@ -44,6 +57,9 @@
@endforeach +
+ {{ $news->links() }} +
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/event/edit.blade.php b/resources/views/admin/schedule/event/edit.blade.php index 78b29ee1..54771fab 100644 --- a/resources/views/admin/schedule/event/edit.blade.php +++ b/resources/views/admin/schedule/event/edit.blade.php @@ -23,6 +23,9 @@
+
+

Information Générale

+
@@ -30,26 +33,26 @@ Veuillez entrer le nom de l'événement
-
+
-
+
-
+
Veuillez entrer le lieu de l'événement
-
+
-
-
- -
- +
+

Options Supplémentaires

+
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+
+
@if ($activity->type == 1) +
+

Horaire d'instruction

+
@for ($i = 1; $i <= \App\Config::getData('admin_level_in_schedule_nb'); $i++) @@ -104,7 +138,9 @@
- course($p,$i) != null) value="{{\App\User::find($activity->course($p,$i)->user_id)->fullname()}}" @endif> +
+ course($p,$i) != null) value="@if(is_numeric($activity->course($p,$i)->user_id)){{\App\User::find($activity->course($p,$i)->user_id)->fullname()}} @else {{$activity->course($p,$i)->user_id}} @endif" @endif> +
Veuillez entrer le nom de l'instructeur
@@ -146,9 +182,12 @@ @section('custom_scripts') + @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..211aa4b4 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

+
+
+ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
- @if ($activity->id == 1) +
+

Horaire d'instruction

+
@for ($i = 1; $i <= \App\Config::getData('admin_level_in_schedule_nb'); $i++) @@ -70,36 +106,33 @@
- + Veuillez entrer le nom du cours
-
- - - Veuillez entrer le nom de l'instructeur -
-
+ +
+ +
+ Veuillez entrer le nom de l'instructeur +
- + Veuillez entrer l'OCOM
- + Veuillez entrer le lieux
-
- -
@endfor @@ -111,10 +144,11 @@
@endif - + \ No newline at end of file diff --git a/resources/views/admin/schedule/modal/show.blade.php b/resources/views/admin/schedule/modal/show.blade.php index 040cdc4f..38138939 100644 --- a/resources/views/admin/schedule/modal/show.blade.php +++ b/resources/views/admin/schedule/modal/show.blade.php @@ -54,7 +54,7 @@ @if(\App\User::find($course->user_id)) {{\App\User::find($course->user_id)->fullname()}} @else - Utilisateur Inconnu + {{$course->user_id}} @endif
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}} diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php index 26fd0a0d..97235b41 100644 --- a/resources/views/admin/update.blade.php +++ b/resources/views/admin/update.blade.php @@ -2,6 +2,89 @@ @section('content')
+
+
+
+
+
+

3.2.4

+

2019-10-19

+
+
+ STABLE +
+
+
+
+
+
+

+ Nouveauté +

    +
  • +
    +
    + +
    +
    + La gestion des postes est maintenant possible. +
    +
    +
    • +
  • +
    +
    + +
    +
    + Refonte du code responsable de la gestion des postes +
    +
    +
    • +
  • +
    +
    + +
    +
    + Modernisation de la base de données des utilisateurs +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout de message la semaine. +
    +
    +
    • +
+

+
+
+

+ Bug +

    +
  • +
    +
    + +
    +
    + Correction de multiples bugs +
    +
    +
    • +
+

+
+
+
+
+
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 @@