📝 🚀 "Refactor backend templates

This commit is contained in:
Till Tomczak 2025-06-01 01:41:52 +02:00
parent 20e81b11d3
commit dfad0937d1
15 changed files with 2760 additions and 1064 deletions

View File

@ -692,7 +692,7 @@ def api_callback():
username=user_data['username'], username=user_data['username'],
email=user_data['email'], email=user_data['email'],
name=user_data['name'], name=user_data['name'],
is_admin=False, role="user",
oauth_provider=provider, oauth_provider=provider,
oauth_id=str(user_data['id']) oauth_id=str(user_data['id'])
) )
@ -777,7 +777,7 @@ def api_callback():
username=user_data['username'], username=user_data['username'],
email=user_data['email'], email=user_data['email'],
name=user_data['name'], name=user_data['name'],
is_admin=False, role="user",
oauth_provider=provider, oauth_provider=provider,
oauth_id=str(user_data['id']) oauth_id=str(user_data['id'])
) )
@ -2570,6 +2570,45 @@ def admin_update_printer_form(printer_id):
flash("Fehler beim Aktualisieren des Druckers.", "error") flash("Fehler beim Aktualisieren des Druckers.", "error")
return redirect(url_for("admin_edit_printer_page", printer_id=printer_id)) return redirect(url_for("admin_edit_printer_page", printer_id=printer_id))
@app.route("/api/admin/users/<int:user_id>", methods=["DELETE"])
@login_required
@admin_required
def delete_user(user_id):
"""Löscht einen Benutzer (nur für Admins)."""
# Verhindern, dass sich der Admin selbst löscht
if user_id == current_user.id:
return jsonify({"error": "Sie können sich nicht selbst löschen"}), 400
try:
db_session = get_db_session()
user = db_session.get(User, user_id)
if not user:
db_session.close()
return jsonify({"error": "Benutzer nicht gefunden"}), 404
# Prüfen, ob noch aktive Jobs für diesen Benutzer existieren
active_jobs = db_session.query(Job).filter(
Job.user_id == user_id,
Job.status.in_(["scheduled", "running"])
).count()
if active_jobs > 0:
db_session.close()
return jsonify({"error": f"Benutzer kann nicht gelöscht werden: {active_jobs} aktive Jobs vorhanden"}), 400
username = user.username or user.email
db_session.delete(user)
db_session.commit()
db_session.close()
user_logger.info(f"Benutzer '{username}' (ID: {user_id}) gelöscht von Admin {current_user.id}")
return jsonify({"success": True, "message": "Benutzer erfolgreich gelöscht"})
except Exception as e:
user_logger.error(f"Fehler beim Löschen des Benutzers {user_id}: {str(e)}")
return jsonify({"error": "Interner Serverfehler"}), 500
# ===== FILE-UPLOAD-ROUTEN ===== # ===== FILE-UPLOAD-ROUTEN =====

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@

File diff suppressed because it is too large Load Diff

View File

@ -21,3 +21,4 @@
2025-06-01 01:16:18 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1) 2025-06-01 01:16:18 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1)
2025-06-01 01:19:40 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1) 2025-06-01 01:19:40 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1)
2025-06-01 01:23:29 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1) 2025-06-01 01:23:29 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1)
2025-06-01 01:31:25 - myp.jobs - INFO - Jobs abgerufen: 0 von 0 (Seite 1)

View File

@ -2747,3 +2747,60 @@
2025-06-01 01:30:30 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker 2025-06-01 01:30:30 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:30:31 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1) 2025-06-01 01:30:31 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:30:31 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker 2025-06-01 01:30:31 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:01 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:01 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:02 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:02 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:15 - myp.printers - INFO - Schnelles Laden abgeschlossen: 6 Drucker geladen (ohne Status-Check)
2025-06-01 01:31:15 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:15 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:15 - myp.printers - INFO - Schnelles Laden abgeschlossen: 6 Drucker geladen (ohne Status-Check)
2025-06-01 01:31:25 - myp.printers - INFO - Schnelles Laden abgeschlossen: 6 Drucker geladen (ohne Status-Check)
2025-06-01 01:31:39 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:39 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:46 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:46 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:50 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:50 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:52 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:52 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:57 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:57 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:31:59 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:31:59 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:32:29 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:32:29 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:32:59 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:32:59 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:33:20 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:33:20 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:33:21 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:33:21 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:33:24 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:33:24 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:33:50 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:33:50 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:34:20 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:34:20 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:34:50 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:34:50 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:34:55 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:34:55 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:35:44 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:35:44 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:35:46 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:35:46 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:35:55 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:35:55 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:36:14 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:36:14 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:36:39 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:36:39 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:37:02 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:37:02 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:37:32 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:37:32 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:38:02 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:38:02 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker
2025-06-01 01:38:08 - myp.printers - INFO - 🔄 Live-Status-Abfrage von Benutzer Administrator (ID: 1)
2025-06-01 01:38:08 - myp.printers - INFO - ✅ Live-Status-Abfrage erfolgreich: 0 Drucker

View File

@ -2759,3 +2759,10 @@
2025-06-01 01:22:56 - myp.scheduler - INFO - Task check_jobs registriert: Intervall 30s, Enabled: True 2025-06-01 01:22:56 - myp.scheduler - INFO - Task check_jobs registriert: Intervall 30s, Enabled: True
2025-06-01 01:22:57 - myp.scheduler - INFO - Scheduler-Thread gestartet 2025-06-01 01:22:57 - myp.scheduler - INFO - Scheduler-Thread gestartet
2025-06-01 01:22:57 - myp.scheduler - INFO - Scheduler gestartet 2025-06-01 01:22:57 - myp.scheduler - INFO - Scheduler gestartet
2025-06-01 01:35:18 - myp.scheduler - INFO - Scheduler-Thread beendet
2025-06-01 01:35:18 - myp.scheduler - INFO - Scheduler gestoppt
2025-06-01 01:35:37 - myp.scheduler - INFO - Task check_jobs registriert: Intervall 30s, Enabled: True
2025-06-01 01:35:39 - myp.scheduler - INFO - Scheduler-Thread gestartet
2025-06-01 01:35:39 - myp.scheduler - INFO - Scheduler gestartet
2025-06-01 01:38:12 - myp.scheduler - INFO - Scheduler-Thread beendet
2025-06-01 01:38:12 - myp.scheduler - INFO - Scheduler gestoppt

View File

@ -238,14 +238,6 @@
Reservierungen Reservierungen
</a> </a>
<a href="{{ url_for('admin_guest_requests') }}"
class="group flex items-center px-6 py-3 text-sm font-medium rounded-xl transition-all duration-300 {{ 'bg-gradient-to-r from-blue-500 to-blue-600 text-white shadow-lg' if active_tab == 'guest_requests' else 'text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700/50 hover:text-slate-900 dark:hover:text-white' }}">
<svg class="w-5 h-5 mr-2 {{ 'text-white' if active_tab == 'guest_requests' else 'text-slate-400 group-hover:text-slate-600 dark:group-hover:text-slate-300' }}" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"/>
</svg>
TBA-Anträge
</a>
<a href="{{ url_for('admin_page', tab='system') }}" <a href="{{ url_for('admin_page', tab='system') }}"
class="group flex items-center px-6 py-3 text-sm font-medium rounded-xl transition-all duration-300 {{ 'bg-gradient-to-r from-blue-500 to-blue-600 text-white shadow-lg' if active_tab == 'system' else 'text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700/50 hover:text-slate-900 dark:hover:text-white' }}"> class="group flex items-center px-6 py-3 text-sm font-medium rounded-xl transition-all duration-300 {{ 'bg-gradient-to-r from-blue-500 to-blue-600 text-white shadow-lg' if active_tab == 'system' else 'text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700/50 hover:text-slate-900 dark:hover:text-white' }}">
<svg class="w-5 h-5 mr-2 {{ 'text-white' if active_tab == 'system' else 'text-slate-400 group-hover:text-slate-600 dark:group-hover:text-slate-300' }}" fill="none" stroke="currentColor" viewBox="0 0 24 24"> <svg class="w-5 h-5 mr-2 {{ 'text-white' if active_tab == 'system' else 'text-slate-400 group-hover:text-slate-600 dark:group-hover:text-slate-300' }}" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@ -262,6 +254,14 @@
</svg> </svg>
Logs Logs
</a> </a>
<a href="{{ url_for('admin_guest_requests') }}"
class="group flex items-center px-6 py-3 text-sm font-medium rounded-xl transition-all duration-300 {{ 'bg-gradient-to-r from-blue-500 to-blue-600 text-white shadow-lg' if active_tab == 'guest_requests' else 'text-slate-600 dark:text-slate-300 hover:bg-slate-100 dark:hover:bg-slate-700/50 hover:text-slate-900 dark:hover:text-white' }}">
<svg class="w-5 h-5 mr-2 {{ 'text-white' if active_tab == 'guest_requests' else 'text-slate-400 group-hover:text-slate-600 dark:group-hover:text-slate-300' }}" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"/>
</svg>
TBA-Anträge
</a>
</nav> </nav>
</div> </div>

View File

