From 81de12b4323b9f996cfca23fddadafbb1f3672d4 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 3 Sep 2024 15:29:33 +0800
Subject: [PATCH] undo last commit

---
 .../ResourceOverconsumptionReport.tsx         | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
index 4d42de8..a8c1577 100644
--- a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
+++ b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
@@ -43,6 +43,7 @@ const ResourceOverconsumptionReport: React.FC<Props> = ({ team, customer, subsid
             const [_custType_B, id_B] = readIntFromString(b.value) as [string, number]
             return (id_A - id_B)
         });
+        console.log(custCombo)
     const subsidiariesCombo: combo[] = subsidiaries.map(sub => ({
         value: `subsidiaryId-${sub.id}`,
         label: `${sub.code} - ${sub.name}`, 
@@ -53,6 +54,7 @@ const ResourceOverconsumptionReport: React.FC<Props> = ({ team, customer, subsid
             const [_custType_B, id_B] = readIntFromString(b.value) as [string, number]
             return (id_A - id_B)
         });
+        console.log(subsidiariesCombo)
     
     const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
         () => [
@@ -99,10 +101,20 @@ return (
                 lowerLimit: 0.9
             }
             if (query.team.length > 0 && query.team.toLocaleLowerCase() !== "all") {        
+                console.log(team)  
+                console.log(query.team)  
+                console.log(teamCombo)  
                 index = teamCombo.findIndex(team => team === query.team)
-                const teamId = team[index].id
-                console.log(teamId)
-                postData.teamId = teamId
+                const teamId1 = team[index].id
+                console.log(teamId1)
+                const sortedTeam = team.sort((a, b) => a.code.localeCompare(b.code))
+                const sortedId = sortedTeam[index].id
+                console.log(sortedId)
+                // console.log(sortedId)
+                // console.log(team.find(team => query.team === `${team.code} - Team ${team.staffName}`)?.id)
+                // const teamId = team.find(team => query.team === `${team.code} - Team ${team.staffName}`)?.id
+                postData.teamId = sortedId
+                // postData.teamId = teamId
             }
             if (Boolean(query.lowerLimit)) {
                 postData.lowerLimit = query.lowerLimit/100
@@ -112,6 +124,7 @@ return (
             }
             postData.status = query.status
             console.log(postData)
+            return
             const response = await fetchProjectResourceOverconsumptionReport(postData)
             if (response) {
                 downloadFile(new Uint8Array(response.blobValue), response.filename!!)