"feat: Update admin features
This commit is contained in:
parent
1dc335709b
commit
51601516f4
@ -1,98 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Datenbank-Migration für Admin-Features in GuestRequest
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import sqlite3
|
||||
from datetime import datetime
|
||||
|
||||
# Pfad zur App hinzufügen
|
||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from config.settings import DATABASE_PATH
|
||||
from utils.logging_config import get_logger
|
||||
|
||||
logger = get_logger("migrate_admin")
|
||||
|
||||
def column_exists(cursor, table_name, column_name):
|
||||
"""Prüft, ob eine Spalte in einer Tabelle existiert."""
|
||||
cursor.execute(f"PRAGMA table_info({table_name})")
|
||||
columns = [row[1] for row in cursor.fetchall()]
|
||||
return column_name in columns
|
||||
|
||||
def migrate_admin_features():
|
||||
"""Fügt die neuen Admin-Felder zur guest_requests Tabelle hinzu."""
|
||||
|
||||
print(f"Datenbankpfad: {DATABASE_PATH}")
|
||||
|
||||
if not os.path.exists(DATABASE_PATH):
|
||||
print(f"FEHLER: Datenbankdatei nicht gefunden: {DATABASE_PATH}")
|
||||
return False
|
||||
|
||||
try:
|
||||
conn = sqlite3.connect(DATABASE_PATH)
|
||||
cursor = conn.cursor()
|
||||
|
||||
print("Aktuelle guest_requests Tabellen-Struktur:")
|
||||
cursor.execute("PRAGMA table_info(guest_requests)")
|
||||
columns = cursor.fetchall()
|
||||
for col in columns:
|
||||
print(f" {col[1]} ({col[2]})")
|
||||
|
||||
changes_made = False
|
||||
|
||||
# Neue Spalten hinzufügen, falls sie nicht existieren
|
||||
new_columns = [
|
||||
("processed_by", "INTEGER", "REFERENCES users(id)"),
|
||||
("processed_at", "DATETIME", None),
|
||||
("approval_notes", "TEXT", None),
|
||||
("rejection_reason", "TEXT", None)
|
||||
]
|
||||
|
||||
for column_name, column_type, constraint in new_columns:
|
||||
if not column_exists(cursor, 'guest_requests', column_name):
|
||||
print(f"Füge Spalte '{column_name}' hinzu...")
|
||||
sql = f"ALTER TABLE guest_requests ADD COLUMN {column_name} {column_type}"
|
||||
cursor.execute(sql)
|
||||
changes_made = True
|
||||
print(f"✓ Spalte '{column_name}' hinzugefügt")
|
||||
else:
|
||||
print(f"✓ Spalte '{column_name}' existiert bereits")
|
||||
|
||||
if changes_made:
|
||||
conn.commit()
|
||||
print("\nNeue guest_requests Tabellen-Struktur:")
|
||||
cursor.execute("PRAGMA table_info(guest_requests)")
|
||||
columns = cursor.fetchall()
|
||||
for col in columns:
|
||||
print(f" {col[1]} ({col[2]})")
|
||||
|
||||
conn.close()
|
||||
|
||||
if changes_made:
|
||||
print("\n✓ Admin-Features erfolgreich hinzugefügt")
|
||||
else:
|
||||
print("\n✓ Alle Admin-Features bereits vorhanden")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"FEHLER bei der Migration: {str(e)}")
|
||||
logger.error(f"Fehler bei der Admin-Features Migration: {str(e)}")
|
||||
if 'conn' in locals():
|
||||
conn.rollback()
|
||||
conn.close()
|
||||
return False
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("=== ADMIN-FEATURES MIGRATION ===")
|
||||
success = migrate_admin_features()
|
||||
|
||||
if success:
|
||||
print("\n✓ Migration erfolgreich!")
|
||||
sys.exit(0)
|
||||
else:
|
||||
print("\n✗ Migration fehlgeschlagen!")
|
||||
sys.exit(1)
|
||||
@ -953,13 +953,13 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* User Menu Button - Neues Design */
|
||||
/* User Menu Button - Kompakteres Design */
|
||||
.user-menu-button-new {
|
||||
@apply flex items-center space-x-2 rounded-lg p-1.5 transition-all duration-300;
|
||||
@apply flex items-center space-x-1.5 rounded-lg p-1 transition-all duration-300;
|
||||
background: rgba(241, 245, 249, 0.6);
|
||||
border: 1px solid rgba(255, 255, 255, 0.6);
|
||||
box-shadow:
|
||||
0 2px 10px rgba(0, 0, 0, 0.04),
|
||||
0 2px 8px rgba(0, 0, 0, 0.04),
|
||||
0 1px 2px rgba(0, 0, 0, 0.02);
|
||||
}
|
||||
|
||||
@ -967,50 +967,50 @@
|
||||
@apply transform -translate-y-0.5;
|
||||
background: rgba(241, 245, 249, 0.8);
|
||||
box-shadow:
|
||||
0 10px 20px rgba(0, 0, 0, 0.06),
|
||||
0 2px 6px rgba(0, 0, 0, 0.04);
|
||||
0 8px 16px rgba(0, 0, 0, 0.06),
|
||||
0 2px 4px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
.dark .user-menu-button-new {
|
||||
background: rgba(30, 41, 59, 0.6);
|
||||
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||
box-shadow:
|
||||
0 2px 10px rgba(0, 0, 0, 0.15),
|
||||
0 2px 8px rgba(0, 0, 0, 0.15),
|
||||
0 1px 2px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.dark .user-menu-button-new:hover {
|
||||
background: rgba(30, 41, 59, 0.8);
|
||||
box-shadow:
|
||||
0 10px 20px rgba(0, 0, 0, 0.15),
|
||||
0 2px 6px rgba(0, 0, 0, 0.1);
|
||||
0 8px 16px rgba(0, 0, 0, 0.15),
|
||||
0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
/* User Avatar - Neues Design */
|
||||
/* User Avatar - Kompakteres Design */
|
||||
.user-avatar-new {
|
||||
@apply h-8 w-8 rounded-full flex items-center justify-center text-white font-semibold text-sm shadow-md transition-all duration-300;
|
||||
@apply h-7 w-7 rounded-full flex items-center justify-center text-white font-semibold text-xs shadow-md transition-all duration-300;
|
||||
background: linear-gradient(135deg, #000000, #333333);
|
||||
box-shadow:
|
||||
0 2px 6px rgba(0, 0, 0, 0.2),
|
||||
0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
0 2px 4px rgba(0, 0, 0, 0.2),
|
||||
0 1px 2px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.dark .user-avatar-new {
|
||||
background: linear-gradient(135deg, #f8fafc, #e2e8f0);
|
||||
color: #0f172a;
|
||||
box-shadow:
|
||||
0 2px 6px rgba(0, 0, 0, 0.3),
|
||||
0 1px 3px rgba(0, 0, 0, 0.2);
|
||||
0 2px 4px rgba(0, 0, 0, 0.3),
|
||||
0 1px 2px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
/* Login Button - Neues Design */
|
||||
/* Login Button - Kompakteres Design */
|
||||
.login-button-new {
|
||||
@apply flex items-center px-4 py-2 rounded-lg text-sm font-medium shadow-sm transition-all duration-300;
|
||||
@apply flex items-center px-3 py-1.5 rounded-lg text-xs font-medium shadow-sm transition-all duration-300;
|
||||
background: #000000;
|
||||
color: #ffffff;
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
box-shadow:
|
||||
0 2px 10px rgba(0, 0, 0, 0.1),
|
||||
0 2px 8px rgba(0, 0, 0, 0.1),
|
||||
0 1px 2px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
|
||||
@ -1018,8 +1018,8 @@
|
||||
@apply transform -translate-y-0.5;
|
||||
background: #333333;
|
||||
box-shadow:
|
||||
0 10px 20px rgba(0, 0, 0, 0.15),
|
||||
0 3px 6px rgba(0, 0, 0, 0.1);
|
||||
0 8px 16px rgba(0, 0, 0, 0.15),
|
||||
0 3px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.dark .login-button-new {
|
||||
@ -1027,18 +1027,18 @@
|
||||
color: #000000;
|
||||
border: 1px solid rgba(0, 0, 0, 0.1);
|
||||
box-shadow:
|
||||
0 2px 10px rgba(0, 0, 0, 0.2),
|
||||
0 2px 8px rgba(0, 0, 0, 0.2),
|
||||
0 1px 2px rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
.dark .login-button-new:hover {
|
||||
background: #f1f5f9;
|
||||
box-shadow:
|
||||
0 10px 20px rgba(0, 0, 0, 0.25),
|
||||
0 3px 6px rgba(0, 0, 0, 0.2);
|
||||
0 8px 16px rgba(0, 0, 0, 0.25),
|
||||
0 3px 4px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
/* Mobile Menu - Neues Design */
|
||||
/* Mobile Menu - Kompakteres Design */
|
||||
.mobile-menu-new {
|
||||
@apply w-full overflow-hidden transition-all duration-300 z-40;
|
||||
background: rgba(255, 255, 255, 0.8);
|
||||
@ -1051,7 +1051,7 @@
|
||||
}
|
||||
|
||||
.mobile-menu-new.open {
|
||||
max-height: 500px;
|
||||
max-height: 400px;
|
||||
opacity: 1;
|
||||
border-bottom: 1px solid rgba(241, 245, 249, 0.8);
|
||||
}
|
||||
@ -1063,7 +1063,7 @@
|
||||
}
|
||||
|
||||
.mobile-nav-item {
|
||||
@apply flex items-center space-x-3 px-4 py-3 rounded-lg text-slate-800 dark:text-slate-200 transition-all duration-300;
|
||||
@apply flex items-center space-x-2.5 px-3 py-2.5 rounded-lg text-sm text-slate-800 dark:text-slate-200 transition-all duration-300;
|
||||
}
|
||||
|
||||
.mobile-nav-item:hover {
|
||||
|
||||
@ -1 +1,609 @@
|
||||
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Gastanfragen verwalten{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container mx-auto px-4 py-8">
|
||||
<div class="bg-white rounded-lg shadow-lg p-6">
|
||||
<!-- Header -->
|
||||
<div class="flex justify-between items-center mb-6">
|
||||
<h1 class="text-3xl font-bold text-gray-800">
|
||||
<i class="fas fa-user-friends mr-3 text-blue-600"></i>
|
||||
Gastanfragen verwalten
|
||||
</h1>
|
||||
<div class="flex items-center space-x-4">
|
||||
<div class="stats-summary flex space-x-4" id="statsContainer">
|
||||
<!-- Statistiken werden hier geladen -->
|
||||
</div>
|
||||
<button onclick="refreshRequests()" class="btn bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-lg">
|
||||
<i class="fas fa-sync-alt mr-2"></i>Aktualisieren
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Filter und Such-Bar -->
|
||||
<div class="mb-6 flex flex-wrap gap-4 items-center">
|
||||
<div class="flex items-center space-x-2">
|
||||
<label for="statusFilter" class="text-sm font-medium text-gray-700">Status:</label>
|
||||
<select id="statusFilter" class="form-select rounded-md border-gray-300" onchange="filterRequests()">
|
||||
<option value="all">Alle</option>
|
||||
<option value="pending" selected>Wartend</option>
|
||||
<option value="approved">Genehmigt</option>
|
||||
<option value="denied">Abgelehnt</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="flex items-center space-x-2">
|
||||
<label for="searchInput" class="text-sm font-medium text-gray-700">Suchen:</label>
|
||||
<input type="text" id="searchInput" placeholder="Name, E-Mail..."
|
||||
class="form-input rounded-md border-gray-300 w-64"
|
||||
oninput="debounceSearch()">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Anfragen-Liste -->
|
||||
<div id="requestsContainer" class="space-y-4">
|
||||
<!-- Wird dynamisch geladen -->
|
||||
</div>
|
||||
|
||||
<!-- Loading Spinner -->
|
||||
<div id="loadingSpinner" class="text-center py-8 hidden">
|
||||
<i class="fas fa-spinner fa-spin text-3xl text-blue-600"></i>
|
||||
<p class="text-gray-600 mt-2">Lade Anfragen...</p>
|
||||
</div>
|
||||
|
||||
<!-- Pagination -->
|
||||
<div id="paginationContainer" class="mt-6 flex justify-center">
|
||||
<!-- Wird dynamisch geladen -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Detail-Modal -->
|
||||
<div id="detailModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full hidden">
|
||||
<div class="relative top-20 mx-auto p-5 border w-11/12 max-w-4xl shadow-lg rounded-md bg-white">
|
||||
<div class="mt-3">
|
||||
<!-- Modal Header -->
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<h3 class="text-lg font-medium text-gray-900" id="modalTitle">Anfrage Details</h3>
|
||||
<button onclick="closeDetailModal()" class="text-gray-400 hover:text-gray-600">
|
||||
<i class="fas fa-times text-xl"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Modal Content -->
|
||||
<div id="modalContent">
|
||||
<!-- Wird dynamisch geladen -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Aktions-Modal (Genehmigen/Ablehnen) -->
|
||||
<div id="actionModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full hidden">
|
||||
<div class="relative top-20 mx-auto p-5 border w-11/12 max-w-lg shadow-lg rounded-md bg-white">
|
||||
<div class="mt-3">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<h3 class="text-lg font-medium text-gray-900" id="actionModalTitle">Anfrage bearbeiten</h3>
|
||||
<button onclick="closeActionModal()" class="text-gray-400 hover:text-gray-600">
|
||||
<i class="fas fa-times text-xl"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form id="actionForm">
|
||||
<input type="hidden" id="actionRequestId">
|
||||
<input type="hidden" id="actionType">
|
||||
|
||||
<!-- Genehmigen-Sektion -->
|
||||
<div id="approveSection" class="hidden">
|
||||
<div class="mb-4">
|
||||
<label for="printerSelect" class="block text-sm font-medium text-gray-700 mb-2">
|
||||
Drucker zuweisen:
|
||||
</label>
|
||||
<select id="printerSelect" class="form-select w-full rounded-md border-gray-300">
|
||||
<option value="">Drucker auswählen...</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<label for="approvalNotes" class="block text-sm font-medium text-gray-700 mb-2">
|
||||
Notizen (optional):
|
||||
</label>
|
||||
<textarea id="approvalNotes" rows="3"
|
||||
class="form-textarea w-full rounded-md border-gray-300"
|
||||
placeholder="Zusätzliche Anweisungen oder Hinweise..."></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Ablehnen-Sektion -->
|
||||
<div id="denySection" class="hidden">
|
||||
<div class="mb-4">
|
||||
<label for="rejectionReason" class="block text-sm font-medium text-gray-700 mb-2">
|
||||
Ablehnungsgrund <span class="text-red-500">*</span>:
|
||||
</label>
|
||||
<textarea id="rejectionReason" rows="4" required
|
||||
class="form-textarea w-full rounded-md border-gray-300"
|
||||
placeholder="Bitte geben Sie einen detaillierten Grund für die Ablehnung an..."></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex justify-end space-x-3 mt-6">
|
||||
<button type="button" onclick="closeActionModal()"
|
||||
class="px-4 py-2 bg-gray-300 text-gray-700 rounded-md hover:bg-gray-400">
|
||||
Abbrechen
|
||||
</button>
|
||||
<button type="submit" id="actionSubmitBtn"
|
||||
class="px-4 py-2 rounded-md text-white">
|
||||
<!-- Text wird dynamisch gesetzt -->
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.badge {
|
||||
@apply px-2 py-1 rounded-full text-xs font-medium;
|
||||
}
|
||||
.badge-pending {
|
||||
@apply bg-yellow-100 text-yellow-800;
|
||||
}
|
||||
.badge-approved {
|
||||
@apply bg-green-100 text-green-800;
|
||||
}
|
||||
.badge-denied {
|
||||
@apply bg-red-100 text-red-800;
|
||||
}
|
||||
.request-card {
|
||||
@apply border rounded-lg p-4 hover:shadow-md transition-shadow;
|
||||
}
|
||||
.request-card.urgent {
|
||||
@apply border-orange-300 bg-orange-50;
|
||||
}
|
||||
.stats-badge {
|
||||
@apply px-3 py-1 rounded-full text-sm font-medium;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
let currentRequests = [];
|
||||
let currentPage = 0;
|
||||
let totalPages = 0;
|
||||
let searchTimeout;
|
||||
|
||||
// Beim Laden der Seite
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
loadAvailablePrinters();
|
||||
refreshRequests();
|
||||
|
||||
// Form-Handler
|
||||
document.getElementById('actionForm').addEventListener('submit', handleActionSubmit);
|
||||
});
|
||||
|
||||
// Anfragen laden
|
||||
async function loadRequests(status = 'pending', offset = 0, search = '') {
|
||||
try {
|
||||
showLoading(true);
|
||||
|
||||
const params = new URLSearchParams({
|
||||
status: status,
|
||||
limit: 20,
|
||||
offset: offset
|
||||
});
|
||||
|
||||
const response = await fetch(`/api/admin/requests?${params}`);
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
currentRequests = data.requests;
|
||||
displayRequests(data.requests, search);
|
||||
displayStats(data.stats);
|
||||
displayPagination(data.pagination);
|
||||
} else {
|
||||
showError('Fehler beim Laden der Anfragen: ' + data.error);
|
||||
}
|
||||
} catch (error) {
|
||||
showError('Fehler beim Laden der Anfragen: ' + error.message);
|
||||
} finally {
|
||||
showLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
// Anfragen anzeigen
|
||||
function displayRequests(requests, search = '') {
|
||||
const container = document.getElementById('requestsContainer');
|
||||
|
||||
// Filtern nach Suchbegriff
|
||||
let filteredRequests = requests;
|
||||
if (search) {
|
||||
const searchLower = search.toLowerCase();
|
||||
filteredRequests = requests.filter(req =>
|
||||
req.name.toLowerCase().includes(searchLower) ||
|
||||
(req.email && req.email.toLowerCase().includes(searchLower)) ||
|
||||
(req.reason && req.reason.toLowerCase().includes(searchLower))
|
||||
);
|
||||
}
|
||||
|
||||
if (filteredRequests.length === 0) {
|
||||
container.innerHTML = `
|
||||
<div class="text-center py-8 text-gray-500">
|
||||
<i class="fas fa-inbox text-4xl mb-4"></i>
|
||||
<p class="text-lg">Keine Anfragen gefunden</p>
|
||||
<p class="text-sm">Versuchen Sie einen anderen Filter oder Suchbegriff</p>
|
||||
</div>
|
||||
`;
|
||||
return;
|
||||
}
|
||||
|
||||
container.innerHTML = filteredRequests.map(req => createRequestCard(req)).join('');
|
||||
}
|
||||
|
||||
// Anfrage-Karte erstellen
|
||||
function createRequestCard(request) {
|
||||
const urgentClass = request.time_since_creation > 24 ? 'urgent' : '';
|
||||
const statusBadge = getStatusBadge(request.status);
|
||||
|
||||
return `
|
||||
<div class="request-card ${urgentClass}" data-request-id="${request.id}">
|
||||
<div class="flex justify-between items-start">
|
||||
<div class="flex-1">
|
||||
<div class="flex items-center space-x-3 mb-2">
|
||||
<h3 class="text-lg font-semibold text-gray-800">${escapeHtml(request.name)}</h3>
|
||||
${statusBadge}
|
||||
${request.time_since_creation > 24 ? '<span class="badge bg-orange-100 text-orange-800">Dringend</span>' : ''}
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 text-sm text-gray-600">
|
||||
<div>
|
||||
<p><i class="fas fa-envelope mr-2"></i>${escapeHtml(request.email || 'Keine E-Mail')}</p>
|
||||
<p><i class="fas fa-clock mr-2"></i>${request.duration_min} Minuten</p>
|
||||
<p><i class="fas fa-calendar mr-2"></i>${formatDateTime(request.created_at)}</p>
|
||||
</div>
|
||||
<div>
|
||||
<p><i class="fas fa-print mr-2"></i>${request.printer ? escapeHtml(request.printer.name) : 'Kein Drucker'}</p>
|
||||
${request.processed_by_user ? `<p><i class="fas fa-user mr-2"></i>Bearbeitet von: ${escapeHtml(request.processed_by_user.name)}</p>` : ''}
|
||||
${request.processed_at ? `<p><i class="fas fa-check mr-2"></i>${formatDateTime(request.processed_at)}</p>` : ''}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
${request.reason ? `<p class="mt-2 text-sm text-gray-700 bg-gray-50 p-2 rounded">${escapeHtml(request.reason)}</p>` : ''}
|
||||
${request.approval_notes ? `<p class="mt-2 text-sm text-green-700 bg-green-50 p-2 rounded"><strong>Genehmigungsnotizen:</strong> ${escapeHtml(request.approval_notes)}</p>` : ''}
|
||||
${request.rejection_reason ? `<p class="mt-2 text-sm text-red-700 bg-red-50 p-2 rounded"><strong>Ablehnungsgrund:</strong> ${escapeHtml(request.rejection_reason)}</p>` : ''}
|
||||
</div>
|
||||
|
||||
<div class="flex flex-col space-y-2 ml-4">
|
||||
<button onclick="showRequestDetails(${request.id})"
|
||||
class="btn bg-blue-600 hover:bg-blue-700 text-white px-3 py-1 rounded text-sm">
|
||||
<i class="fas fa-eye mr-1"></i>Details
|
||||
</button>
|
||||
|
||||
${request.can_be_processed ? `
|
||||
<button onclick="approveRequest(${request.id})"
|
||||
class="btn bg-green-600 hover:bg-green-700 text-white px-3 py-1 rounded text-sm">
|
||||
<i class="fas fa-check mr-1"></i>Genehmigen
|
||||
</button>
|
||||
<button onclick="denyRequest(${request.id})"
|
||||
class="btn bg-red-600 hover:bg-red-700 text-white px-3 py-1 rounded text-sm">
|
||||
<i class="fas fa-times mr-1"></i>Ablehnen
|
||||
</button>
|
||||
` : ''}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
// Status-Badge erstellen
|
||||
function getStatusBadge(status) {
|
||||
const badges = {
|
||||
'pending': '<span class="badge badge-pending">Wartend</span>',
|
||||
'approved': '<span class="badge badge-approved">Genehmigt</span>',
|
||||
'denied': '<span class="badge badge-denied">Abgelehnt</span>'
|
||||
};
|
||||
return badges[status] || `<span class="badge">${status}</span>`;
|
||||
}
|
||||
|
||||
// Statistiken anzeigen
|
||||
function displayStats(stats) {
|
||||
const container = document.getElementById('statsContainer');
|
||||
container.innerHTML = `
|
||||
<span class="stats-badge bg-gray-100 text-gray-800">
|
||||
Gesamt: ${stats.total}
|
||||
</span>
|
||||
<span class="stats-badge bg-yellow-100 text-yellow-800">
|
||||
Wartend: ${stats.pending}
|
||||
</span>
|
||||
<span class="stats-badge bg-green-100 text-green-800">
|
||||
Genehmigt: ${stats.approved}
|
||||
</span>
|
||||
<span class="stats-badge bg-red-100 text-red-800">
|
||||
Abgelehnt: ${stats.denied}
|
||||
</span>
|
||||
`;
|
||||
}
|
||||
|
||||
// Pagination anzeigen
|
||||
function displayPagination(pagination) {
|
||||
const container = document.getElementById('paginationContainer');
|
||||
if (pagination.total <= pagination.limit) {
|
||||
container.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
|
||||
const totalPages = Math.ceil(pagination.total / pagination.limit);
|
||||
const currentPage = Math.floor(pagination.offset / pagination.limit);
|
||||
|
||||
let html = '<div class="flex space-x-2">';
|
||||
|
||||
// Vorherige Seite
|
||||
if (currentPage > 0) {
|
||||
html += `<button onclick="changePage(${currentPage - 1})" class="px-3 py-1 bg-gray-200 rounded hover:bg-gray-300">Zurück</button>`;
|
||||
}
|
||||
|
||||
// Seitenzahlen
|
||||
for (let i = Math.max(0, currentPage - 2); i <= Math.min(totalPages - 1, currentPage + 2); i++) {
|
||||
const active = i === currentPage ? 'bg-blue-600 text-white' : 'bg-gray-200 hover:bg-gray-300';
|
||||
html += `<button onclick="changePage(${i})" class="px-3 py-1 rounded ${active}">${i + 1}</button>`;
|
||||
}
|
||||
|
||||
// Nächste Seite
|
||||
if (pagination.has_more) {
|
||||
html += `<button onclick="changePage(${currentPage + 1})" class="px-3 py-1 bg-gray-200 rounded hover:bg-gray-300">Weiter</button>`;
|
||||
}
|
||||
|
||||
html += '</div>';
|
||||
container.innerHTML = html;
|
||||
}
|
||||
|
||||
// Verfügbare Drucker laden
|
||||
async function loadAvailablePrinters() {
|
||||
try {
|
||||
const response = await fetch('/api/admin/requests/1'); // Dummy-Request für Drucker-Liste
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success && data.request.available_printers) {
|
||||
const select = document.getElementById('printerSelect');
|
||||
select.innerHTML = '<option value="">Drucker auswählen...</option>' +
|
||||
data.request.available_printers.map(printer =>
|
||||
`<option value="${printer.id}">${escapeHtml(printer.name)} (${escapeHtml(printer.location || 'Unbekannt')})</option>`
|
||||
).join('');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Fehler beim Laden der Drucker:', error);
|
||||
}
|
||||
}
|
||||
|
||||
// Anfrage genehmigen
|
||||
function approveRequest(requestId) {
|
||||
document.getElementById('actionRequestId').value = requestId;
|
||||
document.getElementById('actionType').value = 'approve';
|
||||
document.getElementById('actionModalTitle').textContent = 'Anfrage genehmigen';
|
||||
document.getElementById('approveSection').classList.remove('hidden');
|
||||
document.getElementById('denySection').classList.add('hidden');
|
||||
document.getElementById('actionSubmitBtn').textContent = 'Genehmigen';
|
||||
document.getElementById('actionSubmitBtn').className = 'px-4 py-2 rounded-md text-white bg-green-600 hover:bg-green-700';
|
||||
|
||||
// Aktueller Drucker vorauswählen
|
||||
const request = currentRequests.find(r => r.id === requestId);
|
||||
if (request && request.printer_id) {
|
||||
document.getElementById('printerSelect').value = request.printer_id;
|
||||
}
|
||||
|
||||
document.getElementById('actionModal').classList.remove('hidden');
|
||||
}
|
||||
|
||||
// Anfrage ablehnen
|
||||
function denyRequest(requestId) {
|
||||
document.getElementById('actionRequestId').value = requestId;
|
||||
document.getElementById('actionType').value = 'deny';
|
||||
document.getElementById('actionModalTitle').textContent = 'Anfrage ablehnen';
|
||||
document.getElementById('approveSection').classList.add('hidden');
|
||||
document.getElementById('denySection').classList.remove('hidden');
|
||||
document.getElementById('actionSubmitBtn').textContent = 'Ablehnen';
|
||||
document.getElementById('actionSubmitBtn').className = 'px-4 py-2 rounded-md text-white bg-red-600 hover:bg-red-700';
|
||||
|
||||
document.getElementById('actionModal').classList.remove('hidden');
|
||||
}
|
||||
|
||||
// Aktions-Form verarbeiten
|
||||
async function handleActionSubmit(event) {
|
||||
event.preventDefault();
|
||||
|
||||
const requestId = document.getElementById('actionRequestId').value;
|
||||
const actionType = document.getElementById('actionType').value;
|
||||
|
||||
try {
|
||||
let url, data;
|
||||
|
||||
if (actionType === 'approve') {
|
||||
url = `/api/requests/${requestId}/approve`;
|
||||
data = {
|
||||
printer_id: document.getElementById('printerSelect').value || null,
|
||||
notes: document.getElementById('approvalNotes').value
|
||||
};
|
||||
} else {
|
||||
url = `/api/requests/${requestId}/deny`;
|
||||
data = {
|
||||
reason: document.getElementById('rejectionReason').value
|
||||
};
|
||||
}
|
||||
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.success) {
|
||||
showSuccess(`Anfrage erfolgreich ${actionType === 'approve' ? 'genehmigt' : 'abgelehnt'}`);
|
||||
closeActionModal();
|
||||
refreshRequests();
|
||||
} else {
|
||||
showError('Fehler: ' + result.error);
|
||||
}
|
||||
} catch (error) {
|
||||
showError('Fehler beim Verarbeiten der Anfrage: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
||||
// Details anzeigen
|
||||
async function showRequestDetails(requestId) {
|
||||
try {
|
||||
const response = await fetch(`/api/admin/requests/${requestId}`);
|
||||
const data = await response.json();
|
||||
|
||||
if (data.success) {
|
||||
displayRequestDetails(data.request);
|
||||
document.getElementById('detailModal').classList.remove('hidden');
|
||||
} else {
|
||||
showError('Fehler beim Laden der Details: ' + data.error);
|
||||
}
|
||||
} catch (error) {
|
||||
showError('Fehler beim Laden der Details: ' + error.message);
|
||||
}
|
||||
}
|
||||
|
||||
// Request-Details anzeigen
|
||||
function displayRequestDetails(request) {
|
||||
const content = document.getElementById('modalContent');
|
||||
content.innerHTML = `
|
||||
<div class="space-y-4">
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Antragsteller</h4>
|
||||
<p><strong>Name:</strong> ${escapeHtml(request.name)}</p>
|
||||
<p><strong>E-Mail:</strong> ${escapeHtml(request.email || 'Nicht angegeben')}</p>
|
||||
<p><strong>IP-Adresse:</strong> ${escapeHtml(request.author_ip || 'Unbekannt')}</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Anfrage-Details</h4>
|
||||
<p><strong>Status:</strong> ${getStatusBadge(request.status)}</p>
|
||||
<p><strong>Dauer:</strong> ${request.duration_min} Minuten</p>
|
||||
<p><strong>Erstellt:</strong> ${formatDateTime(request.created_at)}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
${request.reason ? `
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Begründung</h4>
|
||||
<p class="bg-gray-50 p-3 rounded">${escapeHtml(request.reason)}</p>
|
||||
</div>
|
||||
` : ''}
|
||||
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Drucker</h4>
|
||||
<p>${request.printer ? escapeHtml(request.printer.name) + ' (' + escapeHtml(request.printer.location || 'Unbekannt') + ')' : 'Kein Drucker zugewiesen'}</p>
|
||||
</div>
|
||||
|
||||
${request.processed_by_user ? `
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Bearbeitung</h4>
|
||||
<p><strong>Bearbeitet von:</strong> ${escapeHtml(request.processed_by_user.name)}</p>
|
||||
<p><strong>Bearbeitet am:</strong> ${formatDateTime(request.processed_at)}</p>
|
||||
</div>
|
||||
` : ''}
|
||||
|
||||
${request.approval_notes ? `
|
||||
<div>
|
||||
<h4 class="font-semibold text-green-700 mb-2">Genehmigungsnotizen</h4>
|
||||
<p class="bg-green-50 p-3 rounded text-green-800">${escapeHtml(request.approval_notes)}</p>
|
||||
</div>
|
||||
` : ''}
|
||||
|
||||
${request.rejection_reason ? `
|
||||
<div>
|
||||
<h4 class="font-semibold text-red-700 mb-2">Ablehnungsgrund</h4>
|
||||
<p class="bg-red-50 p-3 rounded text-red-800">${escapeHtml(request.rejection_reason)}</p>
|
||||
</div>
|
||||
` : ''}
|
||||
|
||||
${request.job_details ? `
|
||||
<div>
|
||||
<h4 class="font-semibold text-gray-800 mb-2">Job-Details</h4>
|
||||
<p><strong>Job-ID:</strong> ${request.job_details.id}</p>
|
||||
<p><strong>Status:</strong> ${escapeHtml(request.job_details.status)}</p>
|
||||
<p><strong>Geplanter Start:</strong> ${formatDateTime(request.job_details.start_at)}</p>
|
||||
<p><strong>Geplantes Ende:</strong> ${formatDateTime(request.job_details.end_at)}</p>
|
||||
${request.job_details.is_overdue ? '<p class="text-red-600"><strong>⚠️ Überfällig</strong></p>' : ''}
|
||||
</div>
|
||||
` : ''}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
// Hilfsfunktionen
|
||||
function refreshRequests() {
|
||||
const status = document.getElementById('statusFilter').value;
|
||||
const search = document.getElementById('searchInput').value;
|
||||
loadRequests(status, 0, search);
|
||||
}
|
||||
|
||||
function filterRequests() {
|
||||
refreshRequests();
|
||||
}
|
||||
|
||||
function debounceSearch() {
|
||||
clearTimeout(searchTimeout);
|
||||
searchTimeout = setTimeout(() => {
|
||||
refreshRequests();
|
||||
}, 500);
|
||||
}
|
||||
|
||||
function changePage(page) {
|
||||
const status = document.getElementById('statusFilter').value;
|
||||
const search = document.getElementById('searchInput').value;
|
||||
loadRequests(status, page * 20, search);
|
||||
}
|
||||
|
||||
function closeDetailModal() {
|
||||
document.getElementById('detailModal').classList.add('hidden');
|
||||
}
|
||||
|
||||
function closeActionModal() {
|
||||
document.getElementById('actionModal').classList.add('hidden');
|
||||
document.getElementById('actionForm').reset();
|
||||
}
|
||||
|
||||
function showLoading(show) {
|
||||
document.getElementById('loadingSpinner').classList.toggle('hidden', !show);
|
||||
document.getElementById('requestsContainer').classList.toggle('hidden', show);
|
||||
}
|
||||
|
||||
function showSuccess(message) {
|
||||
// Einfache Erfolgs-Anzeige
|
||||
alert('✅ ' + message);
|
||||
}
|
||||
|
||||
function showError(message) {
|
||||
// Einfache Fehler-Anzeige
|
||||
alert('❌ ' + message);
|
||||
}
|
||||
|
||||
function escapeHtml(text) {
|
||||
const map = {
|
||||
'&': '&',
|
||||
'<': '<',
|
||||
'>': '>',
|
||||
'"': '"',
|
||||
"'": '''
|
||||
};
|
||||
return text ? String(text).replace(/[&<>"']/g, function(m) { return map[m]; }) : '';
|
||||
}
|
||||
|
||||
function formatDateTime(dateString) {
|
||||
if (!dateString) return 'Unbekannt';
|
||||
const date = new Date(dateString);
|
||||
return date.toLocaleString('de-DE', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
@ -45,13 +45,30 @@
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
|
||||
</svg>
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-lg font-bold text-red-800 dark:text-red-200">ACHTUNG: Offline-Drucker ausgewählt!</p>
|
||||
<p class="text-sm text-red-700 dark:text-red-300 mt-1">
|
||||
Dieser Drucker ist derzeit <span class="font-bold">NICHT VERFÜGBAR</span>.
|
||||
Der Job wird in der Warteschlange gespeichert und erst gestartet,
|
||||
wenn der Drucker wieder online ist.
|
||||
</p>
|
||||
<div class="flex-1">
|
||||
<p class="text-lg font-bold text-red-800 dark:text-red-200">🔄 WARTESCHLANGEN-MODUS: Offline-Drucker ausgewählt!</p>
|
||||
<div class="text-sm text-red-700 dark:text-red-300 mt-2 space-y-1">
|
||||
<p class="flex items-center">
|
||||
<span class="w-2 h-2 bg-red-500 rounded-full mr-2"></span>
|
||||
<span>Dieser Drucker ist derzeit <strong>OFFLINE</strong></span>
|
||||
</p>
|
||||
<p class="flex items-center">
|
||||
<span class="w-2 h-2 bg-yellow-500 rounded-full mr-2"></span>
|
||||
<span>Job wird automatisch in die <strong>WARTESCHLANGE</strong> eingereiht</span>
|
||||
</p>
|
||||
<p class="flex items-center">
|
||||
<span class="w-2 h-2 bg-blue-500 rounded-full mr-2"></span>
|
||||
<span>System überwacht Drucker-Status alle <strong>2 Minuten</strong></span>
|
||||
</p>
|
||||
<p class="flex items-center">
|
||||
<span class="w-2 h-2 bg-green-500 rounded-full mr-2"></span>
|
||||
<span>Job startet <strong>AUTOMATISCH</strong>, sobald Drucker online ist</span>
|
||||
</p>
|
||||
<p class="flex items-center">
|
||||
<span class="w-2 h-2 bg-purple-500 rounded-full mr-2"></span>
|
||||
<span>Sie erhalten eine <strong>BENACHRICHTIGUNG</strong>, wenn der Job aktiviert wird</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -331,29 +348,43 @@ function loadPrinters() {
|
||||
printerSelect.innerHTML = '<option value="">Lade Drucker...</option>';
|
||||
printerSelect.disabled = true;
|
||||
|
||||
// Zuerst versuchen, Online-Drucker zu laden (schnell)
|
||||
fetch('/api/printers/online')
|
||||
// ALLE Drucker laden mit Live-Status-Check
|
||||
fetch('/api/printers/status/live')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const onlinePrinters = data.printers || [];
|
||||
console.log('Online-Drucker geladen:', onlinePrinters);
|
||||
const allPrinters = data.printers || [];
|
||||
console.log('Alle Drucker mit Live-Status geladen:', allPrinters);
|
||||
|
||||
if (onlinePrinters.length > 0) {
|
||||
// Online-Drucker verfügbar - diese bevorzugt anzeigen
|
||||
populatePrinterSelect(onlinePrinters, true);
|
||||
showNotification(`${onlinePrinters.length} online Drucker verfügbar`, 'success');
|
||||
|
||||
// Zusätzlich alle Drucker laden für Vollständigkeit
|
||||
loadAllPrintersAsSecondary(onlinePrinters);
|
||||
if (allPrinters.length === 0) {
|
||||
// Fallback: Normale Drucker-API
|
||||
return loadPrintersBasic();
|
||||
}
|
||||
|
||||
// ALLE Drucker anzeigen (online und offline)
|
||||
populatePrinterSelect(allPrinters, false);
|
||||
|
||||
// Verwende die vom Backend bereitgestellten Werte
|
||||
const onlineCount = data.online_count || 0;
|
||||
const totalCount = data.count || allPrinters.length;
|
||||
|
||||
if (onlineCount > 0) {
|
||||
if (onlineCount === totalCount) {
|
||||
// Alle Drucker online
|
||||
showNotification(`✅ OPTIMAL: Alle ${totalCount} Drucker sind ONLINE und BEREIT`, 'success');
|
||||
} else {
|
||||
// Einige Drucker online
|
||||
const offlineCount = totalCount - onlineCount;
|
||||
showNotification(`⚠️ ${onlineCount} von ${totalCount} Drucker ONLINE | ${offlineCount} Drucker OFFLINE (verfügbar für Warteschlange)`, 'success');
|
||||
}
|
||||
} else {
|
||||
// Keine Online-Drucker - lade alle mit Live-Status-Check
|
||||
loadPrintersWithLiveStatus();
|
||||
// Kein Drucker online
|
||||
showNotification(`🔄 WARTESCHLANGEN-MODUS: Alle ${totalCount} Drucker sind OFFLINE - Jobs werden automatisch gestartet, wenn Drucker verfügbar werden`, 'warning');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Fehler beim Laden der Online-Drucker:', error);
|
||||
// Fallback: Lade alle Drucker mit Live-Status
|
||||
loadPrintersWithLiveStatus();
|
||||
console.error('Fehler beim Live-Status-Check:', error);
|
||||
showNotification('Live-Status-Check fehlgeschlagen, lade Basis-Daten...', 'warning');
|
||||
loadPrintersBasic();
|
||||
});
|
||||
}
|
||||
|
||||
@ -496,110 +527,6 @@ function populatePrinterSelect(printers, onlineOnly = false) {
|
||||
}
|
||||
}
|
||||
|
||||
// Alle Drucker als sekundäre Option laden
|
||||
function loadAllPrintersAsSecondary(onlinePrinters) {
|
||||
fetch('/api/printers/status/live')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const allPrinters = data.printers || [];
|
||||
|
||||
// Prüfe, ob es zusätzliche Drucker gibt, die nicht in der Online-Liste sind
|
||||
const onlineIds = new Set(onlinePrinters.map(p => p.id));
|
||||
const additionalPrinters = allPrinters.filter(p => !onlineIds.has(p.id));
|
||||
|
||||
if (additionalPrinters.length > 0) {
|
||||
// Kombiniere Online- und zusätzliche Drucker
|
||||
const combinedPrinters = [...onlinePrinters, ...additionalPrinters];
|
||||
populatePrinterSelect(combinedPrinters, false);
|
||||
|
||||
const totalOnline = combinedPrinters.filter(p => p.status === 'available' || p.is_online || p.active).length;
|
||||
showNotification(`${totalOnline} von ${combinedPrinters.length} Drucker online`, totalOnline > 0 ? 'success' : 'warning');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Fehler beim Laden aller Drucker:', error);
|
||||
// Nicht kritisch, Online-Drucker sind bereits geladen
|
||||
});
|
||||
}
|
||||
|
||||
// Drucker mit Live-Status-Check laden (Fallback)
|
||||
function loadPrintersWithLiveStatus() {
|
||||
showNotification('Überprüfe Drucker-Status...', 'info');
|
||||
|
||||
fetch('/api/printers/status/live')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const printers = data.printers || [];
|
||||
console.log('Live-Status-Drucker geladen:', printers);
|
||||
|
||||
if (printers.length === 0) {
|
||||
// Letzter Fallback: Normale Drucker-API
|
||||
return loadPrintersBasic();
|
||||
}
|
||||
|
||||
populatePrinterSelect(printers, false);
|
||||
|
||||
// Verwende die vom Backend bereitgestellten Werte
|
||||
const onlineCount = data.online_count || 0;
|
||||
const totalCount = data.count || printers.length;
|
||||
|
||||
if (onlineCount > 0) {
|
||||
if (onlineCount === totalCount) {
|
||||
// Alle Drucker online
|
||||
showNotification(`✅ OPTIMAL: Alle ${totalCount} Drucker sind ONLINE und BEREIT`, 'success');
|
||||
} else {
|
||||
// Einige Drucker online
|
||||
const offlineCount = totalCount - onlineCount;
|
||||
showNotification(`⚠️ ${onlineCount} von ${totalCount} Drucker ONLINE | ${offlineCount} Drucker OFFLINE`, 'success');
|
||||
}
|
||||
} else {
|
||||
// Kein Drucker online
|
||||
showNotification(`❌ ACHTUNG: Alle ${totalCount} Drucker sind OFFLINE - Reservierte Jobs werden in Warteschlange gespeichert`, 'error');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Fehler beim Live-Status-Check:', error);
|
||||
showNotification('Live-Status-Check fehlgeschlagen, lade Basis-Daten...', 'warning');
|
||||
loadPrintersBasic();
|
||||
});
|
||||
}
|
||||
|
||||
// Basis-Drucker-Laden (letzter Fallback)
|
||||
function loadPrintersBasic() {
|
||||
fetch('/api/printers')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const printers = data.printers || [];
|
||||
console.log('Basis-Drucker geladen:', printers);
|
||||
|
||||
if (printers.length === 0) {
|
||||
const printerSelect = document.getElementById('printer_id');
|
||||
printerSelect.innerHTML = '<option value="">Keine Drucker in der Datenbank</option>';
|
||||
printerSelect.disabled = true;
|
||||
showNotification('Keine Drucker in der Datenbank gefunden', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
// Alle Drucker als "Status unbekannt" anzeigen
|
||||
const printersWithUnknownStatus = printers.map(printer => ({
|
||||
...printer,
|
||||
status: 'unknown',
|
||||
is_online: false,
|
||||
active: true // Erlaube Auswahl trotz unbekanntem Status
|
||||
}));
|
||||
|
||||
populatePrinterSelect(printersWithUnknownStatus, false);
|
||||
showNotification(`${printers.length} Drucker geladen (Status unbekannt)`, 'warning');
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Auch Basis-API fehlgeschlagen:', error);
|
||||
const printerSelect = document.getElementById('printer_id');
|
||||
printerSelect.innerHTML = '<option value="">Fehler beim Laden der Drucker</option>';
|
||||
printerSelect.disabled = true;
|
||||
showNotification('Fehler beim Laden der Drucker', 'error');
|
||||
});
|
||||
}
|
||||
|
||||
// Laden der aktiven Jobs
|
||||
function loadActiveJobs() {
|
||||
fetch('/api/jobs/active')
|
||||
@ -668,25 +595,28 @@ function initNewJobForm() {
|
||||
|
||||
// Deutlichere Warnung mit einem ausführlicheren Dialog
|
||||
const confirmOffline = confirm(
|
||||
`⛔ ACHTUNG: OFFLINE-DRUCKER AUSGEWÄHLT! ⛔\n` +
|
||||
`---------------------------------------------\n\n` +
|
||||
`Der Drucker "${printerName}" ist DERZEIT NICHT VERFÜGBAR!\n\n` +
|
||||
`Wenn Sie trotzdem fortfahren:\n\n` +
|
||||
`✓ Ihr Job wird in der WARTESCHLANGE gespeichert\n` +
|
||||
`✓ Der System-Status wird regelmäßig überprüft\n` +
|
||||
`✓ Sie erhalten eine BENACHRICHTIGUNG, sobald der Drucker online geht\n` +
|
||||
`✓ Der Job startet AUTOMATISCH, wenn der Drucker verfügbar wird\n\n` +
|
||||
`---------------------------------------------\n` +
|
||||
`Möchten Sie TROTZDEM mit diesem Offline-Drucker fortfahren?`
|
||||
`🔄 WARTESCHLANGEN-MODUS: OFFLINE-DRUCKER AUSGEWÄHLT! 🔄\n` +
|
||||
`═══════════════════════════════════════════════════════\n\n` +
|
||||
`DRUCKER: "${printerName}" ist derzeit OFFLINE!\n\n` +
|
||||
`📋 WAS PASSIERT, WENN SIE FORTFAHREN:\n\n` +
|
||||
`✅ Job wird in WARTESCHLANGE gespeichert (Status: "Wartend auf Drucker")\n` +
|
||||
`⏰ System überwacht Drucker-Status automatisch alle 2 Minuten\n` +
|
||||
`🔔 Sie erhalten SOFORTIGE BENACHRICHTIGUNG, wenn Drucker online geht\n` +
|
||||
`🚀 Job startet AUTOMATISCH, sobald Drucker verfügbar wird\n` +
|
||||
`📊 Job-Status wird in Echtzeit aktualisiert\n` +
|
||||
`💫 KEINE manuelle Überwachung nötig!\n\n` +
|
||||
`═══════════════════════════════════════════════════════\n` +
|
||||
`🤔 MÖCHTEN SIE TROTZDEM FORTFAHREN?\n` +
|
||||
`(Job wird sicher in der Warteschlange verwaltet)`
|
||||
);
|
||||
|
||||
if (!confirmOffline) {
|
||||
showNotification('Job-Erstellung abgebrochen - Bitte wählen Sie einen ONLINE-Drucker für sofortigen Start', 'info');
|
||||
showNotification('🔄 Job-Erstellung abgebrochen - Wählen Sie einen ONLINE-Drucker für sofortigen Start oder bestätigen Sie die Warteschlange', 'info');
|
||||
return;
|
||||
}
|
||||
|
||||
// Spezielle Benachrichtigung für Offline-Drucker-Jobs
|
||||
showNotification(`⏳ Job für OFFLINE-Drucker "${printerName}" wird in Warteschlange erstellt. Sie werden benachrichtigt, wenn der Drucker verfügbar wird.`, 'warning');
|
||||
showNotification(`⏳ Job für OFFLINE-Drucker "${printerName}" wird in WARTESCHLANGE erstellt. Sie werden automatisch benachrichtigt!`, 'warning');
|
||||
}
|
||||
|
||||
// Startzeit in ISO-Format konvertieren
|
||||
@ -1310,6 +1240,40 @@ function formatDateTime(isoString) {
|
||||
});
|
||||
}
|
||||
|
||||
// Globale Variable für Admin-Status wird über window.isAdmin gesetzt
|
||||
// Basis-Drucker-Laden (letzter Fallback)
|
||||
function loadPrintersBasic() {
|
||||
fetch('/api/printers')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const printers = data.printers || [];
|
||||
console.log('Basis-Drucker geladen:', printers);
|
||||
|
||||
if (printers.length === 0) {
|
||||
const printerSelect = document.getElementById('printer_id');
|
||||
printerSelect.innerHTML = '<option value="">Keine Drucker in der Datenbank</option>';
|
||||
printerSelect.disabled = true;
|
||||
showNotification('Keine Drucker in der Datenbank gefunden', 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
// Alle Drucker als "Status unbekannt" anzeigen - ABER TROTZDEM AUSWÄHLBAR
|
||||
const printersWithUnknownStatus = printers.map(printer => ({
|
||||
...printer,
|
||||
status: 'unknown',
|
||||
is_online: false,
|
||||
active: true // Erlaube Auswahl trotz unbekanntem Status
|
||||
}));
|
||||
|
||||
populatePrinterSelect(printersWithUnknownStatus, false);
|
||||
showNotification(`🔄 ${printers.length} Drucker geladen (Status unbekannt) - Jobs werden in Warteschlange verwaltet`, 'warning');
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Auch Basis-API fehlgeschlagen:', error);
|
||||
const printerSelect = document.getElementById('printer_id');
|
||||
printerSelect.innerHTML = '<option value="">Fehler beim Laden der Drucker</option>';
|
||||
printerSelect.disabled = true;
|
||||
showNotification('Fehler beim Laden der Drucker', 'error');
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{% endblock %}
|
||||
1
backend/app/utils/queue_manager.py
Normal file
1
backend/app/utils/queue_manager.py
Normal file
@ -0,0 +1 @@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user