@ -1,51 +1,63 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="de">
<head> {% block title %}Drucker hinzufügen - MYP Admin{% endblock %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> {% block extra_css %}
<title>Drucker hinzufügen - MYP Admin</title> <!-- Zusätzliche Styles für diese Seite -->
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet"> <style>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"> .form-container {
</head> background: rgba(255, 255, 255, 0.95);
<body class="bg-gray-100"> backdrop-filter: blur(10px);
<div class="min-h-screen py-8"> border: 1px solid rgba(255, 255, 255, 0.2);
<div class="max-w-2xl mx-auto"> box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
}
.dark .form-container {
background: rgba(30, 41, 59, 0.95);
border: 1px solid rgba(255, 255, 255, 0.1);
}
</style>
{% endblock %}
{% block content %}
<div class="min-h-screen py-8">
<div class="max-w-2xl mx-auto px-4">
<!-- Header --> <!-- Header -->
<div class="bg-white rounded-lg shadow-md p-6 mb-6"> <div class="form-container rounded-lg p-6 mb-6">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div class="flex items-center space-x-3"> <div class="flex items-center space-x-3">
<i class="fas fa-print text-blue-600 text-2xl"></i> <i class="fas fa-print text-blue-600 dark:text-blue-400 text-2xl"></i>
<h1 class="text-2xl font-bold text-gray-800">Neuen Drucker hinzufügen</h1> <h1 class="text-2xl font-bold text-slate-800 dark:text-white">Neuen Drucker hinzufügen</h1>
</div> </div>
<a href="{{ url_for('admin_page', tab='printers') }}" <a href="{{ url_for('admin_page', tab='printers') }}"
class="bg-gray-500 hover:bg-gray-600 text-white px-4 py-2 rounded-lg transition-colors"> class="bg-slate-500 hover:bg-slate-600 text-white px-4 py-2 rounded-lg transition-colors">
<i class="fas fa-arrow-left mr-2"></i>Zurück <i class="fas fa-arrow-left mr-2"></i>Zurück
</a> </a>
</div> </div>
</div> </div>
<!-- Formular --> <!-- Formular -->
<div class="bg-white rounded-lg shadow-md p-6"> <div class="form-container rounded-lg p-6">
<form action="{{ url_for('admin_create_printer_form') }}" method="POST" class="space-y-6"> <form action="{{ url_for('admin_create_printer_form') }}" method="POST" class="space-y-6">
<!-- CSRF Token --> <!-- CSRF Token -->
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
<!-- Name --> <!-- Name -->
<div> <div>
<label for="name" class="block text-sm font-medium text-gray-700 mb-2"> <label for="name" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-tag mr-2"></i>Drucker-Name * <i class="fas fa-tag mr-2"></i>Drucker-Name *
</label> </label>
<input type="text" <input type="text"
id="name" id="name"
name="name" name="name"
required required
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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"> placeholder="3D-Drucker Raum A001">
</div> </div>
<!-- IP-Adresse --> <!-- IP-Adresse -->
<div> <div>
<label for="ip_address" class="block text-sm font-medium text-gray-700 mb-2"> <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 * <i class="fas fa-network-wired mr-2"></i>IP-Adresse *
</label> </label>
<input type="text" <input type="text"
@ -53,55 +65,55 @@
name="ip_address" name="ip_address"
required 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]?)$" 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-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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"> placeholder="192.168.1.100">
<p class="text-sm text-gray-500 mt-1">IP-Adresse der Tapo-Steckdose</p> <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse der Tapo-Steckdose</p>
</div> </div>
<!-- Modell --> <!-- Modell -->
<div> <div>
<label for="model" class="block text-sm font-medium text-gray-700 mb-2"> <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> </label>
<input type="text" <input type="text"
id="model" id="model"
name="model" name="model"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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="Ender 3 V2">
</div> </div>
<!-- Standort --> <!-- Standort -->
<div> <div>
<label for="location" class="block text-sm font-medium text-gray-700 mb-2"> <label for="location" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-map-marker-alt mr-2"></i>Standort <i class="fas fa-map-marker-alt mr-2"></i>Standort
</label> </label>
<input type="text" <input type="text"
id="location" id="location"
name="location" name="location"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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="Raum A001, Erdgeschoss">
</div> </div>
<!-- Beschreibung --> <!-- Beschreibung -->
<div> <div>
<label for="description" class="block text-sm font-medium text-gray-700 mb-2"> <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 <i class="fas fa-comment mr-2"></i>Beschreibung
</label> </label>
<textarea id="description" <textarea id="description"
name="description" name="description"
rows="3" rows="3"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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> placeholder="Zusätzliche Informationen zum Drucker..."></textarea>
</div> </div>
<!-- Status --> <!-- Status -->
<div> <div>
<label for="status" class="block text-sm font-medium text-gray-700 mb-2"> <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 <i class="fas fa-circle mr-2"></i>Anfangsstatus
</label> </label>
<select id="status" <select id="status"
name="status" name="status"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"> 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="available">Verfügbar</option>
<option value="offline">Offline</option> <option value="offline">Offline</option>
<option value="maintenance">Wartung</option> <option value="maintenance">Wartung</option>
@ -109,10 +121,10 @@
</div> </div>
<!-- Hinweise --> <!-- Hinweise -->
<div class="bg-blue-50 border border-blue-200 rounded-lg p-4"> <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"> <div class="flex">
<i class="fas fa-info-circle text-blue-500 mt-0.5 mr-3"></i> <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"> <div class="text-sm text-blue-700 dark:text-blue-300">
<p class="font-semibold mb-1">Hinweise:</p> <p class="font-semibold mb-1">Hinweise:</p>
<ul class="list-disc list-inside space-y-1"> <ul class="list-disc list-inside space-y-1">
<li>Felder mit * sind Pflichtfelder</li> <li>Felder mit * sind Pflichtfelder</li>
@ -131,33 +143,19 @@
<i class="fas fa-save mr-2"></i>Drucker erstellen <i class="fas fa-save mr-2"></i>Drucker erstellen
</button> </button>
<a href="{{ url_for('admin_page', tab='printers') }}" <a href="{{ url_for('admin_page', tab='printers') }}"
class="flex-1 bg-gray-500 hover:bg-gray-600 text-white px-4 py-2 rounded-lg text-center transition-colors"> 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 <i class="fas fa-times mr-2"></i>Abbrechen
</a> </a>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
{% endblock %}
<!-- Flash Messages --> {% block extra_js %}
{% with messages = get_flashed_messages(with_categories=true) %} <!-- JavaScript für Form-Validierung -->
{% if messages %} <script>
<div class="fixed top-4 right-4 z-50 space-y-2">
{% for category, message in messages %}
<div class="alert alert-{{ 'danger' if category == 'error' else category }} bg-{{ 'red' if category == 'error' else 'green' }}-100 border border-{{ 'red' if category == 'error' else 'green' }}-400 text-{{ 'red' if category == 'error' else 'green' }}-700 px-4 py-3 rounded-lg shadow-md">
<div class="flex items-center">
<i class="fas fa-{{ 'exclamation-triangle' if category == 'error' else 'check-circle' }} mr-2"></i>
{{ message }}
</div>
</div>
{% endfor %}
</div>
{% endif %}
{% endwith %}
<!-- JavaScript für Form-Validierung -->
<script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const form = document.querySelector('form'); const form = document.querySelector('form');
const nameInput = document.getElementById('name'); const nameInput = document.getElementById('name');
@ -170,10 +168,10 @@
if (ip && !ipRegex.test(ip)) { if (ip && !ipRegex.test(ip)) {
this.classList.add('border-red-500'); this.classList.add('border-red-500');
this.classList.remove('border-gray-300'); this.classList.remove('border-slate-300', 'dark:border-slate-600');
} else { } else {
this.classList.remove('border-red-500'); this.classList.remove('border-red-500');
this.classList.add('border-gray-300'); this.classList.add('border-slate-300', 'dark:border-slate-600');
} }
}); });
@ -185,19 +183,26 @@
if (!name) { if (!name) {
e.preventDefault(); e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie einen Drucker-Namen ein.', 'error');
} else {
alert('Bitte geben Sie einen Drucker-Namen ein.'); alert('Bitte geben Sie einen Drucker-Namen ein.');
}
nameInput.focus(); nameInput.focus();
return; return;
} }
if (!ip || !ipRegex.test(ip)) { if (!ip || !ipRegex.test(ip)) {
e.preventDefault(); 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.'); alert('Bitte geben Sie eine gültige IP-Adresse ein.');
}
ipInput.focus(); ipInput.focus();
return; return;
} }
}); });
}); });
</script> </script>
</body> {% endblock %}
</html>

View File

