From 2d5abd1960f4830b30250b74ea06bc2e37524a68 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Tue, 3 Sep 2024 15:44:53 +0800
Subject: [PATCH] update

---
 .../ResourceOverconsumptionReport.tsx         | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
index 89adcf8..f33279f 100644
--- a/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
+++ b/src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx
@@ -33,29 +33,19 @@ const ResourceOverconsumptionReport: React.FC<Props> = ({ team, customer, subsid
     const { t } = useTranslation("report");
     const statusCombo = ["Potential Overconsumption"]
     const sortedTeam = team.sort((a, b) => a.code.localeCompare(b.code));
+    const sortedCust = customer.sort((a, b) => a.code.localeCompare(b.code));
+    const sortedSubs = subsidiaries.sort((a, b) => a.code.localeCompare(b.code));
     const teamCombo = sortedTeam.map(t => `${t.code} - ${t.name}`)
-    const custCombo: combo[] = customer.map(c => ({
+    const custCombo: combo[] = sortedCust.map(c => ({
         value: `custId-${c.id}`,
         label: `${c.code} - ${c.name}`, 
         group: t("Client")
         }))
-        .sort((a: combo, b: combo) => {
-            const [_custType_A, id_A] = readIntFromString(a.value) as [string, number]
-            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 => ({
+    const subsidiariesCombo: combo[] = sortedSubs.map(sub => ({
         value: `subsidiaryId-${sub.id}`,
         label: `${sub.code} - ${sub.name}`, 
         group: t("Subsidiary")
         }))
-        .sort((a: combo, b: combo) => {
-            const [_custType_A, id_A] = readIntFromString(a.value) as [string, number]
-            const [_custType_B, id_B] = readIntFromString(b.value) as [string, number]
-            return (id_A - id_B)
-        });
-        console.log(subsidiariesCombo)
     
     const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
         () => [
@@ -102,7 +92,7 @@ return (
             }
             if (query.team.length > 0 && query.team.toLocaleLowerCase() !== "all") {        
                 const index = teamCombo.findIndex(team => team === query.team)
-                const teamId = team[index].id
+                const teamId = sortedTeam[index].id
                 postData.teamId = teamId
             }
             if (Boolean(query.lowerLimit)) {