浏览代码

update dashboard (fix bugs)

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui 1年前
父节点
当前提交
b925a8cdb4
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. +2
    -2
      src/components/CreateProject/ProjectClientDetails.tsx
  2. +3
    -2
      src/components/StaffUtilization/StaffUtilization.tsx

+ 2
- 2
src/components/CreateProject/ProjectClientDetails.tsx 查看文件

@@ -344,7 +344,7 @@ const ProjectClientDetails: React.FC<Props> = ({
/> />
</Grid> </Grid>


<Grid item xs={6}>
{/* <Grid item xs={6}>
<Checkbox <Checkbox
{...register("isClpProject")} {...register("isClpProject")}
checked={Boolean(watch("isClpProject"))} checked={Boolean(watch("isClpProject"))}
@@ -353,7 +353,7 @@ const ProjectClientDetails: React.FC<Props> = ({
<Typography variant="overline" display="inline"> <Typography variant="overline" display="inline">
{t("CLP Project")} {t("CLP Project")}
</Typography> </Typography>
</Grid>
</Grid> */}
</Grid> </Grid>
</Box> </Box>




+ 3
- 2
src/components/StaffUtilization/StaffUtilization.tsx 查看文件

@@ -362,7 +362,7 @@ const StaffUtilization: React.FC<Props> = ({ abilities, staff }) => {
const startCount = weeklyPlanned[i].startCount const startCount = weeklyPlanned[i].startCount
const endCount = weeklyPlanned[i].endCount const endCount = weeklyPlanned[i].endCount
for (var j = 0; j < weeklyPlanned[i].searchDuration; j++) { for (var j = 0; j < weeklyPlanned[i].searchDuration; j++) {
if (j >= startCount && j < endCount) {
if (j >= startCount && j <= endCount) {
weeklyPlannedSubList.push(weeklyPlanned[i].AverageManhours) weeklyPlannedSubList.push(weeklyPlanned[i].AverageManhours)
} else { } else {
weeklyPlannedSubList.push(0) weeklyPlannedSubList.push(0)
@@ -503,7 +503,8 @@ const StaffUtilization: React.FC<Props> = ({ abilities, staff }) => {




const fetchMonthlyUnsubmittedData = async () => { const fetchMonthlyUnsubmittedData = async () => {
const fetchResult = await fetchMonthlyUnsubmit(teamUnsubmitTeamId, unsubmitMonthlyFromValue.format('YYYY-MM-DD'), unsubmitMonthlyToValue.endOf('month').format('YYYY-MM-DD'), holidayDates);
const fetchResult = await fetchMonthlyUnsubmit(teamUnsubmitTeamId, unsubmitMonthlyFromValue.startOf('month').format('YYYY-MM-DD'), unsubmitMonthlyToValue.endOf('month').format('YYYY-MM-DD'), holidayDates);

const result = [] const result = []
const staffList = [] const staffList = []
var maxValue = 5 var maxValue = 5


正在加载...
取消
保存