joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cập nhật view thông tin createBy

This commit is contained in:
Truong Vo 2024-09-19 09:01:36 +07:00
parent 41794d7c40
commit 2941663e7b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BACKEND/Modules/Admin/app/Http/Controllers/ProfileController.php
View File

@ -52,7 +52,7 @@ class ProfileController extends Controller
return [ return [
'criteria' => $criteria->name, 'criteria' => $criteria->name,
'note' => $userCriteria->note ?? '', 'note' => $userCriteria->note ?? '',
'createdBy' => auth('admins')->user()->name ?? '', // Lấy tên user từ auth 'createdBy' => $userCriteria->created_by ?? '', // Lấy tên user từ auth
'point' => $userCriteria->point ?? '', 'point' => $userCriteria->point ?? '',
]; ];
}) })

8
BACKEND/Modules/Admin/routes/api.php
View File

@ -161,8 +161,8 @@ Route::middleware('api')
'prefix' => 'criterias', 'prefix' => 'criterias',
], function () { ], function () {
Route::get('/sprints/{sprintId}', [CriteriasController::class, 'getCriteriasForSprint'])->middleware('check.permission:admin'); Route::get('/sprints/{sprintId}', [CriteriasController::class, 'getCriteriasForSprint'])->middleware('check.permission:admin');
Route::get('/users/{userId}', [CriteriasController::class, 'getCriteriasForUser'])->middleware('check.permission:admin'); // Route::get('/users/{userId}', [CriteriasController::class, 'getCriteriasForUser'])->middleware('check.permission:admin');
Route::get('/users/{userId}/sprints/{sprintId}', [CriteriasController::class, 'getCriteriasForUserBySprint'])->middleware('check.permission:admin'); // Route::get('/users/{userId}/sprints/{sprintId}', [CriteriasController::class, 'getCriteriasForUserBySprint'])->middleware('check.permission:admin');
Route::get('/getAll', [CriteriasController::class, 'getAllCriterias'])->middleware('check.permission:admin'); Route::get('/getAll', [CriteriasController::class, 'getAllCriterias'])->middleware('check.permission:admin');
Route::post('/sprints/{sprintId}', [CriteriasController::class, 'updateCriteriasForSprint'])->middleware('check.permission:admin'); Route::post('/sprints/{sprintId}', [CriteriasController::class, 'updateCriteriasForSprint'])->middleware('check.permission:admin');
@ -170,8 +170,8 @@ Route::middleware('api')
Route::post('/test-cases/{sprintId}', [TestCaseForSprintController::class, 'createTestReport'])->middleware('check.permission:admin,tester'); Route::post('/test-cases/{sprintId}', [TestCaseForSprintController::class, 'createTestReport'])->middleware('check.permission:admin,tester');
Route::get('/test-cases/delete', [TestCaseForSprintController::class, 'deleteTestReport'])->middleware('check.permission:admin,tester'); Route::get('/test-cases/delete', [TestCaseForSprintController::class, 'deleteTestReport'])->middleware('check.permission:admin,tester');
Route::get('/profiles-data', [ProfileController::class, 'getProfilesData']); Route::get('/profiles-data', [ProfileController::class, 'getProfilesData'])->middleware('check.permission:admin.hr.staff.tester');
Route::post('/profiles-data/update', [ProfileController::class, 'updateProfilesData'])->middleware('check.permission:admin.hr.staff.tester');
}); });
}); });
}); });

2
FRONTEND/src/routes/main.tsx
View File

@ -193,7 +193,7 @@ const mainRoutes = [
{ {
path: '/profile', path: '/profile',
element: ( element: (
<ProtectedRoute mode="route" permission="staff,admin,hr"> <ProtectedRoute mode="route" permission="staff,admin,hr,tester">
<BasePage <BasePage
main={ main={
<> <>