April 9 update

This commit is contained in:
George Frederick "Buzz" Beurling
2020-04-09 17:20:03 -04:00
parent 94509caf3c
commit 50abb9d909
57 changed files with 2635 additions and 854 deletions

View File

@@ -64,13 +64,17 @@ Route::middleware('auth:api')->group(function () {
/** Job Route */
Route::post('/config/job/delete','JobController@destroy')->middleware('perm:config_edit');
/** Course Route */
Route::post('/course/{id}/plan/validate','CourseController@validatePlan')->middleware('courseperm:validate_plan');;
/** File Exlorer Route */
Route::get('/drive/{folder}/permission/{subject}/{id}','GoogleDriveController@editPermissionModal')->middleware('perm:file_see');
Route::get('/drive/folders/{folder?}','GoogleDriveController@list');
Route::get('/drive/path/{folder}','GoogleDriveController@getPath');
Route::get('/drive/patharray','GoogleDriveController@getPathArray');
Route::get('/drive/files/{dir}/{file}','GoogleDriveController@showMetadata');
Route::get('/drive/checkfilestructure','GoogleDriveController@checkFileSystem');
Route::get('/drive/{folder}/addpermission/{subject}','GoogleDriveController@addPermissionModal')->middleware('perm:file_see');
Route::get('/drive/folders/{folder?}','GoogleDriveController@list')->middleware('fileperm:folder,r');
Route::get('/drive/path/{folder}','GoogleDriveController@getPath')->middleware('fileperm:folder,r');
Route::get('/drive/patharray','GoogleDriveController@getPathArray')->middleware('perm:file_see');
Route::get('/drive/files/{dir}/{file}','GoogleDriveController@showMetadata')->middleware('fileperm:folder,r');
Route::get('/drive/checkfilestructure','GoogleDriveController@checkFileSystem')->middleware('perm:config_edit');;
Route::get('/user/perm/{id}', function($id) {
$user = \App\User::find($id);

View File

@@ -50,9 +50,16 @@ Breadcrumbs::for('admin.log', function ($trail) {
});
// Admin > User
Breadcrumbs::for('admin.user', function ($trail) {
Breadcrumbs::for('admin.users', function ($trail) {
$trail->parent('admin.dashboard');
$trail->push('Utilisateurs', route('admin.user'));
$trail->push('Utilisateurs', route('admin.users'));
});
// Admin > User > [user]
Breadcrumbs::for('admin.user', function ($trail, $id) {
$user = \App\User::findOrFail($id);
$trail->parent('admin.users');
$trail->push($user->fullname(), route('admin.user',$user));
});
// Admin > User > Add
@@ -61,27 +68,35 @@ Breadcrumbs::for('admin.user.add', function ($trail) {
$trail->push('Ajouter un utilisateur', route('admin.user.add'));
});
// Admin > User > Edit
// Admin > User > [user] > Edit
Breadcrumbs::for('admin.user.edit', function ($trail, $id) {
$trail->parent('admin.user');
$trail->push('Modifier un utilisateur', route('admin.user.edit', $id));
$user = \App\User::findOrFail($id);
$trail->parent('admin.user',$id);
$trail->push('Modifier', route('admin.user.edit', $user));
});
// Admin > User > [user] > Courses
Breadcrumbs::for('admin.user.courses', function ($trail, $id) {
$user = \App\User::findOrFail($id);
$trail->parent('admin.user',$id);
$trail->push('Liste des cours', route('admin.user.courses', $user));
});
// Admin > Config
Breadcrumbs::for('admin.config', function ($trail) {
Breadcrumbs::for('admin.config.general', function ($trail) {
$trail->parent('admin.dashboard');
$trail->push('Configurations', route('admin.config'));
$trail->push('Configurations', route('admin.config.general'));
});
// Admin > Config > Calendrier
// Admin > Config > Instruction
Breadcrumbs::for('admin.config.schedule', function ($trail) {
$trail->parent('admin.config');
$trail->push('Horaire', route('admin.config.schedule'));
$trail->parent('admin.config.general');
$trail->push('Instruction', route('admin.config.schedule'));
});
// Admin > Config > Activite complementaire
Breadcrumbs::for('admin.config.complementary-activity', function ($trail) {
$trail->parent('admin.config');
$trail->parent('admin.config.general');
$trail->push('Activitée complémentaire', route('admin.config.complementary-activity'));
});
@@ -99,13 +114,13 @@ Breadcrumbs::for('admin.config.complementary-activity.edit', function ($trail, $
// Admin > Config > Customisation
Breadcrumbs::for('admin.config.customisation', function ($trail) {
$trail->parent('admin.config');
$trail->parent('admin.config.general');
$trail->push('Apparence', route('admin.config.customisation'));
});
// Admin > Config > Rank
Breadcrumbs::for('admin.config.rank', function ($trail) {
$trail->parent('admin.config');
$trail->parent('admin.config.general');
$trail->push('Grade', route('admin.config.rank'));
});
@@ -123,7 +138,7 @@ Breadcrumbs::for('admin.config.rank.edit', function ($trail, $id) {
// Admin > Config > Jobs
Breadcrumbs::for('admin.config.jobs', function ($trail) {
$trail->parent('admin.config');
$trail->parent('admin.config.general');
$trail->push('Postes', route('admin.config.jobs'));
});
@@ -141,7 +156,7 @@ Breadcrumbs::for('admin.config.jobs.edit', function ($trail, $id) {
// Admin > Config > Files
Breadcrumbs::for('admin.config.files', function ($trail) {
$trail->parent('admin.config');
$trail->parent('admin.config.general');
$trail->push('Système de fichier', route('admin.config.files'));
});
@@ -247,6 +262,12 @@ Breadcrumbs::for('admin.profil.psw', function ($trail) {
$trail->push('Password', route('admin.profil.psw'));
});
// Admin > Profil > Adress
Breadcrumbs::for('admin.profil.courses', function ($trail) {
$trail->parent('admin.profil');
$trail->push('Mes cours', route('admin.profil.courses'));
});
// Admin > Drive
Breadcrumbs::for('admin.drive', function ($trail) {
$trail->parent('admin.dashboard');
@@ -265,17 +286,64 @@ Breadcrumbs::for('admin.drive.folder', function ($trail,$folder) {
$trail->push(\Storage::cloud()->getMetadata($folder)['name'], route('admin.drive',$folder));
});
// Admin > Guide
Breadcrumbs::for('admin.guide', function ($trail) {
// Admin > Instruction
Breadcrumbs::for('admin.instruction', function ($trail) {
$trail->parent('admin.dashboard');
$trail->push('Guide pédagogique', route('admin.guide'));
$trail->push('Instruction', route('admin.instruction'));
});
// Admin > Instruction > Guide
Breadcrumbs::for('admin.instruction.guide', function ($trail) {
$trail->parent('admin.instruction');
$trail->push('Guide pédagogique et norme de qualification', route('admin.instruction.guide'));
});
// Admin > Instruction > Lesson Plan
Breadcrumbs::for('admin.instruction.course', function ($trail) {
$trail->parent('admin.instruction');
$trail->push('Plan de cours et documentation', route('admin.instruction.course'));
});
// Admin > Instruction > Lesson Plan
Breadcrumbs::for('admin.stats.instruction', function ($trail) {
$trail->parent('admin.instruction');
$trail->push('Statistique de l\'instruction', route('admin.stats.instruction'));
});
// Admin > Files
Breadcrumbs::for('admin.files', function ($trail) {
$trail->parent('admin.dashboard');
$trail->push('Fichier', route('admin.files'));
$trail->push('Mes fichier', route('admin.files'));
});
// Admin > Files > Cadet
Breadcrumbs::for('admin.files.cadet', function ($trail) {
$trail->parent('admin.files');
$trail->push('Cadet', route('admin.files.cadet'));
});
// Admin > Files > Staff
Breadcrumbs::for('admin.files.staff', function ($trail) {
$trail->parent('admin.files');
$trail->push('Staff', route('admin.files.staff'));
});
// Admin > Files > ETAMAS
Breadcrumbs::for('admin.files.etamas', function ($trail) {
$trail->parent('admin.files');
$trail->push('ETAMAS', route('admin.files.etamas'));
});
// Admin > Files > Officier
Breadcrumbs::for('admin.files.officier', function ($trail) {
$trail->parent('admin.files');
$trail->push('Officier', route('admin.files.officier'));
});
// Admin > Files > Publique
Breadcrumbs::for('admin.files.publique', function ($trail) {
$trail->parent('admin.files');
$trail->push('Publique', route('admin.files.publique'));
});
// Admin > OCOM
@@ -308,4 +376,17 @@ Breadcrumbs::for('admin.ocom.edit', function ($trail, $id) {
$ocom = \App\OCOM::findOrFail($id);
$trail->parent('admin.ocom.show',$id);
$trail->push('Modifier', route('admin.ocom.edit', $ocom));
});
// Admin > Course
Breadcrumbs::for('admin.course', function ($trail) {
$trail->parent('admin.dashboard');
$trail->push('Liste des cours', route('admin.course'));
});
// Admin > Course > [course]
Breadcrumbs::for('admin.course.show', function ($trail, $id) {
$course = \App\Course::findOrFail($id);
$trail->parent('admin.course',$id);
$trail->push($course->ocom.' ('.$course->event->date_begin.')', route('admin.course.show',$course));
});

View File

@@ -50,7 +50,8 @@ Route::middleware(['auth'])->name('admin.')->group(function () {
Route::post('/admin/schedule/event/edit/{id}','EventController@update')->middleware('perm:schedule_edit');
/** Statistique */
Route::get('/admin/stats/log' , 'LogController@index')->middleware('perm:stats_see')->name('log');
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');
/** Message */
Route::get('/admin/message' , 'MessageController@index')->middleware('perm:msg_see')->name('message');
@@ -59,22 +60,25 @@ Route::middleware(['auth'])->name('admin.')->group(function () {
Route::get('/admin/message/{id}', ['uses' =>'MessageController@show'])->middleware('perm:msg_see')->name('message.show');
/** User */
Route::get('/admin/user' , 'UserController@index')->middleware('perm:user_see')->name('user');
Route::get('/admin/user' , 'UserController@index')->middleware('perm:user_see')->name('users');
Route::get('/admin/user/{id}' , 'UserController@show')->middleware('perm:user_see')->name('user');
Route::get('/admin/user/{id}/course','UserController@showCourses')->name('user.courses');
Route::get('/admin/user/add' , 'UserController@create')->middleware('perm:user_add')->name('user.add');
Route::post('/admin/user/add' , 'UserController@store')->middleware('perm:user_add');
Route::get('/admin/user/edit/{id}' , 'UserController@edit')->middleware('perm:user_edit')->name('user.edit');
Route::post('/admin/user/edit/{id}' , 'UserController@update')->middleware('perm:user_edit');
/** Config */
Route::get('/admin/config/schedule' , 'ScheduleController@index')->middleware('perm:config_edit')->name('config.schedule');
Route::post('/admin/config/schedule/edit' , 'ScheduleController@update')->middleware('perm:config_edit');
Route::get('/admin/config/instruction' , 'ScheduleController@index')->middleware('perm:config_edit')->name('config.schedule');
Route::get('/admin/config/instruction/event_type/{id}' , 'EventTypeController@show')->middleware('perm:config_edit')->name('config.schedule.event_type');
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::post('/admin/config/general/edit','ConfigController@update')->middleware('perm:config_edit');
Route::get('/admin/config/' , 'ConfigController@index')->middleware('perm:config_edit')->name('config');
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');
@@ -149,6 +153,7 @@ Route::middleware(['auth'])->name('admin.')->group(function () {
Route::post('/admin/notication/mark/{id}','UserController@notificationmark');
/** Profil */
Route::get('/admin/profil/courses' , 'ProfilController@courses')->name('profil.courses');
Route::get('/admin/profil/avatar' , 'UserController@UserAvatar')->name('profil.avatar');
Route::get('/admin/profil/password' , 'UserController@UserPassword')->name('profil.psw');
Route::get('/admin/profil/adress' , 'UserController@UserAdress')->name('profil.adress');
@@ -157,28 +162,51 @@ Route::middleware(['auth'])->name('admin.')->group(function () {
Route::get('/admin/profil/edit/avatar/{id}' , 'UserController@editUserAvatar');
Route::get('/admin/profil/{id?}' , 'UserController@showUserProfil')->name('profil');
/** Files */
Route::post('/file/create','GoogleDriveController@createFile');
Route::post('/file/upload','GoogleDriveController@uploadFile');
Route::post('/folder/create','GoogleDriveController@createFolder');
Route::get('/file/delete','GoogleDriveController@deleteFile')->middleware('perm:file_delete');
Route::get('/folder/delete','GoogleDriveController@deleteDir')->middleware('perm:file_delete');
/** Instruction */
Route::get('/admin/instruction','AdminController@instruction')->name('instruction');
Route::get('/admin/instruction/guide','FilesController@guide')->middleware('perm:instruction_guide_see')->name('instruction.guide');
Route::get('/admin/instruction/files','FilesController@instruction')->middleware('perm:file_see')->name('instruction.files');
/** Courses */
Route::get('/admin/course','CourseController@index')->name('course');
Route::get('/admin/course/{id}','CourseController@show')->name('course.show')->middleware('courseperm:see');
Route::patch('/admin/course/{id}/commentOfficer','CourseController@updateCommentOfficer')->middleware('courseperm:comment_officer');
Route::patch('/admin/course/{id}/comment','CourseController@updateComment')->middleware('courseperm:edit');
Route::patch('/admin/course/{id}/plan/commentOfficer','CourseController@updateCommentOfficerPlan')->middleware('courseperm:comment_plan_officer');
Route::patch('/admin/course/{id}/plan/comment','CourseController@updateCommentPlan')->middleware('courseperm:edit');
Route::post('/admin/course/{id}/lessonPlan','CourseController@updateLessonPlan')->middleware('courseperm:edit');
/** Files */
Route::post('/file/create','GoogleDriveController@createFile')->middleware('fileperm:folder,w');
Route::post('/file/upload','GoogleDriveController@uploadFile')->middleware('fileperm:folder,w');
Route::post('/folder/create','GoogleDriveController@createFolder')->middleware('fileperm:folder,w');
Route::get('/file/delete','GoogleDriveController@deleteFile')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
Route::get('/folder/delete','GoogleDriveController@deleteDir')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
Route::get('/admin/files','FilesController@index')->middleware('perm:file_see')->name('files');
Route::get('/admin/guide','FilesController@guide')->middleware('perm:file_see')->name('guide');
Route::get('/admin/drive/{folder?}','GoogleDriveController@index')->middleware('fileperm:folder,r')->name('drive');
Route::get('/admin/files/cadet','FilesController@cadet')->middleware('perm:file_see')->name('files.cadet')->middleware('fileperm:folder,r');
Route::get('/admin/files/staff','FilesController@staff')->middleware('perm:file_see')->name('files.staff')->middleware('fileperm:folder,r');
Route::get('/admin/files/etamas','FilesController@etamas')->middleware('perm:file_see')->name('files.etamas')->middleware('fileperm:folder,r');
Route::get('/admin/files/officier','FilesController@officier')->middleware('perm:file_see')->name('files.officier')->middleware('fileperm:folder,r');
Route::get('/admin/files/publique','FilesController@publique')->middleware('perm:file_see')->name('files.publique')->middleware('fileperm:folder,r');
Route::get('/admin/drive/{folder?}','GoogleDriveController@index')->middleware('fileperm:folder,r','perm:drive_see')->name('drive');
Route::get('/admin/folder/{folder?}','GoogleDriveController@index')->middleware('fileperm:folder,r')->name('drive');
Route::get('/admin/drive/{folder}/permission','GoogleDriveController@editPermission')->middleware('fileperm:folder,p')->name('drive.permission');
Route::patch('/admin/drive/{folder}/permission/{subject}/{id}','GoogleDriveController@editPermission')->middleware('perm:file_see','fileperm:folder,p');
Route::patch('/admin/drive/{folder}/permission/{subject}/{id}','GoogleDriveController@patchPermission')->middleware('perm:file_see','fileperm:folder,p');
Route::get('/admin/drive/{folder}/deletepermission/{subject}/{id}','GoogleDriveController@deletePermission')->middleware('perm:file_see','fileperm:folder,p');
Route::patch('/admin/drive/{folder}/addpermission/{subject}','GoogleDriveController@addPermission')->middleware('perm:file_see','fileperm:folder,p');
/** OCOM */
Route::get('/admin/ocom','OCOMController@index')->name('ocom');
Route::get('/admin/ocom/generate','OCOMController@showgenerate')->name('ocom.generate');
Route::put('/admin/ocom/generate','OCOMController@generate');
Route::get('/admin/ocom/add','OCOMController@create')->name('ocom.add');
Route::put('/admin/ocom/add','OCOMController@store');
Route::get('/admin/ocom/{id}/edit','OCOMController@edit')->name('ocom.edit');
Route::patch('/admin/ocom/{id}/edit','OCOMController@update');
Route::get('/admin/ocom/{id}','OCOMController@show')->name('ocom.show');
Route::get('/admin/ocom','OCOMController@index')->name('ocom')->middleware('perm:instruction_db_ocom_see');
Route::get('/admin/ocom/generate','OCOMController@showgenerate')->name('ocom.generate')->middleware('perm:instruction_db_ocom_edit');
Route::put('/admin/ocom/generate','OCOMController@generate')->middleware('perm:instruction_db_ocom_edit');
Route::get('/admin/ocom/add','OCOMController@create')->name('ocom.add')->middleware('perm:instruction_db_ocom_add');
Route::put('/admin/ocom/add','OCOMController@store')->middleware('perm:instruction_db_ocom_add');
Route::get('/admin/ocom/{id}/edit','OCOMController@edit')->name('ocom.edit')->middleware('perm:instruction_db_ocom_edit');
Route::patch('/admin/ocom/{id}/edit','OCOMController@update')->middleware('perm:instruction_db_ocom_edit');
Route::get('/admin/ocom/{id}','OCOMController@show')->name('ocom.show')->middleware('perm:instruction_db_ocom_see');
});