The provided text appears to be a log of changes made in a software project, likely using version control systems like Git. Here's a breakdown:

backend/models.py

@@ -6,7 +6,7 @@ from datetime import datetime, timedelta
 from typing import Optional, List, Dict, Any
 from contextlib import contextmanager
 
-from sqlalchemy import create_engine, Column, Integer, String, Boolean, DateTime, ForeignKey, Float, event, text, Text
+from sqlalchemy import create_engine, Column, Integer, String, Boolean, DateTime, ForeignKey, Float, event, text, Text, func
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship, sessionmaker, Session, Mapped, mapped_column, scoped_session
 from sqlalchemy.pool import StaticPool, QueuePool
@@ -376,6 +376,50 @@ class User(UserMixin, Base):
     def is_admin(self) -> bool:
         return self.role == "admin"
     
+    def has_role(self, role: str) -> bool:
+        """
+        Überprüft, ob der Benutzer eine bestimmte Rolle hat.
+        
+        Args:
+            role: Name der Rolle (z.B. 'admin', 'user')
+        
+        Returns:
+            bool: True wenn Rolle vorhanden, sonst False
+        """
+        return self.role == role
+    
+    def get_initials(self) -> str:
+        """
+        Generiert Initialen aus dem Benutzernamen für Avatar-Anzeige.
+        
+        Returns:
+            str: Initialen des Benutzers (max. 2 Zeichen)
+        """
+        if self.name:
+            # Aus dem vollständigen Namen Initialen erstellen
+            name_parts = self.name.strip().split()
+            if len(name_parts) >= 2:
+                return (name_parts[0][0] + name_parts[-1][0]).upper()
+            elif len(name_parts) == 1:
+                return name_parts[0][:2].upper()
+        
+        # Fallback: Aus Username Initialen erstellen
+        if self.username:
+            return self.username[:2].upper()
+        
+        # Notfall-Fallback
+        return "??"
+    
+    @property
+    def display_name(self) -> str:
+        """
+        Gibt den Anzeigenamen des Benutzers zurück.
+        
+        Returns:
+            str: Name oder Username als Fallback
+        """
+        return self.name if self.name else self.username
+    
     @property
     def is_active(self) -> bool:
         """Required for Flask-Login"""
@@ -485,6 +529,10 @@ class User(UserMixin, Base):
         if permission_name == 'ADMIN':
             return self.is_admin
         
+        # Standard-Berechtigungen für alle aktiven Benutzer
+        if permission_name in ['VIEW_JOBS', 'VIEW_CALENDAR']:
+            return True  # Alle aktiven Benutzer können Jobs und Kalender ansehen
+        
         # Überprüfe spezifische Berechtigungen über UserPermission
         if self.permissions:
             if permission_name == 'CONTROL_PRINTER':
@@ -851,10 +899,13 @@ class Notification(Base):
     
     id = Column(Integer, primary_key=True)
     user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    title = Column(String(255), nullable=True)  # Titel der Benachrichtigung
+    message = Column(Text, nullable=True)      # Inhalt der Benachrichtigung
     type = Column(String(50), nullable=False)
     payload = Column(Text)  # JSON-Daten als String
     created_at = Column(DateTime, default=datetime.now)
-    read = Column(Boolean, default=False)
+    is_read = Column(Boolean, default=False)   # Korrigiert: is_read statt read
+    read_at = Column(DateTime, nullable=True)  # Zeitpunkt des Lesens
     
     user = relationship("User", back_populates="notifications")
     
@@ -865,10 +916,13 @@ class Notification(Base):
         return {
             "id": self.id,
             "user_id": self.user_id,
+            "title": self.title,
+            "message": self.message,
             "type": self.type,
             "payload": self.payload,
             "created_at": self.created_at.isoformat() if self.created_at else None,
-            "read": self.read
+            "is_read": self.is_read,
+            "read_at": self.read_at.isoformat() if self.read_at else None
         }
     
     @classmethod