- ({params.row.title}) {params.value}
+ {params.row.title ? `(${params.row.title})` : ''} {params.value}
);
}
@@ -94,7 +94,6 @@ export default function ClientTable({recordList}) {
sortComparator: dateComparator,
renderCell: (params) => (
- {/* {formattedDate = date.toLocaleDateString()} */}
{getDateString(params.row.joinDate, 'dd/MM/yyyy')}
),
diff --git a/src/pages/client/ClientSearchPage/index.js b/src/pages/client/ClientSearchPage/index.js
index 373b4f6..5f18efa 100644
--- a/src/pages/client/ClientSearchPage/index.js
+++ b/src/pages/client/ClientSearchPage/index.js
@@ -78,8 +78,8 @@ const ClientSearchPage = () => {
// }, []);
function applySearch(input) {
- console.log("SearchCriteria:")
- console.log(input)
+ // console.log("SearchCriteria:")
+ // console.log(input)
setSearchCriteria(input);
}
diff --git a/src/pages/pdf/index.js b/src/pages/pdf/index.js
index 6848039..661985a 100644
--- a/src/pages/pdf/index.js
+++ b/src/pages/pdf/index.js
@@ -2,6 +2,10 @@
import React, { useEffect, useRef, useState } from 'react';
// import './App.css'; // For basic styling
import axios from 'axios';
+import {apiPath} from "../../auth/utils";
+import {
+ GET_PDF_PATH
+} from "../../utils/ApiPathConst";
// Import your chosen commercial PDF SDK (e.g., PSPDFKit)
import PSPDFKit from 'pspdfkit';
@@ -10,28 +14,48 @@ function PDF() {
const viewerRef = useRef(null); // Ref for the DOM element where PDF will render
const instanceRef = useRef(null); // Ref for the PSPDFKit instance
const [pdfLoaded, setPdfLoaded] = useState(false);
+ const [template,setTemplate] = useState();
+ const [viewInstance,setViewInstance] = useState();
useEffect(() => {
const loadPdfViewer = async () => {
- if (viewerRef.current) {
+ if (document.getElementById(viewerRef)) {
+ // if (viewerRef.current) {
try {
- // 1. Fetch the blank PDF template from your Spring Boot backend
- const response = await axios.get('http://localhost:8090/api/pdf/template', {
- responseType: 'arraybuffer' // Essential for binary data
+ //New try
+ axios.get(`${apiPath}${GET_PDF_PATH}`, {
+ responseType: 'arraybuffer', // Essential for binary data
+ })
+ .then((response) => {
+ if (response.status === 200) {
+ setTemplate(response);
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ return false;
});
- const pdfBlob = new Blob([response.data], { type: 'application/pdf' });
+ // 1. Fetch the blank PDF template from your Spring Boot backend
+ // const response = await axios.get(`${apiPath}${GET_PDF_PATH}`, {
+ // responseType: 'arraybuffer', // Essential for binary data
+ // });
+ const pdfBlob = new Blob(template, { type: 'application/pdf' });
const pdfUrl = URL.createObjectURL(pdfBlob);
// 2. Initialize the PDF SDK (e.g., PSPDFKit)
+ console.log(template);
+
const instance = await PSPDFKit.load({
- container: viewerRef.current,
+ // setViewInstance(await PSPDFKit.load({
+ container: document.getElementById(viewerRef),//viewerRef.current,
document: pdfUrl,
// Remember to add your SDK license key if applicable
// licenseKey: "YOUR_PSPDFKIT_LICENSE_KEY",
- baseUrl: process.env.PUBLIC_URL + '/pspdfkit-lib/', // Path to SDK assets
+ baseUrl: `${process.env.PUBLIC_URL}/pspdfkit-lib/`//, // Path to SDK assets
// Enable form filling UI
- formDesignerViewMode: PSPDFKit.FormDesignerViewMode.Enabled
+ // formDesignerViewMode: PSPDFKit.FormDesignerViewMode.Enabled
});
+ // }));
instanceRef.current = instance;
setPdfLoaded(true);
@@ -104,7 +128,7 @@ function PDF() {
)}
import('pages/client/ClientSearchPage')));
const ClientMaintainPage = Loadable(lazy( () => import('pages/client/ClientMaintainPage')));
-const PDF = Loadable(lazy( () => import('pages/pdf')));
// ==============================|| AUTH ROUTING ||============================== //
@@ -41,16 +40,6 @@ const ClientRoutes =() => {
)
),
},
- {
- path: 'pdf',
- element: (
- handleRouteAbility(
- ability.can('VIEW', 'DASHBOARD'),
-
,
-
- )
- ),
- },
]
};
};
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index 4322166..14798e1 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -59,6 +59,7 @@ export const DELETE_FILE_PATH = "/file"
export const GET_FILE_PATH = "/file/dl"
export const GET_THUMBNAIL_PATH = "/file/thumbnail"
export const POST_THUMBNAIL_PATH = "/file/thumbnail/ul"
+export const GET_PDF_PATH = "/pdf/template"
export const GET_CLIENT_PATH = "/client"
export const POST_CLIENT_PATH = "/client/save"
export const GET_EVENT_PATH = "/event"
diff --git a/src/utils/CommonFunction.js b/src/utils/CommonFunction.js
index bff13b0..4d8c0b1 100644
--- a/src/utils/CommonFunction.js
+++ b/src/utils/CommonFunction.js
@@ -261,11 +261,11 @@ export function removeObjectWithId(arr, id) {
/**
* Display the date array in string format, default format is 'yyyy-MM-dd'.
*
- * @param {*} queryDateArray - The date array to display.
+ * @param {*} dateInput - The date value to be displayed, can be array or timestamp.
* @param {*} [formatOption] - Set to True to display also the timestamp, or input custom format text.
*/
-export function getDateString(queryDateArray, formatOption=false) {
- if (queryDateArray === null || queryDateArray === undefined) {
+export function getDateString(dateInput, formatOption=false) {
+ if (dateInput === null || dateInput === undefined) {
return null;
}
@@ -276,17 +276,26 @@ export function getDateString(queryDateArray, formatOption=false) {
dateFormat = formatOption;
}
- return format(
- new Date(
+ let inputType = 0; // Array
+ if (!Array.isArray(dateInput)) {
+ inputType = 1;
+ }
+
+ let date = new Date();
+ if (inputType == 0) {
+ let queryDateArray = dateInput;
+ date = new Date(
queryDateArray[0],
queryDateArray[1]-1,
queryDateArray[2],
queryDateArray[3] !== undefined ? queryDateArray[3] : 0,
queryDateArray[4] !== undefined ? queryDateArray[4] : 0,
queryDateArray[5] !== undefined ? queryDateArray[5] : 0
- ),
- dateFormat
- );
+ );
+ } else {
+ date = new Date(dateInput);
+ }
+ return format(date, dateFormat);
}
export const isOptionEqualToValue = (option, value) => {