From d76b6b0c6b98c52ada33b22121d99d29932d0915 Mon Sep 17 00:00:00 2001 From: ISA Date: Fri, 18 Oct 2024 14:38:09 +0200 Subject: [PATCH] =?UTF-8?q?applikationsversion=20von=20Platzhalter=20anzei?= =?UTF-8?q?gen=20und=20in=20der=20Einstellung=20"Systemzeit=20=C3=BCberneh?= =?UTF-8?q?men"=20vorbereitet,=20muss=20nur=20Platzhalter=20von=20Kai=20ge?= =?UTF-8?q?setzt=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/dashboard/page.jsx | 7 +++- components/modales/SettingsModal.jsx | 43 ++++++++++++++++++++- last20Messages.acp | 58 ++++++++++++++++++++++++++++ public/CPL/SERVICE/System.acp | 1 + utils/loadWindowVariables.js | 2 +- 5 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 last20Messages.acp diff --git a/app/dashboard/page.jsx b/app/dashboard/page.jsx index 20c72b0..893a3f0 100644 --- a/app/dashboard/page.jsx +++ b/app/dashboard/page.jsx @@ -22,6 +22,7 @@ function Dashboard() { const [loading, setLoading] = useState(true); const [error, setError] = useState(null); const [kueCableBreak, setKueCableBreak] = useState([]); + const [appVersion, setAppVersion] = useState(""); useEffect(() => { loadWindowVariables(apiUrl) @@ -32,6 +33,7 @@ function Dashboard() { setIp(window.ip); setSubnet(window.subnet); setGateway(window.gateway); + setAppVersion(window.appVersion); } else { console.error("Konnte last20Messages nicht finden."); setError("Konnte last20Messages nicht finden."); @@ -239,8 +241,9 @@ function Dashboard() {

- Applikationsversion: 5.1.1.8 - C-24-KA + + Applikationsversion: {appVersion}{" "} +

diff --git a/components/modales/SettingsModal.jsx b/components/modales/SettingsModal.jsx index aaceab3..2cb462d 100644 --- a/components/modales/SettingsModal.jsx +++ b/components/modales/SettingsModal.jsx @@ -139,6 +139,47 @@ function SettingModal({ showModal, onClose }) { alert("Keine Änderungen vorgenommen."); } }; + const handleSetDateTime = () => { + const currentDate = new Date(); + + // Format date and time as required by the system: + const year = currentDate.getFullYear().toString().slice(-2); // Last two digits of the year + const month = String(currentDate.getMonth() + 1).padStart(2, "0"); // Month (1-12) + const day = String(currentDate.getDate()).padStart(2, "0"); // Day (1-31) + + const hours = String(currentDate.getHours()).padStart(2, "0"); // Hours (0-23) + const minutes = String(currentDate.getMinutes()).padStart(2, "0"); // Minutes (0-59) + const seconds = String(currentDate.getSeconds()).padStart(2, "0"); // Seconds (0-59) + + // Date command + const dateCommand = `CLK00=${year}-${month}-${day}`; + + // Time command + const timeCommand = `CLK01=${hours}-${minutes}-${seconds}`; + + // Send the commands to the server using fetch and GET method + fetch(`/CPL?${dateCommand}`, { method: "GET" }) + .then((response) => { + if (response.ok) { + alert("Datum erfolgreich gesetzt!"); + return fetch(`/CPL?${timeCommand}`, { method: "GET" }); + } else { + alert("Fehler beim Setzen des Datums!"); + throw new Error("Date setting failed."); + } + }) + .then((response) => { + if (response.ok) { + alert("Uhrzeit erfolgreich gesetzt!"); + } else { + alert("Fehler beim Setzen der Uhrzeit!"); + } + }) + .catch((error) => { + console.error("Fehler:", error); + alert("Fehler beim Setzen von Datum und Uhrzeit!"); + }); + }; return ( <> @@ -272,7 +313,7 @@ function SettingModal({ showModal, onClose }) { "Möchten Sie wirklich die Systemzeit übernehmen?" ) ) { - setSystemUhr(new Date().toLocaleString()); + handleSetDateTime(); } }} > diff --git a/last20Messages.acp b/last20Messages.acp new file mode 100644 index 0000000..3c8f960 --- /dev/null +++ b/last20Messages.acp @@ -0,0 +1,58 @@ +// Letzte 20 Meldungen für dashboard.html Start.acp +var last20Messages = `<%=SAM01%>`; + +//System.acp +var appVersion="<%=SAV00%>"; +var deviceName="<%=SAN01%>"; +var mac1="<%=SEM01%>"; +var mac2="<%=SEM02%>"; +var ip="<%=SEI01%>"; +var subnet="<%=SES01%>"; +var gateway="<%=SEG01%>"; +var datetime="<%=SCL01%>"; + +//de.acp +var de=[<%=DES80%>,<%=DES81%>,<%=DES82%>,<%=DES83%>]; +var counter=[<%=DEC80%>,<%=DEC81%>,<%=DEC82%>,<%=DEC83%>]; +var flutter=[<%=DEF80%>,<%=DEF81%>,<%=DEF82%>,<%=DEF83%>]; + +//kueConfig.acp +var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>]; +var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>]; +var kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>]; + +//kueDetail.acp +var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>]; +var kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>]; +var kueValid=[<%=KIV80%>,<%=KIV81%>,<%=KIV82%>,<%=KIV83%>]; +var kueAlarm1=[<%=KIA80%>,<%=KIA81%>,<%=KIA82%>,<%=KIA83%>]; +var kueAlarm2=[<%=KRA80%>,<%=KRA81%>,<%=KRA82%>,<%=KRA83%>]; + +var kueRes=[<%=KRM80%>,<%=KRM81%>,<%=KRM82%>,<%=KRM83%>]; + +var kueCableBreak=[<%=KSC80%>,<%=KSC81%>,<%=KSC82%>,<%=KSC83%>]; +var kueGroundFault=[<%=KSG80%>,<%=KSG81%>,<%=KSG82%>,<%=KSG83%>]; + +var kueLimit1=[<%=KIG80%>,<%=KIG81%>,<%=KIG82%>,<%=KIG83%>]; +var kueLimit2Low=[<%=KRG80%>,<%=KRG81%>,<%=KRG82%>,<%=KRG83%>]; +var kueLimit2High=[<%=KRH80%>,<%=KRH81%>,<%=KRH82%>,<%=KRH83%>]; +var kueDelay1=[<%=KID80%>,<%=KID81%>,<%=KID82%>,<%=KID83%>]; +var kueLoopInterval=[<%=KRI80%>,<%=KRI81%>,<%=KRI82%>,<%=KRI83%>]; + +var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>]; +var kueVersion=[<%=KSV80%>,<%=KSV81%>,<%=KSV82%>,<%=KSV83%>]; +var kueName=[<%=KSA80%>,<%=KSA81%>,<%=KSA82%>,<%=KSA83%>]; + + +var tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>]; +var tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>]; +var tdrSpeed=[<%=KTS80%>,<%=KTS81%>,<%=KTS82%>,<%=KTS83%>]; +var tdrAmp=[<%=KTA80%>,<%=KTA81%>,<%=KTA82%>,<%=KTA83%>]; +var tdrTrigger=[<%=KTE80%>,<%=KTE81%>,<%=KTE82%>,<%=KTE83%>]; +var tdrLocation=[<%=KTF80%>,<%=KTF81%>,<%=KTF82%>,<%=KTF83%>]; +var tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>]; +var kueOverflow=[<%=KIW80%>,<%=KIW81%>,<%=KIW82%>,<%=KIW83%>]; +var kue100V=[<%=KSS80%>,<%=KSS81%>,<%=KSS82%>,<%=KSS83%>]; +var kueResidence=[<%=KSN80%>,<%=KSN81%>,<%=KSN82%>,<%=KSN83%>]; +var tdrLastMeasurement=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>]; +var kueBooting=[<%=KSB80%>,<%=KSB81%>,<%=KSB82%>,<%=KSB83%>]; \ No newline at end of file diff --git a/public/CPL/SERVICE/System.acp b/public/CPL/SERVICE/System.acp index 94687fb..1d85d26 100644 --- a/public/CPL/SERVICE/System.acp +++ b/public/CPL/SERVICE/System.acp @@ -1,3 +1,4 @@ +var appVersion="<%=SAV00%>"; var deviceName="<%=SAN01%>"; var mac1="<%=SEM01%>"; var mac2="<%=SEM02%>"; diff --git a/utils/loadWindowVariables.js b/utils/loadWindowVariables.js index 82929a9..3087b20 100644 --- a/utils/loadWindowVariables.js +++ b/utils/loadWindowVariables.js @@ -67,7 +67,7 @@ export async function loadWindowVariables(apiUrl) { kueResidence: window.kueResidence, tdrLastMeasurement: window.tdrLastMeasurement, kueBooting: window.kueBooting, - k1json: window.k1json, + appVersion: window.appVersion, }); resolve();