📝 🎉 Improved session management system with new backup database and enhanced logs 🌐

This commit is contained in:
2025-06-12 08:23:49 +02:00
parent 841d4cc466
commit f2be2e65a8
103 changed files with 1351 additions and 508 deletions

View File

@ -38,7 +38,7 @@
<!-- Formular -->
<div class="form-container rounded-lg p-6">
<form action="{{ url_for('admin.create_printer_api') }}" method="POST" class="space-y-6">
<form id="printerForm" class="space-y-6">
<!-- CSRF Token -->
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
@ -52,34 +52,20 @@
name="name"
required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="3D-Drucker Raum A001">
</div>
<!-- IP-Adresse -->
<div>
<label for="ip_address" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-network-wired mr-2"></i>IP-Adresse *
</label>
<input type="text"
id="ip_address"
name="ip_address"
required
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.100">
<p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse der Tapo-Steckdose</p>
placeholder="z.B. Prusa MK3S+ Raum 101">
</div>
<!-- Modell -->
<div>
<label for="model" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-cogs mr-2"></i>Drucker-Modell
<i class="fas fa-cogs mr-2"></i>Drucker-Modell *
</label>
<input type="text"
id="model"
name="model"
required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Ender 3 V2">
placeholder="z.B. Prusa i3 MK3S+">
</div>
<!-- Standort -->
@ -91,33 +77,77 @@
id="location"
name="location"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Raum A001, Erdgeschoss">
placeholder="z.B. Werkstatt Erdgeschoss">
</div>
<!-- Beschreibung -->
<!-- Steckdosen-Konfiguration -->
<div class="bg-slate-50 dark:bg-slate-900/50 rounded-lg p-4 space-y-4">
<h3 class="text-lg font-semibold text-slate-800 dark:text-white">
<i class="fas fa-plug mr-2"></i>Tapo Smart-Plug Konfiguration (optional)
</h3>
<!-- Plug IP -->
<div>
<label for="plug_ip" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
IP-Adresse der Steckdose
</label>
<input type="text"
id="plug_ip"
name="plug_ip"
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.100">
</div>
<!-- Plug Username -->
<div>
<label for="plug_username" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
Tapo Benutzername
</label>
<input type="text"
id="plug_username"
name="plug_username"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="TP-Link Konto E-Mail">
</div>
<!-- Plug Password -->
<div>
<label for="plug_password" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
Tapo Passwort
</label>
<input type="password"
id="plug_password"
name="plug_password"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="TP-Link Konto Passwort">
</div>
</div>
<!-- Drucker IP (optional) -->
<div>
<label for="description" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-comment mr-2"></i>Beschreibung
<label for="ip_address" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-network-wired mr-2"></i>Drucker IP-Adresse (optional)
</label>
<textarea id="description"
name="description"
rows="3"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Zusätzliche Informationen zum Drucker..."></textarea>
<input type="text"
id="ip_address"
name="ip_address"
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.101">
<p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse des Druckers selbst (falls verfügbar)</p>
</div>
<!-- Status -->
<div>
<label for="status" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-circle mr-2"></i>Anfangsstatus
<label for="active" class="flex items-center space-x-2 text-sm font-medium text-slate-700 dark:text-slate-300 cursor-pointer">
<input type="checkbox"
id="active"
name="active"
checked
class="rounded text-blue-600 focus:ring-2 focus:ring-blue-500">
<span>Drucker aktiv</span>
</label>
<select id="status"
name="status"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white">
<option value="available">Verfügbar</option>
<option value="offline">Offline</option>
<option value="maintenance">Wartung</option>
</select>
</div>
<!-- Hinweise -->
@ -128,9 +158,9 @@
<p class="font-semibold mb-1">Hinweise:</p>
<ul class="list-disc list-inside space-y-1">
<li>Felder mit * sind Pflichtfelder</li>
<li>Die IP-Adresse sollte die Adresse der Tapo-Steckdose sein</li>
<li>Der Drucker wird automatisch mit Standard-Tapo-Einstellungen konfiguriert</li>
<li>Status "Verfügbar" bedeutet bereit für Druckaufträge</li>
<li>Die Tapo-Konfiguration ist optional, ermöglicht aber die Stromsteuerung</li>
<li>Bei fehlenden Tapo-Zugangsdaten werden die globalen Einstellungen verwendet</li>
<li>Eine MAC-Adresse wird automatisch generiert wenn nicht vorhanden</li>
</ul>
</div>
</div>
@ -139,6 +169,7 @@
<!-- Aktionen -->
<div class="flex space-x-3 pt-4">
<button type="submit"
id="submitBtn"
class="flex-1 bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-lg transition-colors">
<i class="fas fa-save mr-2"></i>Drucker erstellen
</button>
@ -154,55 +185,96 @@
{% endblock %}
{% block extra_js %}
<!-- JavaScript für Form-Validierung -->
<!-- JavaScript für Form-Validierung und AJAX-Submit -->
<script>
document.addEventListener('DOMContentLoaded', function() {
const form = document.querySelector('form');
const nameInput = document.getElementById('name');
const ipInput = document.getElementById('ip_address');
const form = document.getElementById('printerForm');
const submitBtn = document.getElementById('submitBtn');
// IP-Adresse-Validierung
ipInput.addEventListener('blur', function() {
const ip = this.value;
function validateIP(ip) {
const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return !ip || ipRegex.test(ip);
}
// Form-Submit mit AJAX
form.addEventListener('submit', async function(e) {
e.preventDefault();
if (ip && !ipRegex.test(ip)) {
this.classList.add('border-red-500');
this.classList.remove('border-slate-300', 'dark:border-slate-600');
} else {
this.classList.remove('border-red-500');
this.classList.add('border-slate-300', 'dark:border-slate-600');
}
});
// Form-Submit-Validierung
form.addEventListener('submit', function(e) {
const name = nameInput.value.trim();
const ip = ipInput.value.trim();
const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
if (!name) {
e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie einen Drucker-Namen ein.', 'error');
} else {
alert('Bitte geben Sie einen Drucker-Namen ein.');
}
nameInput.focus();
// Validierung
const plugIp = document.getElementById('plug_ip').value;
const printerIp = document.getElementById('ip_address').value;
if (!validateIP(plugIp)) {
showNotification('Ungültige Steckdosen-IP-Adresse', 'error');
return;
}
if (!ip || !ipRegex.test(ip)) {
e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie eine gültige IP-Adresse ein.', 'error');
} else {
alert('Bitte geben Sie eine gültige IP-Adresse ein.');
}
ipInput.focus();
if (!validateIP(printerIp)) {
showNotification('Ungültige Drucker-IP-Adresse', 'error');
return;
}
// Button deaktivieren
submitBtn.disabled = true;
submitBtn.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Wird erstellt...';
// Daten sammeln
const formData = {
name: document.getElementById('name').value,
model: document.getElementById('model').value,
location: document.getElementById('location').value || '',
ip_address: printerIp || null,
plug_ip: plugIp || null,
plug_username: document.getElementById('plug_username').value || null,
plug_password: document.getElementById('plug_password').value || null,
active: document.getElementById('active').checked
};
try {
const response = await fetch('/api/admin/printers', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': document.querySelector('[name=csrf_token]').value
},
body: JSON.stringify(formData)
});
const result = await response.json();
if (response.ok && result.success) {
showNotification(result.message || 'Drucker erfolgreich erstellt', 'success');
// Nach kurzer Verzögerung zur Drucker-Liste
setTimeout(() => {
window.location.href = "{{ url_for('admin.admin_dashboard', tab='printers') }}";
}, 1500);
} else {
showNotification(result.error || 'Fehler beim Erstellen des Druckers', 'error');
submitBtn.disabled = false;
submitBtn.innerHTML = '<i class="fas fa-save mr-2"></i>Drucker erstellen';
}
} catch (error) {
console.error('Fehler:', error);
showNotification('Netzwerkfehler beim Erstellen des Druckers', 'error');
submitBtn.disabled = false;
submitBtn.innerHTML = '<i class="fas fa-save mr-2"></i>Drucker erstellen';
}
});
});
// Notification-Funktion
function showNotification(message, type = 'info') {
// Verwende die globale Notification-Funktion falls vorhanden
if (typeof window.showNotification === 'function') {
window.showNotification(message, type);
} else if (typeof showFlashMessage === 'function') {
showFlashMessage(message, type);
} else {
// Fallback
alert(message);
}
}
</script>
{% endblock %}

