From 89ad46a7107dc33a76a8e6ba6a680c13e10009ab Mon Sep 17 00:00:00 2001
From: Net <93821485+somnetsak123@users.noreply.github.com>
Date: Mon, 22 Apr 2024 14:19:35 +0700
Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B9=80=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=20=E0=B8=A0=E0=B8=B2=E0=B8=A9=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StatCardComponent.vue        | 24 ++++++++++++++-------
 src/pages/01_branch-management/MainPage.vue | 12 +++++++++--
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/StatCardComponent.vue b/src/components/StatCardComponent.vue
index 2bf084b9..69d1d5ab 100644
--- a/src/components/StatCardComponent.vue
+++ b/src/components/StatCardComponent.vue
@@ -1,13 +1,19 @@
 <script setup lang="ts">
 import AppBox from 'components/app/AppBox.vue';
 
-const props = defineProps<{
-  branch: {
-    count: number;
-    label: string;
-  }[];
-  dark?: boolean;
-}>();
+const props = withDefaults(
+  defineProps<{
+    branch: {
+      count: number;
+      label: string;
+    }[];
+    dark?: boolean;
+    isBranch?: boolean;
+  }>(),
+  {
+    isBranch: false,
+  },
+);
 
 const color = ['pink', 'purple'];
 </script>
@@ -34,7 +40,9 @@ const color = ['pink', 'purple'];
 
       <div class="stat__content">
         <div class="text-h5 text-weight-bold">{{ v.count }}</div>
-        <div class="text-weight-bold">{{ v.label }}</div>
+        <div class="text-weight-bold">
+          {{ isBranch ? $t(v.label) : v.label }}
+        </div>
       </div>
     </AppBox>
   </div>
diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 83e5d0a4..c30921f7 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -382,7 +382,7 @@ watch(locale, () => {
     </div>
 
     <AppBox bordered class="q-mb-md">
-      <StatCard :branch="stats" :dark="$q.dark.isActive" />
+      <StatCard isBranch :branch="stats" :dark="$q.dark.isActive" />
     </AppBox>
 
     <AppBox
@@ -763,7 +763,15 @@ watch(locale, () => {
                       v.isHeadOffice ? 'branchHQLabel' : 'branchLabel',
                     ),
                     branchLabelStatus: $t(`status${v.status}`),
-                  }))"
+                  }))
+                  .sort((a, b) => {
+                    console.log(a);
+
+                    if (a.hq) return 1;
+                    // if (!a.hq) return -1;
+
+                    return 0;
+                  })"
                 @click="
                   () => {
                     if (item.hq) {