c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-21 02:39:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'schedule-table' into 'master'

Browse Source 
Schedule Table view update & permissions update

See merge request TheGamecraft/c-cms!114
This commit is contained in:
Mathieu Lagace
2020-10-02 22:09:26 +00:00
parent 6eb517a0cb 9cdd47a6f4
commit 63301aec97
7 changed files with 125 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Event.php
View File

@@ -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 = "";

2
app/Http/Controllers/CalendarController.php
View File

@@ -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')]);
}
}

46
app/Permission.php
View File

@@ -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',

2
resources/views/admin/dashboard.blade.php
View File

@@ -69,7 +69,7 @@
@else
@foreach ($futureEvent as $event)
<div class="col-md-12">
<div class="alert" style="background-color: @if($event->calendar_color == null){{ \App\ComplementaryActivity::find($event->type)->calendar_color}} @else {{$event->calendar_color}} @endif">
<div class="alert cursor" style="background-color: @if($event->calendar_color == null){{ \App\ComplementaryActivity::find($event->type)->calendar_color}} @else {{$event->calendar_color}} @endif" onclick="navigate('schedule?e={{$event->id}}')">
<div class="row text-white">
<div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
<h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">@if($event->calendar_icon == null) {!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!} @else <i class="{{$event->calendar_icon}}"></i> @endif</h3>

13
resources/views/admin/schedule/table/index.blade.php
View File

@@ -65,15 +65,16 @@
<td>
<div class="row" style="width: 29rem">
<div class="col-2 text-center m-auto">
1
{{ $loop->iteration }}
</div>
<div class="col-4 m-auto">
{{$event->name}}
</div>
<div class="col-3 m-auto">
{{$event->date_begin}}
{{$event->date_begin}} à {{ $event->date_end }}
</div>
<div class="col-3 m-auto pr-0">
@if($event->use_schedule == 1)
@foreach($event->schedule["periodes"] as $periode)
<table class="table-borderless">
<tr>
@@ -83,9 +84,11 @@
</tr>
</table>
@endforeach
@endif
</div>
</div>
</td>
@if($event->use_schedule == 1)
@for($n = 1;$n <= $event->nbNiveau();$n++)
<td style="padding: 0px;">
@for($p = 1;$p <= $event->nbPeriode();$p++)
@@ -118,6 +121,12 @@
@endfor
</td>
@endfor
@else
<td colspan="{{\App\Event::getMaxLevels($events)}}">
{!! $event->desc !!}
</td>
@endif
</tr>
@endforeach
</table>

4
resources/views/layouts/admin/sidebar.blade.php
View File

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

52
routes/web.php
View File

@@ -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');