@ -1,29 +1,41 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="de">
<head> {% block title %}Drucker bearbeiten - MYP Admin{% endblock %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> {% block extra_css %}
<title>Drucker bearbeiten - MYP Admin</title> <!-- Zusätzliche Styles für diese Seite -->
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet"> <style>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"> .form-container {
</head> background: rgba(255, 255, 255, 0.95);
<body class="bg-gray-100"> backdrop-filter: blur(10px);
<div class="min-h-screen py-8"> border: 1px solid rgba(255, 255, 255, 0.2);
<div class="max-w-2xl mx-auto"> box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
}
.dark .form-container {
background: rgba(30, 41, 59, 0.95);
border: 1px solid rgba(255, 255, 255, 0.1);
}
</style>
{% endblock %}
{% block content %}
<div class="min-h-screen py-8">
<div class="max-w-2xl mx-auto px-4">
<!-- Header --> <!-- Header -->
<div class="bg-white rounded-lg shadow-md p-6 mb-6"> <div class="form-container rounded-lg p-6 mb-6">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div class="flex items-center space-x-3"> <div class="flex items-center space-x-3">
<i class="fas fa-edit text-blue-600 text-2xl"></i> <i class="fas fa-edit text-blue-600 dark:text-blue-400 text-2xl"></i>
<h1 class="text-2xl font-bold text-gray-800">Drucker bearbeiten</h1> <h1 class="text-2xl font-bold text-slate-800 dark:text-white">Drucker bearbeiten</h1>
</div> </div>
<a href="{{ url_for('admin_page', tab='printers') }}" <a href="{{ url_for('admin_page', tab='printers') }}"
class="bg-gray-500 hover:bg-gray-600 text-white px-4 py-2 rounded-lg transition-colors"> class="bg-slate-500 hover:bg-slate-600 text-white px-4 py-2 rounded-lg transition-colors">
<i class="fas fa-arrow-left mr-2"></i>Zurück <i class="fas fa-arrow-left mr-2"></i>Zurück
</a> </a>
</div> </div>
<div class="mt-4 p-3 bg-blue-50 rounded-lg"> <div class="mt-4 p-3 bg-blue-50 dark:bg-blue-900/20 rounded-lg">
<p class="text-sm text-blue-700"> <p class="text-sm text-blue-700 dark:text-blue-300">
<i class="fas fa-info-circle mr-2"></i> <i class="fas fa-info-circle mr-2"></i>
<strong>Drucker-ID:</strong> {{ printer.id }} | <strong>Drucker-ID:</strong> {{ printer.id }} |
<strong>Erstellt am:</strong> {{ printer.created_at[:10] if printer.created_at else 'Unbekannt' }} <strong>Erstellt am:</strong> {{ printer.created_at[:10] if printer.created_at else 'Unbekannt' }}
@ -32,14 +44,14 @@
</div> </div>
<!-- Formular --> <!-- Formular -->
<div class="bg-white rounded-lg shadow-md p-6"> <div class="form-container rounded-lg p-6">
<form action="{{ url_for('admin_update_printer_form', printer_id=printer.id) }}" method="POST" class="space-y-6"> <form action="{{ url_for('admin_update_printer_form', printer_id=printer.id) }}" method="POST" class="space-y-6">
<!-- CSRF Token --> <!-- CSRF Token -->
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
<!-- Name --> <!-- Name -->
<div> <div>
<label for="name" class="block text-sm font-medium text-gray-700 mb-2"> <label for="name" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-tag mr-2"></i>Drucker-Name * <i class="fas fa-tag mr-2"></i>Drucker-Name *
</label> </label>
<input type="text" <input type="text"
@ -47,13 +59,13 @@
name="name" name="name"
required required
value="{{ printer.name }}" value="{{ printer.name }}"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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"> placeholder="3D-Drucker Raum A001">
</div> </div>
<!-- IP-Adresse --> <!-- IP-Adresse -->
<div> <div>
<label for="ip_address" class="block text-sm font-medium text-gray-700 mb-2"> <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 * <i class="fas fa-network-wired mr-2"></i>IP-Adresse *
</label> </label>
<input type="text" <input type="text"
@ -62,57 +74,57 @@
required required
value="{{ printer.plug_ip }}" 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]?)$" 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-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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"> placeholder="192.168.1.100">
<p class="text-sm text-gray-500 mt-1">IP-Adresse der Tapo-Steckdose</p> <p class="text-sm text-slate-500 dark:text-slate-400 mt-1">IP-Adresse der Tapo-Steckdose</p>
</div> </div>
<!-- Modell --> <!-- Modell -->
<div> <div>
<label for="model" class="block text-sm font-medium text-gray-700 mb-2"> <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> </label>
<input type="text" <input type="text"
id="model" id="model"
name="model" name="model"
value="{{ printer.model }}" value="{{ printer.model }}"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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="Ender 3 V2">
</div> </div>
<!-- Standort --> <!-- Standort -->
<div> <div>
<label for="location" class="block text-sm font-medium text-gray-700 mb-2"> <label for="location" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2">
<i class="fas fa-map-marker-alt mr-2"></i>Standort <i class="fas fa-map-marker-alt mr-2"></i>Standort
</label> </label>
<input type="text" <input type="text"
id="location" id="location"
name="location" name="location"
value="{{ printer.location }}" value="{{ printer.location }}"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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="Raum A001, Erdgeschoss">
</div> </div>
<!-- Beschreibung --> <!-- Beschreibung -->
<div> <div>
<label for="description" class="block text-sm font-medium text-gray-700 mb-2"> <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 <i class="fas fa-comment mr-2"></i>Beschreibung
</label> </label>
<textarea id="description" <textarea id="description"
name="description" name="description"
rows="3" rows="3"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent" 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> placeholder="Zusätzliche Informationen zum Drucker...">{{ printer.description or '' }}</textarea>
</div> </div>
<!-- Status --> <!-- Status -->
<div> <div>
<label for="status" class="block text-sm font-medium text-gray-700 mb-2"> <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 <i class="fas fa-circle mr-2"></i>Aktueller Status
</label> </label>
<select id="status" <select id="status"
name="status" name="status"
class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"> 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="available" {{ 'selected' if printer.status == 'available' else '' }}>Verfügbar</option>
<option value="offline" {{ 'selected' if printer.status == 'offline' else '' }}>Offline</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="maintenance" {{ 'selected' if printer.status == 'maintenance' else '' }}>Wartung</option>
@ -127,36 +139,36 @@
<input type="checkbox" <input type="checkbox"
name="is_active" name="is_active"
{{ 'checked' if printer.active else '' }} {{ 'checked' if printer.active else '' }}
class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"> 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-gray-700"> <span class="text-sm font-medium text-slate-700 dark:text-slate-300">
<i class="fas fa-power-off mr-2"></i>Drucker aktiv <i class="fas fa-power-off mr-2"></i>Drucker aktiv
</span> </span>
</label> </label>
<p class="text-sm text-gray-500 mt-1">Inaktive Drucker werden nicht für neue Aufträge verwendet</p> <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> </div>
<!-- Erweiterte Informationen --> <!-- Erweiterte Informationen -->
<div class="bg-gray-50 border border-gray-200 rounded-lg p-4"> <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-gray-700 mb-3"> <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 <i class="fas fa-info-circle mr-2"></i>Drucker-Informationen
</h3> </h3>
<div class="grid grid-cols-1 md:grid-cols-2 gap-3 text-sm"> <div class="grid grid-cols-1 md:grid-cols-2 gap-3 text-sm">
<div> <div>
<span class="font-medium text-gray-600">MAC-Adresse:</span> <span class="font-medium text-slate-600 dark:text-slate-400">MAC-Adresse:</span>
<span class="text-gray-800">{{ printer.mac_address or 'Nicht verfügbar' }}</span> <span class="text-slate-800 dark:text-slate-200">{{ printer.mac_address or 'Nicht verfügbar' }}</span>
</div> </div>
<div> <div>
<span class="font-medium text-gray-600">Letzter Check:</span> <span class="font-medium text-slate-600 dark:text-slate-400">Letzter Check:</span>
<span class="text-gray-800">{{ printer.last_checked or 'Nie' }}</span> <span class="text-slate-800 dark:text-slate-200">{{ printer.last_checked or 'Nie' }}</span>
</div> </div>
</div> </div>
</div> </div>
<!-- Warnung --> <!-- Warnung -->
<div class="bg-yellow-50 border border-yellow-200 rounded-lg p-4"> <div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-lg p-4">
<div class="flex"> <div class="flex">
<i class="fas fa-exclamation-triangle text-yellow-500 mt-0.5 mr-3"></i> <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"> <div class="text-sm text-yellow-700 dark:text-yellow-300">
<p class="font-semibold mb-1">Wichtige Hinweise:</p> <p class="font-semibold mb-1">Wichtige Hinweise:</p>
<ul class="list-disc list-inside space-y-1"> <ul class="list-disc list-inside space-y-1">
<li>Änderungen an der IP-Adresse können die Verbindung unterbrechen</li> <li>Änderungen an der IP-Adresse können die Verbindung unterbrechen</li>
@ -174,7 +186,7 @@
<i class="fas fa-save mr-2"></i>Änderungen speichern <i class="fas fa-save mr-2"></i>Änderungen speichern
</button> </button>
<a href="{{ url_for('admin_page', tab='printers') }}" <a href="{{ url_for('admin_page', tab='printers') }}"
class="flex-1 bg-gray-500 hover:bg-gray-600 text-white px-4 py-2 rounded-lg text-center transition-colors"> 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 <i class="fas fa-times mr-2"></i>Abbrechen
</a> </a>
</div> </div>
@ -182,8 +194,8 @@
</div> </div>
<!-- Zusätzliche Aktionen --> <!-- Zusätzliche Aktionen -->
<div class="bg-white rounded-lg shadow-md p-6 mt-6"> <div class="form-container rounded-lg p-6 mt-6">
<h3 class="text-lg font-semibold text-gray-800 mb-4"> <h3 class="text-lg font-semibold text-slate-800 dark:text-white mb-4">
<i class="fas fa-tools mr-2"></i>Drucker-Aktionen <i class="fas fa-tools mr-2"></i>Drucker-Aktionen
</h3> </h3>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4"> <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
@ -200,26 +212,12 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %}
<!-- Flash Messages --> {% block extra_js %}
{% with messages = get_flashed_messages(with_categories=true) %} <!-- JavaScript -->
{% if messages %} <script>
<div class="fixed top-4 right-4 z-50 space-y-2">
{% for category, message in messages %}
<div class="alert alert-{{ 'danger' if category == 'error' else category }} bg-{{ 'red' if category == 'error' else 'green' }}-100 border border-{{ 'red' if category == 'error' else 'green' }}-400 text-{{ 'red' if category == 'error' else 'green' }}-700 px-4 py-3 rounded-lg shadow-md">
<div class="flex items-center">
<i class="fas fa-{{ 'exclamation-triangle' if category == 'error' else 'check-circle' }} mr-2"></i>
{{ message }}
</div>
</div>
{% endfor %}
</div>
{% endif %}
{% endwith %}
<!-- JavaScript -->
<script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
const form = document.querySelector('form'); const form = document.querySelector('form');
const nameInput = document.getElementById('name'); const nameInput = document.getElementById('name');
@ -232,10 +230,10 @@
if (ip && !ipRegex.test(ip)) { if (ip && !ipRegex.test(ip)) {
this.classList.add('border-red-500'); this.classList.add('border-red-500');
this.classList.remove('border-gray-300'); this.classList.remove('border-slate-300', 'dark:border-slate-600');
} else { } else {
this.classList.remove('border-red-500'); this.classList.remove('border-red-500');
this.classList.add('border-gray-300'); this.classList.add('border-slate-300', 'dark:border-slate-600');
} }
}); });
@ -247,14 +245,22 @@
if (!name) { if (!name) {
e.preventDefault(); e.preventDefault();
if (typeof showFlashMessage === 'function') {
showFlashMessage('Bitte geben Sie einen Drucker-Namen ein.', 'error');
} else {
alert('Bitte geben Sie einen Drucker-Namen ein.'); alert('Bitte geben Sie einen Drucker-Namen ein.');
}
nameInput.focus(); nameInput.focus();
return; return;
} }
if (!ip || !ipRegex.test(ip)) { if (!ip || !ipRegex.test(ip)) {
e.preventDefault(); 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.'); alert('Bitte geben Sie eine gültige IP-Adresse ein.');
}
ipInput.focus(); ipInput.focus();
return; return;
} }
@ -292,13 +298,28 @@
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.tapo_test && data.tapo_test.success) { if (data.tapo_test && data.tapo_test.success) {
alert('✅ Verbindung erfolgreich!\n\nStatus: ' + (data.tapo_test.device_info ? data.tapo_test.device_info.device_on ? 'EIN' : 'AUS' : 'Unbekannt')); 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 { } else {
alert('❌ Verbindung fehlgeschlagen!\n\nFehler: ' + (data.tapo_test ? data.tapo_test.error : 'Unbekannter Fehler')); alert(message);
}
} 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);
}
} }
}) })
.catch(error => { .catch(error => {
alert('❌ Verbindungstest fehlgeschlagen!\n\nFehler: ' + error.message); const message = '❌ Verbindungstest fehlgeschlagen!\n\nFehler: ' + error.message;
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
}
}) })
.finally(() => { .finally(() => {
button.innerHTML = originalText; button.innerHTML = originalText;
@ -327,21 +348,35 @@
.then(response => response.json()) .then(response => response.json())
.then(data => { .then(data => {
if (data.success) { if (data.success) {
alert('✅ Drucker erfolgreich ' + data.action + '!'); const message = '✅ Drucker erfolgreich ' + data.action + '!';
// Seite neu laden um aktuellen Status zu zeigen if (typeof showFlashMessage === 'function') {
location.reload(); showFlashMessage(message, 'success');
} else { } else {
alert('❌ Fehler beim Schalten!\n\nFehler: ' + (data.error || 'Unbekannter Fehler')); alert(message);
}
// Seite neu laden um aktuellen Status zu zeigen
setTimeout(() => location.reload(), 1000);
} else {
const message = '❌ Fehler beim Schalten!\n\nFehler: ' + (data.error || 'Unbekannter Fehler');
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
}
} }
}) })
.catch(error => { .catch(error => {
alert('❌ Schaltvorgang fehlgeschlagen!\n\nFehler: ' + error.message); const message = '❌ Schaltvorgang fehlgeschlagen!\n\nFehler: ' + error.message;
if (typeof showFlashMessage === 'function') {
showFlashMessage(message, 'error');
} else {
alert(message);
}
}) })
.finally(() => { .finally(() => {
button.innerHTML = originalText; button.innerHTML = originalText;
button.disabled = false; button.disabled = false;
}); });
} }
</script> </script>
</body> {% endblock %}
</html>

