diff --git a/src/components/ProjectResourceConsumptionRanking/ProjectResourceConsumptionRanking.tsx b/src/components/ProjectResourceConsumptionRanking/ProjectResourceConsumptionRanking.tsx
index 340f856..84ce0c0 100644
--- a/src/components/ProjectResourceConsumptionRanking/ProjectResourceConsumptionRanking.tsx
+++ b/src/components/ProjectResourceConsumptionRanking/ProjectResourceConsumptionRanking.tsx
@@ -134,7 +134,7 @@ const ProjectResourceConsumptionRanking: React.FC = () => {
for (let i = 0; i < teamProjectResult.length; i++){
teamProjectResult[i].color = color[i]
console.log(teamProjectResult[i])
- projectNo.push(teamProjectResult[i].projectCode + "(" + teamProjectResult[i].team + ")")
+ projectNo.push(teamProjectResult[i].team + "(" + teamProjectResult[i].teamLead + ")")
projectName.push(teamProjectResult[i].projectName)
projectBudgetedManHour.push(teamProjectResult[i].budgetedManhour)
projectSpentManHour.push(teamProjectResult[i].spentManhour)
@@ -319,18 +319,6 @@ const ProjectResourceConsumptionRanking: React.FC = () => {
},
flex: 0.1,
},
- {
- id: "projectCode",
- field: "projectCode",
- headerName: "Project No",
- minWidth:100
- },
- {
- id: "projectName",
- field: "projectName",
- headerName: "Project",
- minWidth:300
- },
{
id: "team",
field: "team",
@@ -343,27 +331,6 @@ const ProjectResourceConsumptionRanking: React.FC = () => {
headerName: "Team Leader",
minWidth: 70
},
- {
- id: "expectedStage",
- field: "expectedStage",
- headerName: "Expected Stage",
- minWidth: 300,
- renderCell: (params: any) => {
- if (params.row.expectedStage != null){
- const expectedStage = params.row.expectedStage;
- const lines = expectedStage.split(",").map((line:any, index:any) => (
-
-