Ismail/CPLv4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applikationsversion von Platzhalter anzeigen und in der Einstellung "Systemzeit übernehmen" vorbereitet, muss nur Platzhalter von Kai gesetzt werden

Browse Source
This commit is contained in:
ISA
2024-10-18 14:38:09 +02:00
parent b25951c7ba
commit d76b6b0c6b
5 changed files with 107 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/dashboard/page.jsx
View File

@@ -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() {
<div className="flex flex-row p-2 space-x-2">
<Icon icon="bx:code-block" className="text-xl text-blue-400" />
<p className="text-sm text-gray-600">
<span className="font-bold">Applikationsversion: </span> 5.1.1.8
C-24-KA
<span className="font-bold">
Applikationsversion: {appVersion}{" "}
</span>
</p>
</div>
<div className="flex flex-row p-2 space-x-2">

43
components/modales/SettingsModal.jsx
View File

@@ -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();
}
}}
>

58
last20Messages.acp Normal file
View File

@@ -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%>];

1
public/CPL/SERVICE/System.acp
View File

@@ -1,3 +1,4 @@
var appVersion="<%=SAV00%>";
var deviceName="<%=SAN01%>";
var mac1="<%=SEM01%>";
var mac2="<%=SEM02%>";

2
utils/loadWindowVariables.js
View File

@@ -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();