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

update some UI #87

Merged
joseph merged 1 commits from joseph.update_navbar_permissions into master 2024-09-24 19:04:08 +10:00
Conversation 0 Commits 1 Files Changed 2 +18 -13
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FRONTEND/src/pages/SprintReview/SprintReview.tsx
View File

@ -478,7 +478,9 @@ const SprintReview = () => {
criteriaSprint.length == 0 || loading ? { display: 'none' } : {}
}
>
Criteria for Sprint:
Criteria for Sprint: <Box fs={'italic'} fz={'sm'}>
<a href={`/test-report?projectID=${filter.projectID}&sprintID=${filter.sprintID}`} target='_blank'>Sprint test report</a>
</Box>
</Title>
<Box
style={{
@ -506,17 +508,17 @@ const SprintReview = () => {
>
<Table.Thead>
<Table.Tr bg="#228be66b" style={rowStyle}>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '15%' }}>
Criteria
</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '25%' }}>
Expect Result
</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '25%' }}>
Actual Result
</Table.Th>
<Table.Th style={{ textAlign: 'center' }}>Note</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '100px' }}>
<Table.Th style={{ textAlign: 'center', width: '30%' }}>Note</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '5%' }}>
Point
</Table.Th>
</Table.Tr>
@ -599,6 +601,7 @@ const SprintReview = () => {
value={finalPoint}
onChange={(value) => setFinalPoint(value ?? '')}
size="xs"
w={'40%'}
styles={() => ({
input: {
color: 'red',
@ -639,17 +642,17 @@ const SprintReview = () => {
>
<Table.Thead>
<Table.Tr bg="#228be66b" style={rowStyle}>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '15%' }}>
User
</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '25%' }}>
Criteria
</Table.Th>
<Table.Th style={{ textAlign: 'center' }}>Note</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '250px' }}>
<Table.Th style={{ textAlign: 'center', width: '40%' }}>Note</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '15%' }}>
Created by
</Table.Th>
<Table.Th style={{ textAlign: 'center', width: '100px' }}>
<Table.Th style={{ textAlign: 'center', width: '5%' }}>
Point
</Table.Th>
</Table.Tr>

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

@ -297,10 +297,11 @@ const StaffEvaluation = () => {
User:
</Text>
<Select
style={{ width: '50%' }}
style={{ width: '30%' }}
label={''}
placeholder="Select user"
maxLength={255}
size={'xs'}
required
data={listUsers.map((i: User) => ({
value: i.id.toString(),
@ -331,7 +332,6 @@ const StaffEvaluation = () => {
w="100%"
display={'flex'}
mt={15}
style={{ justifyContent: 'space-evenly' }}
>
<Box display={'flex'} mr={10}>
<Text
@ -346,6 +346,7 @@ const StaffEvaluation = () => {
<DateInput
placeholder="Select date"
clearable
size='xs'
required
label={''}
value={filter.fromDate ? new Date(filter.fromDate) : null}
@ -366,6 +367,7 @@ const StaffEvaluation = () => {
<DateInput
placeholder="Select date"
clearable
size='xs'
required
label={''}
value={filter.toDate ? new Date(filter.toDate) : null}