View File

@ -16,6 +16,10 @@
background: rgba(30, 41, 59, 0.95);
border: 1px solid rgba(255, 255, 255, 0.1);
}
.test-result {
transition: all 0.3s ease;
}
</style>
{% endblock %}
@ -34,20 +38,20 @@
<i class="fas fa-arrow-left mr-2"></i>Zurück
</a>
</div>
<div class="mt-4 p-3 bg-blue-50 dark:bg-blue-900/20 rounded-lg">
<p class="text-sm text-blue-700 dark:text-blue-300">
<i class="fas fa-info-circle mr-2"></i>
<strong>Drucker-ID:</strong> {{ printer.id }} |
<strong>Erstellt am:</strong> {{ printer.created_at[:10] if printer.created_at else 'Unbekannt' }}
</p>
</div>
</div>
<!-- Formular -->
<div class="form-container rounded-lg p-6">
<form action="{{ url_for('admin.update_printer_api', printer_id=printer.id) }}" method="POST" class="space-y-6">
<!-- Ladeindikator -->
<div id="loadingIndicator" class="form-container rounded-lg p-6 mb-6 text-center">
<i class="fas fa-spinner fa-spin text-4xl text-blue-600 dark:text-blue-400"></i>
<p class="mt-2 text-slate-600 dark:text-slate-300">Drucker-Daten werden geladen...</p>
</div>
<!-- Formular (anfangs versteckt) -->
<div id="printerFormContainer" class="form-container rounded-lg p-6 hidden">
<form id="printerForm" class="space-y-6">
<!-- CSRF Token -->
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
<input type="hidden" id="printerId" value="" />
<!-- Name -->
<div>
@ -58,38 +62,21 @@
id="name"
name="name"
required
value="{{ printer.name }}"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="3D-Drucker Raum A001">
</div>
<!-- IP-Adresse -->
<div>
<label for="ip_address" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-network-wired mr-2"></i>IP-Adresse *
</label>
<input type="text"
id="ip_address"
name="ip_address"
required
value="{{ printer.plug_ip }}"
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.100">
<p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse der Tapo-Steckdose</p>
placeholder="z.B. Prusa MK3S+ Raum 101">
</div>
<!-- Modell -->
<div>
<label for="model" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-cogs mr-2"></i>Drucker-Modell
<i class="fas fa-cogs mr-2"></i>Drucker-Modell *
</label>
<input type="text"
id="model"
name="model"
value="{{ printer.model }}"
required
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Ender 3 V2">
placeholder="z.B. Prusa i3 MK3S+">
</div>
<!-- Standort -->
@ -100,80 +87,122 @@
<input type="text"
id="location"
name="location"
value="{{ printer.location }}"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Raum A001, Erdgeschoss">
placeholder="z.B. Werkstatt Erdgeschoss">
</div>
<!-- Beschreibung -->
<div>
<label for="description" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-comment mr-2"></i>Beschreibung
</label>
<textarea id="description"
name="description"
rows="3"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="Zusätzliche Informationen zum Drucker...">{{ printer.description or '' }}</textarea>
</div>
<!-- Status -->
<div>
<label for="status" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-circle mr-2"></i>Aktueller Status
</label>
<select id="status"
name="status"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white">
<option value="available" {{ 'selected' if printer.status == 'available' else '' }}>Verfügbar</option>
<option value="offline" {{ 'selected' if printer.status == 'offline' else '' }}>Offline</option>
<option value="maintenance" {{ 'selected' if printer.status == 'maintenance' else '' }}>Wartung</option>
<option value="online" {{ 'selected' if printer.status == 'online' else '' }}>Online</option>
<option value="printing" {{ 'selected' if printer.status == 'printing' else '' }}>Druckt</option>
</select>
</div>
<!-- Aktiv-Status -->
<div>
<label class="flex items-center space-x-3">
<input type="checkbox"
name="is_active"
{{ 'checked' if printer.active else '' }}
class="w-4 h-4 text-blue-600 bg-slate-100 dark:bg-slate-700 border-slate-300 dark:border-slate-600 rounded focus:ring-blue-500 focus:ring-2">
<span class="text-sm font-medium text-slate-700 dark:text-slate-300">
<i class="fas fa-power-off mr-2"></i>Drucker aktiv
</span>
</label>
<p class="text-sm text-slate-500 dark:text-slate-400 mt-1">Inaktive Drucker werden nicht für neue Aufträge verwendet</p>
</div>
<!-- Erweiterte Informationen -->
<div class="bg-slate-50 dark:bg-slate-800/50 border border-slate-200 dark:border-slate-700 rounded-lg p-4">
<h3 class="text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
<i class="fas fa-info-circle mr-2"></i>Drucker-Informationen
</h3>
<div class="grid grid-cols-1 md:grid-cols-2 gap-3 text-sm">
<div>
<span class="font-medium text-slate-600 dark:text-slate-400">MAC-Adresse:</span>
<span class="text-slate-800 dark:text-slate-200">{{ printer.mac_address or 'Nicht verfügbar' }}</span>
</div>
<div>
<span class="font-medium text-slate-600 dark:text-slate-400">Letzter Check:</span>
<span class="text-slate-800 dark:text-slate-200">{{ printer.last_checked or 'Nie' }}</span>
</div>
<!-- Steckdosen-Konfiguration -->
<div class="bg-slate-50 dark:bg-slate-900/50 rounded-lg p-4 space-y-4">
<div class="flex items-center justify-between">
<h3 class="text-lg font-semibold text-slate-800 dark:text-white">
<i class="fas fa-plug mr-2"></i>Tapo Smart-Plug Konfiguration
</h3>
<button type="button"
id="testConnectionBtn"
class="bg-blue-500 hover:bg-blue-600 text-white px-3 py-1 rounded text-sm transition-colors">
<i class="fas fa-network-wired mr-1"></i>Verbindung testen
</button>
</div>
<!-- Test-Ergebnis -->
<div id="testResult" class="hidden test-result rounded-lg p-3"></div>
<!-- Plug IP -->
<div>
<label for="plug_ip" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
IP-Adresse der Steckdose
</label>
<input type="text"
id="plug_ip"
name="plug_ip"
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.100">
</div>
<!-- Plug Username -->
<div>
<label for="plug_username" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
Tapo Benutzername
</label>
<input type="text"
id="plug_username"
name="plug_username"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="TP-Link Konto E-Mail">
</div>
<!-- Plug Password -->
<div>
<label for="plug_password" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
Tapo Passwort
</label>
<input type="password"
id="plug_password"
name="plug_password"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="TP-Link Konto Passwort (leer lassen für keine Änderung)">
<p class="text-xs text-slate-500 dark:text-slate-400 mt-1">
Lassen Sie dieses Feld leer, wenn Sie es nicht ändern möchten
</p>
</div>
</div>
<!-- Warnung -->
<div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-lg p-4">
<!-- Drucker IP (optional) -->
<div>
<label for="ip_address" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-network-wired mr-2"></i>Drucker IP-Adresse (optional)
</label>
<input type="text"
id="ip_address"
name="ip_address"
pattern="^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent bg-white dark:bg-slate-800 text-slate-900 dark:text-white"
placeholder="192.168.1.101">
<p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse des Druckers selbst (falls verfügbar)</p>
</div>
<!-- MAC-Adresse (readonly) -->
<div>
<label for="mac_address" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-barcode mr-2"></i>MAC-Adresse
</label>
<input type="text"
id="mac_address"
name="mac_address"
readonly
class="w-full px-3 py-2 border border-slate-300 dark:border-slate-600 rounded-lg bg-slate-100 dark:bg-slate-700 text-slate-600 dark:text-slate-400 cursor-not-allowed"
placeholder="Wird automatisch generiert">
</div>
<!-- Status -->
<div class="space-y-2">
<label for="active" class="flex items-center space-x-2 text-sm font-medium text-slate-700 dark:text-slate-300 cursor-pointer">
<input type="checkbox"
id="active"
name="active"
class="rounded text-blue-600 focus:ring-2 focus:ring-blue-500">
<span>Drucker aktiv</span>
</label>
<!-- Status-Info -->
<div class="flex items-center space-x-2 text-sm">
<span class="text-slate-600 dark:text-slate-400">Aktueller Status:</span>
<span id="currentStatus" class="font-medium"></span>
</div>
</div>
<!-- Hinweise -->
<div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4">
<div class="flex">
<i class="fas fa-exclamation-triangle text-yellow-500 dark:text-yellow-400 mt-0.5 mr-3"></i>
<div class="text-sm text-yellow-700 dark:text-yellow-300">
<p class="font-semibold mb-1">Wichtige Hinweise:</p>
<i class="fas fa-info-circle text-blue-500 dark:text-blue-400 mt-0.5 mr-3"></i>
<div class="text-sm text-blue-700 dark:text-blue-300">
<p class="font-semibold mb-1">Hinweise:</p>
<ul class="list-disc list-inside space-y-1">
<li>Änderungen an der IP-Adresse können die Verbindung unterbrechen</li>
<li>Stellen Sie sicher, dass die Tapo-Steckdose unter der neuen IP erreichbar ist</li>
<li>Bei Status-Änderungen werden laufende Jobs möglicherweise beeinflusst</li>
<li>Felder mit * sind Pflichtfelder</li>
<li>Die MAC-Adresse kann nicht geändert werden</li>
<li>Lassen Sie das Passwort-Feld leer, wenn Sie es nicht ändern möchten</li>
<li>Testen Sie die Verbindung nach Änderungen an der Tapo-Konfiguration</li>
</ul>
</div>
</div>
@ -182,9 +211,15 @@
<!-- Aktionen -->
<div class="flex space-x-3 pt-4">
<button type="submit"
id="submitBtn"
class="flex-1 bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-lg transition-colors">
<i class="fas fa-save mr-2"></i>Änderungen speichern
</button>
<button type="button"
id="deleteBtn"
class="bg-red-600 hover:bg-red-700 text-white px-4 py-2 rounded-lg transition-colors">
<i class="fas fa-trash mr-2"></i>Löschen
</button>
<a href="{{ url_for('admin.admin_dashboard', tab='printers') }}"
class="flex-1 bg-slate-500 hover:bg-slate-600 text-white px-4 py-2 rounded-lg text-center transition-colors">
<i class="fas fa-times mr-2"></i>Abbrechen
@ -192,191 +227,259 @@
</div>
</form>
</div>
<!-- Zusätzliche Aktionen -->
<div class="form-container rounded-lg p-6 mt-6">
<h3 class="text-lg font-semibold text-slate-800 dark:text-white mb-4">
<i class="fas fa-tools mr-2"></i>Drucker-Aktionen
</h3>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<button data-printer-id="{{ printer.id }}"
data-action="test"
class="printer-action-btn bg-green-600 hover:bg-green-700 text-white px-4 py-3 rounded-lg transition-colors">
<i class="fas fa-plug mr-2"></i>Verbindung testen
</button>
<button data-printer-id="{{ printer.id }}"
data-action="toggle"
class="printer-action-btn bg-orange-600 hover:bg-orange-700 text-white px-4 py-3 rounded-lg transition-colors">
<i class="fas fa-power-off mr-2"></i>Ein/Ausschalten
</button>
</div>
</div>
</div>
</div>
{% endblock %}
{% block extra_js %}
<!-- JavaScript -->
<!-- JavaScript für Form-Handling und AJAX -->
<script>
document.addEventListener('DOMContentLoaded', function() {
const form = document.querySelector('form');
const nameInput = document.getElementById('name');
const ipInput = document.getElementById('ip_address');
// IP-Adresse-Validierung
ipInput.addEventListener('blur', function() {
const ip = this.value;
const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
if (ip && !ipRegex.test(ip)) {
this.classList.add('border-red-500');
this.classList.remove('border-slate-300', 'dark:border-slate-600');
} else {
this.classList.remove('border-red-500');
this.classList.add('border-slate-300', 'dark:border-slate-600');
}
});
// Form-Submit-Validierung
form.addEventListener('submit', function(e) {
const name = nameInput.value.trim();
const ip = ipInput.value.trim();
const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
if (!name) {
e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie einen Drucker-Namen ein.', 'error');
} else {
alert('Bitte geben Sie einen Drucker-Namen ein.');
}
nameInput.focus();
return;
}
if (!ip || !ipRegex.test(ip)) {
e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie eine gültige IP-Adresse ein.', 'error');
} else {
alert('Bitte geben Sie eine gültige IP-Adresse ein.');
}
ipInput.focus();
return;
}
});
// Event-Listener für Drucker-Aktions-Buttons
document.querySelectorAll('.printer-action-btn').forEach(button => {
button.addEventListener('click', function() {
const printerId = this.getAttribute('data-printer-id');
const action = this.getAttribute('data-action');
if (action === 'test') {
testPrinterConnection(printerId, this);
} else if (action === 'toggle') {
togglePrinterPower(printerId, this);
let printerData = null;
// Extrahiere Drucker-ID aus der URL
const urlParts = window.location.pathname.split('/');
const printerId = parseInt(urlParts[urlParts.length - 1]) || 0;
document.addEventListener('DOMContentLoaded', async function() {
// Drucker-Daten laden
await loadPrinterData();
// Event-Listener
document.getElementById('printerForm').addEventListener('submit', handleSubmit);
document.getElementById('deleteBtn').addEventListener('click', handleDelete);
document.getElementById('testConnectionBtn').addEventListener('click', testConnection);
});
async function loadPrinterData() {
try {
const response = await fetch(`/api/admin/printers/${printerId}`, {
headers: {
'X-CSRFToken': document.querySelector('[name=csrf_token]').value
}
});
});
});
// Verbindungstest
function testPrinterConnection(printerId, button) {
const originalText = button.innerHTML;
button.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Teste...';
button.disabled = true;
fetch(`/api/admin/printers/${printerId}/test-tapo`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': '{{ csrf_token() }}'
}
})
.then(response => response.json())
.then(data => {
if (data.tapo_test && data.tapo_test.success) {
const message = '✅ Verbindung erfolgreich!\n\nStatus: ' + (data.tapo_test.device_info ? data.tapo_test.device_info.device_on ? 'EIN' : 'AUS' : 'Unbekannt');
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'success');
} else {
alert(message);
}
const result = await response.json();
if (response.ok && result.success) {
printerData = result.printer;
populateForm(printerData);
// UI aktualisieren
document.getElementById('loadingIndicator').classList.add('hidden');
document.getElementById('printerFormContainer').classList.remove('hidden');
} else {
const message = '❌ Verbindung fehlgeschlagen!\n\nFehler: ' + (data.tapo_test ? data.tapo_test.error : 'Unbekannter Fehler');
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
}
showNotification(result.error || 'Fehler beim Laden der Drucker-Daten', 'error');
setTimeout(() => {
window.location.href = "{{ url_for('admin.admin_dashboard', tab='printers') }}";
}, 2000);
}
})
.catch(error => {
const message = '❌ Verbindungstest fehlgeschlagen!\n\nFehler: ' + error.message;
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
}
})
.finally(() => {
button.innerHTML = originalText;
button.disabled = false;
});
} catch (error) {
console.error('Fehler:', error);
showNotification('Netzwerkfehler beim Laden der Drucker-Daten', 'error');
}
}
// Drucker ein/ausschalten
function togglePrinterPower(printerId, button) {
const originalText = button.innerHTML;
function populateForm(data) {
document.getElementById('name').value = data.name || '';
document.getElementById('model').value = data.model || '';
document.getElementById('location').value = data.location || '';
document.getElementById('ip_address').value = data.ip_address || '';
document.getElementById('mac_address').value = data.mac_address || '';
document.getElementById('plug_ip').value = data.plug_ip || '';
document.getElementById('plug_username').value = data.plug_username || '';
// Passwort nicht vorausfüllen aus Sicherheitsgründen
document.getElementById('active').checked = data.active !== false;
if (!confirm('Möchten Sie den Drucker ein-/ausschalten?')) {
// Status anzeigen
const statusEl = document.getElementById('currentStatus');
statusEl.textContent = data.status || 'offline';
statusEl.className = 'font-medium ' + getStatusClass(data.status);
}
function getStatusClass(status) {
switch(status) {
case 'online':
case 'idle':
return 'text-green-600 dark:text-green-400';
case 'busy':
case 'printing':
return 'text-blue-600 dark:text-blue-400';
case 'offline':
return 'text-slate-600 dark:text-slate-400';
case 'error':
return 'text-red-600 dark:text-red-400';
default:
return 'text-slate-600 dark:text-slate-400';
}
}
async function handleSubmit(e) {
e.preventDefault();
const submitBtn = document.getElementById('submitBtn');
submitBtn.disabled = true;
submitBtn.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Wird gespeichert...';
// Daten sammeln
const formData = {
name: document.getElementById('name').value,
model: document.getElementById('model').value,
location: document.getElementById('location').value || '',
ip_address: document.getElementById('ip_address').value || null,
plug_ip: document.getElementById('plug_ip').value || null,
plug_username: document.getElementById('plug_username').value || null,
active: document.getElementById('active').checked
};
// Passwort nur hinzufügen wenn ausgefüllt
const password = document.getElementById('plug_password').value;
if (password) {
formData.plug_password = password;
}
try {
const response = await fetch(`/api/admin/printers/${printerId}`, {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': document.querySelector('[name=csrf_token]').value
},
body: JSON.stringify(formData)
});
const result = await response.json();
if (response.ok && result.success) {
showNotification(result.message || 'Drucker erfolgreich aktualisiert', 'success');
// Nach kurzer Verzögerung zur Drucker-Liste
setTimeout(() => {
window.location.href = "{{ url_for('admin.admin_dashboard', tab='printers') }}";
}, 1500);
} else {
showNotification(result.error || 'Fehler beim Aktualisieren des Druckers', 'error');
submitBtn.disabled = false;
submitBtn.innerHTML = '<i class="fas fa-save mr-2"></i>Änderungen speichern';
}
} catch (error) {
console.error('Fehler:', error);
showNotification('Netzwerkfehler beim Aktualisieren des Druckers', 'error');
submitBtn.disabled = false;
submitBtn.innerHTML = '<i class="fas fa-save mr-2"></i>Änderungen speichern';
}
}
async function handleDelete() {
if (!confirm('Möchten Sie diesen Drucker wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.')) {
return;
}
button.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Schaltet...';
button.disabled = true;
const deleteBtn = document.getElementById('deleteBtn');
deleteBtn.disabled = true;
deleteBtn.innerHTML = '<i class="fas fa-spinner fa-spin mr-2"></i>Wird gelöscht...';
fetch(`/api/admin/printers/${printerId}/toggle`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CSRFToken': '{{ csrf_token() }}'
}
})
.then(response => response.json())
.then(data => {
if (data.success) {
const message = '✅ Drucker erfolgreich ' + data.action + '!';
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'success');
} else {
alert(message);
try {
const response = await fetch(`/api/admin/printers/${printerId}`, {
method: 'DELETE',
headers: {
'X-CSRFToken': document.querySelector('[name=csrf_token]').value
}
// Seite neu laden um aktuellen Status zu zeigen
setTimeout(() => location.reload(), 1000);
});
const result = await response.json();
if (response.ok && result.success) {
showNotification(result.message || 'Drucker erfolgreich gelöscht', 'success');
setTimeout(() => {
window.location.href = "{{ url_for('admin.admin_dashboard', tab='printers') }}";
}, 1500);
} else {
const message = 'Fehler beim Schalten!\n\nFehler: ' + (data.error || 'Unbekannter Fehler');
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
showNotification(result.error || 'Fehler beim Löschen des Druckers', 'error');
deleteBtn.disabled = false;
deleteBtn.innerHTML = '<i class="fas fa-trash mr-2"></i>Löschen';
}
} catch (error) {
console.error('Fehler:', error);
showNotification('Netzwerkfehler beim Löschen des Druckers', 'error');
deleteBtn.disabled = false;
deleteBtn.innerHTML = '<i class="fas fa-trash mr-2"></i>Löschen';
}
}
async function testConnection() {
const testBtn = document.getElementById('testConnectionBtn');
const resultDiv = document.getElementById('testResult');
const plugIp = document.getElementById('plug_ip').value;
if (!plugIp) {
showNotification('Bitte geben Sie eine IP-Adresse ein', 'error');
return;
}
testBtn.disabled = true;
testBtn.innerHTML = '<i class="fas fa-spinner fa-spin mr-1"></i>Teste...';
try {
const response = await fetch('/api/printers/test/socket/' + printerId, {
method: 'GET',
headers: {
'X-CSRFToken': document.querySelector('[name=csrf_token]').value
}
}
})
.catch(error => {
const message = '❌ Schaltvorgang fehlgeschlagen!\n\nFehler: ' + error.message;
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
});
const result = await response.json();
// Ergebnis anzeigen
resultDiv.classList.remove('hidden', 'bg-green-100', 'bg-red-100', 'border-green-200', 'border-red-200');
if (response.ok && result.success) {
const socketInfo = result.socket.info;
resultDiv.classList.add('bg-green-100', 'dark:bg-green-900/20', 'border', 'border-green-200', 'dark:border-green-800');
resultDiv.innerHTML = `
<div class="flex items-start space-x-2">
<i class="fas fa-check-circle text-green-600 dark:text-green-400 mt-0.5"></i>
<div class="text-sm text-green-700 dark:text-green-300">
<p class="font-semibold">Verbindung erfolgreich!</p>
<p>Status: ${socketInfo.device_on ? 'Ein' : 'Aus'}</p>
${socketInfo.current_power !== null ? `<p>Leistung: ${socketInfo.current_power}W</p>` : ''}
<p>Firmware: ${socketInfo.fw_ver || 'Unbekannt'}</p>
</div>
</div>
`;
} else {
alert(message);
resultDiv.classList.add('bg-red-100', 'dark:bg-red-900/20', 'border', 'border-red-200', 'dark:border-red-800');
resultDiv.innerHTML = `
<div class="flex items-start space-x-2">
<i class="fas fa-times-circle text-red-600 dark:text-red-400 mt-0.5"></i>
<div class="text-sm text-red-700 dark:text-red-300">
<p class="font-semibold">Verbindung fehlgeschlagen!</p>
<p>${result.socket?.error || 'Steckdose nicht erreichbar'}</p>
</div>
</div>
`;
}
})
.finally(() => {
button.innerHTML = originalText;
button.disabled = false;
});
} catch (error) {
console.error('Fehler:', error);
showNotification('Fehler beim Testen der Verbindung', 'error');
} finally {
testBtn.disabled = false;
testBtn.innerHTML = '<i class="fas fa-network-wired mr-1"></i>Verbindung testen';
}
}
// Notification-Funktion
function showNotification(message, type = 'info') {
// Verwende die globale Notification-Funktion falls vorhanden
if (typeof window.showNotification === 'function') {
window.showNotification(message, type);
} else if (typeof showFlashMessage === 'function') {
showFlashMessage(message, type);
} else {
// Fallback
alert(message);
}
}
</script>
{% endblock %}