core/Projektarbeit-MYP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Update: Enhanced API for printer list retrieval with additional query parameters for filtering active and inactive printers. Improved response structure to include printer reachability and display status for better UI integration. Added granular permissions management in user creation process. 📚

Browse Source
This commit is contained in:
Till Tomczak
2025-06-12 21:14:08 +02:00
parent a212fcc8a3
commit bcb8f80415
129 changed files with 694 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
backend/app.py
View File

@@ -892,40 +892,69 @@ def api_finish_job(job_id):
@app.route("/api/printers", methods=["GET"])
@login_required
def api_get_printers():
"""API-Endpunkt für Drucker-Liste mit konsistenter Response-Struktur"""
"""API-Endpunkt für Drucker-Liste mit konsistenter Response-Struktur
Query-Parameter:
- include_inactive: 'true' um auch inaktive Drucker anzuzeigen (default: 'true')
- show_all: 'true' um ALLE Drucker anzuzeigen, unabhängig vom Status
"""
try:
from models import get_db_session, Printer
# Query-Parameter auslesen
include_inactive = request.args.get('include_inactive', 'true').lower() == 'true'
show_all = request.args.get('show_all', 'true').lower() == 'true'
db_session = get_db_session()
# Alle Drucker für API-Abfragen anzeigen (unabhängig von active-Status)
printers = db_session.query(Printer).all()
# Basis-Query - standardmäßig ALLE Drucker zeigen für Dropdown-Auswahl
query = db_session.query(Printer)
# Optional: Nur aktive Drucker filtern (wenn explizit angefordert)
if not include_inactive and not show_all:
query = query.filter(Printer.active == True)
printers = query.all()
printer_list = []
for printer in printers:
# Status-Bestimmung: Wenn nicht erreichbar, dann "offline"
status = printer.status or "offline"
# Zusätzliche Status-Informationen
is_reachable = status not in ["offline", "unreachable", "error"]
printer_dict = {
"id": printer.id,
"name": printer.name,
"model": printer.model or "Unbekanntes Modell",
"location": printer.location or "Unbekannter Standort",
"status": printer.status or "offline",
"status": status,
"ip_address": printer.ip_address,
"plug_ip": printer.plug_ip,
"active": getattr(printer, 'active', True),
"is_reachable": is_reachable, # Zusätzliches Feld für UI
"is_selectable": True, # WICHTIG: Alle Drucker sind auswählbar!
"created_at": printer.created_at.isoformat() if printer.created_at else datetime.now().isoformat(),
"last_checked": printer.last_checked.isoformat() if printer.last_checked else None
"last_checked": printer.last_checked.isoformat() if printer.last_checked else None,
"display_status": f"{printer.name} - {status.title()}" # Für Dropdown-Anzeige
}
printer_list.append(printer_dict)
db_session.close()
app_logger.info(f"✅ API: {len(printer_list)} Drucker abgerufen")
app_logger.info(f"✅ API: {len(printer_list)} Drucker abgerufen (include_inactive={include_inactive})")
# Konsistente Response-Struktur wie erwartet
return jsonify({
"success": True,
"printers": printer_list,
"count": len(printer_list),
"message": "Drucker erfolgreich geladen"
"message": "Drucker erfolgreich geladen",
"filters": {
"include_inactive": include_inactive,
"show_all": show_all
}
})
except Exception as e: