dev #1

Merged
alientim merged 145 commits from dev into main 2025-10-12 13:44:14 +02:00
Showing only changes of commit de6b5c7fe9 - Show all commits

View File

@@ -16,19 +16,16 @@
<script> <script>
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
// --- Intervall aus Datenbank (Jinja Variable) ---
const intervalMinutes = {{ interval | int }}; const intervalMinutes = {{ interval | int }};
const intervalMilliseconds = intervalMinutes * 60 * 1000; const intervalMilliseconds = intervalMinutes * 60 * 1000;
let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt let lastUpdateTime = Date.now(); // wird nach Log-Auswertung gesetzt
// --- Log laden ---
function fetchLog() { function fetchLog() {
fetch("{{ url_for('get_log') }}") fetch("{{ url_for('get_log') }}")
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
const box = document.getElementById("log-box"); const box = document.getElementById("log-box");
// Zeilen filtern
const filteredLines = data const filteredLines = data
.split("\n") .split("\n")
.filter(line => !line.includes("ist erreichbar!")); .filter(line => !line.includes("ist erreichbar!"));
@@ -36,7 +33,7 @@ document.addEventListener("DOMContentLoaded", () => {
box.innerText = filteredLines.join("\n"); box.innerText = filteredLines.join("\n");
box.scrollTop = box.scrollHeight; box.scrollTop = box.scrollHeight;
// --- Timer: letzte "----" Linie finden --- // letzte Separator-Linie finden
let lastSeparatorIndex = -1; let lastSeparatorIndex = -1;
for (let i = filteredLines.length - 1; i >= 0; i--) { for (let i = filteredLines.length - 1; i >= 0; i--) {
if (filteredLines[i].startsWith("--------------------------------------------------------------------")) { if (filteredLines[i].startsWith("--------------------------------------------------------------------")) {
@@ -61,21 +58,19 @@ document.addEventListener("DOMContentLoaded", () => {
.catch(err => console.error("Fehler beim Laden der Logs:", err)); .catch(err => console.error("Fehler beim Laden der Logs:", err));
} }
// --- Timer aktualisieren ---
function updateTimer() { function updateTimer() {
const now = Date.now(); const now = Date.now();
const remainingMs = intervalMilliseconds - (now - lastUpdateTime); const nextRefresh = lastUpdateTime + intervalMilliseconds;
const remainingMs = nextRefresh - now;
const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0); const remainingSec = Math.max(Math.ceil(remainingMs / 1000), 0);
document.getElementById("timer").innerText = remainingSec; document.getElementById("timer").innerText = remainingSec;
} }
// --- Button klick ---
document.getElementById("refresh-btn").addEventListener("click", fetchLog); document.getElementById("refresh-btn").addEventListener("click", fetchLog);
// --- Initial starten --- fetchLog();
fetchLog(); // zuerst laden setInterval(fetchLog, intervalMilliseconds);
setInterval(fetchLog, intervalMilliseconds); // automatische Updates nach DB-Intervall setInterval(updateTimer, 1000);
setInterval(updateTimer, 1000); // Timer jede Sekunde
}); });
</script> </script>