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

Merge pull request 'Sprint-4/MS-37-FE-Evaluation' (#56) from Sprint-4/MS-37-FE-Evaluation into master 

Reviewed-on: #56
This commit is contained in:
joseph 2024-09-21 10:33:35 +10:00
parent 06ed7722fa 0fe9228241
commit 5bc84a10b8
7 changed files with 271 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BACKEND/Modules/Admin/app/Http/Controllers/EvaluationController.php
View File

@ -33,22 +33,33 @@ class EvaluationController extends Controller
$projects = $this->jiraService->getAllProjects();
$query = UserCriteria::where('user_email', $userEmail);
// Date filter
if ($request->filled('fromDate')) {
$fromDate = Carbon::parse($request->input('fromDate'));
$query->where('created_at', '>=', $fromDate);
}
if ($request->filled('toDate')) {
$toDate = Carbon::parse($request->input('toDate'));
$query->where('created_at', '<=', $toDate);
}
// End query
$userCriterias = $query->with(['sprint', 'criteria'])->get();
$startDate = $request->input('fromDate');
$endDate = $request->input('toDate');
$userCriterias = UserCriteria::with([
'sprint' => function ($query) use ($startDate, $endDate) {
if ($startDate && $endDate) {
$query->whereBetween('complete_date', [$startDate, $endDate]);
} elseif ($startDate) {
$query->where('complete_date', '>=', $startDate);
} elseif ($endDate) {
$query->where('complete_date', '<=', $endDate);
}
},
'criteria',
])->where('user_email', $userEmail)
->whereHas('sprint', function ($query) use ($startDate, $endDate) {
if ($startDate && $endDate) {
$query->whereBetween('complete_date', [$startDate, $endDate]);
} elseif ($startDate) {
$query->where('complete_date', '>=', $startDate);
} elseif ($endDate) {
$query->where('complete_date', '<=', $endDate);
}
})
->get();
// dd($userCriterias);
// Xử lý dữ liệu thành cấu trúc mong muốn
$projectsData = $userCriterias->groupBy('sprint.project_id')->map(function ($userCriteriasByProject, $projectId) use ($projects) {
$result = self::getProjectById($projects, $projectId);
return [
@ -57,12 +68,13 @@ class EvaluationController extends Controller
$sprint = $userCriteriasBySprint->first()->sprint;
return [
'name' => $sprint->name,
'complete_date' => $sprint->complete_date ?? '',
'criterias' => $userCriteriasBySprint->map(function ($userCriteria) {
$criteria = $userCriteria->criteria;
return [
'criteria' => $criteria->name,
'note' => $userCriteria->note ?? '',
'createdBy' => $userCriteria->created_by ?? '',
'createdBy' => $userCriteria->created_by ?? '', // Lấy tên user từ auth
'point' => $userCriteria->point ?? '',
];
})
@ -71,6 +83,7 @@ class EvaluationController extends Controller
];
})->values();
// Trả về kết quả
return AbstractController::ResultSuccess($projectsData);
}

29
BACKEND/Modules/Admin/app/Http/Controllers/TechnicalController.php
View File

@ -86,25 +86,36 @@ class TechnicalController extends Controller
{
$technicals = TechnicalUser::with('technical')
->where('user_id', $userId)
->orderBy('point', 'desc')
->get();
if ($technicals->isEmpty()) {
return AbstractController::ResultError("No technicals found for this user.");
// Lấy tất cả các technical
$allTechnicals = Technical::all();
if ($technicals->isEmpty() && $allTechnicals->isEmpty()) {
return AbstractController::ResultError("No technicals found.");
}
// Chuẩn bị dữ liệu để trả về
$technicalData = $technicals->map(function ($technicalUser) {
$technicalData = $allTechnicals->map(function ($technical) use ($technicals) {
// Tìm kiếm kỹ thuật từ bảng technical_users
$technicalUser = $technicals->firstWhere('technical_id', $technical->id);
return [
'id' => $technicalUser->technical->id,
'name' => $technicalUser->technical->name,
'level' => $technicalUser->technical->level,
'point' => $technicalUser->point,
'updated_at' => $technicalUser->updated_at
'id' => $technical->id,
'name' => $technical->name,
'level' => $technical->level,
'point' => $technicalUser ? $technicalUser->point : 0, // Nếu không tồn tại, điểm mặc định là 0
'updated_at' => $technicalUser ? $technicalUser->updated_at : null // Nếu không tồn tại, updated_at là null
];
});
return AbstractController::ResultSuccess($technicalData);
$sortedTechnicalData = $technicalData->sortByDesc('point')->values(); // values() để giữ lại chỉ số
return AbstractController::ResultSuccess($sortedTechnicalData);
}
public function getTechnicalsOfUser()
{
$userInfo = auth('admins')->user();

9
FRONTEND/src/api/Admin.ts
View File

@ -73,7 +73,12 @@ export const createTestCase = API_URL + 'v1/admin/criterias/test-cases'
//Profile
export const getProfilesData = API_URL + 'v1/admin/criterias/profiles-data'
export const updateProfilesData = API_URL + 'v1/admin/criterias/profiles-data/update'
export const updateProfilesData =
API_URL + 'v1/admin/criterias/profiles-data/update'
export const getAllUser = API_URL + 'v1/admin/technical/get-all-user'
export const getAllTechByUserId =
API_URL + 'v1/admin/technical/get-tech-by-user-id'
export const evaluation = API_URL + 'v1/admin/evaluation/report'
export const sprintReview = API_URL + 'v1/admin/evaluation/sprint-review'

9
FRONTEND/src/components/DataTable/DataTable.module.css
View File

@ -27,6 +27,15 @@
justify-items: center;
}
.totalBox {
width: 60%;
display: flex;
flex-flow: row;
align-items: end;
justify-content: right;
justify-items: center;
}
.headers {
height: 6vh;
z-index: 100;

2
FRONTEND/src/components/DataTable/DataTable.tsx
View File

@ -326,7 +326,7 @@ export const DataTableAll = ({
)}
</Box>
<Box
className={classes.paginationBox}
className={classes.totalBox}
display={infoTotal ? 'flex' : 'none'}
>
<Text fz={'sm'} ta={'right'}>

19
FRONTEND/src/components/ProjectInvolvement/ProjectInvolvement.tsx
View File

@ -1,6 +1,6 @@
import { Box, Table, Text } from '@mantine/core'
import { IconCornerDownRight } from '@tabler/icons-react'
import { useState } from 'react'
import { useEffect, useState } from 'react'
import classes from './ProjectInvolvement.module.css'
interface Project {
@ -81,6 +81,23 @@ const ProjectInvolvement = ({ dataProfile, page }: ProjectInvolvementProps) => {
const [expandedProjects, setExpandedProjects] = useState<ExpandedProjects>({})
const [expandedSprints, setExpandedSprints] = useState<ExpandedSprints>({})
useEffect(() => {
const initialProjectState: ExpandedProjects = {}
const initialSprintState: ExpandedSprints = {}
dataProfile.forEach((project) => {
initialProjectState[project.name] = true // Expand all projects by default
initialSprintState[project.name] = {}
project.sprints.forEach((sprint) => {
initialSprintState[project.name][sprint.name] = true // Expand all sprints by default
})
})
setExpandedProjects(initialProjectState)
setExpandedSprints(initialSprintState)
}, [dataProfile])
const handleProjectToggle = (projectName: string) => {
setExpandedProjects((prev) => ({
...prev,

254
FRONTEND/src/pages/StaffEvaluation/StaffEvaluation.tsx
View File

@ -1,14 +1,19 @@
import { evaluation, getProfilesData } from '@/api/Admin'
import {
evaluation,
getAllTechByUserId,
getAllUser,
sprintReview
} from '@/api/Admin'
import DataTableAll from '@/components/DataTable/DataTable'
import ProjectInvolvement from '@/components/ProjectInvolvement/ProjectInvolvement'
import { get } from '@/rtk/helpers/apiService'
import { Box, Button, Select, Text, Title } from '@mantine/core'
import { Box, Button, Loader, Select, Text, Title } from '@mantine/core'
import { DateInput } from '@mantine/dates'
import { notifications } from '@mantine/notifications'
import axios from 'axios'
import moment from 'moment'
import { useEffect, useState } from 'react'
import classes from './StaffEvaluation.module.css'
import axios from 'axios'
interface User {
id: number
@ -28,8 +33,19 @@ interface Filter {
// other properties of the filter object
}
interface DataTechnical {
id: number
name: string
level: number
point: number
updated_at: string
}
const StaffEvaluation = () => {
const [loading, setLoading] = useState(false)
const [loadingTechnical, setLoadingTechnical] = useState(false)
const [dataProfile, setDataProfile] = useState<any>([])
const [dataTechnical, setDataTechnical] = useState<DataTechnical[]>([])
const [listUsers, setListUsers] = useState<User[]>([])
const [filter, setFilter] = useState<Filter>({
userID: '',
@ -39,36 +55,10 @@ const StaffEvaluation = () => {
console.log(filter, 'filter')
// const getAllTracking = async () => {
// try {
// const searchParams = new URLSearchParams(window.location.search)
// const params = {}
// for (const [key, value] of searchParams.entries()) {
// if (key === 'page' && value === '') {
// Object.assign(params, { [`${key}`]: 1 })
// } else {
// Object.assign(params, { [`${key}`]: value })
// }
// }
// const res = await get(getListTracking, params)
// if (res.status) {
// setListTracking(res)
// }
// } catch (error:any) {
// notifications.show({
// title: 'Error',
// message: error.message??error,
// color: 'red',
// })
// }
// }
const getListProfilesData = async () => {
const getListUser = async () => {
try {
const params = {}
const res = await get(getProfilesData, params)
const res = await get(getAllUser, params)
if (res.status) {
return res.data
}
@ -115,18 +105,96 @@ const StaffEvaluation = () => {
useEffect(() => {
const fetchData = async () => {
const result = await getListProfilesData()
setDataProfile(result ?? [])
const result = await getListUser()
setListUsers(result ?? [])
}
fetchData()
}, [])
const getListProfilesData = async (filterSearch: Filter) => {
try {
const params = {
userID: filterSearch.userID ?? '',
fromDate: filterSearch.fromDate
? moment(filterSearch.fromDate).format('YYYY-MM-DD')
: null,
toDate: filterSearch.toDate
? moment(filterSearch.toDate).format('YYYY-MM-DD')
: null,
}
const res = await get(sprintReview, params)
if (res.status) {
return res.data
}
} catch (error: any) {
notifications.show({
title: 'Error',
message: error.message ?? error,
color: 'red',
})
}
return []
}
const getListTechnicalByUserId = async (id: string) => {
try {
const params = {}
const res = await get(`${getAllTechByUserId}/${id}`, params)
if (res.status) {
return res.data
}
} catch (error: any) {
notifications.show({
title: 'Error',
message: error.message ?? error,
color: 'red',
})
}
return []
}
useEffect(() => {
if (filter?.userID) {
setLoading(true)
const fetchData = async () => {
const result = await getListProfilesData(filter)
setDataProfile(result ?? [])
setLoading(false)
}
fetchData()
}
}, [filter])
useEffect(() => {
if (filter?.userID) {
setLoadingTechnical(true)
const fetchData = async () => {
const result = await getListTechnicalByUserId(filter?.userID)
setDataTechnical(result ?? [])
setLoadingTechnical(false)
}
fetchData()
}
}, [filter?.userID])
const columns = [
{
name: 'level',
size: '20%',
size: '10%',
header: 'Level',
render: (row: any) => {
if (row.level)
return (
<div
style={{
display: 'flex',
justifyContent: 'center',
}}
>
{row?.level}
</div>
)
},
},
{
name: 'name',
@ -138,16 +206,17 @@ const StaffEvaluation = () => {
size: '10%',
header: 'Point',
render: (row: any) => {
return (
<div
style={{
display: 'flex',
justifyContent: 'center',
}}
>
{row?.point}
</div>
)
if (row?.point > 0)
return (
<div
style={{
display: 'flex',
justifyContent: 'center',
}}
>
{row?.point}
</div>
)
},
},
{
@ -162,31 +231,33 @@ const StaffEvaluation = () => {
justifyContent: 'center',
}}
>
{moment(row?.updated_at).format('HH:mm:ss DD/MM/YYYY')}
{moment(row?.updated_at).format('DD/MM/YYYY HH:mm:ss')}
</div>
)
},
},
]
const users = [
{
id: 1,
level: 'Level 1',
name: 'React JS',
point: 3,
created_at: null,
updated_at: '2024-09-19T09:08:48.000000Z',
},
]
const infoTotal = () => {
// Tính tổng point và số lượng point > 0
let totalPoint = 0
let count = 0
dataTechnical.forEach((item) => {
if (item.point > 0) {
totalPoint += item.point
count++
}
})
const averagePoint = count > 0 ? (totalPoint / count).toFixed(2) : '0.00'
return (
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
<Text mr={20} fs={'italic'}>
Avg:{users.length}
Avg: {averagePoint}
</Text>
<Text fs={'italic'}>Total: {users.length}</Text>
<Text fs={'italic'}>Total: {totalPoint}</Text>
</div>
)
}
@ -198,6 +269,7 @@ const StaffEvaluation = () => {
Staff Evaluation
</h3>
</div>
<Box w="100%" display={'flex'} mt={15} ml={10}>
<Box w="50%" display={'flex'}>
<Text
@ -209,11 +281,16 @@ const StaffEvaluation = () => {
User:
</Text>
<Select
style={{ width: '50%' }}
label={''}
placeholder="Select user"
maxLength={255}
required
data={listUsers.map((i: User) => i.name)}
data={listUsers.map((i: User) => ({
value: i.id.toString(),
label: i.name,
}))}
value={filter.userID}
onChange={(e) => setFilter({ ...filter, userID: e! })}
/>
</Box>
@ -280,20 +357,63 @@ const StaffEvaluation = () => {
></DateInput>
</Box>
</Box>
<ProjectInvolvement dataProfile={dataProfile} page="admin" />
<Box
style={{
marginTop: '10%',
textAlign: 'center',
display: loading ? 'block' : 'none',
// display: 'none',
}}
>
<Loader size={'sm'} color="green" type="bars" m={'0 auto'} />
<Text fw={600} c={'gray'}>
Loading . . .
</Text>
</Box>
{!loading && dataProfile.length == 0 && (
<Box
style={{
marginTop: '10%',
textAlign: 'center',
display: 'block',
}}
>
<Text fw={600} c={'gray'}>
No Data Sprint
</Text>
</Box>
)}
{!loading && (
<ProjectInvolvement dataProfile={dataProfile} page="admin" />
)}
</Box>
<Box className={classes.sidebar}>
<Title order={3} className={classes.titleSidebar}>
Technicals
</Title>
<DataTableAll
data={users}
columns={columns}
size=""
searchInput
infoTotal={infoTotal()}
/>
{loadingTechnical ? (
<Box
style={{
marginTop: '10%',
textAlign: 'center',
display: 'block',
}}
>
<Loader size={'sm'} color="green" type="bars" m={'0 auto'} />
<Text fw={600} c={'gray'}>
Loading . . .
</Text>
</Box>
) : (
<DataTableAll
data={dataTechnical}
columns={columns}
size=""
searchInput
infoTotal={infoTotal()}
/>
)}
</Box>
</Box>
</div>