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

📝 🚀 Improved calendar and printer functionalities, refactored logs, and updated tests. 🖥️📅

Browse Source
This commit is contained in:
Till Tomczak
2025-06-19 10:03:26 +02:00
parent 52ff6b453e
commit 18ebd9a2b6
10 changed files with 29 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/blueprints/calendar.py
View File

@@ -7,7 +7,7 @@ from sqlalchemy import and_, or_, func
from models import Job, Printer, User, UserPermission, get_cached_session
from utils.logging_config import get_logger
from utils.job_queue_system import conflict_manager, ConflictType, ConflictSeverity
from utils.tapo_status_manager import tapo_status_manager
from utils.hardware_integration import printer_monitor
calendar_blueprint = Blueprint('calendar', __name__)
logger = get_logger("calendar")
@@ -255,7 +255,7 @@ def api_get_calendar_events():
# Für Admins: Erweiterte Steckdosen-Status-Informationen hinzufügen
if current_user.is_admin:
# Aktuellen Steckdosen-Status abrufen
printer_status = tapo_status_manager.get_printer_status(job.printer_id)
printer_status = printer_monitor.get_printer_status(job.printer_id)
event["extendedProps"].update({
"plugStatus": printer_status.get("plug_status", "unknown"),
@@ -268,8 +268,8 @@ def api_get_calendar_events():
# Status-Display-Informationen hinzufügen
plug_status = printer_status.get("plug_status", "unknown")
if plug_status in tapo_status_manager.STATUS_DISPLAY:
status_info = tapo_status_manager.STATUS_DISPLAY[plug_status]
if plug_status in printer_monitor.STATUS_DISPLAY:
status_info = printer_monitor.STATUS_DISPLAY[plug_status]
event["extendedProps"]["statusDisplay"] = {
"text": status_info["text"],
"color": status_info["color"],

14
backend/blueprints/printers.py
View File

@@ -245,13 +245,13 @@ def get_printer_status():
'error': 0
}
# Tapo Status Manager importieren
# Hardware Integration Monitor importieren
try:
from utils.tapo_status_manager import TapoStatusManager
tapo_manager = TapoStatusManager()
from utils.hardware_integration import printer_monitor
tapo_manager = printer_monitor
except ImportError:
tapo_manager = None
printers_logger.warning("⚠️ TapoStatusManager nicht verfügbar")
printers_logger.warning("⚠️ Hardware Integration Monitor nicht verfügbar")
for printer in printers:
# Basis-Drucker-Daten
@@ -493,11 +493,11 @@ def force_refresh_all_printer_status():
printers_logger.info(f"🔄 Force-Refresh aller Drucker von Benutzer {current_user.name} (ID: {current_user.id})")
try:
# Tapo Status Manager für Force-Refresh verwenden
from utils.tapo_status_manager import tapo_status_manager
# Hardware Integration Monitor für Force-Refresh verwenden
from utils.hardware_integration import printer_monitor
# Force-Network-Refresh durchführen
refresh_results = tapo_status_manager.force_network_refresh()
refresh_results = printer_monitor.force_network_refresh()
if refresh_results.get("success", False):
printers_logger.info(f"✅ Force-Refresh erfolgreich: {refresh_results.get('printers_refreshed', 0)} Drucker aktualisiert")