aq-fe-framework 0.1.725 → 0.1.727

package/dist/{chunk-RW6TLBQ2.mjs → chunk-6SQDJZ5F.mjs}

@@ -18,11 +18,11 @@ import {
 } from "./chunk-2B2FKBKX.mjs";
 import {
   baseColumns
-} from "./chunk-7PUDC2WF.mjs";
+} from "./chunk-O7YCQQO5.mjs";
 import {
-  U0DateToDDMMYYYString,
-  utils_date_dateToDDMMYYYString
-} from "./chunk-EWDS5IOF.mjs";
+  utils_date_dateToDDMMYYYString,
+  utils_date_formatToDateTimeString
+} from "./chunk-QSWIVDXC.mjs";
 import {
   const_object_colors,
   const_object_documentTypes
@@ -656,8 +656,28 @@ function MyDataTable(_a) {
   ]);
   const { renderRowActions } = __spreadValues({}, rest);
   const finalColumns = useMemo(() => {
-    const filterColumns = utils_mantineReactTable_filterColumnsByVisibleKeys(columns, visibleFields);
-    return utils_mantineReactTable_sortColumnsByKeyOrder(filterColumns, visibleFields);
+    let filterColumns = utils_mantineReactTable_filterColumnsByVisibleKeys(columns, visibleFields);
+    filterColumns = utils_mantineReactTable_sortColumnsByKeyOrder(filterColumns, visibleFields);
+    const cleanedColumns = filterColumns.filter(
+      (col) => col.accessorKey !== "modifiedWhen" && col.accessorKey !== "modifiedFullName"
+    );
+    cleanedColumns.push(
+      {
+        accessorKey: "modifiedWhen",
+        header: "Ng\xE0y c\u1EADp nh\u1EADt",
+        Cell: ({ cell }) => {
+          const value = cell.getValue();
+          return utils_date_formatToDateTimeString(value, true);
+        },
+        size: 180
+      },
+      {
+        accessorKey: "modifiedFullName",
+        header: "Ng\u01B0\u1EDDi c\u1EADp nh\u1EADt",
+        size: 150
+      }
+    );
+    return cleanedColumns;
   }, [columns, visibleFields]);
   const table = useMantineReactTable(__spreadProps(__spreadValues({
     columns: finalColumns,
@@ -9716,7 +9736,7 @@ function Usecase_UserAsyncFromEdusoftnet({
   isLoading
 }) {
   return /* @__PURE__ */ jsxs48(Fragment18, { children: [
-    /* @__PURE__ */ jsx92(Button17, { color: "green", loading: isLoading, leftSection: /* @__PURE__ */ jsx92(IconRefresh, {}), onClick: onStartSync, children: "\u0110\u1ED3ng b\u1ED9 t\u1EEB Edusoft.net" }),
+    /* @__PURE__ */ jsx92(Button17, { color: "green", loading: isLoading, leftSection: /* @__PURE__ */ jsx92(IconRefresh, {}), onClick: onStartSync, children: "\u0110\u1ED3ng b\u1ED9 t\u1EEB Edusoft.Net" }),
     /* @__PURE__ */ jsxs48(Modal13, { title: "Th\xF4ng b\xE1o \u0111\u1ED3ng b\u1ED9", onClose: disclosure[1].close, opened: disclosure[0], children: [
       /* @__PURE__ */ jsx92(Text23, { children: `\u0110\xE3 \u0111\u1ED3ng b\u1ED9 t\xE0i kho\u1EA3n ng\u01B0\u1EDDi d\xF9ng t\u1EEB h\u1EC7 th\u1ED1ng Edusoft.NET v\u1EDBi tr\u1EA1ng th\xE1i "\u0110ang ho\u1EA1t \u0111\u1ED9ng". B\u1EA1n vui l\xF2ng ki\u1EC3m tra l\u1EA1i` }),
       /* @__PURE__ */ jsx92(Center7, { children: /* @__PURE__ */ jsx92(Button17, { onClick: disclosure[1].close, children: "\u0110\u1ED3ng \xFD" }) })
@@ -10182,7 +10202,7 @@ function SubRead({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_formatToDateTimeString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -10526,11 +10546,11 @@ function F_core16209({ RefinementTypeId }) {
       },
       {
         header: "Ng\xE0y b\u1EAFt \u0111\u1EA7u",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.startDate))
+        accessorFn: (row) => utils_date_formatToDateTimeString(new Date(row.startDate))
       },
       {
         header: "Ng\xE0y k\u1EBFt th\xFAc",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.endDate))
+        accessorFn: (row) => utils_date_formatToDateTimeString(new Date(row.endDate))
       },
       {
         header: "File",
@@ -10921,7 +10941,7 @@ function SubRead2({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -11218,7 +11238,7 @@ function SubRead3({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -11935,7 +11955,7 @@ function F_core76318_Read({ SecurityTypeId }) {
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_formatToDateTimeString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -12633,10 +12653,7 @@ import { useForm as useForm27 } from "@mantine/form";
 import { useEffect as useEffect25, useMemo as useMemo23 } from "react";
 import { jsx as jsx163, jsxs as jsxs90 } from "react/jsx-runtime";
 var getDefaultBodyForType1 = () => {
-  return `<p>G\u1EEDi \xD4ng/B\xE0: {TenVC} {MAVC]}</p>
-<p>K\u1EBFt qu\u1EA3 ti\xEAu ch\xED l\xE0: {TTKT}</p>
-<p>D\u1EEF li\u1EC7u li\xEAn quan:</p>
-<p>{MaKH}, {TenKH}, {MaCTDT}, {TenCTDT}, {MaGD}, {NhomCT}, {MaVC}, {TenVC}, {MaTieuChi}, {TTPT}, {TTKT}, {NXTN}</p>`;
+  return ``;
 };
 function EmailTemplateCreateUpdateButton({ initValues, emailTemplateEnum }) {
   var _a, _b;
@@ -13128,7 +13145,7 @@ function SubRead4({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -14041,7 +14058,7 @@ function SubRead5({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -14216,7 +14233,9 @@ function Feat_PageContentTable({ menuData }) {
         description: item.description,
         file: new File([], item.documentFilePath || "Vui l\xF2ng ch\u1ECDn file"),
         menuName: item.name,
-        videoLink: item.link
+        videoLink: item.link,
+        modifiedFullName: item.modifiedFullName,
+        modifiedWhen: item.modifiedWhen
       })) || [],
       onSave: async (value) => {
         const transformed = await Promise.all(value.map(async (item) => ({
@@ -15122,7 +15141,7 @@ function F_securityPolicyDocs_Read({ SecurityTypeId }) {
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",
@@ -15373,11 +15392,11 @@ function F_systemUpdateDocs({ RefinementTypeId }) {
       },
       {
         header: "Ng\xE0y b\u1EAFt \u0111\u1EA7u",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.startDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.startDate))
       },
       {
         header: "Ng\xE0y k\u1EBFt th\xFAc",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.endDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.endDate))
       },
       {
         header: "File",
@@ -15841,7 +15860,7 @@ function SubRead6({
       },
       {
         header: "Ng\xE0y ban h\xE0nh",
-        accessorFn: (row) => U0DateToDDMMYYYString(new Date(row.promulgateDate))
+        accessorFn: (row) => utils_date_dateToDDMMYYYString(new Date(row.promulgateDate))
       },
       {
         header: "T\xEAn t\xE0i li\u1EC7u",

package/dist/{chunk-7PUDC2WF.mjs → chunk-O7YCQQO5.mjs}

@@ -1,6 +1,6 @@
 import {
   utils_date_dateToDDMMYYYString
-} from "./chunk-EWDS5IOF.mjs";
+} from "./chunk-QSWIVDXC.mjs";
 
 // src/columns/baseColumns.ts
 var baseColumns = [

package/dist/{chunk-EWDS5IOF.mjs → chunk-QSWIVDXC.mjs}

@@ -1,11 +1,4 @@
 // src/utils/utils_date.ts
-function U0DateToDDMMYYYString(date) {
-  if (!(date instanceof Date) || isNaN(date.getTime())) return "";
-  const day = String(date.getDate()).padStart(2, "0");
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const year = date.getFullYear();
-  return `${day}/${month}/${year}`;
-}
 function utils_date_dateToDDMMYYYString(date) {
   const parsedDate = typeof date === "string" ? new Date(date) : date;
   if (!(parsedDate instanceof Date) || isNaN(parsedDate.getTime())) return "";
@@ -30,10 +23,21 @@ function utils_date_getHHmm(date) {
   const minute = String(date.getMinutes()).padStart(2, "0");
   return `${hour}:${minute}`;
 }
+function utils_date_formatToDateTimeString(date, WithSeconds) {
+  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");
+  const month = String(parsedDate.getMonth() + 1).padStart(2, "0");
+  const year = parsedDate.getFullYear();
+  const hours = String(parsedDate.getHours()).padStart(2, "0");
+  const minutes = String(parsedDate.getMinutes()).padStart(2, "0");
+  const seconds = String(parsedDate.getSeconds()).padStart(2, "0");
+  return `${day}/${month}/${year} - ${hours}:${minutes}${WithSeconds && `:${seconds}`}`;
+}
 
 export {
-  U0DateToDDMMYYYString,
   utils_date_dateToDDMMYYYString,
   utils_date_formatToDateTimeStartEnd,
-  utils_date_getHHmm
+  utils_date_getHHmm,
+  utils_date_formatToDateTimeString
 };

package/dist/columns/index.mjs

@@ -1,7 +1,7 @@
 import {
   baseColumns
-} from "../chunk-7PUDC2WF.mjs";
-import "../chunk-EWDS5IOF.mjs";
+} from "../chunk-O7YCQQO5.mjs";
+import "../chunk-QSWIVDXC.mjs";
 import "../chunk-FWCSY2DS.mjs";
 export {
   baseColumns

package/dist/components/index.mjs

@@ -70,11 +70,11 @@ import {
   useHeaderMegaMenuStore,
   useS_ButtonImport,
   useStore_BasicAppShell
-} from "../chunk-RW6TLBQ2.mjs";
+} from "../chunk-6SQDJZ5F.mjs";
 import "../chunk-SUH3FFFV.mjs";
 import "../chunk-2B2FKBKX.mjs";
-import "../chunk-7PUDC2WF.mjs";
-import "../chunk-EWDS5IOF.mjs";
+import "../chunk-O7YCQQO5.mjs";
+import "../chunk-QSWIVDXC.mjs";
 import "../chunk-IUTUR43V.mjs";
 import "../chunk-K6S7R6LU.mjs";
 import "../chunk-2JFYOBBR.mjs";

package/dist/core/index.mjs

@@ -25,11 +25,11 @@ import {
   MyStatsCard,
   MyTextInput2 as MyTextInput,
   MyWeeklySessionSchedulerPicker
-} from "../chunk-RW6TLBQ2.mjs";
+} from "../chunk-6SQDJZ5F.mjs";
 import "../chunk-SUH3FFFV.mjs";
 import "../chunk-2B2FKBKX.mjs";
-import "../chunk-7PUDC2WF.mjs";
-import "../chunk-EWDS5IOF.mjs";
+import "../chunk-O7YCQQO5.mjs";
+import "../chunk-QSWIVDXC.mjs";
 import "../chunk-IUTUR43V.mjs";
 import "../chunk-K6S7R6LU.mjs";
 import "../chunk-2JFYOBBR.mjs";

package/dist/coreService/index.mjs

@@ -1,10 +1,10 @@
 import {
   MyModalDelete
-} from "../chunk-RW6TLBQ2.mjs";
+} from "../chunk-6SQDJZ5F.mjs";
 import "../chunk-SUH3FFFV.mjs";
 import "../chunk-2B2FKBKX.mjs";
-import "../chunk-7PUDC2WF.mjs";
-import "../chunk-EWDS5IOF.mjs";
+import "../chunk-O7YCQQO5.mjs";
+import "../chunk-QSWIVDXC.mjs";
 import "../chunk-IUTUR43V.mjs";
 import "../chunk-K6S7R6LU.mjs";
 import {

package/dist/modules-features/index.mjs

@@ -112,11 +112,11 @@ import {
   MailTemplateDeleteButton,
   useS_authenticate,
   useS_moduleConfig
-} from "../chunk-RW6TLBQ2.mjs";
+} from "../chunk-6SQDJZ5F.mjs";
 import "../chunk-SUH3FFFV.mjs";
 import "../chunk-2B2FKBKX.mjs";
-import "../chunk-7PUDC2WF.mjs";
-import "../chunk-EWDS5IOF.mjs";
+import "../chunk-O7YCQQO5.mjs";
+import "../chunk-QSWIVDXC.mjs";
 import "../chunk-IUTUR43V.mjs";
 import "../chunk-K6S7R6LU.mjs";
 import "../chunk-2JFYOBBR.mjs";

package/dist/utils/index.d.mts

@@ -36,10 +36,10 @@ declare function utils_converter_youTubeUrlToEmbed(url: string): string;
 
 declare function utils_currency_formatWithSuffix(amount: number, suffix?: string): string;
 
-declare function U0DateToDDMMYYYString(date: Date): string;
 declare function utils_date_dateToDDMMYYYString(date?: Date | string): string;
 declare function utils_date_formatToDateTimeStartEnd(startDate: Date, endDate: Date): string;
 declare function utils_date_getHHmm(date: Date): string;
+declare function utils_date_formatToDateTimeString(date?: Date | string, WithSeconds?: boolean): string;
 
 declare function utils_field_extractAQBaseField(values?: Partial<IBaseEntity>): {
     id: number | undefined;
@@ -96,4 +96,4 @@ declare function U0MyValidateEmpty(message?: string): (value: unknown) => React.
 declare function U0MyValidateEmail(value?: string): "Email không đúng định dạng" | null;
 declare const utils_validator_validateCode: (value?: string) => "Không được để trống" | "Chỉ được nhập chữ, số và dấu '-' (không bắt đầu bằng '-')" | null;
 
-export { U0DateToDDMMYYYString, U0MyValidateEmail, U0MyValidateEmpty, updateEnableList, utils_aq_mapBaseEntityToDomain, utils_aq_mapDomainToEntity, utils_config_getBaseUrl, utils_config_getConfig, utils_converter_enumToSelectOptions, utils_converter_getKeyByValue, utils_converter_getLabelByValue, utils_converter_mapEnumToSelectData, utils_converter_youTubeUrlToEmbed, utils_currency_formatWithSuffix, utils_date_dateToDDMMYYYString, utils_date_formatToDateTimeStartEnd, utils_date_getHHmm, utils_field_extractAQBaseField, utils_format_fixDecimal, utils_list_hasEmptyField, utils_list_isFieldUnique, utils_list_isTotalEqual, utils_list_sumField, utils_mantineReactTable_filterColumnsByVisibleKeys, utils_mantineReactTable_sortColumnsByKeyOrder, utils_notification_show, utils_pdf_download, utils_reactQuery_updateListItemInQuery, utils_text_getNormalizedTextFromHtml, utils_time_convertTimeStringToSeconds, utils_time_extractHourMinute, utils_time_getCurrentTimeString, utils_time_getHourMinuteFromString, utils_validator_validateCode };
+export { U0MyValidateEmail, U0MyValidateEmpty, updateEnableList, utils_aq_mapBaseEntityToDomain, utils_aq_mapDomainToEntity, utils_config_getBaseUrl, utils_config_getConfig, utils_converter_enumToSelectOptions, utils_converter_getKeyByValue, utils_converter_getLabelByValue, utils_converter_mapEnumToSelectData, utils_converter_youTubeUrlToEmbed, utils_currency_formatWithSuffix, utils_date_dateToDDMMYYYString, utils_date_formatToDateTimeStartEnd, utils_date_formatToDateTimeString, utils_date_getHHmm, utils_field_extractAQBaseField, utils_format_fixDecimal, utils_list_hasEmptyField, utils_list_isFieldUnique, utils_list_isTotalEqual, utils_list_sumField, utils_mantineReactTable_filterColumnsByVisibleKeys, utils_mantineReactTable_sortColumnsByKeyOrder, utils_notification_show, utils_pdf_download, utils_reactQuery_updateListItemInQuery, utils_text_getNormalizedTextFromHtml, utils_time_convertTimeStringToSeconds, utils_time_extractHourMinute, utils_time_getCurrentTimeString, utils_time_getHourMinuteFromString, utils_validator_validateCode };

package/dist/utils/index.mjs

@@ -38,17 +38,16 @@ import {
   utils_validator_validateCode
 } from "../chunk-2B2FKBKX.mjs";
 import {
-  U0DateToDDMMYYYString,
   utils_date_dateToDDMMYYYString,
   utils_date_formatToDateTimeStartEnd,
+  utils_date_formatToDateTimeString,
   utils_date_getHHmm
-} from "../chunk-EWDS5IOF.mjs";
+} from "../chunk-QSWIVDXC.mjs";
 import {
   utils_notification_show
 } from "../chunk-7ZCOFATU.mjs";
 import "../chunk-FWCSY2DS.mjs";
 export {
-  U0DateToDDMMYYYString,
   U0MyValidateEmail,
   U0MyValidateEmpty,
   updateEnableList,
@@ -64,6 +63,7 @@ export {
   utils_currency_formatWithSuffix,
   utils_date_dateToDDMMYYYString,
   utils_date_formatToDateTimeStartEnd,
+  utils_date_formatToDateTimeString,
   utils_date_getHHmm,
   utils_excel_download,
   utils_excel_exportExcel,

package/package.json

@@ -50,7 +50,7 @@
       "types": "./dist/types/index.d.mts"
     }
   },
-  "version": "0.1.725",
+  "version": "0.1.727",
   "private": false,
   "files": [
     "dist"