diff --git a/app/Event.php b/app/Event.php index c2d52808..9b704abf 100644 --- a/app/Event.php +++ b/app/Event.php @@ -96,7 +96,7 @@ class Event extends Model } $error = new \App\Course(); $error->name = "Cours manquant dans la BD"; - $error->ocom = "ERROR"; + $error->ocom = "ERREUR"; $error->periode = $p; $error->level = $l; $error->location = ""; diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 229d0ad8..6a89e622 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -37,6 +37,6 @@ class CalendarController extends Controller public function indexTable() { - return view('admin.schedule.table.index',['events' => \App\Event::allThisYear()]); + return view('admin.schedule.table.index',['events' => \App\Event::allThisYear()->sortBy('date_begin')]); } } diff --git a/app/Permission.php b/app/Permission.php index a7609aba..3e2e0d0f 100644 --- a/app/Permission.php +++ b/app/Permission.php @@ -116,8 +116,43 @@ class Permission extends Model ], 'config_edit' => [ 'ckey' => 'config_edit', - 'communName' => 'Modifier les configurations', - 'desc' => 'L\'utilisateur peut-il modifier les configurations', + 'communName' => 'Modifier les configurations générales', + 'desc' => 'L\'utilisateur peut-il modifier les configurations générales', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit_instruction' => [ + 'ckey' => 'config_edit_instruction', + 'communName' => 'Modifier les configurations de l\'instruction', + 'desc' => 'L\'utilisateur peut-il modifier les configurations de l\'instruction', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit_administration' => [ + 'ckey' => 'config_edit_administration', + 'communName' => 'Modifier les configurations de l\'administration', + 'desc' => 'L\'utilisateur peut-il modifier les configurations de l\'administration', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit_rank' => [ + 'ckey' => 'config_edit_rank', + 'communName' => 'Modifier les configurations des grades', + 'desc' => 'L\'utilisateur peut-il modifier les configurations des grades', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit_job' => [ + 'ckey' => 'config_edit_job', + 'communName' => 'Modifier les configurations des postes', + 'desc' => 'L\'utilisateur peut-il modifier les configurations des postes', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], + 'config_edit_customization' => [ + 'ckey' => 'config_edit_customization', + 'communName' => 'Modifier les configurations de l\'apparence du site', + 'desc' => 'L\'utilisateur peut-il modifier les configurations de l\'apparence du site', 'icon' => 'fa-eye', 'valeur' => 0 ] @@ -167,6 +202,13 @@ class Permission extends Model 'icon' => 'fa-eye', 'valeur' => 0 ], + 'stats_instruction_see' => [ + 'ckey' => 'stats_instruction_see', + 'communName' => 'Voir les statistiques de l\'instruction', + 'desc' => 'L\'utilisateur peut-il voir les statistiques de l\'instruction', + 'icon' => 'fa-eye', + 'valeur' => 0 + ], 'course_see_all' => [ 'ckey' => 'course_see_all', 'communName' => 'Voir les cours de tous les utilisateurs', diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 10bbba9e..60a635eb 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -69,7 +69,7 @@ @else @foreach ($futureEvent as $event)
-
+

@if($event->calendar_icon == null) {!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!} @else @endif

diff --git a/resources/views/admin/schedule/table/index.blade.php b/resources/views/admin/schedule/table/index.blade.php index 4faa3a10..b6d06ffa 100644 --- a/resources/views/admin/schedule/table/index.blade.php +++ b/resources/views/admin/schedule/table/index.blade.php @@ -65,59 +65,68 @@
- 1 + {{ $loop->iteration }}
{{$event->name}}
- {{$event->date_begin}} + {{$event->date_begin}} à {{ $event->date_end }}
- @foreach($event->schedule["periodes"] as $periode) - - - - -
- P{{$loop->iteration}} - {{ $periode['begin_time'] }} à {{ $periode['end_time'] }} -
- @endforeach + @if($event->use_schedule == 1) + @foreach($event->schedule["periodes"] as $periode) + + + + +
+ P{{$loop->iteration}} - {{ $periode['begin_time'] }} à {{ $periode['end_time'] }} +
+ @endforeach + @endif
- @for($n = 1;$n <= $event->nbNiveau();$n++) - - @for($p = 1;$p <= $event->nbPeriode();$p++) - - nbPeriode())class="border-bottom"@endif> - + +
-
- @php($course = $event->course($p,$n)) -
- @if(!$course->use_course()) - {{ $course->ocom }} - {{ $course->name }} - @else - {{ $course->desc }} - @endif + @if($event->use_schedule == 1) + @for($n = 1;$n <= $event->nbNiveau();$n++) +
+ @for($p = 1;$p <= $event->nbPeriode();$p++) + + nbPeriode())class="border-bottom"@endif> + - -
+
+ @php($course = $event->course($p,$n)) +
+ @if(!$course->use_course()) + {{ $course->ocom }} - {{ $course->name }} + @else + {{ $course->desc }} + @endif +
+
+ {{ $course->instructor() }} +
+
+ {{ $course->location }} +
+
+ NA +
+ @php($course = null)
-
- {{ $course->instructor() }} -
-
- {{ $course->location }} -
-
- NA -
- @php($course = null) - -
- @endfor +
+ @endfor + + @endfor + @else + + {!! $event->desc !!} - @endfor + @endif + @endforeach diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 332bd427..244104e5 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -95,7 +95,7 @@ $sidebar = [ 'Configuration' => [ 'route' => null, 'icon' => 'menu_book', - 'perm' => 'config_edit', + 'perm' => 'config_see', 'child' => [ 'Général' => [ 'route' => 'admin.config.general', @@ -136,7 +136,7 @@ $sidebar = [ 'Apparence' => [ 'route' => 'admin.config.customisation', 'icon' => 'fas fa-palette', - 'perm' => 'config_edit_instruction', + 'perm' => 'config_edit_customization', 'child' => null ] ] diff --git a/routes/web.php b/routes/web.php index 29469a89..3c9ce82f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -57,7 +57,7 @@ Route::middleware(['auth', 'firstlogin'])->name('admin.')->group(function () { /** Statistique */ Route::get('/admin/stats/log', 'LogController@index')->middleware('perm:stats_see')->name('stats.log'); - Route::get('/admin/stats/instruction', 'StatsController@instruction')->middleware('perm:stats_see')->name('stats.instruction'); + Route::get('/admin/stats/instruction', 'StatsController@instruction')->middleware('perm:stats_instruction_see')->name('stats.instruction'); /** Message */ Route::get('/admin/message', 'MessageController@index')->middleware('perm:msg_see')->name('message'); @@ -75,39 +75,39 @@ Route::middleware(['auth', 'firstlogin'])->name('admin.')->group(function () { Route::post('/admin/user/edit/{id}', 'UserController@update')->middleware('perm:user_edit'); /** Config */ - Route::get('/admin/config/instruction', 'ScheduleController@index')->middleware('perm:config_edit')->name('config.schedule'); - Route::get('/admin/config/instruction/event_type/create', 'EventTypeController@create')->middleware('perm:config_edit')->name('config.schedule.event_type.create'); - Route::post('/admin/config/instruction/event_type/create', 'EventTypeController@store')->middleware('perm:config_edit'); - Route::get('/admin/config/instruction/event_type/{id}', 'EventTypeController@show')->middleware('perm:config_edit')->name('config.schedule.event_type'); - Route::patch('/admin/config/instruction/event_type/{id}', 'EventTypeController@update')->middleware('perm:config_edit'); - Route::patch('/admin/config/instruction', 'ScheduleController@update')->middleware('perm:config_edit'); - Route::get('/admin/config/activity', 'ComplementaryActivityController@index')->middleware('perm:config_edit')->name('config.complementary-activity'); - Route::get('/admin/config/activity/add', 'ComplementaryActivityController@create')->middleware('perm:config_edit')->name('config.complementary-activity.add'); - Route::post('/admin/config/activity/add', 'ComplementaryActivityController@store')->middleware('perm:config_edit'); - Route::get('/admin/config/activity/edit/{id}', 'ComplementaryActivityController@edit')->middleware('perm:config_edit')->name('config.complementary-activity.edit'); - Route::post('/admin/config/activity/edit/{id}', 'ComplementaryActivityController@update')->middleware('perm:config_edit'); + Route::get('/admin/config/instruction', 'ScheduleController@index')->middleware('perm:config_edit_instruction')->name('config.schedule'); + Route::get('/admin/config/instruction/event_type/create', 'EventTypeController@create')->middleware('perm:config_edit_instruction')->name('config.schedule.event_type.create'); + Route::post('/admin/config/instruction/event_type/create', 'EventTypeController@store')->middleware('perm:config_edit_instruction'); + Route::get('/admin/config/instruction/event_type/{id}', 'EventTypeController@show')->middleware('perm:config_edit_instruction')->name('config.schedule.event_type'); + Route::patch('/admin/config/instruction/event_type/{id}', 'EventTypeController@update')->middleware('perm:config_edit_instruction'); + Route::patch('/admin/config/instruction', 'ScheduleController@update')->middleware('perm:config_edit_instruction'); + Route::get('/admin/config/activity', 'ComplementaryActivityController@index')->middleware('perm:config_edit_administration')->name('config.complementary-activity'); + Route::get('/admin/config/activity/add', 'ComplementaryActivityController@create')->middleware('perm:config_edit_administration')->name('config.complementary-activity.add'); + Route::post('/admin/config/activity/add', 'ComplementaryActivityController@store')->middleware('perm:config_edit_administration'); + Route::get('/admin/config/activity/edit/{id}', 'ComplementaryActivityController@edit')->middleware('perm:config_edit_administration')->name('config.complementary-activity.edit'); + Route::post('/admin/config/activity/edit/{id}', 'ComplementaryActivityController@update')->middleware('perm:config_edit_administration'); Route::post('/admin/config/general/edit', 'ConfigController@update')->middleware('perm:config_edit'); Route::get('/admin/config/', 'ConfigController@index')->middleware('perm:config_edit')->name('config.general'); - Route::get('/admin/config/customisation', 'ConfigController@customisation')->middleware('perm:config_edit')->name('config.customisation'); - Route::post('/admin/config/customisation', 'ConfigController@customisationUpdate')->middleware('perm:config_edit'); + Route::get('/admin/config/customisation', 'ConfigController@customisation')->middleware('perm:config_edit_customization')->name('config.customisation'); + Route::post('/admin/config/customisation', 'ConfigController@customisationUpdate')->middleware('perm:config_edit_customization'); - Route::get('/admin/config/ranks', 'RankController@index')->middleware('perm:config_edit')->name('config.rank'); - Route::get('/admin/config/ranks/add', 'RankController@create')->middleware('perm:config_edit')->name('config.rank.add'); - Route::post('/admin/config/ranks/add', 'RankController@store')->middleware('perm:config_edit'); - Route::get('/admin/config/ranks/{id}', 'RankController@show')->middleware('perm:config_edit')->name('config.rank.edit'); - Route::post('/admin/config/ranks/{id}', 'RankController@update')->middleware('perm:config_edit'); - Route::get('/admin/config/jobs', 'JobController@index')->middleware('perm:config_edit')->name('config.jobs'); - Route::get('/admin/config/jobs/add', 'JobController@create')->middleware('perm:config_edit')->name('config.jobs.add'); - Route::post('/admin/config/jobs/add', 'JobController@store')->middleware('perm:config_edit'); - Route::get('/admin/config/jobs/{id}', 'JobController@edit')->middleware('perm:config_edit')->name('config.jobs.edit'); - Route::post('/admin/config/jobs/{id}', 'JobController@update')->middleware('perm:config_edit'); + Route::get('/admin/config/ranks', 'RankController@index')->middleware('perm:config_edit_rank')->name('config.rank'); + Route::get('/admin/config/ranks/add', 'RankController@create')->middleware('perm:config_edit_rank')->name('config.rank.add'); + Route::post('/admin/config/ranks/add', 'RankController@store')->middleware('perm:config_edit_rank'); + Route::get('/admin/config/ranks/{id}', 'RankController@show')->middleware('perm:config_edit_rank')->name('config.rank.edit'); + Route::post('/admin/config/ranks/{id}', 'RankController@update')->middleware('perm:config_edit_rank'); + Route::get('/admin/config/jobs', 'JobController@index')->middleware('perm:config_edit_job')->name('config.jobs'); + Route::get('/admin/config/jobs/add', 'JobController@create')->middleware('perm:config_edit_job')->name('config.jobs.add'); + Route::post('/admin/config/jobs/add', 'JobController@store')->middleware('perm:config_edit_job'); + Route::get('/admin/config/jobs/{id}', 'JobController@edit')->middleware('perm:config_edit_job')->name('config.jobs.edit'); + Route::post('/admin/config/jobs/{id}', 'JobController@update')->middleware('perm:config_edit_job'); Route::get('/admin/config/files', 'ConfigController@showfilesConfig')->middleware('perm:config_edit')->name('config.files'); Route::post('/admin/config/files', 'ConfigController@editfilesConfig')->middleware('perm:config_edit'); /** Public page */ - Route::get('/admin/public/edit/{config}', 'PublicController@edit')->middleware('perm:config_edit'); - Route::post('/admin/public/edit/{config}', 'PublicController@update')->middleware('perm:config_edit'); + Route::get('/admin/public/edit/{config}', 'PublicController@edit')->middleware('perm:config_edit_customization'); + Route::post('/admin/public/edit/{config}', 'PublicController@update')->middleware('perm:config_edit_customization'); /** Picture */ Route::get('/admin/picture', 'PictureController@indexAdmin')->middleware('perm:picture_see')->name('picture');