From 0cc78e871599021adf21a1caa902b11a6f656ce2 Mon Sep 17 00:00:00 2001 From: nguyentrungthat <80239428+nguentrungthat@users.noreply.github.com> Date: Tue, 10 Feb 2026 14:28:43 +0700 Subject: [PATCH] Update UI card line view listFeatureTested --- BACKEND/app/services/line_connection.ts | 12 ++-- FRONTEND/src/components/BottomToolBar.tsx | 4 ++ FRONTEND/src/components/CardLine.tsx | 66 ++++++++++++------- .../src/components/Modal/ModalTerminal.tsx | 17 +++-- 4 files changed, 66 insertions(+), 33 deletions(-) diff --git a/BACKEND/app/services/line_connection.ts b/BACKEND/app/services/line_connection.ts index 46834fa..7d233ca 100644 --- a/BACKEND/app/services/line_connection.ts +++ b/BACKEND/app/services/line_connection.ts @@ -1710,7 +1710,7 @@ ${log} const body = ` - +
DPELPPhysical TestPhysical Testing
@@ -1720,7 +1720,7 @@ ${log} IOS: ${dataShowVersion?.SOFTWARE_IMAGE ?? ''} ${dataShowVersion?.VERSION ?? ''}
MEM: ${dataShowVersion?.MEMORY ?? ''}
FLASH: ${dataShowVersion?.USB_FLASH ?? ''}
- License: ${ + Licenses: ${ dataShowLic ? dataShowLic ?.filter((el) => el.LICENSE_TYPE === 'Permanent') @@ -1729,18 +1729,18 @@ ${log} : '' }
Summary: ${this.config?.latestScenario?.detectAI?.summary || ''}
- Issue: ${issue?.length ? `
- ` + issue.join(`
- `) : 'No issues detected.'}

+ Issues: ${issue?.length ? `
- ` + issue.join(`
- `) : 'No issues detected.'}

Total Ports: ${portPhysical?.length}
- Ports Tested (UP): ${portPhysical.filter((p) => p.tested).length}
- Ports Missing: ${portPhysical.filter((p) => !p.tested).length}
+ Ports Tested (Link UP): ${portPhysical.filter((p) => p.tested).length}
+ Ports Missing/Down: ${portPhysical.filter((p) => !p.tested).length}
` await sendMessageToMail( - `[ATC] - [${this.config.stationName} - Line: ${this.config.lineNumber}] - Summary Fully Tested`, + `[ATC] - [${this.config.stationName} - Line: ${this.config.lineNumber}] - Summary of Testing Results`, body ) } diff --git a/FRONTEND/src/components/BottomToolBar.tsx b/FRONTEND/src/components/BottomToolBar.tsx index 3008171..c3b2747 100644 --- a/FRONTEND/src/components/BottomToolBar.tsx +++ b/FRONTEND/src/components/BottomToolBar.tsx @@ -408,6 +408,10 @@ const BottomToolBar = ({ stationId: Number(station.id), }); }); + setIsDisable(true); + setTimeout(() => { + setIsDisable(false); + }, 10000); }} > Physical diff --git a/FRONTEND/src/components/CardLine.tsx b/FRONTEND/src/components/CardLine.tsx index 5d391d1..efe1b58 100644 --- a/FRONTEND/src/components/CardLine.tsx +++ b/FRONTEND/src/components/CardLine.tsx @@ -337,28 +337,50 @@ const CardLine = ({ )} - - - {/* {line?.tickets && line?.tickets?.length > 0 ? ( - - {line?.tickets[0].description ?? ""} - - ) : ( - "" - )} */} - -
- {line?.userOpenCLI - ? (line?.userOpenCLI === user?.userName - ? "You are" - : line?.userOpenCLI + " is") + " using" - : ""} -
+ + {line?.listFeatureTested?.includes("DPELP") ? ( + + DPELP + + ) : ( + "" + )} + {line?.listFeatureTested?.includes("PHYSICAL") ? ( + + Physical + + ) : ( + "" + )}
diff --git a/FRONTEND/src/components/Modal/ModalTerminal.tsx b/FRONTEND/src/components/Modal/ModalTerminal.tsx index edf22d6..576657a 100644 --- a/FRONTEND/src/components/Modal/ModalTerminal.tsx +++ b/FRONTEND/src/components/Modal/ModalTerminal.tsx @@ -138,11 +138,18 @@ const ModalTerminal = ({ }, [opened, line?.listFeatureTested]); useEffect(() => { - if (opened && line?.tickets && line?.tickets?.length > 0) { - const data = line?.tickets[0]; - setLatestTicket(data); - setDataTicket({ ...data, description: "" }); - } else { + // if (opened && line?.tickets && line?.tickets?.length > 0) { + // const data = line?.tickets[0]; + // setLatestTicket(data); + // setDataTicket({ ...data, description: "" }); + // } else { + // setLatestTicket(INIT_TICKET); + // setDataTicket(INIT_TICKET); + // setValueBaud(""); + // setActiveStep(0); + // setActiveTabs("general"); + // } + if (!opened) { setLatestTicket(INIT_TICKET); setDataTicket(INIT_TICKET); setValueBaud("");