aq-fe-framework 0.1.886 → 0.1.888

package/dist/{chunk-PGV27XKS.mjs → chunk-AHTTLRL5.mjs}

@@ -1,12 +1,3 @@
-import {
-  createGenericStore,
-  useAppStore,
-  useStore_Permission
-} from "./chunk-3P5GXZPO.mjs";
-import {
-  utils_date,
-  utils_mantineReactTable
-} from "./chunk-IRA4J5UX.mjs";
 import {
   utils_aq_mapBaseEntityToDomain,
   utils_aq_mapDomainToEntity,
@@ -18,6 +9,15 @@ import {
   utils_file_fileToAQDocumentType,
   utils_pdf_download
 } from "./chunk-E4JVWPXS.mjs";
+import {
+  createGenericStore,
+  useAppStore,
+  useStore_Permission
+} from "./chunk-3P5GXZPO.mjs";
+import {
+  utils_date,
+  utils_mantineReactTable
+} from "./chunk-PHIQKJYJ.mjs";
 import {
   baseColumns
 } from "./chunk-O7YCQQO5.mjs";
@@ -266,6 +266,7 @@ function MyButton(_a) {
 // src/core/button/MyButtonCreateUpdate.tsx
 import { Modal, ScrollArea, Space, Tooltip, useMantineColorScheme as useMantineColorScheme3 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
+import { notifications } from "@mantine/notifications";
 
 // src/core/layout/MyFlexColumn.tsx
 import { Flex } from "@mantine/core";
@@ -316,6 +317,13 @@ function MyButtonCreateUpdate({
         onSuccess == null ? void 0 : onSuccess(...args);
       },
       onError: (error) => {
+        if (error.message != null) {
+          notifications.show({
+            color: "red",
+            message: error.message
+          });
+          return;
+        }
         let parsed;
         try {
           parsed = JSON.parse(error.message);
@@ -995,11 +1003,11 @@ function MyLabelValueRow({
   groupProps
 }) {
   return /* @__PURE__ */ jsxs10(Group5, __spreadProps(__spreadValues({ gap: 5, wrap: "nowrap" }, groupProps), { children: [
-    /* @__PURE__ */ jsxs10(Text5, __spreadProps(__spreadValues({ fw: 600 }, labelProps), { children: [
+    /* @__PURE__ */ jsxs10(Text5, __spreadProps(__spreadValues({ fw: 600, size: "sm" }, labelProps), { children: [
       label,
       ":"
     ] })),
-    /* @__PURE__ */ jsx18(Text5, __spreadProps(__spreadValues({}, valueProps), { children: value }))
+    /* @__PURE__ */ jsx18(Text5, __spreadProps(__spreadValues({ size: "sm" }, valueProps), { children: value }))
   ] }));
 }
 
@@ -9266,10 +9274,10 @@ function AcademicYearExport({ data: data2, table }) {
   };
   const exportData = data2.map((item) => {
     return __spreadProps(__spreadValues({}, item), {
-      academicYearStart: item.academicYearStart ? utils_date.toDDMMYYY(item.academicYearStart) : void 0,
-      academicYearEnd: item.academicYearEnd ? utils_date.toDDMMYYY(item.academicYearEnd) : void 0,
-      administrativeYearStart: item.administrativeYearStart ? utils_date.toDDMMYYY(item.administrativeYearStart) : void 0,
-      administrativeYearEnd: item.administrativeYearEnd ? utils_date.toDDMMYYY(item.administrativeYearEnd) : void 0
+      academicYearStart: item.academicYearStart ? utils_date.toDDMMYYYY(item.academicYearStart) : void 0,
+      academicYearEnd: item.academicYearEnd ? utils_date.toDDMMYYYY(item.academicYearEnd) : void 0,
+      administrativeYearStart: item.administrativeYearStart ? utils_date.toDDMMYYYY(item.administrativeYearStart) : void 0,
+      administrativeYearEnd: item.administrativeYearEnd ? utils_date.toDDMMYYYY(item.administrativeYearEnd) : void 0
     });
   });
   return /* @__PURE__ */ jsx82(
@@ -9278,10 +9286,10 @@ function AcademicYearExport({ data: data2, table }) {
       objectName: "Danh m\u1EE5c n\u0103m h\u1ECDc",
       data: table.getIsAllPageRowsSelected() ? exportData : table.getSelectedRowModel().rows.map((item) => {
         return __spreadProps(__spreadValues({}, item.original), {
-          academicYearStart: item.original.academicYearStart ? utils_date.toDDMMYYY(item.original.academicYearStart) : void 0,
-          academicYearEnd: item.original.academicYearEnd ? utils_date.toDDMMYYY(item.original.academicYearEnd) : void 0,
-          administrativeYearStart: item.original.administrativeYearStart ? utils_date.toDDMMYYY(item.original.administrativeYearStart) : void 0,
-          administrativeYearEnd: item.original.administrativeYearEnd ? utils_date.toDDMMYYY(item.original.administrativeYearEnd) : void 0
+          academicYearStart: item.original.academicYearStart ? utils_date.toDDMMYYYY(item.original.academicYearStart) : void 0,
+          academicYearEnd: item.original.academicYearEnd ? utils_date.toDDMMYYYY(item.original.academicYearEnd) : void 0,
+          administrativeYearStart: item.original.administrativeYearStart ? utils_date.toDDMMYYYY(item.original.administrativeYearStart) : void 0,
+          administrativeYearEnd: item.original.administrativeYearEnd ? utils_date.toDDMMYYYY(item.original.administrativeYearEnd) : void 0
         });
       }),
       exportConfig: exportConfig3
@@ -9782,22 +9790,22 @@ function AcademicYearsRead() {
       {
         header: "Ng\xE0y b\u1EAFt \u0111\u1EA7u n\u0103m h\u1ECDc",
         accessorKey: "startDate",
-        accessorFn: (row) => utils_date.toDDMMYYY(row.academicYearStart)
+        accessorFn: (row) => utils_date.toDDMMYYYY(row.academicYearStart)
       },
       {
         header: "Ng\xE0y k\u1EBFt th\xFAc n\u0103m h\u1ECDc",
         accessorKey: "endDate",
-        accessorFn: (row) => utils_date.toDDMMYYY(row.academicYearEnd)
+        accessorFn: (row) => utils_date.toDDMMYYYY(row.academicYearEnd)
       },
       {
         header: "Ng\xE0y b\u1EAFt \u0111\u1EA7u n\u0103m h\xE0nh ch\xEDnh",
         accessorKey: "startDateHC",
-        accessorFn: (row) => utils_date.toDDMMYYY(row.administrativeYearStart)
+        accessorFn: (row) => utils_date.toDDMMYYYY(row.administrativeYearStart)
       },
       {
         header: "Ng\xE0y k\u1EBFt th\xFAc n\u0103m h\xE0nh ch\xEDnh",
         accessorKey: "endDateHC",
-        accessorFn: (row) => utils_date.toDDMMYYY(row.administrativeYearEnd)
+        accessorFn: (row) => utils_date.toDDMMYYYY(row.administrativeYearEnd)
       },
       {
         header: "Hi\u1EC7n h\xE0nh",
@@ -13882,7 +13890,7 @@ function EmailTemplateButtonImport({ emailTemplateEnum }) {
 // src/modules-features/admin/core/EmailTemplate/EmailTemplateCreateUpdateButton.tsx
 import { Button as Button19, Grid as Grid6 } from "@mantine/core";
 import { useForm as useForm26 } from "@mantine/form";
-import { notifications } from "@mantine/notifications";
+import { notifications as notifications2 } from "@mantine/notifications";
 import { useEffect as useEffect27, useMemo as useMemo24 } from "react";
 import { jsx as jsx171, jsxs as jsxs94 } from "react/jsx-runtime";
 var getDefaultBodyFortype1 = () => {
@@ -13990,7 +13998,7 @@ function EmailTemplateCreateUpdateButton({ initValue, emailTemplateEnum }) {
             const typeName = emailTemplateEnum[values.type || 0] || `Type ${values.type}`;
             const errorMessage = `Lo\u1EA1i h\xE0nh \u0111\u1ED9ng "${typeName}" \u0111\xE3 t\u1ED3n t\u1EA1i. Ch\u1EC9 \u0111\u01B0\u1EE3c t\u1EA1o 1 Template trong 1 lo\u1EA1i h\xE0nh \u0111\u1ED9ng.`;
             form.setFieldError("type", errorMessage);
-            notifications.show({
+            notifications2.show({
               title: "L\u1ED7i t\u1EA1o template",
               message: errorMessage,
               color: "red",
@@ -14446,7 +14454,7 @@ function SubRead4({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => utils_date.toDDMMYYY(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date.toDDMMYYYY(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -15380,7 +15388,7 @@ function SubRead5({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => utils_date.toDDMMYYY(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date.toDDMMYYYY(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -15577,7 +15585,7 @@ function Feat_PageContentTable({ menuData }) {
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_ReadMenu.tsx
 import { Group as Group32 } from "@mantine/core";
-import { notifications as notifications2 } from "@mantine/notifications";
+import { notifications as notifications3 } from "@mantine/notifications";
 import { useMemo as useMemo33, useState as useState24 } from "react";
 
 // src/modules-features/admin/core/pageContentConfig/F_pageContentConfig_Export.tsx
@@ -15682,7 +15690,7 @@ function F_pageContentConfig_ReadMenu({ menuData }) {
               });
               setEditedDescriptions((prev) => __spreadValues(__spreadValues({}, prev), updated));
               table.resetRowSelection();
-              notifications2.show({
+              notifications3.show({
                 message: "X\xF3a th\xE0nh c\xF4ng",
                 color: "green"
               });
@@ -16130,7 +16138,7 @@ function Adapter_UserTable(_a) {
 
 // src/modules/User/adapter/Adapter_UserAddToRole.tsx
 import { useDisclosure as useDisclosure16 } from "@mantine/hooks";
-import { notifications as notifications3 } from "@mantine/notifications";
+import { notifications as notifications4 } from "@mantine/notifications";
 import { useQueryClient as useQueryClient4 } from "@tanstack/react-query";
 import { useEffect as useEffect35, useState as useState26 } from "react";
 import { jsx as jsx214 } from "react/jsx-runtime";
@@ -16165,7 +16173,7 @@ function Adapter_UserAddToRole({
       onSuccess: () => {
         disc[1].close();
         queryClient.invalidateQueries();
-        notifications3.show({
+        notifications4.show({
           message: "C\u1EADp nh\u1EADt th\xE0nh c\xF4ng",
           color: "green"
         });
@@ -17216,7 +17224,7 @@ function SubRead6({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => utils_date.toDDMMYYY(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date.toDDMMYYYY(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -17289,7 +17297,7 @@ import {
   Title as Title2
 } from "@mantine/core";
 import { useForm as useForm44 } from "@mantine/form";
-import { notifications as notifications4 } from "@mantine/notifications";
+import { notifications as notifications5 } from "@mantine/notifications";
 import { useMutation as useMutation4 } from "@tanstack/react-query";
 import Link4 from "next/link.js";
 import { useRouter as useRouter4 } from "next/navigation.js";
@@ -17383,7 +17391,7 @@ function Feat_Authenticate_Login({
         router.replace(redirectUrlAfterLogin);
       },
       onError: (error) => {
-        notifications4.show({
+        notifications5.show({
           message: "C\xF3 l\u1ED7i x\u1EA3y ra vui l\xF2ng th\u1EED l\u1EA1i",
           color: "red"
         });
@@ -17761,6 +17769,19 @@ function User_AvatarMenu() {
   ] });
 }
 
+// src/modules/User/components/SessionUserInfo/User_SessionUserInfo.tsx
+import { Card as Card5 } from "@mantine/core";
+import { jsx as jsx245, jsxs as jsxs135 } from "react/jsx-runtime";
+function User_SessionUserInfo() {
+  const authenticateStore = useStore_Authenticate();
+  const fullName = authenticateStore.state.fullName || null;
+  const code = authenticateStore.state.code || null;
+  return /* @__PURE__ */ jsxs135(Card5, { bg: const_object_colors.mantineBackgroundTealLight, children: [
+    /* @__PURE__ */ jsx245(MyLabelValueRow, { label: "T\xE0i kho\u1EA3n", value: code }),
+    /* @__PURE__ */ jsx245(MyLabelValueRow, { label: "H\u1ECD v\xE0 t\xEAn", value: fullName })
+  ] });
+}
+
 // src/components/Layouts/BasicAppShell/utils.ts
 function findBreadcrumbPath(items, currentPath, parents = []) {
   for (const item of items) {
@@ -17880,7 +17901,7 @@ function extractLinkedMenuItems(menu) {
 }
 
 // src/components/Layouts/BasicAppShell/BasicAppShell.tsx
-import { jsx as jsx245, jsxs as jsxs135 } from "react/jsx-runtime";
+import { jsx as jsx246, jsxs as jsxs136 } from "react/jsx-runtime";
 function base64ToFaviconUrl(base64, ext) {
   const byteCharacters = atob(base64.trim());
   const byteArray = new Uint8Array([...byteCharacters].map((c4) => c4.charCodeAt(0)));
@@ -17974,25 +17995,25 @@ function BasicAppShell({ children, menu, extraTopRight, title, logoutRedirect, i
     }
   }, [pathname, allChildItems, filteredMenu, readablePageIds, pageContentQuery.data]);
   const canAccess = isDev || isAccessible || permissionStore.state.isSuperAdmin;
-  const renderHeader = () => /* @__PURE__ */ jsx245(AppShell.Header, { children: media ? /* @__PURE__ */ jsxs135(Group37, { h: "100%", px: "md", justify: "space-between", children: [
-    /* @__PURE__ */ jsxs135(Group37, { h: "100%", children: [
-      /* @__PURE__ */ jsx245(Tooltip7, { label: appShellStore.state.opened ? "\u1EA8n thanh menu" : "Hi\u1EC7n thanh menu", children: /* @__PURE__ */ jsx245(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.toggle, children: appShellStore.state.opened ? /* @__PURE__ */ jsx245(IconLayoutSidebarLeftExpand, {}) : /* @__PURE__ */ jsx245(IconLayoutSidebarLeftCollapse, {}) }) }),
-      /* @__PURE__ */ jsx245(Tooltip7, { label: "\u0110\xF3ng t\u1EA5t c\u1EA3 menu", children: /* @__PURE__ */ jsx245(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.clearGroupMenuOpenId, children: /* @__PURE__ */ jsx245(IconLibraryMinus, {}) }) })
+  const renderHeader = () => /* @__PURE__ */ jsx246(AppShell.Header, { children: media ? /* @__PURE__ */ jsxs136(Group37, { h: "100%", px: "md", justify: "space-between", children: [
+    /* @__PURE__ */ jsxs136(Group37, { h: "100%", children: [
+      /* @__PURE__ */ jsx246(Tooltip7, { label: appShellStore.state.opened ? "\u1EA8n thanh menu" : "Hi\u1EC7n thanh menu", children: /* @__PURE__ */ jsx246(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.toggle, children: appShellStore.state.opened ? /* @__PURE__ */ jsx246(IconLayoutSidebarLeftExpand, {}) : /* @__PURE__ */ jsx246(IconLayoutSidebarLeftCollapse, {}) }) }),
+      /* @__PURE__ */ jsx246(Tooltip7, { label: "\u0110\xF3ng t\u1EA5t c\u1EA3 menu", children: /* @__PURE__ */ jsx246(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.clearGroupMenuOpenId, children: /* @__PURE__ */ jsx246(IconLibraryMinus, {}) }) })
     ] }),
-    /* @__PURE__ */ jsx245(Tooltip7, { label: title || `${appShellStore.state.moduleCode} - ${appShellStore.state.moduleName}`, children: /* @__PURE__ */ jsx245(Group37, { style: { position: "absolute", left: "50%", transform: "translateX(-50%)" }, children: /* @__PURE__ */ jsx245(Text27, { c: "green", fw: "bold", size: "sm", children: title || `${appShellStore.state.moduleCode} - ${appShellStore.state.moduleName}` }) }) }),
-    /* @__PURE__ */ jsxs135(Group37, { children: [
+    /* @__PURE__ */ jsx246(Tooltip7, { label: title || `${appShellStore.state.moduleCode} - ${appShellStore.state.moduleName}`, children: /* @__PURE__ */ jsx246(Group37, { style: { position: "absolute", left: "50%", transform: "translateX(-50%)" }, children: /* @__PURE__ */ jsx246(Text27, { c: "green", fw: "bold", size: "sm", children: title || `${appShellStore.state.moduleCode} - ${appShellStore.state.moduleName}` }) }) }),
+    /* @__PURE__ */ jsxs136(Group37, { children: [
       extraTopRight,
-      /* @__PURE__ */ jsx245(MySwitchTheme, {}),
-      /* @__PURE__ */ jsx245(User_AvatarMenu, {})
+      /* @__PURE__ */ jsx246(MySwitchTheme, {}),
+      /* @__PURE__ */ jsx246(User_AvatarMenu, {})
     ] })
-  ] }) : /* @__PURE__ */ jsxs135(Group37, { h: "100%", px: "md", justify: "space-between", children: [
-    /* @__PURE__ */ jsx245(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.toggle, children: appShellStore.state.opened ? /* @__PURE__ */ jsx245(IconLayoutSidebarLeftExpand, {}) : /* @__PURE__ */ jsx245(IconLayoutSidebarLeftCollapse, {}) }),
-    /* @__PURE__ */ jsx245(
+  ] }) : /* @__PURE__ */ jsxs136(Group37, { h: "100%", px: "md", justify: "space-between", children: [
+    /* @__PURE__ */ jsx246(ActionIcon12, { variant: "default", size: "lg", radius: "md", onClick: appShellStore.toggle, children: appShellStore.state.opened ? /* @__PURE__ */ jsx246(IconLayoutSidebarLeftExpand, {}) : /* @__PURE__ */ jsx246(IconLayoutSidebarLeftCollapse, {}) }),
+    /* @__PURE__ */ jsx246(
       Tooltip7,
       {
         label: title || `${appShellStore.state.moduleCode} - ${appShellStore.state.moduleName}`,
         withArrow: true,
-        children: /* @__PURE__ */ jsx245(
+        children: /* @__PURE__ */ jsx246(
           Text27,
           {
             c: "green",
@@ -18013,21 +18034,23 @@ function BasicAppShell({ children, menu, extraTopRight, title, logoutRedirect, i
         )
       }
     ),
-    /* @__PURE__ */ jsxs135(Group37, { children: [
+    /* @__PURE__ */ jsxs136(Group37, { children: [
       extraTopRight,
-      /* @__PURE__ */ jsx245(MySwitchTheme, {}),
-      /* @__PURE__ */ jsx245(User_AvatarMenu, {})
+      /* @__PURE__ */ jsx246(MySwitchTheme, {}),
+      /* @__PURE__ */ jsx246(User_AvatarMenu, {})
     ] })
   ] }) });
   const renderNavbar = () => {
     var _a, _b;
-    return /* @__PURE__ */ jsxs135(AppShell.Navbar, { children: [
-      /* @__PURE__ */ jsx245(MyAppSpotlight, { menu: filteredMenu }),
-      /* @__PURE__ */ jsx245(AppShell.Section, { grow: true, component: ScrollArea6, p: 5, children: /* @__PURE__ */ jsx245(RenderNavLinks, { items: filteredMenu }) }),
-      /* @__PURE__ */ jsxs135(AppShell.Section, { px: "md", children: [
-        /* @__PURE__ */ jsx245(Divider4, {}),
-        /* @__PURE__ */ jsx245(Feat_Authenticate_Logout, { redirectURL: logoutRedirect }),
-        /* @__PURE__ */ jsx245(
+    return /* @__PURE__ */ jsxs136(AppShell.Navbar, { children: [
+      /* @__PURE__ */ jsx246(MyAppSpotlight, { menu: filteredMenu }),
+      /* @__PURE__ */ jsx246(AppShell.Section, { grow: true, component: ScrollArea6, p: 5, children: /* @__PURE__ */ jsx246(RenderNavLinks, { items: filteredMenu }) }),
+      /* @__PURE__ */ jsxs136(AppShell.Section, { px: "md", children: [
+        /* @__PURE__ */ jsx246(Divider4, {}),
+        /* @__PURE__ */ jsx246(User_SessionUserInfo, {}),
+        /* @__PURE__ */ jsx246(Divider4, {}),
+        /* @__PURE__ */ jsx246(Feat_Authenticate_Logout, { redirectURL: logoutRedirect }),
+        /* @__PURE__ */ jsx246(
           Image4,
           {
             fit: "contain",
@@ -18041,11 +18064,11 @@ function BasicAppShell({ children, menu, extraTopRight, title, logoutRedirect, i
       ] })
     ] });
   };
-  const renderMain = () => /* @__PURE__ */ jsx245(AppShell.Main, { bg: "light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-8))", children: isLoadingPermission ? /* @__PURE__ */ jsx245("div", { style: { padding: "2rem", textAlign: "center" }, children: /* @__PURE__ */ jsx245(Text27, { fw: 600, size: "md", children: "\u0110ang t\u1EA3i quy\u1EC1n truy c\u1EADp..." }) }) : canAccess ? children : /* @__PURE__ */ jsxs135("div", { style: { padding: "2rem", textAlign: "center" }, children: [
-    /* @__PURE__ */ jsx245("h1", { children: "404 - Kh\xF4ng t\xECm th\u1EA5y trang" }),
-    /* @__PURE__ */ jsx245("p", { children: "B\u1EA1n kh\xF4ng c\xF3 quy\u1EC1n truy c\u1EADp ho\u1EB7c \u0111\u01B0\u1EDDng d\u1EABn kh\xF4ng t\u1ED3n t\u1EA1i." })
+  const renderMain = () => /* @__PURE__ */ jsx246(AppShell.Main, { bg: "light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-8))", children: isLoadingPermission ? /* @__PURE__ */ jsx246("div", { style: { padding: "2rem", textAlign: "center" }, children: /* @__PURE__ */ jsx246(Text27, { fw: 600, size: "md", children: "\u0110ang t\u1EA3i quy\u1EC1n truy c\u1EADp..." }) }) : canAccess ? children : /* @__PURE__ */ jsxs136("div", { style: { padding: "2rem", textAlign: "center" }, children: [
+    /* @__PURE__ */ jsx246("h1", { children: "404 - Kh\xF4ng t\xECm th\u1EA5y trang" }),
+    /* @__PURE__ */ jsx246("p", { children: "B\u1EA1n kh\xF4ng c\xF3 quy\u1EC1n truy c\u1EADp ho\u1EB7c \u0111\u01B0\u1EDDng d\u1EABn kh\xF4ng t\u1ED3n t\u1EA1i." })
   ] }) });
-  return /* @__PURE__ */ jsxs135(
+  return /* @__PURE__ */ jsxs136(
     AppShell,
     {
       header: { height: 60 },
@@ -18069,10 +18092,10 @@ function BasicAppShell({ children, menu, extraTopRight, title, logoutRedirect, i
 
 // src/components/Layouts/Container/MyContainer.tsx
 import { Container, Flex as Flex9 } from "@mantine/core";
-import { jsx as jsx246 } from "react/jsx-runtime";
+import { jsx as jsx247 } from "react/jsx-runtime";
 function MyContainer(_a) {
   var _b = _a, { children } = _b, rest = __objRest(_b, ["children"]);
-  return /* @__PURE__ */ jsx246(Container, __spreadProps(__spreadValues({ fluid: true }, rest), { children: /* @__PURE__ */ jsx246(Flex9, { direction: "column", children }) }));
+  return /* @__PURE__ */ jsx247(Container, __spreadProps(__spreadValues({ fluid: true }, rest), { children: /* @__PURE__ */ jsx247(Flex9, { direction: "column", children }) }));
 }
 
 // src/components/Layouts/HeaderMegaMenu/HeaderMegaMenu.tsx
@@ -18118,7 +18141,7 @@ function useHeaderMegaMenuStore() {
 }
 
 // src/components/Layouts/HeaderMegaMenu/HeaderMegaMenu.tsx
-import { jsx as jsx247, jsxs as jsxs136 } from "react/jsx-runtime";
+import { jsx as jsx248, jsxs as jsxs137 } from "react/jsx-runtime";
 var mockdata = [
   {
     icon: IconCode,
@@ -18156,27 +18179,27 @@ function HeaderMegaMenu({ children, menus }) {
   const [linksOpened, { toggle: toggleLinks }] = useDisclosure19(false);
   const HeaderMegaMenuStore = useHeaderMegaMenuStore();
   const theme = useMantineTheme();
-  const links = mockdata.map((item) => /* @__PURE__ */ jsx247(UnstyledButton, { className: css_default.subLink, children: /* @__PURE__ */ jsxs136(Group38, { wrap: "nowrap", align: "flex-start", children: [
-    /* @__PURE__ */ jsx247(ThemeIcon3, { size: 34, variant: "default", radius: "md", children: /* @__PURE__ */ jsx247(item.icon, { size: 22, color: theme.colors.blue[6] }) }),
-    /* @__PURE__ */ jsxs136("div", { children: [
-      /* @__PURE__ */ jsx247(Text28, { size: "sm", fw: 500, children: item.title }),
-      /* @__PURE__ */ jsx247(Text28, { size: "xs", c: "dimmed", children: item.description })
+  const links = mockdata.map((item) => /* @__PURE__ */ jsx248(UnstyledButton, { className: css_default.subLink, children: /* @__PURE__ */ jsxs137(Group38, { wrap: "nowrap", align: "flex-start", children: [
+    /* @__PURE__ */ jsx248(ThemeIcon3, { size: 34, variant: "default", radius: "md", children: /* @__PURE__ */ jsx248(item.icon, { size: 22, color: theme.colors.blue[6] }) }),
+    /* @__PURE__ */ jsxs137("div", { children: [
+      /* @__PURE__ */ jsx248(Text28, { size: "sm", fw: 500, children: item.title }),
+      /* @__PURE__ */ jsx248(Text28, { size: "xs", c: "dimmed", children: item.description })
     ] })
   ] }) }, item.title));
-  return /* @__PURE__ */ jsxs136(Box6, { children: [
-    /* @__PURE__ */ jsx247("header", { className: css_default.header, children: /* @__PURE__ */ jsxs136(Group38, { justify: "space-between", h: "100%", children: [
-      /* @__PURE__ */ jsxs136(Group38, { children: [
-        /* @__PURE__ */ jsx247(Image5, { src: "/imgs/0/IMG0LogoAQTech.png", h: 30, alt: "", w: "auto" }),
-        /* @__PURE__ */ jsx247(Group38, { h: "100%", gap: 5, visibleFrom: "sm", children: menus == null ? void 0 : menus.map((item, idx) => /* @__PURE__ */ jsx247(Button26, { component: Link5, href: item.href, variant: HeaderMegaMenuStore.state.name == item.label ? "light" : "subtle", onClick: () => HeaderMegaMenuStore.setState({ name: item.label }), children: item.label }, idx)) })
+  return /* @__PURE__ */ jsxs137(Box6, { children: [
+    /* @__PURE__ */ jsx248("header", { className: css_default.header, children: /* @__PURE__ */ jsxs137(Group38, { justify: "space-between", h: "100%", children: [
+      /* @__PURE__ */ jsxs137(Group38, { children: [
+        /* @__PURE__ */ jsx248(Image5, { src: "/imgs/0/IMG0LogoAQTech.png", h: 30, alt: "", w: "auto" }),
+        /* @__PURE__ */ jsx248(Group38, { h: "100%", gap: 5, visibleFrom: "sm", children: menus == null ? void 0 : menus.map((item, idx) => /* @__PURE__ */ jsx248(Button26, { component: Link5, href: item.href, variant: HeaderMegaMenuStore.state.name == item.label ? "light" : "subtle", onClick: () => HeaderMegaMenuStore.setState({ name: item.label }), children: item.label }, idx)) })
       ] }),
-      /* @__PURE__ */ jsxs136(Group38, { children: [
-        /* @__PURE__ */ jsx247(TextInput12, { placeholder: "T\xECm ki\u1EBFm", leftSection: /* @__PURE__ */ jsx247(IconSearch6, {}), radius: "xl", w: "250px" }),
-        /* @__PURE__ */ jsx247(MySwitchTheme, {})
+      /* @__PURE__ */ jsxs137(Group38, { children: [
+        /* @__PURE__ */ jsx248(TextInput12, { placeholder: "T\xECm ki\u1EBFm", leftSection: /* @__PURE__ */ jsx248(IconSearch6, {}), radius: "xl", w: "250px" }),
+        /* @__PURE__ */ jsx248(MySwitchTheme, {})
       ] }),
-      /* @__PURE__ */ jsx247(Burger, { opened: drawerOpened, onClick: toggleDrawer, hiddenFrom: "sm" })
+      /* @__PURE__ */ jsx248(Burger, { opened: drawerOpened, onClick: toggleDrawer, hiddenFrom: "sm" })
     ] }) }),
-    /* @__PURE__ */ jsx247(Container2, { fluid: true, pt: "sm", pb: "md", bg: const_object_colors.mantineBackgroundSecondary, mih: "93vh", children }),
-    /* @__PURE__ */ jsx247(
+    /* @__PURE__ */ jsx248(Container2, { fluid: true, pt: "sm", pb: "md", bg: const_object_colors.mantineBackgroundSecondary, mih: "93vh", children }),
+    /* @__PURE__ */ jsx248(
       Drawer,
       {
         opened: drawerOpened,
@@ -18186,10 +18209,10 @@ function HeaderMegaMenu({ children, menus }) {
         title: "Navigation",
         hiddenFrom: "sm",
         zIndex: 1e6,
-        children: /* @__PURE__ */ jsxs136(ScrollArea7, { h: "calc(100vh - 80px", mx: "-md", children: [
-          /* @__PURE__ */ jsx247(Divider5, { my: "sm" }),
-          /* @__PURE__ */ jsx247(MyFlexColumn2, { h: "100%", gap: 0, children: menus == null ? void 0 : menus.map((item, idx) => /* @__PURE__ */ jsx247(Button26, { component: Link5, href: item.href, variant: HeaderMegaMenuStore.state.name == item.label ? "light" : "subtle", onClick: () => HeaderMegaMenuStore.setState({ name: item.label }), children: item.label }, idx)) }),
-          /* @__PURE__ */ jsx247(Divider5, { my: "sm" })
+        children: /* @__PURE__ */ jsxs137(ScrollArea7, { h: "calc(100vh - 80px", mx: "-md", children: [
+          /* @__PURE__ */ jsx248(Divider5, { my: "sm" }),
+          /* @__PURE__ */ jsx248(MyFlexColumn2, { h: "100%", gap: 0, children: menus == null ? void 0 : menus.map((item, idx) => /* @__PURE__ */ jsx248(Button26, { component: Link5, href: item.href, variant: HeaderMegaMenuStore.state.name == item.label ? "light" : "subtle", onClick: () => HeaderMegaMenuStore.setState({ name: item.label }), children: item.label }, idx)) }),
+          /* @__PURE__ */ jsx248(Divider5, { my: "sm" })
         ] })
       }
     )
@@ -18210,7 +18233,7 @@ var service_aq = __spreadProps(__spreadValues({}, createBaseApi(CONTROLLER12, ba
 // src/components/Layouts/PageContent/MyPageContent.tsx
 import { Badge as Badge6, Breadcrumbs, Center as Center12, Container as Container3, Divider as Divider6, Flex as Flex10, Group as Group39, Stack as Stack11, Text as Text29, Title as Title4, Tooltip as Tooltip8 } from "@mantine/core";
 import { useClipboard, useDisclosure as useDisclosure20 } from "@mantine/hooks";
-import { notifications as notifications5 } from "@mantine/notifications";
+import { notifications as notifications6 } from "@mantine/notifications";
 import { IconBrandParsinta } from "@tabler/icons-react";
 import { useEffect as useEffect42 } from "react";
 
@@ -18237,7 +18260,7 @@ function getFinalLinkVieo(url) {
 }
 
 // src/components/Layouts/PageContent/MyPageContent.tsx
-import { jsx as jsx248, jsxs as jsxs137 } from "react/jsx-runtime";
+import { jsx as jsx249, jsxs as jsxs138 } from "react/jsx-runtime";
 var getStatusColor = (status) => {
   switch (status) {
     case "Prototype":
@@ -18250,10 +18273,10 @@ var getStatusColor = (status) => {
 };
 function PageTitle({ title, status, note }) {
   const color = getStatusColor(status);
-  return /* @__PURE__ */ jsx248(Group39, { children: /* @__PURE__ */ jsxs137(MyFlexColumn2, { gap: 0, children: [
-    /* @__PURE__ */ jsxs137(Group39, { align: "center", children: [
-      /* @__PURE__ */ jsx248(Title4, { order: 3, children: title }),
-      status && /* @__PURE__ */ jsx248(
+  return /* @__PURE__ */ jsx249(Group39, { children: /* @__PURE__ */ jsxs138(MyFlexColumn2, { gap: 0, children: [
+    /* @__PURE__ */ jsxs138(Group39, { align: "center", children: [
+      /* @__PURE__ */ jsx249(Title4, { order: 3, children: title }),
+      status && /* @__PURE__ */ jsx249(
         Badge6,
         {
           variant: "gradient",
@@ -18264,7 +18287,7 @@ function PageTitle({ title, status, note }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsx248(Text29, { size: "lg", c: "dimmed", fs: "italic", children: note })
+    /* @__PURE__ */ jsx249(Text29, { size: "lg", c: "dimmed", fs: "italic", children: note })
   ] }) });
 }
 function MyPageContent({
@@ -18292,13 +18315,13 @@ function MyPageContent({
     if (!query.data) return;
     basicAppShellStore.setProperty("fileGuildDetail", query.data);
   }, [query.data]);
-  return /* @__PURE__ */ jsxs137(Container3, { p: 0, fluid: true, children: [
-    /* @__PURE__ */ jsxs137(Group39, { justify: "space-between", children: [
-      /* @__PURE__ */ jsxs137(Group39, { children: [
-        /* @__PURE__ */ jsx248(MyButtonRouterBack, {}),
-        /* @__PURE__ */ jsxs137(Stack11, { gap: 2, children: [
-          /* @__PURE__ */ jsxs137(Flex10, { align: "center", gap: "10", children: [
-            /* @__PURE__ */ jsx248(
+  return /* @__PURE__ */ jsxs138(Container3, { p: 0, fluid: true, children: [
+    /* @__PURE__ */ jsxs138(Group39, { justify: "space-between", children: [
+      /* @__PURE__ */ jsxs138(Group39, { children: [
+        /* @__PURE__ */ jsx249(MyButtonRouterBack, {}),
+        /* @__PURE__ */ jsxs138(Stack11, { gap: 2, children: [
+          /* @__PURE__ */ jsxs138(Flex10, { align: "center", gap: "10", children: [
+            /* @__PURE__ */ jsx249(
               PageTitle,
               {
                 title: finalTitle,
@@ -18306,7 +18329,7 @@ function MyPageContent({
                 note: basicAppShellStore.state.note
               }
             ),
-            /* @__PURE__ */ jsx248(Tooltip8, { label: "Xem video h\u01B0\u1EDBng d\u1EABn", children: /* @__PURE__ */ jsx248(
+            /* @__PURE__ */ jsx249(Tooltip8, { label: "Xem video h\u01B0\u1EDBng d\u1EABn", children: /* @__PURE__ */ jsx249(
               MyButtonModal,
               {
                 isActionIcon: true,
@@ -18319,11 +18342,11 @@ function MyPageContent({
                   size: "80%"
                 },
                 actionIconProps: {
-                  children: /* @__PURE__ */ jsx248(IconBrandParsinta, {}),
+                  children: /* @__PURE__ */ jsx249(IconBrandParsinta, {}),
                   disabled: basicAppShellStore.state.videoLink == void 0 || basicAppShellStore.state.videoLink == "",
                   color: "red"
                 },
-                children: /* @__PURE__ */ jsx248(Center12, { h: "67vh", p: "md", children: getFinalLinkVieo(basicAppShellStore.state.videoLink || "") == "" ? "\u0110\u01B0\u1EDDng d\u1EABn video kh\xF4ng h\u1EE3p l\u1EC7" : /* @__PURE__ */ jsx248(
+                children: /* @__PURE__ */ jsx249(Center12, { h: "67vh", p: "md", children: getFinalLinkVieo(basicAppShellStore.state.videoLink || "") == "" ? "\u0110\u01B0\u1EDDng d\u1EABn video kh\xF4ng h\u1EE3p l\u1EC7" : /* @__PURE__ */ jsx249(
                   "iframe",
                   {
                     width: "90%",
@@ -18337,7 +18360,7 @@ function MyPageContent({
                 ) })
               }
             ) }),
-            /* @__PURE__ */ jsx248(
+            /* @__PURE__ */ jsx249(
               MyButtonViewFile,
               {
                 isActionIcon: true,
@@ -18355,38 +18378,38 @@ function MyPageContent({
               }
             )
           ] }),
-          /* @__PURE__ */ jsx248(Text29, { children: basicAppShellStore.state.description })
+          /* @__PURE__ */ jsx249(Text29, { children: basicAppShellStore.state.description })
         ] }),
         leftTopBar
       ] }),
-      /* @__PURE__ */ jsxs137(Group39, { p: "md", children: [
+      /* @__PURE__ */ jsxs138(Group39, { p: "md", children: [
         rightTopBar,
-        /* @__PURE__ */ jsx248(Breadcrumbs, { style: { cursor: "pointer" }, separatorMargin: "7", onClick: () => {
+        /* @__PURE__ */ jsx249(Breadcrumbs, { style: { cursor: "pointer" }, separatorMargin: "7", onClick: () => {
           var _a2;
           clipboard.copy((_a2 = basicAppShellStore.state.breadcrumb) == null ? void 0 : _a2.join(" / "));
-          notifications5.show({
+          notifications6.show({
             message: "Sao ch\xE9p \u0111\u01B0\u1EDDng d\u1EABn menu th\xE0nh c\xF4ng"
           });
-        }, children: (_a = basicAppShellStore.state.breadcrumb) == null ? void 0 : _a.map((item, idx) => /* @__PURE__ */ jsx248(Text29, { fw: "600", c: "blue", children: item }, idx)) })
+        }, children: (_a = basicAppShellStore.state.breadcrumb) == null ? void 0 : _a.map((item, idx) => /* @__PURE__ */ jsx249(Text29, { fw: "600", c: "blue", children: item }, idx)) })
       ] })
     ] }),
-    /* @__PURE__ */ jsx248(Divider6, { my: "xs" }),
+    /* @__PURE__ */ jsx249(Divider6, { my: "xs" }),
     children,
-    /* @__PURE__ */ jsx248(Divider6, { my: "xs" })
+    /* @__PURE__ */ jsx249(Divider6, { my: "xs" })
   ] });
 }
 
 // src/components/Layouts/Tab/MyTab.tsx
 import { rem, Space as Space10, Tabs as Tabs4 } from "@mantine/core";
-import { jsx as jsx249, jsxs as jsxs138 } from "react/jsx-runtime";
+import { jsx as jsx250, jsxs as jsxs139 } from "react/jsx-runtime";
 function MyTab(_a) {
   var _b = _a, { tabList, children } = _b, rest = __objRest(_b, ["tabList", "children"]);
   const iconStyle = { width: rem(20), height: rem(20) };
-  return /* @__PURE__ */ jsxs138(Tabs4, __spreadProps(__spreadValues({ defaultValue: tabList[0].label }, rest), { children: [
-    /* @__PURE__ */ jsx249(Tabs4.List, { children: tabList.map((item, idx) => {
-      return /* @__PURE__ */ jsx249(Tabs4.Tab, { value: item.label, leftSection: item.icon && /* @__PURE__ */ jsx249(item.icon, { style: iconStyle }), children: item.label }, idx);
+  return /* @__PURE__ */ jsxs139(Tabs4, __spreadProps(__spreadValues({ defaultValue: tabList[0].label }, rest), { children: [
+    /* @__PURE__ */ jsx250(Tabs4.List, { children: tabList.map((item, idx) => {
+      return /* @__PURE__ */ jsx250(Tabs4.Tab, { value: item.label, leftSection: item.icon && /* @__PURE__ */ jsx250(item.icon, { style: iconStyle }), children: item.label }, idx);
     }) }),
-    /* @__PURE__ */ jsx249(Space10, { my: "md" }),
+    /* @__PURE__ */ jsx250(Space10, { my: "md" }),
     children
   ] }));
 }
@@ -18395,33 +18418,33 @@ function MyTab(_a) {
 import { ActionIcon as ActionIcon13, Button as Button27, Fieldset as Fieldset5, Group as Group40, Modal as Modal16 } from "@mantine/core";
 import { useDisclosure as useDisclosure21 } from "@mantine/hooks";
 import { IconX as IconX4 } from "@tabler/icons-react";
-import { jsx as jsx250, jsxs as jsxs139 } from "react/jsx-runtime";
+import { jsx as jsx251, jsxs as jsxs140 } from "react/jsx-runtime";
 function MyDataTableSelect(_a) {
   var _b = _a, { modalSize, renderTopToolbarCustomActions, data: data2, selectButtonlabel, listState, columns, listLabel } = _b, rest = __objRest(_b, ["modalSize", "renderTopToolbarCustomActions", "data", "selectButtonlabel", "listState", "columns", "listLabel"]);
   const disc = useDisclosure21(false);
   if (data2 == void 0) return "\u0110ang t\u1EA3i...";
-  return /* @__PURE__ */ jsxs139(Fieldset5, { legend: listLabel ? listLabel : "Danh s\xE1ch", children: [
-    /* @__PURE__ */ jsx250(
+  return /* @__PURE__ */ jsxs140(Fieldset5, { legend: listLabel ? listLabel : "Danh s\xE1ch", children: [
+    /* @__PURE__ */ jsx251(
       MyDataTable,
       __spreadValues({
         renderTopToolbarCustomActions: ({ table }) => {
-          return /* @__PURE__ */ jsxs139(Group40, { children: [
+          return /* @__PURE__ */ jsxs140(Group40, { children: [
             renderTopToolbarCustomActions && renderTopToolbarCustomActions({ table }),
-            /* @__PURE__ */ jsx250(Button27, { onClick: disc[1].open, children: selectButtonlabel || "Ch\u1ECDn t\u1EEB danh s\xE1ch" })
+            /* @__PURE__ */ jsx251(Button27, { onClick: disc[1].open, children: selectButtonlabel || "Ch\u1ECDn t\u1EEB danh s\xE1ch" })
           ] });
         },
         columns,
         data: listState[0],
         renderRowActions: ({ row }) => {
-          return /* @__PURE__ */ jsx250(MyCenterFull, { children: /* @__PURE__ */ jsx250(ActionIcon13, { color: "red", onClick: () => listState[1].remove(row.index), children: /* @__PURE__ */ jsx250(IconX4, {}) }) });
+          return /* @__PURE__ */ jsx251(MyCenterFull, { children: /* @__PURE__ */ jsx251(ActionIcon13, { color: "red", onClick: () => listState[1].remove(row.index), children: /* @__PURE__ */ jsx251(IconX4, {}) }) });
         }
       }, rest)
     ),
-    /* @__PURE__ */ jsx250(Modal16, { opened: disc[0], onClose: disc[1].close, size: modalSize || "80%", children: /* @__PURE__ */ jsx250(
+    /* @__PURE__ */ jsx251(Modal16, { opened: disc[0], onClose: disc[1].close, size: modalSize || "80%", children: /* @__PURE__ */ jsx251(
       MyDataTable,
       __spreadValues({
         renderTopToolbarCustomActions: ({ table }) => {
-          return /* @__PURE__ */ jsx250(Button27, { onClick: () => {
+          return /* @__PURE__ */ jsx251(Button27, { onClick: () => {
             table.getSelectedRowModel().rows.map((item) => listState[1].append(item.original));
             disc[1].close();
           }, children: "Ch\u1ECDn" });
@@ -18437,7 +18460,7 @@ function MyDataTableSelect(_a) {
 // src/components/RESTAPIComponents/SelectAPIGet/MySelectAPIGet.tsx
 import { Select as Select10 } from "@mantine/core";
 import { useQuery as useQuery13 } from "@tanstack/react-query";
-import { jsx as jsx251 } from "react/jsx-runtime";
+import { jsx as jsx252 } from "react/jsx-runtime";
 function MySelectAPIGet(_a) {
   var _b = _a, { apiGet, label = "", dataMapper } = _b, rest = __objRest(_b, ["apiGet", "label", "dataMapper"]);
   var _a2;
@@ -18456,7 +18479,7 @@ function MySelectAPIGet(_a) {
       label: `${item.code}-${item.name}`
     };
   });
-  return /* @__PURE__ */ jsx251(
+  return /* @__PURE__ */ jsx252(
     Select10,
     __spreadValues({
       label,
@@ -18471,7 +18494,7 @@ import { useNextCalendarApp as useNextCalendarApp2, ScheduleXCalendar as Schedul
 import { createEventsServicePlugin as createEventsServicePlugin2 } from "@schedule-x/events-service";
 import { useState as useState31 } from "react";
 import { createEventModalPlugin as createEventModalPlugin2 } from "@schedule-x/event-modal";
-import { jsx as jsx252 } from "react/jsx-runtime";
+import { jsx as jsx253 } from "react/jsx-runtime";
 function MyScheduleX({
   values,
   timeGridEvent,
@@ -18496,7 +18519,7 @@ function MyScheduleX({
     events: values,
     plugins: [eventsService, eventModalPlugin]
   });
-  return /* @__PURE__ */ jsx252(
+  return /* @__PURE__ */ jsx253(
     ScheduleXCalendar2,
     {
       calendarApp: calendar,
@@ -18510,9 +18533,9 @@ function MyScheduleX({
 
 // src/components/Skeletons/SkeletonTable/MySkeletonTable.tsx
 import { Skeleton as Skeleton8 } from "@mantine/core";
-import { jsx as jsx253 } from "react/jsx-runtime";
+import { jsx as jsx254 } from "react/jsx-runtime";
 function MySkeletonTable({ h: h5 = 500 }) {
-  return /* @__PURE__ */ jsx253(Skeleton8, { h: h5 });
+  return /* @__PURE__ */ jsx254(Skeleton8, { h: h5 });
 }
 
 // src/core/overlays/MyModalStackImport/Usecase/FileImportConfigModal.tsx
@@ -18526,15 +18549,29 @@ import {
   Stack as Stack12,
   Text as Text30
 } from "@mantine/core";
-import { notifications as notifications6 } from "@mantine/notifications";
+import { notifications as notifications7 } from "@mantine/notifications";
 import { IconCircleFilled } from "@tabler/icons-react";
 import { useEffect as useEffect43, useMemo as useMemo42, useState as useState32 } from "react";
 import * as XLSX4 from "xlsx";
-import { jsx as jsx254, jsxs as jsxs140 } from "react/jsx-runtime";
+import { jsx as jsx255, jsxs as jsxs141 } from "react/jsx-runtime";
+function toVietnamTime(utcString) {
+  const utcDate = new Date(utcString);
+  const vnDate = new Date(utcDate.getTime() + 7 * 60 * 60 * 1e3);
+  const year = vnDate.getFullYear();
+  const month = String(vnDate.getMonth() + 1).padStart(2, "0");
+  const day = String(vnDate.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
 function isValidDateFormat(dateStr) {
-  const mmddyy = /^\d{1,2}\/\d{1,2}\/\d{2}$/;
   const ddmmyyyy = /^\d{1,2}\/\d{1,2}\/\d{4}$/;
-  return mmddyy.test(dateStr) || ddmmyyyy.test(dateStr);
+  return ddmmyyyy.test(dateStr);
+}
+function isValidDate(dateStr) {
+  const regex = /^\d{4}-\d{2}-\d{2}$/;
+  if (!regex.test(dateStr)) return false;
+  const [year, month, day] = dateStr.split("-").map(Number);
+  const date = new Date(year, month - 1, day);
+  return date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day;
 }
 function toIsoDate(dateStr) {
   const mmddyy = /^\d{1,2}\/\d{1,2}\/\d{2}$/;
@@ -18550,9 +18587,8 @@ function toIsoDate(dateStr) {
   return null;
 }
 function formatForDisplay(value) {
-  if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value)) {
-    const [year, month, day] = value.split("-");
-    return `${day}/${month}/${year}`;
+  if (isValidDate(value)) {
+    return utils_date.toDDMMYYYY(value);
   }
   return value;
 }
@@ -18576,12 +18612,14 @@ function FileImportConfigModal(_a) {
     const data2 = await file2.arrayBuffer();
     const workbook = XLSX4.read(data2, { cellDates: true });
     const sheet = workbook.Sheets[workbook.SheetNames[0]];
-    const json = XLSX4.utils.sheet_to_json(sheet, { header: 1, raw: false });
+    const json = XLSX4.utils.sheet_to_json(sheet, { header: 1 });
     const parsed = json.map(
       (row) => row.map((cell) => {
-        if (typeof cell === "string" && isValidDateFormat(cell)) {
-          const iso = toIsoDate(cell);
-          return iso != null ? iso : cell;
+        if (cell instanceof Date) {
+          return toVietnamTime(cell.toString());
+        }
+        if (isValidDateFormat(cell)) {
+          return toIsoDate(cell);
         }
         return cell;
       })
@@ -18639,15 +18677,15 @@ function FileImportConfigModal(_a) {
       setDataStartIndex((parseInt(titleIndex) + 1).toString());
     }
   }, [titleIndex]);
-  return /* @__PURE__ */ jsx254(
+  return /* @__PURE__ */ jsx255(
     Modal17,
     __spreadProps(__spreadValues({
       title: "Import",
       size: "80%"
     }, rest), {
-      children: /* @__PURE__ */ jsxs140(Stack12, { children: [
-        /* @__PURE__ */ jsxs140(Grid9, { children: [
-          /* @__PURE__ */ jsx254(Grid9.Col, { span: 12, children: /* @__PURE__ */ jsx254(
+      children: /* @__PURE__ */ jsxs141(Stack12, { children: [
+        /* @__PURE__ */ jsxs141(Grid9, { children: [
+          /* @__PURE__ */ jsx255(Grid9.Col, { span: 12, children: /* @__PURE__ */ jsx255(
             FileInput17,
             {
               error: fileInputError[0],
@@ -18658,36 +18696,36 @@ function FileImportConfigModal(_a) {
               onChange: handleSelectFile
             }
           ) }),
-          /* @__PURE__ */ jsx254(Grid9.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx254(
+          /* @__PURE__ */ jsx255(Grid9.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx255(
             Select11,
             {
               searchable: false,
               value: titleIndex,
               onChange: setTitleIndex,
-              label: /* @__PURE__ */ jsxs140(Group41, { children: [
-                /* @__PURE__ */ jsx254(IconCircleFilled, { size: 20, color: const_object_colors.mantineBackgroundTealLight }),
-                /* @__PURE__ */ jsx254(Text30, { children: "D\xF2ng ti\xEAu \u0111\u1EC1 b\u1EAFt \u0111\u1EA7u t\u1EEB" })
+              label: /* @__PURE__ */ jsxs141(Group41, { children: [
+                /* @__PURE__ */ jsx255(IconCircleFilled, { size: 20, color: const_object_colors.mantineBackgroundTealLight }),
+                /* @__PURE__ */ jsx255(Text30, { children: "D\xF2ng ti\xEAu \u0111\u1EC1 b\u1EAFt \u0111\u1EA7u t\u1EEB" })
               ] }),
               data: rawData.map((_5, i5) => (i5 + 1).toString()),
               disabled: !file
             }
           ) }),
-          /* @__PURE__ */ jsx254(Grid9.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx254(
+          /* @__PURE__ */ jsx255(Grid9.Col, { span: { base: 12, md: 6 }, children: /* @__PURE__ */ jsx255(
             Select11,
             {
               searchable: false,
               value: dataStartIndex,
               onChange: setDataStartIndex,
-              label: /* @__PURE__ */ jsxs140(Group41, { children: [
-                /* @__PURE__ */ jsx254(IconCircleFilled, { size: 20, color: const_object_colors.mantineBackgroundBlueLight }),
-                /* @__PURE__ */ jsx254(Text30, { children: "D\xF2ng d\u1EEF li\u1EC7u b\u1EAFt \u0111\u1EA7u t\u1EEB" })
+              label: /* @__PURE__ */ jsxs141(Group41, { children: [
+                /* @__PURE__ */ jsx255(IconCircleFilled, { size: 20, color: const_object_colors.mantineBackgroundBlueLight }),
+                /* @__PURE__ */ jsx255(Text30, { children: "D\xF2ng d\u1EEF li\u1EC7u b\u1EAFt \u0111\u1EA7u t\u1EEB" })
               ] }),
               data: rawData.map((_5, i5) => (i5 + 1).toString()).filter((i5) => !titleIndex || parseInt(i5) > parseInt(titleIndex)),
               disabled: !file || !titleIndex
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsx254(MyFieldset, { title: "Danh s\xE1ch tr\u01B0\u1EDDng th\xF4ng tin trong file d\u1EEF li\u1EC7u", children: /* @__PURE__ */ jsx254(
+        /* @__PURE__ */ jsx255(MyFieldset, { title: "Danh s\xE1ch tr\u01B0\u1EDDng th\xF4ng tin trong file d\u1EEF li\u1EC7u", children: /* @__PURE__ */ jsx255(
           MyDataTable,
           {
             mantineTableBodyRowProps: ({ row }) => {
@@ -18704,21 +18742,21 @@ function FileImportConfigModal(_a) {
             data: tableDisplayData
           }
         ) }),
-        /* @__PURE__ */ jsxs140(Group41, { justify: "end", children: [
-          /* @__PURE__ */ jsx254(
+        /* @__PURE__ */ jsxs141(Group41, { justify: "end", children: [
+          /* @__PURE__ */ jsx255(
             Button28,
             {
               onClick: onExportStructure,
               children: "Xu\u1EA5t file c\u1EA5u tr\xFAc"
             }
           ),
-          /* @__PURE__ */ jsx254(Button28, { onClick: () => {
+          /* @__PURE__ */ jsx255(Button28, { onClick: () => {
             if (file == null) {
               fileInputError[1]("Vui l\xF2ng ch\u1ECDn file");
               return;
             }
             if (dataStartIndex == "" || dataStartIndex == null) {
-              notifications6.show({
+              notifications7.show({
                 message: "D\xF2ng d\u1EEF li\u1EC7u b\u1EAFt \u0111\u1EA7u kh\xF4ng \u0111\u01B0\u1EE3c \u0111\u1EC3 tr\u1ED1ng",
                 color: "red"
               });
@@ -18727,7 +18765,7 @@ function FileImportConfigModal(_a) {
             fileInputError[1]("");
             onContinute == null ? void 0 : onContinute();
           }, children: "Ti\u1EBFp t\u1EE5c" }),
-          /* @__PURE__ */ jsx254(Button28, { variant: "outline", onClick: rest.onClose, children: "\u0110\xF3ng" })
+          /* @__PURE__ */ jsx255(Button28, { variant: "outline", onClick: rest.onClose, children: "\u0110\xF3ng" })
         ] })
       ] })
     })
@@ -18737,7 +18775,7 @@ function FileImportConfigModal(_a) {
 // src/core/overlays/MyModalStackImport/MyModalImport.tsx
 import { Modal as Modal18 } from "@mantine/core";
 import { useState as useState33 } from "react";
-import { jsx as jsx255, jsxs as jsxs141 } from "react/jsx-runtime";
+import { jsx as jsx256, jsxs as jsxs142 } from "react/jsx-runtime";
 function MyModalImport({
   fieldDefinition = [],
   stack,
@@ -18748,8 +18786,8 @@ function MyModalImport({
   const value = useState33([]);
   const valueMapping = useState33([]);
   const [detailRows, setDetailRows] = useState33([]);
-  return /* @__PURE__ */ jsxs141(Modal18.Stack, { children: [
-    /* @__PURE__ */ jsx255(
+  return /* @__PURE__ */ jsxs142(Modal18.Stack, { children: [
+    /* @__PURE__ */ jsx256(
       FileImportConfigModal,
       __spreadValues({
         value: value[0],
@@ -18764,7 +18802,7 @@ function MyModalImport({
         }
       }, stack.register("FileImportConfig"))
     ),
-    /* @__PURE__ */ jsx255(
+    /* @__PURE__ */ jsx256(
       FileFieldMappingModal,
       __spreadValues({
         jsonData: value[0],
@@ -18788,7 +18826,7 @@ function MyModalImport({
 
 // src/core/overlays/MyModalStackImport/Usecase/FileImportValidationDetailModal.tsx
 import { Modal as Modal19, Table as Table5, Text as Text31 } from "@mantine/core";
-import { jsx as jsx256, jsxs as jsxs142 } from "react/jsx-runtime";
+import { jsx as jsx257, jsxs as jsxs143 } from "react/jsx-runtime";
 
 // src/core/overlays/MyModalStackImport/Usecase/FileImportValidationModal.tsx
 import {
@@ -18797,15 +18835,15 @@ import {
   Modal as Modal20,
   Table as Table6
 } from "@mantine/core";
-import { jsx as jsx257, jsxs as jsxs143 } from "react/jsx-runtime";
+import { jsx as jsx258, jsxs as jsxs144 } from "react/jsx-runtime";
 
 // src/core/withAPI/CustomDataTableAPI.tsx
-import { jsx as jsx258 } from "react/jsx-runtime";
+import { jsx as jsx259 } from "react/jsx-runtime";
 
 // src/core/withAPI/MyButtonViewFileAPI.tsx
 import { useDisclosure as useDisclosure22 } from "@mantine/hooks";
 import { useQuery as useQuery14 } from "@tanstack/react-query";
-import { jsx as jsx259 } from "react/jsx-runtime";
+import { jsx as jsx260 } from "react/jsx-runtime";
 function MyButtonViewFileAPI({ filePath }) {
   const disc = useDisclosure22();
   const query = useQuery14({
@@ -18816,7 +18854,7 @@ function MyButtonViewFileAPI({ filePath }) {
     },
     enabled: filePath != void 0 && disc[0]
   });
-  return /* @__PURE__ */ jsx259(
+  return /* @__PURE__ */ jsx260(
     MyButtonViewFile,
     {
       file: query.data,

package/dist/{chunk-IRA4J5UX.mjs → chunk-PHIQKJYJ.mjs}

@@ -26,7 +26,7 @@ var utils_currency = {
 
 // src/utils-v2/utils_date.ts
 var utils_date = {
-  toDDMMYYY(date) {
+  toDDMMYYYY(date) {
     const parsedDate = typeof date === "string" ? new Date(date) : date;
     if (!(parsedDate instanceof Date) || isNaN(parsedDate.getTime())) return "";
     const day = String(parsedDate.getDate()).padStart(2, "0");
@@ -34,7 +34,7 @@ var utils_date = {
     const year = parsedDate.getFullYear();
     return `${day}/${month}/${year}`;
   },
-  toMMYYY(date) {
+  toMMYYYY(date) {
     const parsedDate = typeof date === "string" ? new Date(date) : date;
     if (!(parsedDate instanceof Date) || isNaN(parsedDate.getTime())) return "";
     const month = String(parsedDate.getMonth() + 1).padStart(2, "0");

package/dist/components/index.mjs

@@ -70,10 +70,10 @@ import {
   useHeaderMegaMenuStore,
   useS_ButtonImport,
   useStore_BasicAppShell
-} from "../chunk-PGV27XKS.mjs";
-import "../chunk-3P5GXZPO.mjs";
-import "../chunk-IRA4J5UX.mjs";
+} from "../chunk-AHTTLRL5.mjs";
 import "../chunk-E4JVWPXS.mjs";
+import "../chunk-3P5GXZPO.mjs";
+import "../chunk-PHIQKJYJ.mjs";
 import "../chunk-O7YCQQO5.mjs";
 import "../chunk-QSWIVDXC.mjs";
 import "../chunk-FE4HVT67.mjs";

package/dist/core/index.mjs

@@ -29,10 +29,10 @@ import {
   MyStatsCard,
   MyTextInput2 as MyTextInput,
   MyWeeklySessionSchedulerPicker
-} from "../chunk-PGV27XKS.mjs";
-import "../chunk-3P5GXZPO.mjs";
-import "../chunk-IRA4J5UX.mjs";
+} from "../chunk-AHTTLRL5.mjs";
 import "../chunk-E4JVWPXS.mjs";
+import "../chunk-3P5GXZPO.mjs";
+import "../chunk-PHIQKJYJ.mjs";
 import "../chunk-O7YCQQO5.mjs";
 import "../chunk-QSWIVDXC.mjs";
 import "../chunk-FE4HVT67.mjs";

package/dist/modules-features/index.mjs

@@ -113,10 +113,10 @@ import {
   MailTemplateDeleteButton,
   useS_moduleConfig,
   useStore_Authenticate
-} from "../chunk-PGV27XKS.mjs";
-import "../chunk-3P5GXZPO.mjs";
-import "../chunk-IRA4J5UX.mjs";
+} from "../chunk-AHTTLRL5.mjs";
 import "../chunk-E4JVWPXS.mjs";
+import "../chunk-3P5GXZPO.mjs";
+import "../chunk-PHIQKJYJ.mjs";
 import "../chunk-O7YCQQO5.mjs";
 import "../chunk-QSWIVDXC.mjs";
 import "../chunk-FE4HVT67.mjs";

package/dist/shared/index.mjs

@@ -4,12 +4,12 @@ import {
 } from "../chunk-RGUQWALX.mjs";
 import {
   MySelect
-} from "../chunk-PGV27XKS.mjs";
+} from "../chunk-AHTTLRL5.mjs";
+import "../chunk-E4JVWPXS.mjs";
 import "../chunk-3P5GXZPO.mjs";
 import {
   utils_converter
-} from "../chunk-IRA4J5UX.mjs";
-import "../chunk-E4JVWPXS.mjs";
+} from "../chunk-PHIQKJYJ.mjs";
 import "../chunk-O7YCQQO5.mjs";
 import "../chunk-QSWIVDXC.mjs";
 import "../chunk-FE4HVT67.mjs";

package/dist/utils/index.d.mts

@@ -34,7 +34,7 @@ declare function utils_currency_formatWithSuffix(amount: number, suffix?: string
 
 /**
  * @deprecated Hàm này không xài nữa nha mấy ní
- * Vui lòng dùng `utils_date.toDDMMYYY` từ `utils-v2` thay thế.
+ * Vui lòng dùng `utils_date.toDDMMYYYY` từ `utils-v2` thay thế.
  */
 declare function utils_date_dateToDDMMYYYString(date?: Date | string): string;
 /**

package/dist/utils-v2/index.d.mts

@@ -13,8 +13,8 @@ declare const utils_currency: {
 };
 
 declare const utils_date: {
-    toDDMMYYY(date?: Date | string): string;
-    toMMYYY(date?: Date | string): string;
+    toDDMMYYYY(date?: Date | string): string;
+    toMMYYYY(date?: Date | string): string;
     toHHmm(date: Date): string;
     toDateTime(date?: Date | string, WithSeconds?: boolean): string;
     toDateTimeStartEnd(startDate: Date, endDate: Date): string;

package/dist/utils-v2/index.mjs

@@ -7,7 +7,7 @@ import {
   utils_mantineReactTable,
   utils_text,
   utils_time
-} from "../chunk-IRA4J5UX.mjs";
+} from "../chunk-PHIQKJYJ.mjs";
 import "../chunk-JD6AELXS.mjs";
 export {
   normalizeDate,

package/package.json

@@ -54,7 +54,7 @@
       "types": "./dist/types/index.d.mts"
     }
   },
-  "version": "0.1.886",
+  "version": "0.1.888",
   "private": false,
   "files": [
     "dist"