View File

@ -5,164 +5,592 @@
{% block head %} {% block head %}
{{ super() }} {{ super() }}
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<style>
/* Modern Toggle Switch */
.toggle-switch {
position: relative;
display: inline-block;
width: 52px;
height: 28px;
}
.toggle-switch input {
opacity: 0;
width: 0;
height: 0;
}
.toggle-slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(135deg, #e2e8f0, #cbd5e1);
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
border-radius: 28px;
border: 2px solid rgba(148, 163, 184, 0.2);
box-shadow:
inset 0 2px 4px rgba(0, 0, 0, 0.1),
0 1px 3px rgba(0, 0, 0, 0.1);
}
.toggle-slider:before {
position: absolute;
content: "";
height: 20px;
width: 20px;
left: 2px;
bottom: 2px;
background: linear-gradient(135deg, #ffffff, #f8fafc);
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
border-radius: 50%;
box-shadow:
0 2px 8px rgba(0, 0, 0, 0.15),
0 1px 4px rgba(0, 0, 0, 0.1);
}
input:checked + .toggle-slider {
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
border-color: rgba(59, 130, 246, 0.3);
box-shadow:
inset 0 2px 4px rgba(29, 78, 216, 0.2),
0 0 0 3px rgba(59, 130, 246, 0.1),
0 4px 12px rgba(59, 130, 246, 0.2);
}
input:checked + .toggle-slider:before {
transform: translateX(24px);
background: linear-gradient(135deg, #ffffff, #f1f5f9);
box-shadow:
0 3px 12px rgba(0, 0, 0, 0.2),
0 1px 6px rgba(0, 0, 0, 0.15);
}
/* Premium Input Fields */
.premium-input {
background: linear-gradient(135deg, rgba(255, 255, 255, 0.9), rgba(248, 250, 252, 0.95));
backdrop-filter: blur(8px);
border: 2px solid transparent;
background-clip: padding-box;
position: relative;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
}
.premium-input:before {
content: '';
position: absolute;
inset: 0;
padding: 2px;
background: linear-gradient(135deg, #e2e8f0, #cbd5e1, #e2e8f0);
border-radius: inherit;
mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
mask-composite: exclude;
-webkit-mask-composite: xor;
}
.premium-input:focus {
transform: translateY(-1px);
box-shadow:
0 10px 25px rgba(59, 130, 246, 0.15),
0 4px 10px rgba(59, 130, 246, 0.1),
0 0 0 3px rgba(59, 130, 246, 0.1);
}
.premium-input:focus:before {
background: linear-gradient(135deg, #3b82f6, #1d4ed8, #3b82f6);
}
/* Dark mode styles */
.dark .premium-input {
background: linear-gradient(135deg, rgba(30, 41, 59, 0.9), rgba(15, 23, 42, 0.95));
color: #f1f5f9;
}
.dark .premium-input:before {
background: linear-gradient(135deg, #475569, #334155, #475569);
}
.dark .toggle-slider {
background: linear-gradient(135deg, #475569, #334155);
border-color: rgba(71, 85, 105, 0.3);
}
/* Permission Card Animations */
.permission-card {
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
}
.permission-card:hover {
transform: translateY(-2px);
box-shadow:
0 20px 25px -5px rgba(0, 0, 0, 0.1),
0 10px 10px -5px rgba(0, 0, 0, 0.04);
}
/* Floating Labels */
.floating-label {
position: relative;
}
.floating-label input:focus + label,
.floating-label input:not(:placeholder-shown) + label {
transform: translateY(-24px) scale(0.875);
color: #3b82f6;
}
.floating-label label {
position: absolute;
left: 12px;
top: 14px;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
pointer-events: none;
color: #64748b;
}
/* Button Hover Effects */
.btn-gradient {
background: linear-gradient(135deg, #3b82f6, #1d4ed8);
position: relative;
overflow: hidden;
}
.btn-gradient:before {
content: '';
position: absolute;
top: 0;
left: -100%;
width: 100%;
height: 100%;
background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
transition: left 0.5s;
}
.btn-gradient:hover:before {
left: 100%;
}
/* Glass Effect Cards */
.glass-card {
background: rgba(255, 255, 255, 0.85);
backdrop-filter: blur(16px);
border: 1px solid rgba(255, 255, 255, 0.2);
box-shadow:
0 25px 50px -12px rgba(0, 0, 0, 0.1),
0 0 0 1px rgba(255, 255, 255, 0.05) inset;
}
.dark .glass-card {
background: rgba(15, 23, 42, 0.85);
border: 1px solid rgba(255, 255, 255, 0.1);
}
</style>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="min-h-screen bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-50 dark:from-slate-900 dark:via-slate-800 dark:to-slate-900"> <div class="min-h-screen bg-gradient-to-br from-blue-50 via-indigo-50 to-purple-50 dark:from-slate-900 dark:via-blue-900 dark:to-indigo-900 relative overflow-hidden">
<div class="max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 py-8"> <!-- Animated Background Elements -->
<div class="absolute inset-0 overflow-hidden pointer-events-none">
<!-- Header --> <div class="absolute -top-40 -right-32 w-96 h-96 bg-gradient-to-br from-blue-400/20 to-indigo-600/20 rounded-full blur-3xl animate-pulse"></div>
<div class="mb-8"> <div class="absolute -bottom-40 -left-32 w-96 h-96 bg-gradient-to-tr from-purple-400/20 to-pink-600/20 rounded-full blur-3xl animate-pulse delay-1000"></div>
<div class="flex items-center justify-between"> <div class="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 w-64 h-64 bg-gradient-to-r from-blue-300/10 to-indigo-300/10 rounded-full blur-2xl animate-pulse delay-500"></div>
<div>
<h1 class="text-3xl font-bold text-slate-900 dark:text-white">Benutzer bearbeiten</h1>
<p class="text-slate-600 dark:text-slate-400 mt-2">Bearbeiten Sie die Daten von {{ user.name or user.email }}</p>
</div> </div>
<a href="{{ url_for('admin_page', tab='users') }}" class="inline-flex items-center px-4 py-2 bg-slate-200 dark:bg-slate-700 text-slate-700 dark:text-slate-300 rounded-xl hover:bg-slate-300 dark:hover:bg-slate-600 transition-all duration-300">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24"> <div class="relative z-10 max-w-4xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
<!-- Modern Header with Glass Effect -->
<div class="mb-12">
<div class="glass-card rounded-3xl p-8 mb-8">
<div class="flex items-center justify-between">
<div class="flex items-center space-x-6">
<div class="w-16 h-16 bg-gradient-to-br from-blue-500 to-indigo-600 rounded-2xl flex items-center justify-center shadow-xl">
<svg class="w-8 h-8 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"/>
</svg>
</div>
<div>
<h1 class="text-4xl font-bold bg-gradient-to-r from-slate-900 to-slate-700 dark:from-white dark:to-gray-200 bg-clip-text text-transparent">
Benutzer bearbeiten
</h1>
<p class="text-lg text-slate-600 dark:text-slate-400 mt-2 flex items-center">
<svg class="w-5 h-5 mr-2 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
</svg>
{{ user.name or user.email }}
</p>
</div>
</div>
<a href="{{ url_for('admin_page', tab='users') }}"
class="group inline-flex items-center px-6 py-3 bg-white/80 dark:bg-slate-800/80 backdrop-blur-sm text-slate-700 dark:text-slate-300 rounded-2xl hover:bg-white dark:hover:bg-slate-700 transition-all duration-300 shadow-lg hover:shadow-xl border border-white/20 dark:border-slate-700/50">
<svg class="w-5 h-5 mr-2 transition-transform group-hover:-translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 19l-7-7m0 0l7-7m-7 7h18"/> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 19l-7-7m0 0l7-7m-7 7h18"/>
</svg> </svg>
Zurück zur Benutzerverwaltung <span class="font-medium">Zurück zur Verwaltung</span>
</a> </a>
</div> </div>
</div> </div>
</div>
<!-- Form --> <!-- Modern Form with Glass Effect -->
<div class="bg-white dark:bg-slate-800 rounded-2xl shadow-xl p-8"> <div class="glass-card rounded-3xl p-10 shadow-2xl">
<form method="POST" action="{{ url_for('admin_update_user_form', user_id=user.id) }}" class="space-y-6"> <form method="POST" action="{{ url_for('admin_update_user_form', user_id=user.id) }}" class="space-y-8" id="userEditForm">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="_method" value="PUT"/> <input type="hidden" name="_method" value="PUT"/>
<!-- Benutzername --> <!-- Form Header -->
<div> <div class="border-b border-slate-200 dark:border-slate-700 pb-8">
<label for="username" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2"> <h2 class="text-2xl font-bold text-slate-900 dark:text-white mb-3 flex items-center">
<svg class="w-6 h-6 mr-3 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
</svg>
Benutzerdaten bearbeiten
</h2>
<p class="text-slate-600 dark:text-slate-400 text-lg">
Bearbeiten Sie die Informationen und Berechtigungen für diesen Benutzer
</p>
</div>
<!-- Personal Information Section -->
<div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
<!-- Left Column: Basic Info -->
<div class="space-y-6">
<div class="bg-gradient-to-br from-blue-50 to-indigo-50 dark:from-blue-900/20 dark:to-indigo-900/20 rounded-2xl p-6 border border-blue-200/50 dark:border-blue-800/50">
<h3 class="text-lg font-semibold text-slate-900 dark:text-white mb-6 flex items-center">
<svg class="w-5 h-5 mr-2 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
</svg>
Persönliche Informationen
</h3>
<!-- Username Field -->
<div class="mb-6">
<label for="username" class="block text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
Benutzername Benutzername
</label> </label>
<input type="text" name="username" id="username" required <div class="relative group">
<input type="text"
name="username"
id="username"
required
value="{{ user.username }}" value="{{ user.username }}"
class="w-full px-4 py-3 border border-slate-300 dark:border-slate-600 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white" class="premium-input w-full px-5 py-4 rounded-xl text-slate-900 dark:text-white placeholder-slate-500 dark:placeholder-slate-400 focus:outline-none"
placeholder="max.mustermann"> placeholder="max.mustermann">
<div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
<svg class="w-5 h-5 text-slate-400 group-focus-within:text-blue-500 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 12a4 4 0 10-8 0 4 4 0 008 0zm0 0v1.5a2.5 2.5 0 005 0V12a9 9 0 10-9 9m4.5-1.206a8.959 8.959 0 01-4.5 1.207"/>
</svg>
</div>
</div>
</div> </div>
<!-- Name --> <!-- Full Name Field -->
<div> <div class="mb-6">
<label for="name" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2"> <label for="name" class="block text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
Vollständiger Name Vollständiger Name
</label> </label>
<input type="text" name="name" id="name" <div class="relative group">
<input type="text"
name="name"
id="name"
value="{{ user.name }}" value="{{ user.name }}"
class="w-full px-4 py-3 border border-slate-300 dark:border-slate-600 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white" class="premium-input w-full px-5 py-4 rounded-xl text-slate-900 dark:text-white placeholder-slate-500 dark:placeholder-slate-400 focus:outline-none"
placeholder="Max Mustermann"> placeholder="Max Mustermann">
<div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
<svg class="w-5 h-5 text-slate-400 group-focus-within:text-blue-500 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"/>
</svg>
</div>
</div>
</div> </div>
<!-- Neues Passwort (optional) --> <!-- Password Field -->
<div> <div>
<label for="password" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2"> <label for="password" class="block text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
Neues Passwort (leer lassen, um beizubehalten) Neues Passwort
<span class="text-xs font-normal text-slate-500 dark:text-slate-400 ml-2">(optional)</span>
</label> </label>
<input type="password" name="password" id="password" <div class="relative group">
class="w-full px-4 py-3 border border-slate-300 dark:border-slate-600 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white" <input type="password"
placeholder="Neues Passwort"> name="password"
id="password"
class="premium-input w-full px-5 py-4 rounded-xl text-slate-900 dark:text-white placeholder-slate-500 dark:placeholder-slate-400 focus:outline-none"
placeholder="Leer lassen, um beizubehalten">
<div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
<svg class="w-5 h-5 text-slate-400 group-focus-within:text-blue-500 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 0h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"/>
</svg>
</div>
</div>
<p class="text-xs text-slate-500 dark:text-slate-400 mt-2 ml-1">
Lassen Sie das Feld leer, um das aktuelle Passwort beizubehalten
</p>
</div>
</div>
</div> </div>
<!-- Rolle --> <!-- Right Column: Role & Status -->
<div> <div class="space-y-6">
<label for="role" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2"> <div class="bg-gradient-to-br from-green-50 to-emerald-50 dark:from-green-900/20 dark:to-emerald-900/20 rounded-2xl p-6 border border-green-200/50 dark:border-green-800/50">
<h3 class="text-lg font-semibold text-slate-900 dark:text-white mb-6 flex items-center">
<svg class="w-5 h-5 mr-2 text-green-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
Rolle & Status
</h3>
<!-- Role Selection -->
<div class="mb-6">
<label for="role" class="block text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
Benutzerrolle Benutzerrolle
</label> </label>
<select name="role" id="role" <div class="relative">
class="w-full px-4 py-3 border border-slate-300 dark:border-slate-600 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white"> <select name="role"
<option value="user" {% if not user.is_admin %}selected{% endif %}>Benutzer</option> id="role"
<option value="admin" {% if user.is_admin %}selected{% endif %}>Administrator</option> class="premium-input w-full px-5 py-4 rounded-xl text-slate-900 dark:text-white focus:outline-none appearance-none cursor-pointer">
<option value="user" {% if not user.is_admin %}selected{% endif %}>
👤 Standard-Benutzer
</option>
<option value="admin" {% if user.is_admin %}selected{% endif %}>
👑 Administrator
</option>
</select> </select>
<div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
<svg class="w-5 h-5 text-slate-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
</svg>
</div>
</div>
</div> </div>
<!-- Status --> <!-- Status Selection -->
<div> <div>
<label for="is_active" class="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-2"> <label for="is_active" class="block text-sm font-semibold text-slate-700 dark:text-slate-300 mb-3">
Benutzerstatus Kontostatus
</label> </label>
<select name="is_active" id="is_active" <div class="relative">
class="w-full px-4 py-3 border border-slate-300 dark:border-slate-600 rounded-xl focus:ring-2 focus:ring-blue-500 focus:border-transparent dark:bg-slate-700 dark:text-white"> <select name="is_active"
<option value="true" {% if user.active %}selected{% endif %}>Aktiv</option> id="is_active"
<option value="false" {% if not user.active %}selected{% endif %}>Deaktiviert</option> class="premium-input w-full px-5 py-4 rounded-xl text-slate-900 dark:text-white focus:outline-none appearance-none cursor-pointer">
<option value="true" {% if user.active %}selected{% endif %}>
✅ Aktiv
</option>
<option value="false" {% if not user.active %}selected{% endif %}>
❌ Deaktiviert
</option>
</select> </select>
<div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
<svg class="w-5 h-5 text-slate-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"/>
</svg>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<!-- Berechtigungen --> <!-- Advanced Permissions Section -->
<div class="border-t border-slate-200 dark:border-slate-600 pt-6"> <div class="bg-gradient-to-br from-purple-50 to-pink-50 dark:from-purple-900/20 dark:to-pink-900/20 rounded-2xl p-8 border border-purple-200/50 dark:border-purple-800/50">
<h3 class="text-lg font-medium text-slate-900 dark:text-white mb-4">Benutzerberechtigungen</h3> <div class="mb-8">
<h3 class="text-xl font-bold text-slate-900 dark:text-white mb-3 flex items-center">
<svg class="w-6 h-6 mr-3 text-purple-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 0h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"/>
</svg>
Erweiterte Berechtigungen
</h3>
<p class="text-slate-600 dark:text-slate-400">
Konfigurieren Sie die spezifischen Zugriffsrechte für diesen Benutzer
</p>
</div>
<div class="space-y-4"> <div class="grid grid-cols-1 md:grid-cols-3 gap-6">
<!-- Jobs ohne Genehmigung starten --> <!-- Permission: Start Jobs -->
<div class="flex items-center justify-between"> <div class="permission-card bg-white/60 dark:bg-slate-800/60 backdrop-blur-sm rounded-2xl p-6 border border-white/50 dark:border-slate-700/50">
<div> <div class="flex items-start justify-between mb-4">
<label for="can_start_jobs" class="text-sm font-medium text-slate-700 dark:text-slate-300"> <div class="flex-1">
Jobs ohne Genehmigung starten <div class="flex items-center mb-2">
</label> <svg class="w-5 h-5 text-green-500 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<p class="text-xs text-slate-500 dark:text-slate-400"> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.828 14.828a4 4 0 01-5.656 0M9 10h1m4 0h1m-6 4h.01M19 10a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<h4 class="font-semibold text-slate-900 dark:text-white">Jobs starten</h4>
</div>
<p class="text-sm text-slate-600 dark:text-slate-400 leading-relaxed">
Benutzer kann eigene Druckjobs ohne Admin-Genehmigung starten Benutzer kann eigene Druckjobs ohne Admin-Genehmigung starten
</p> </p>
</div> </div>
<div class="relative inline-block w-10 mr-2 align-middle select-none transition duration-200 ease-in"> <div class="ml-4">
<input type="checkbox" name="can_start_jobs" id="can_start_jobs" <label class="toggle-switch">
{% if user.permissions and user.permissions.can_start_jobs %}checked{% endif %} <input type="checkbox"
class="toggle-checkbox absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer"> name="can_start_jobs"
<label for="can_start_jobs" class="toggle-label block overflow-hidden h-6 rounded-full bg-gray-300 cursor-pointer"></label> {% if user.permissions and user.permissions.can_start_jobs %}checked{% endif %}>
<span class="toggle-slider"></span>
</label>
</div>
</div> </div>
</div> </div>
<!-- Genehmigungspflicht --> <!-- Permission: Needs Approval -->
<div class="flex items-center justify-between"> <div class="permission-card bg-white/60 dark:bg-slate-800/60 backdrop-blur-sm rounded-2xl p-6 border border-white/50 dark:border-slate-700/50">
<div> <div class="flex items-start justify-between mb-4">
<label for="needs_approval" class="text-sm font-medium text-slate-700 dark:text-slate-300"> <div class="flex-1">
Genehmigungspflicht für Jobs <div class="flex items-center mb-2">
</label> <svg class="w-5 h-5 text-orange-500 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<p class="text-xs text-slate-500 dark:text-slate-400"> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<h4 class="font-semibold text-slate-900 dark:text-white">Genehmigungspflicht</h4>
</div>
<p class="text-sm text-slate-600 dark:text-slate-400 leading-relaxed">
Jobs des Benutzers müssen von einem Admin genehmigt werden Jobs des Benutzers müssen von einem Admin genehmigt werden
</p> </p>
</div> </div>
<div class="relative inline-block w-10 mr-2 align-middle select-none transition duration-200 ease-in"> <div class="ml-4">
<input type="checkbox" name="needs_approval" id="needs_approval" <label class="toggle-switch">
{% if not user.permissions or user.permissions.needs_approval %}checked{% endif %} <input type="checkbox"
class="toggle-checkbox absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer"> name="needs_approval"
<label for="needs_approval" class="toggle-label block overflow-hidden h-6 rounded-full bg-gray-300 cursor-pointer"></label> {% if not user.permissions or user.permissions.needs_approval %}checked{% endif %}>
<span class="toggle-slider"></span>
</label>
</div>
</div> </div>
</div> </div>
<!-- Jobs genehmigen --> <!-- Permission: Can Approve -->
<div class="flex items-center justify-between"> <div class="permission-card bg-white/60 dark:bg-slate-800/60 backdrop-blur-sm rounded-2xl p-6 border border-white/50 dark:border-slate-700/50">
<div> <div class="flex items-start justify-between mb-4">
<label for="can_approve_jobs" class="text-sm font-medium text-slate-700 dark:text-slate-300"> <div class="flex-1">
Jobs genehmigen <div class="flex items-center mb-2">
</label> <svg class="w-5 h-5 text-blue-500 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<p class="text-xs text-slate-500 dark:text-slate-400"> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z"/>
</svg>
<h4 class="font-semibold text-slate-900 dark:text-white">Jobs genehmigen</h4>
</div>
<p class="text-sm text-slate-600 dark:text-slate-400 leading-relaxed">
Benutzer kann Gastanfragen und fremde Jobs genehmigen Benutzer kann Gastanfragen und fremde Jobs genehmigen
</p> </p>
</div> </div>
<div class="relative inline-block w-10 mr-2 align-middle select-none transition duration-200 ease-in"> <div class="ml-4">
<input type="checkbox" name="can_approve_jobs" id="can_approve_jobs" <label class="toggle-switch">
{% if user.permissions and user.permissions.can_approve_jobs %}checked{% endif %} <input type="checkbox"
class="toggle-checkbox absolute block w-6 h-6 rounded-full bg-white border-4 appearance-none cursor-pointer"> name="can_approve_jobs"
<label for="can_approve_jobs" class="toggle-label block overflow-hidden h-6 rounded-full bg-gray-300 cursor-pointer"></label> {% if user.permissions and user.permissions.can_approve_jobs %}checked{% endif %}>
<span class="toggle-slider"></span>
</label>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Buttons --> <!-- Action Buttons -->
<div class="flex items-center justify-end space-x-4 pt-4"> <div class="flex items-center justify-between pt-8 border-t border-slate-200 dark:border-slate-700">
<div class="flex items-center space-x-4">
<div class="flex items-center text-sm text-slate-500 dark:text-slate-400">
<svg class="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<span>Änderungen werden sofort gespeichert</span>
</div>
</div>
<div class="flex items-center space-x-4">
<a href="{{ url_for('admin_page', tab='users') }}" <a href="{{ url_for('admin_page', tab='users') }}"
class="px-6 py-3 border border-slate-300 dark:border-slate-600 text-slate-700 dark:text-slate-300 rounded-xl hover:bg-slate-50 dark:hover:bg-slate-700 transition-all duration-300"> class="group inline-flex items-center px-8 py-4 bg-white/80 dark:bg-slate-800/80 backdrop-blur-sm text-slate-700 dark:text-slate-300 rounded-2xl hover:bg-white dark:hover:bg-slate-700 transition-all duration-300 shadow-lg hover:shadow-xl border border-white/20 dark:border-slate-700/50">
Abbrechen <svg class="w-5 h-5 mr-2 transition-transform group-hover:-translate-x-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
</svg>
<span class="font-medium">Abbrechen</span>
</a> </a>
<button type="submit" <button type="submit"
class="px-6 py-3 bg-gradient-to-r from-blue-500 to-blue-600 text-white rounded-xl hover:from-blue-600 hover:to-blue-700 transition-all duration-300 shadow-lg"> class="btn-gradient group inline-flex items-center px-8 py-4 text-white rounded-2xl hover:shadow-2xl transition-all duration-300 shadow-xl font-semibold text-lg relative overflow-hidden">
Änderungen speichern <svg class="w-5 h-5 mr-3 transition-transform group-hover:scale-110" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"/>
</svg>
<span>Änderungen speichern</span>
</button> </button>
</div> </div>
</div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<!-- Enhanced JavaScript for better UX -->
<script>
document.addEventListener('DOMContentLoaded', function() {
const form = document.getElementById('userEditForm');
const submitButton = form.querySelector('button[type="submit"]');
// Add smooth loading state
form.addEventListener('submit', function(e) {
submitButton.disabled = true;
submitButton.innerHTML = `
<svg class="w-5 h-5 mr-3 animate-spin" fill="none" viewBox="0 0 24 24">
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
<span>Speichere...</span>
`;
});
// Enhanced input focus effects
const inputs = form.querySelectorAll('.premium-input');
inputs.forEach(input => {
input.addEventListener('focus', function() {
this.parentElement.classList.add('focused');
});
input.addEventListener('blur', function() {
this.parentElement.classList.remove('focused');
});
});
// Smooth scroll on form errors
const errors = document.querySelectorAll('.error-message');
if (errors.length > 0) {
errors[0].scrollIntoView({ behavior: 'smooth', block: 'center' });
}
// Toggle switch animations
const toggles = document.querySelectorAll('.toggle-switch input');
toggles.forEach(toggle => {
toggle.addEventListener('change', function() {
const slider = this.nextElementSibling;
if (this.checked) {
slider.style.transform = 'scale(1.1)';
setTimeout(() => {
slider.style.transform = 'scale(1)';
}, 150);
}
});
});
// Form validation feedback
const requiredInputs = form.querySelectorAll('input[required]');
requiredInputs.forEach(input => {
input.addEventListener('blur', function() {
if (this.value.trim() === '') {
this.classList.add('border-red-300');
this.classList.remove('border-green-300');
} else {
this.classList.add('border-green-300');
this.classList.remove('border-red-300');
}
});
});
// Auto-save notification (mock)
let saveTimeout;
inputs.forEach(input => {
input.addEventListener('input', function() {
clearTimeout(saveTimeout);
saveTimeout = setTimeout(() => {
// Could implement auto-save here
console.log('Changes detected - auto-save ready');
}, 2000);
});
});
});
</script>
{% endblock %} {% endblock %}

View File

@ -214,7 +214,7 @@
</div> </div>
<!-- Action Buttons --> <!-- Action Buttons -->
<div class="flex space-x-3"> <div class="flex space-x-3 ml-6">
<button id="refresh-btn" <button id="refresh-btn"
class="inline-flex items-center px-4 py-3 bg-blue-500 dark:bg-blue-600 text-white rounded-xl hover:bg-blue-600 dark:hover:bg-blue-700 transition-all duration-300 shadow-lg hover:shadow-xl hover:scale-105"> class="inline-flex items-center px-4 py-3 bg-blue-500 dark:bg-blue-600 text-white rounded-xl hover:bg-blue-600 dark:hover:bg-blue-700 transition-all duration-300 shadow-lg hover:shadow-xl hover:scale-105">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24"> <svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">

View File

@ -1,24 +1,22 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="de">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Gastauftrag Status-Abfrage - Mercedes-Benz TBA Marienfelde</title>
<link href="{{ url_for('static', filename='css/output.css') }}" rel="stylesheet">
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
<style> {% block title %}Gastauftrag Status-Abfrage - Mercedes-Benz TBA Marienfelde{% endblock %}
{% block extra_css %}
<!-- Zusätzliche Styles für diese Seite -->
<style>
.status-card { .status-card {
background: linear-gradient(135deg, #ffffff 0%, #f8fafc 100%); background: linear-gradient(135deg, rgba(255, 255, 255, 0.95) 0%, rgba(248, 250, 252, 0.95) 100%);
border: 1px solid #e2e8f0; border: 1px solid rgba(226, 232, 240, 0.8);
border-radius: 16px; border-radius: 16px;
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1); box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
transition: all 0.3s ease; transition: all 0.3s ease;
backdrop-filter: blur(10px);
} }
.dark .status-card { .dark .status-card {
background: linear-gradient(135deg, #1e293b 0%, #0f172a 100%); background: linear-gradient(135deg, rgba(30, 41, 59, 0.95) 0%, rgba(15, 23, 42, 0.95) 100%);
border-color: #334155; border-color: rgba(51, 65, 85, 0.8);
} }
.otp-input { .otp-input {
@ -38,12 +36,34 @@
font-size: 0.875rem; font-size: 0.875rem;
} }
.status-pending { background-color: #fef3c7; color: #92400e; } .status-pending {
.status-approved { background-color: #d1fae5; color: #065f46; } background-color: rgba(254, 243, 199, 0.8);
.status-rejected { background-color: #fee2e2; color: #991b1b; } color: #92400e;
}
.status-approved {
background-color: rgba(209, 250, 229, 0.8);
color: #065f46;
}
.status-rejected {
background-color: rgba(254, 226, 226, 0.8);
color: #991b1b;
}
.dark .status-pending {
background-color: rgba(146, 64, 14, 0.2);
color: #fbbf24;
}
.dark .status-approved {
background-color: rgba(6, 95, 70, 0.2);
color: #34d399;
}
.dark .status-rejected {
background-color: rgba(153, 27, 27, 0.2);
color: #f87171;
}
.loading-spinner { .loading-spinner {
border: 2px solid #f3f4f6; border: 2px solid rgba(243, 244, 246, 0.3);
border-top: 2px solid #0073ce; border-top: 2px solid #0073ce;
border-radius: 50%; border-radius: 50%;
width: 1rem; width: 1rem;
@ -55,22 +75,31 @@
0% { transform: rotate(0deg); } 0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); } 100% { transform: rotate(360deg); }
} }
</style>
</head> .mercedes-blue {
<body class="bg-gray-50 font-mercedes"> background-color: #0073ce;
<div class="min-h-screen flex items-center justify-center p-4"> }
.font-mercedes {
font-family: 'Mercedes-Benz Text', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
}
</style>
{% endblock %}
{% block content %}
<div class="min-h-screen flex items-center justify-center p-4">
<div class="max-w-md w-full space-y-8"> <div class="max-w-md w-full space-y-8">
<!-- Header --> <!-- Header -->
<div class="text-center"> <div class="text-center">
<div class="mx-auto h-12 w-12 bg-mercedes-blue rounded-full flex items-center justify-center"> <div class="mx-auto h-12 w-12 mercedes-blue rounded-full flex items-center justify-center">
<svg class="h-6 w-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24"> <svg class="h-6 w-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/> <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
</svg> </svg>
</div> </div>
<h2 class="mt-6 text-3xl font-bold text-gray-900"> <h2 class="mt-6 text-3xl font-bold text-slate-900 dark:text-white">
Auftragsstatus prüfen Auftragsstatus prüfen
</h2> </h2>
<p class="mt-2 text-sm text-gray-600"> <p class="mt-2 text-sm text-slate-600 dark:text-slate-400">
Geben Sie Ihren Statuscode ein, um Informationen über Ihren Gastauftrag zu erhalten Geben Sie Ihren Statuscode ein, um Informationen über Ihren Gastauftrag zu erhalten
</p> </p>
</div> </div>
@ -79,38 +108,38 @@
<div class="status-card p-6" id="query-form"> <div class="status-card p-6" id="query-form">
<form id="status-form" class="space-y-6"> <form id="status-form" class="space-y-6">
<div> <div>
<label for="otp_code" class="block text-sm font-medium text-gray-700"> <label for="otp_code" class="block text-sm font-medium text-slate-700 dark:text-slate-300">
Statuscode (16 Zeichen) Statuscode (16 Zeichen)
</label> </label>
<input type="text" <input type="text"
id="otp_code" id="otp_code"
name="otp_code" name="otp_code"
maxlength="16" maxlength="16"
class="otp-input mt-1 appearance-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-md focus:outline-none focus:ring-mercedes-blue focus:border-mercedes-blue focus:z-10 sm:text-sm" class="otp-input mt-1 appearance-none relative block w-full px-3 py-2 border border-slate-300 dark:border-slate-600 placeholder-slate-500 dark:placeholder-slate-400 text-slate-900 dark:text-white bg-white dark:bg-slate-800 rounded-md focus:outline-none focus:ring-blue-500 focus:border-blue-500 focus:z-10 sm:text-sm"
placeholder="XXXXXXXXXXXXXXXX" placeholder="XXXXXXXXXXXXXXXX"
required> required>
<p class="mt-1 text-xs text-gray-500"> <p class="mt-1 text-xs text-slate-500 dark:text-slate-400">
Der Code wurde Ihnen bei der Antragsstellung mitgeteilt Der Code wurde Ihnen bei der Antragsstellung mitgeteilt
</p> </p>
</div> </div>
<div> <div>
<label for="email" class="block text-sm font-medium text-gray-700"> <label for="email" class="block text-sm font-medium text-slate-700 dark:text-slate-300">
E-Mail-Adresse (optional) E-Mail-Adresse (optional)
</label> </label>
<input type="email" <input type="email"
id="email" id="email"
name="email" name="email"
class="mt-1 appearance-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-md focus:outline-none focus:ring-mercedes-blue focus:border-mercedes-blue focus:z-10 sm:text-sm" class="mt-1 appearance-none relative block w-full px-3 py-2 border border-slate-300 dark:border-slate-600 placeholder-slate-500 dark:placeholder-slate-400 text-slate-900 dark:text-white bg-white dark:bg-slate-800 rounded-md focus:outline-none focus:ring-blue-500 focus:border-blue-500 focus:z-10 sm:text-sm"
placeholder="ihre.email@example.com"> placeholder="ihre.email@example.com">
<p class="mt-1 text-xs text-gray-500"> <p class="mt-1 text-xs text-slate-500 dark:text-slate-400">
Zusätzliche Sicherheit (empfohlen) Zusätzliche Sicherheit (empfohlen)
</p> </p>
</div> </div>
<div> <div>
<button type="submit" <button type="submit"
class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm font-medium rounded-md text-white bg-mercedes-blue hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"> class="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm font-medium rounded-md text-white mercedes-blue hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
<span id="submit-text">Status prüfen</span> <span id="submit-text">Status prüfen</span>
<span id="loading-spinner" class="loading-spinner ml-2 hidden"></span> <span id="loading-spinner" class="loading-spinner ml-2 hidden"></span>
</button> </button>
@ -127,11 +156,11 @@
<div class="mt-6 flex gap-3"> <div class="mt-6 flex gap-3">
<button onclick="resetForm()" <button onclick="resetForm()"
class="flex-1 py-2 px-4 border border-gray-300 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"> class="flex-1 py-2 px-4 border border-slate-300 dark:border-slate-600 rounded-md text-sm font-medium text-slate-700 dark:text-slate-300 hover:bg-slate-50 dark:hover:bg-slate-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
Neue Abfrage Neue Abfrage
</button> </button>
<button onclick="refreshStatus()" <button onclick="refreshStatus()"
class="flex-1 py-2 px-4 border border-transparent rounded-md text-sm font-medium text-white bg-mercedes-blue hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"> class="flex-1 py-2 px-4 border border-transparent rounded-md text-sm font-medium text-white mercedes-blue hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
Aktualisieren Aktualisieren
</button> </button>
</div> </div>
@ -148,8 +177,8 @@
</svg> </svg>
</div> </div>
<div class="ml-3"> <div class="ml-3">
<h3 class="text-sm font-medium text-red-800">Fehler</h3> <h3 class="text-sm font-medium text-red-800 dark:text-red-400">Fehler</h3>
<div class="mt-2 text-sm text-red-700" id="error-text"> <div class="mt-2 text-sm text-red-700 dark:text-red-300" id="error-text">
<!-- Wird per JavaScript gefüllt --> <!-- Wird per JavaScript gefüllt -->
</div> </div>
</div> </div>
@ -166,15 +195,17 @@
<!-- Footer --> <!-- Footer -->
<div class="text-center"> <div class="text-center">
<p class="text-xs text-gray-500"> <p class="text-xs text-slate-500 dark:text-slate-400">
Mercedes-Benz Technische Berufsausbildung Marienfelde<br> Mercedes-Benz Technische Berufsausbildung Marienfelde<br>
<a href="/guest/request" class="text-mercedes-blue hover:underline">Neuen Antrag stellen</a> <a href="/guest/request" class="text-blue-600 dark:text-blue-400 hover:underline">Neuen Antrag stellen</a>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
{% endblock %}
<script> {% block extra_js %}
<script>
let currentRequestData = null; let currentRequestData = null;
// Formular-Submit-Handler // Formular-Submit-Handler
@ -255,43 +286,43 @@
let html = ` let html = `
<div class="text-center mb-6"> <div class="text-center mb-6">
<div class="text-4xl mb-2">${statusIcon}</div> <div class="text-4xl mb-2">${statusIcon}</div>
<h3 class="text-xl font-semibold text-gray-900 mb-2"> <h3 class="text-xl font-semibold text-slate-900 dark:text-white mb-2">
Antrag von ${request.name} Antrag von ${request.name}
</h3> </h3>
${statusBadge} ${statusBadge}
</div> </div>
<div class="space-y-4"> <div class="space-y-4">
<div class="bg-gray-50 p-4 rounded-lg"> <div class="bg-slate-50 dark:bg-slate-800/50 p-4 rounded-lg">
<h4 class="font-medium text-gray-900 mb-2">Antragsdetails</h4> <h4 class="font-medium text-slate-900 dark:text-white mb-2">Antragsdetails</h4>
<dl class="space-y-1 text-sm"> <dl class="space-y-1 text-sm">
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-gray-600">Erstellt am:</dt> <dt class="text-slate-600 dark:text-slate-400">Erstellt am:</dt>
<dd class="text-gray-900">${formatDate(request.created_at)}</dd> <dd class="text-slate-900 dark:text-white">${formatDate(request.created_at)}</dd>
</div> </div>
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-gray-600">Dauer:</dt> <dt class="text-slate-600 dark:text-slate-400">Dauer:</dt>
<dd class="text-gray-900">${request.duration_min} Minuten</dd> <dd class="text-slate-900 dark:text-white">${request.duration_min} Minuten</dd>
</div> </div>
${request.file_name ? ` ${request.file_name ? `
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-gray-600">Datei:</dt> <dt class="text-slate-600 dark:text-slate-400">Datei:</dt>
<dd class="text-gray-900">${request.file_name}</dd> <dd class="text-slate-900 dark:text-white">${request.file_name}</dd>
</div> </div>
` : ''} ` : ''}
</dl> </dl>
</div> </div>
<div class="bg-blue-50 border border-blue-200 rounded-lg p-4"> <div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4">
<p class="text-sm text-blue-800"> <p class="text-sm text-blue-800 dark:text-blue-300">
${request.message} ${request.message}
</p> </p>
</div> </div>
${request.status === 'approved' && request.can_start_job ? ` ${request.status === 'approved' && request.can_start_job ? `
<div class="bg-green-50 border border-green-200 rounded-lg p-4"> <div class="bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 rounded-lg p-4">
<h4 class="font-medium text-green-800 mb-2">🎯 Bereit zum Drucken!</h4> <h4 class="font-medium text-green-800 dark:text-green-300 mb-2">🎯 Bereit zum Drucken!</h4>
<p class="text-sm text-green-700 mb-3"> <p class="text-sm text-green-700 dark:text-green-400 mb-3">
Ihr Auftrag wurde genehmigt. Sie können mit dem 3D-Druck beginnen. Ihr Auftrag wurde genehmigt. Sie können mit dem 3D-Druck beginnen.
</p> </p>
<a href="/guest/start-job" <a href="/guest/start-job"
@ -302,28 +333,28 @@
` : ''} ` : ''}
${request.status === 'rejected' && request.rejection_reason ? ` ${request.status === 'rejected' && request.rejection_reason ? `
<div class="bg-red-50 border border-red-200 rounded-lg p-4"> <div class="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg p-4">
<h4 class="font-medium text-red-800 mb-2">Ablehnungsgrund:</h4> <h4 class="font-medium text-red-800 dark:text-red-300 mb-2">Ablehnungsgrund:</h4>
<p class="text-sm text-red-700">${request.rejection_reason}</p> <p class="text-sm text-red-700 dark:text-red-400">${request.rejection_reason}</p>
</div> </div>
` : ''} ` : ''}
${request.job ? ` ${request.job ? `
<div class="bg-indigo-50 border border-indigo-200 rounded-lg p-4"> <div class="bg-indigo-50 dark:bg-indigo-900/20 border border-indigo-200 dark:border-indigo-800 rounded-lg p-4">
<h4 class="font-medium text-indigo-800 mb-2">📋 Job-Informationen</h4> <h4 class="font-medium text-indigo-800 dark:text-indigo-300 mb-2">📋 Job-Informationen</h4>
<dl class="space-y-1 text-sm"> <dl class="space-y-1 text-sm">
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-indigo-600">Job-Name:</dt> <dt class="text-indigo-600 dark:text-indigo-400">Job-Name:</dt>
<dd class="text-indigo-900">${request.job.name}</dd> <dd class="text-indigo-900 dark:text-indigo-200">${request.job.name}</dd>
</div> </div>
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-indigo-600">Status:</dt> <dt class="text-indigo-600 dark:text-indigo-400">Status:</dt>
<dd class="text-indigo-900">${request.job.status}</dd> <dd class="text-indigo-900 dark:text-indigo-200">${request.job.status}</dd>
</div> </div>
${request.job.printer_name ? ` ${request.job.printer_name ? `
<div class="flex justify-between"> <div class="flex justify-between">
<dt class="text-indigo-600">Drucker:</dt> <dt class="text-indigo-600 dark:text-indigo-400">Drucker:</dt>
<dd class="text-indigo-900">${request.job.printer_name}</dd> <dd class="text-indigo-900 dark:text-indigo-200">${request.job.printer_name}</dd>
</div> </div>
` : ''} ` : ''}
</dl> </dl>
@ -407,6 +438,5 @@
// Nur alphanumerische Zeichen erlauben // Nur alphanumerische Zeichen erlauben
e.target.value = e.target.value.replace(/[^A-Fa-f0-9]/g, '').toUpperCase(); e.target.value = e.target.value.replace(/[^A-Fa-f0-9]/g, '').toUpperCase();
}); });
</script> </script>
</body> {% endblock %}
</html>

View File

@ -149,8 +149,8 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
<!-- Chart.js CDN --> <!-- Chart.js - Lokale Version -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.0/chart.min.js"></script> <script src="{{ url_for('static', filename='js/charts/chart.min.js') }}"></script>
<!-- Global Refresh Functions --> <!-- Global Refresh Functions -->
<script src="{{ url_for('static', filename='js/global-refresh-functions.js') }}"></script> <script src="{{ url_for('static', filename='js/global-refresh-functions.js') }}"></script>
@ -196,7 +196,9 @@ async function loadBasicStats() {
} catch (error) { } catch (error) {
console.error('Fehler beim Laden der Basis-Statistiken:', error); console.error('Fehler beim Laden der Basis-Statistiken:', error);
showToast('Fehler beim Laden der Statistiken', 'error'); if (typeof showFlashMessage === 'function') {
showFlashMessage('Fehler beim Laden der Statistiken', 'error');
}
} }
} }
@ -251,7 +253,9 @@ function animateCounter(element, start, end, finalText) {
// Statistiken neu laden // Statistiken neu laden
function refreshStats() { function refreshStats() {
// Feedback für den Benutzer // Feedback für den Benutzer
showToast('Statistiken werden aktualisiert...', 'info'); if (typeof showFlashMessage === 'function') {
showFlashMessage('Statistiken werden aktualisiert...', 'info');
}
// Basis-Statistiken laden // Basis-Statistiken laden
loadBasicStats(); loadBasicStats();
@ -263,7 +267,9 @@ function refreshStats() {
// Erfolgsmeldung // Erfolgsmeldung
setTimeout(() => { setTimeout(() => {
showToast('Statistiken erfolgreich aktualisiert', 'success'); if (typeof showFlashMessage === 'function') {
showFlashMessage('Statistiken erfolgreich aktualisiert', 'success');
}
}, 1000); }, 1000);
} }
@ -272,19 +278,5 @@ function exportStats() {
// Direkter Download vom API-Endpunkt // Direkter Download vom API-Endpunkt
window.location.href = '/api/stats/export'; window.location.href = '/api/stats/export';
} }
// Helper-Funktion für Toast-Benachrichtigungen
function showToast(message, type) {
if (window.showToast) {
window.showToast(message, type);
} else {
// Fallback für einfache Alert
if (type === 'error') {
alert('Fehler: ' + message);
} else {
console.log(type + ': ' + message);
}
}
}
</script> </script>
{% endblock %} {% endblock %}