fixed klammer usage

backend/package.json

@@ -25,10 +25,7 @@
     "uuid": "^9.0.0",
     "express-rate-limit": "8.1.0",
     "helmet": "8.1.0",
-    "express-validator": "7.3.0",
+    "express-validator": "7.3.0"
-    "exceljs": "4.4.0",
-    "pdfkit": "0.12.3",
-    "@types/pdfkit": "^0.12.3"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",

backend/src/controllers/shiftPlanController.ts

@@ -8,8 +8,6 @@ import {
 } from '../models/ShiftPlan.js';
 import { AuthRequest } from '../middleware/auth.js';
 import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js';
-import ExcelJS from 'exceljs';
-import PDFDocument from 'pdfkit';
 
 async function getPlanWithDetails(planId: string) {
   const plan = await db.get<any>(`
@@ -594,26 +592,6 @@ async function getShiftPlanById(planId: string): Promise<any> {
     `, [planId]);
   }
 
-  // Load employees without role column + join with employee_roles
-  const employees = await db.all<any>(`
-    SELECT 
-      e.id, 
-      e.firstname, 
-      e.lastname, 
-      e.email, 
-      e.employee_type,
-      e.contract_type,
-      e.can_work_alone,
-      e.is_trainee,
-      e.is_active as isActive,
-      GROUP_CONCAT(er.role) as roles
-    FROM employees e
-    LEFT JOIN employee_roles er ON e.id = er.employee_id
-    WHERE e.is_active = 1
-    GROUP BY e.id
-    ORDER BY e.firstname, e.lastname
-  `, []);
-
   return {
     ...plan,
     isTemplate: plan.is_template === 1,
@@ -651,19 +629,6 @@ async function getShiftPlanById(planId: string): Promise<any> {
       requiredEmployees: shift.required_employees,
       assignedEmployees: JSON.parse(shift.assigned_employees || '[]'),
       timeSlotName: shift.time_slot_name
-    })),
-    // Include employees with proper role handling
-    employees: employees.map(emp => ({
-      id: emp.id,
-      firstname: emp.firstname,
-      lastname: emp.lastname,
-      email: emp.email,
-      employeeType: emp.employee_type,
-      contractType: emp.contract_type,
-      canWorkAlone: emp.can_work_alone === 1,
-      isTrainee: emp.is_trainee === 1,
-      isActive: emp.isActive === 1,
-      roles: emp.roles ? emp.roles.split(',') : [] // Convert comma-separated roles to array
     }))
   };
 }
@@ -968,492 +933,3 @@ export const clearAssignments = async (req: Request, res: Response): Promise<voi
     res.status(500).json({ error: 'Internal server error' });
   }
 };
-
-export const exportShiftPlanToExcel = async (req: Request, res: Response): Promise<void> => {
-  try {
-    const { id } = req.params;
-
-    console.log('📊 Starting Excel export for plan:', id);
-
-    // Check if plan exists
-    const plan = await getShiftPlanById(id);
-    if (!plan) {
-      res.status(404).json({ error: 'Shift plan not found' });
-      return;
-    }
-
-    if (plan.status !== 'published') {
-      res.status(400).json({ error: 'Can only export published shift plans' });
-      return;
-    }
-
-    // Create workbook
-    const workbook = new ExcelJS.Workbook();
-    workbook.creator = 'Schichtplaner System';
-    workbook.created = new Date();
-
-    // Add Summary Sheet
-    const summarySheet = workbook.addWorksheet('Planübersicht');
-
-    // Summary data
-    summarySheet.columns = [
-      { header: 'Eigenschaft', key: 'property', width: 20 },
-      { header: 'Wert', key: 'value', width: 30 }
-    ];
-
-    summarySheet.addRows([
-      { property: 'Plan Name', value: plan.name },
-      { property: 'Beschreibung', value: plan.description || 'Keine' },
-      { property: 'Zeitraum', value: `${plan.startDate} bis ${plan.endDate}` },
-      { property: 'Status', value: plan.status },
-      { property: 'Erstellt von', value: plan.created_by_name || 'Unbekannt' },
-      { property: 'Erstellt am', value: plan.createdAt },
-      { property: 'Anzahl Schichten', value: plan.scheduledShifts?.length || 0 },
-      { property: 'Anzahl Mitarbeiter', value: plan.employees?.length || 0 }
-    ]);
-
-    // Style summary sheet
-    summarySheet.getRow(1).font = { bold: true };
-    summarySheet.getRow(1).fill = {
-      type: 'pattern',
-      pattern: 'solid',
-      fgColor: { argb: 'FF2C3E50' }
-    };
-    summarySheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
-
-    // Add Assignments Sheet
-    const assignmentsSheet = workbook.addWorksheet('Schichtzuweisungen');
-
-    assignmentsSheet.columns = [
-      { header: 'Datum', key: 'date', width: 12 },
-      { header: 'Tag', key: 'day', width: 10 },
-      { header: 'Schicht', key: 'shift', width: 15 },
-      { header: 'Zeit', key: 'time', width: 15 },
-      { header: 'Zugewiesene Mitarbeiter', key: 'employees', width: 30 },
-      { header: 'Benötigte Mitarbeiter', key: 'required', width: 18 }
-    ];
-
-    // Group scheduled shifts by date
-    const shiftsByDate = new Map();
-    plan.scheduledShifts?.forEach((scheduledShift: any) => {
-      const date = scheduledShift.date;
-      if (!shiftsByDate.has(date)) {
-        shiftsByDate.set(date, []);
-      }
-      shiftsByDate.get(date).push(scheduledShift);
-    });
-
-    // Sort dates chronologically
-    const sortedDates = Array.from(shiftsByDate.keys()).sort();
-
-    // Add data to sheet
-    sortedDates.forEach(date => {
-      const dateShifts = shiftsByDate.get(date);
-      const dateObj = new Date(date);
-      const dayName = getGermanDayName(dateObj.getDay());
-
-      dateShifts.forEach((scheduledShift: any) => {
-        const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
-        const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
-          const employee = plan.employees?.find((emp: any) => emp.id === empId);
-          return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
-        }).join(', ') || 'Keine Zuweisungen';
-
-        assignmentsSheet.addRow({
-          date: date,
-          day: dayName,
-          shift: timeSlot?.name || 'Unbekannt',
-          time: timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : '',
-          employees: employeeNames,
-          required: scheduledShift.requiredEmployees || 2
-        });
-      });
-    });
-
-    // Style assignments sheet
-    assignmentsSheet.getRow(1).font = { bold: true };
-    assignmentsSheet.getRow(1).fill = {
-      type: 'pattern',
-      pattern: 'solid',
-      fgColor: { argb: 'FF34495E' }
-    };
-    assignmentsSheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
-
-    // Add border to all cells with data
-    assignmentsSheet.eachRow((row, rowNumber) => {
-      if (rowNumber > 1) {
-        row.eachCell((cell) => {
-          cell.border = {
-            top: { style: 'thin' },
-            left: { style: 'thin' },
-            bottom: { style: 'thin' },
-            right: { style: 'thin' }
-          };
-        });
-      }
-    });
-
-    // Add Employee Overview Sheet
-    const employeeSheet = workbook.addWorksheet('Mitarbeiterübersicht');
-
-    employeeSheet.columns = [
-      { header: 'Name', key: 'name', width: 25 },
-      { header: 'E-Mail', key: 'email', width: 25 },
-      { header: 'Rolle', key: 'role', width: 15 },
-      { header: 'Mitarbeiter Typ', key: 'type', width: 15 },
-      { header: 'Vertragstyp', key: 'contract', width: 15 }
-    ];
-
-    plan.employees?.forEach((employee: any) => {
-      employeeSheet.addRow({
-        name: `${employee.firstname} ${employee.lastname}`,
-        email: employee.email,
-        role: employee.roles?.join(', ') || 'Benutzer',
-        type: employee.employeeType,
-        contract: employee.contractType || 'Nicht angegeben'
-      });
-    });
-
-    // Style employee sheet
-    employeeSheet.getRow(1).font = { bold: true };
-    employeeSheet.getRow(1).fill = {
-      type: 'pattern',
-      pattern: 'solid',
-      fgColor: { argb: 'FF34495E' }
-    };
-    employeeSheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
-
-    // Set response headers
-    res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-    res.setHeader('Content-Disposition', `attachment; filename="Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.xlsx"`);
-
-    // Write to response
-    await workbook.xlsx.write(res);
-
-    console.log('✅ Excel export completed for plan:', id);
-
-  } catch (error) {
-    console.error('❌ Error exporting to Excel:', error);
-    res.status(500).json({ error: 'Internal server error during Excel export' });
-  }
-};
-
-export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise<void> => {
-  try {
-    const { id } = req.params;
-
-    console.log('📄 Starting PDF export for plan:', id);
-
-    // Check if plan exists
-    const plan = await getShiftPlanById(id);
-    if (!plan) {
-      res.status(404).json({ error: 'Shift plan not found' });
-      return;
-    }
-
-    if (plan.status !== 'published') {
-      res.status(400).json({ error: 'Can only export published shift plans' });
-      return;
-    }
-
-    // Create PDF document
-    const doc = new PDFDocument({ margin: 50 });
-
-    // Set response headers
-    res.setHeader('Content-Type', 'application/pdf');
-    res.setHeader('Content-Disposition', `attachment; filename="Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.pdf"`);
-
-    // Pipe PDF to response
-    doc.pipe(res);
-
-    // Add title
-    doc.fontSize(20).font('Helvetica-Bold').text(`Schichtplan: ${plan.name}`, 50, 50);
-    doc.fontSize(12).font('Helvetica').text(`Erstellt am: ${new Date().toLocaleDateString('de-DE')}`, 50, 80);
-
-    // Plan summary
-    let yPosition = 120;
-    doc.fontSize(14).font('Helvetica-Bold').text('Plan Informationen', 50, yPosition);
-    yPosition += 30;
-
-    doc.fontSize(10).font('Helvetica');
-    doc.text(`Plan Name: ${plan.name}`, 50, yPosition);
-    yPosition += 20;
-
-    if (plan.description) {
-      doc.text(`Beschreibung: ${plan.description}`, 50, yPosition);
-      yPosition += 20;
-    }
-
-    doc.text(`Zeitraum: ${plan.startDate} bis ${plan.endDate}`, 50, yPosition);
-    yPosition += 20;
-    doc.text(`Status: ${plan.status}`, 50, yPosition);
-    yPosition += 20;
-    doc.text(`Erstellt von: ${plan.created_by_name || 'Unbekannt'}`, 50, yPosition);
-    yPosition += 20;
-    doc.text(`Erstellt am: ${plan.createdAt}`, 50, yPosition);
-    yPosition += 20;
-    doc.text(`Anzahl Schichten: ${plan.scheduledShifts?.length || 0}`, 50, yPosition);
-    yPosition += 20;
-    doc.text(`Anzahl Mitarbeiter: ${plan.employees?.length || 0}`, 50, yPosition);
-    yPosition += 40;
-
-    // Group scheduled shifts by date
-    const shiftsByDate = new Map();
-    plan.scheduledShifts?.forEach((scheduledShift: any) => {
-      const date = scheduledShift.date;
-      if (!shiftsByDate.has(date)) {
-        shiftsByDate.set(date, []);
-      }
-      shiftsByDate.get(date).push(scheduledShift);
-    });
-
-    // Sort dates chronologically
-    const sortedDates = Array.from(shiftsByDate.keys()).sort();
-
-    // Add assignments section
-    doc.addPage();
-    doc.fontSize(16).font('Helvetica-Bold').text('Schichtzuweisungen', 50, 50);
-
-    let currentY = 80;
-
-    sortedDates.forEach(date => {
-      const dateShifts = shiftsByDate.get(date);
-      const dateObj = new Date(date);
-      const dayName = getGermanDayName(dateObj.getDay());
-
-      // Check if we need a new page
-      if (currentY > 650) {
-        doc.addPage();
-        currentY = 50;
-      }
-
-      // Date header
-      doc.fontSize(12).font('Helvetica-Bold').text(`${date} (${dayName})`, 50, currentY);
-      currentY += 20;
-
-      // Table headers
-      doc.fontSize(10).font('Helvetica-Bold');
-      doc.text('Schicht', 50, currentY);
-      doc.text('Zeit', 150, currentY);
-      doc.text('Mitarbeiter', 250, currentY);
-      doc.text('Benötigt', 450, currentY);
-      currentY += 15;
-
-      // Horizontal line
-      doc.moveTo(50, currentY).lineTo(550, currentY).stroke();
-      currentY += 10;
-
-      doc.fontSize(9).font('Helvetica');
-
-      dateShifts.forEach((scheduledShift: any) => {
-        // Check if we need a new page for this shift
-        if (currentY > 700) {
-          doc.addPage();
-          currentY = 50;
-          // Re-add headers for new page
-          doc.fontSize(10).font('Helvetica-Bold');
-          doc.text('Schicht', 50, currentY);
-          doc.text('Zeit', 150, currentY);
-          doc.text('Mitarbeiter', 250, currentY);
-          doc.text('Benötigt', 450, currentY);
-          currentY += 25;
-        }
-
-        const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
-        const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
-          const employee = plan.employees?.find((emp: any) => emp.id === empId);
-          return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
-        }).join(', ') || 'Keine Zuweisungen';
-
-        // Split employee names if too long
-        const employeesLines = doc.heightOfString(employeeNames, { width: 190 });
-
-        doc.text(timeSlot?.name || 'Unbekannt', 50, currentY);
-        doc.text(timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : '', 150, currentY);
-
-        // Handle multi-line employee names
-        const employeeText = doc.heightOfString(employeeNames, { width: 190 }) > 20 ?
-          employeeNames.split(', ').join(',\n') : employeeNames;
-
-        doc.text(employeeText, 250, currentY, { width: 190, align: 'left' });
-        doc.text(String(scheduledShift.requiredEmployees || 2), 450, currentY);
-
-        currentY += Math.max(20, employeesLines) + 5;
-      });
-
-      currentY += 20; // Space between dates
-    });
-
-    // Add employee overview page
-    doc.addPage();
-    doc.fontSize(16).font('Helvetica-Bold').text('Mitarbeiterübersicht', 50, 50);
-
-    currentY = 80;
-
-    // Table headers
-    doc.fontSize(10).font('Helvetica-Bold');
-    doc.text('Name', 50, currentY);
-    doc.text('E-Mail', 200, currentY);
-    doc.text('Rolle', 350, currentY);
-    doc.text('Typ', 450, currentY);
-    currentY += 15;
-
-    // Horizontal line
-    doc.moveTo(50, currentY).lineTo(550, currentY).stroke();
-    currentY += 10;
-
-    doc.fontSize(9).font('Helvetica');
-
-    plan.employees?.forEach((employee: any) => {
-      if (currentY > 700) {
-        doc.addPage();
-        currentY = 50;
-        // Re-add headers
-        doc.fontSize(10).font('Helvetica-Bold');
-        doc.text('Name', 50, currentY);
-        doc.text('E-Mail', 200, currentY);
-        doc.text('Rolle', 350, currentY);
-        doc.text('Typ', 450, currentY);
-        currentY += 25;
-      }
-
-      doc.text(`${employee.firstname} ${employee.lastname}`, 50, currentY);
-      doc.text(employee.email, 200, currentY, { width: 140 });
-      doc.text(employee.roles?.join(', ') || 'Benutzer', 350, currentY, { width: 90 });
-      doc.text(employee.employeeType, 450, currentY);
-
-      currentY += 20;
-    });
-
-    // Add footer to each page
-    const pages = doc.bufferedPageRange();
-    for (let i = 0; i < pages.count; i++) {
-      doc.switchToPage(i);
-
-      doc.fontSize(8).font('Helvetica');
-      doc.text(
-        `Seite ${i + 1} von ${pages.count} • Erstellt am: ${new Date().toLocaleString('de-DE')} • Schichtplaner System`,
-        50,
-        800,
-        { align: 'center', width: 500 }
-      );
-    }
-
-    // Finalize PDF
-    doc.end();
-
-    console.log('✅ PDF export completed for plan:', id);
-
-  } catch (error) {
-    console.error('❌ Error exporting to PDF:', error);
-    res.status(500).json({ error: 'Internal server error during PDF export' });
-  }
-};
-
-// Helper function to generate HTML data
-function generateHTMLFromPlan(plan: any): string {
-  const shiftsByDate = new Map();
-
-  plan.scheduledShifts?.forEach((scheduledShift: any) => {
-    const date = scheduledShift.date;
-    if (!shiftsByDate.has(date)) {
-      shiftsByDate.set(date, []);
-    }
-    shiftsByDate.get(date).push(scheduledShift);
-  });
-
-  const sortedDates = Array.from(shiftsByDate.keys()).sort();
-
-  let html = `
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Schichtplan: ${plan.name}</title>
-    <style>
-        body { font-family: Arial, sans-serif; margin: 20px; }
-        h1 { color: #2c3e50; }
-        h2 { color: #34495e; margin-top: 30px; }
-        table { width: 100%; border-collapse: collapse; margin-bottom: 20px; }
-        th, td { border: 1px solid #ddd; padding: 12px; text-align: left; }
-        th { background-color: #f2f2f2; font-weight: bold; }
-        tr:nth-child(even) { background-color: #f9f9f9; }
-        .summary { background-color: #e8f4fd; padding: 15px; border-radius: 5px; margin-bottom: 20px; }
-        .date-section { margin-bottom: 30px; }
-    </style>
-</head>
-<body>
-    <h1>Schichtplan: ${plan.name}</h1>
-    
-    <div class="summary">
-        <h2>Plan Informationen</h2>
-        <p><strong>Zeitraum:</strong> ${plan.startDate} bis ${plan.endDate}</p>
-        <p><strong>Status:</strong> ${plan.status}</p>
-        <p><strong>Erstellt von:</strong> ${plan.created_by_name || 'Unbekannt'}</p>
-        <p><strong>Erstellt am:</strong> ${plan.createdAt}</p>
-        <p><strong>Anzahl Schichten:</strong> ${plan.scheduledShifts?.length || 0}</p>
-    </div>
-
-    <h2>Schichtzuweisungen</h2>
-  `;
-
-  sortedDates.forEach(date => {
-    const dateShifts = shiftsByDate.get(date);
-    const dateObj = new Date(date);
-    const dayName = getGermanDayName(dateObj.getDay());
-
-    html += `
-    <div class="date-section">
-        <h3>${date} (${dayName})</h3>
-        <table>
-            <thead>
-                <tr>
-                    <th>Schicht</th>
-                    <th>Zeit</th>
-                    <th>Zugewiesene Mitarbeiter</th>
-                    <th>Benötigte Mitarbeiter</th>
-                </tr>
-            </thead>
-            <tbody>
-    `;
-
-    dateShifts.forEach((scheduledShift: any) => {
-      const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
-      const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
-        const employee = plan.employees?.find((emp: any) => emp.id === empId);
-        return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
-      }).join(', ') || 'Keine Zuweisungen';
-
-      html += `
-                <tr>
-                    <td>${timeSlot?.name || 'Unbekannt'}</td>
-                    <td>${timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : ''}</td>
-                    <td>${employeeNames}</td>
-                    <td>${scheduledShift.requiredEmployees || 2}</td>
-                </tr>
-      `;
-    });
-
-    html += `
-            </tbody>
-        </table>
-    </div>
-    `;
-  });
-
-  html += `
-    <div style="margin-top: 40px; font-size: 12px; color: #666; text-align: center;">
-        Erstellt am: ${new Date().toLocaleString('de-DE')}
-    </div>
-</body>
-</html>
-  `;
-
-  return html;
-}
-
-// Helper function to get German day names
-function getGermanDayName(dayIndex: number): string {
-  const days = ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'];
-  return days[dayIndex];
-}

backend/src/routes/shiftPlans.ts

@@ -7,9 +7,7 @@ import {
   updateShiftPlan, 
   deleteShiftPlan,
   createFromPreset,
-  clearAssignments,
+  clearAssignments
-  exportShiftPlanToExcel,
-  exportShiftPlanToPDF
 } from '../controllers/shiftPlanController.js';
 import { 
   validateShiftPlan, 
@@ -32,7 +30,4 @@ router.put('/:id', validateId, validateShiftPlanUpdate, handleValidationErrors,
 router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShiftPlan);
 router.post('/:id/clear-assignments', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), clearAssignments);
 
-router.get('/:id/export/excel', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToExcel);
-router.get('/:id/export/pdf', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToPDF);
-
 export default router;

frontend/package.json

@@ -30,6 +30,7 @@
     "framer-motion": "12.23.24",
     "file-saver": "2.0.5",
     "@types/file-saver": "2.0.5"
+
   },
   "scripts": {
     "dev": "vite dev",

frontend/src/design/DesignSystem.txt

@@ -20,6 +20,8 @@ export const designTokens = {
       10: '#ebd7fa',
     },
 
+    manager: '#CC0000',
+    
     // Semantic Colors
     primary: '#51258f',
     secondary: '#642ab5',

frontend/src/pages/ShiftPlans/ShiftPlanView.tsx

@@ -896,9 +896,6 @@ const ShiftPlanView: React.FC = () => {
                     <div style={{ fontSize: '14px', color: '#666' }}>
                       {formatTime(timeSlot.startTime)} - {formatTime(timeSlot.endTime)}
                     </div>
-                    <div style={{ fontSize: '11px', color: '#999', marginTop: '4px' }}>
-                      ID: {timeSlot.id.substring(0, 8)}...
-                    </div>
                   </td>
                   {days.map(weekday => {
                     const shift = timeSlot.shiftsByDay[weekday.id];
@@ -922,7 +919,55 @@ const ShiftPlanView: React.FC = () => {
                     const isValidShift = shift.timeSlotId === timeSlot.id && shift.dayOfWeek === weekday.id;
                     
                     let assignedEmployees: string[] = [];
-                    let displayText = '';
+                    let displayContent: React.ReactNode = null;
+
+                    // Helper function to create employee boxes
+                    const createEmployeeBoxes = (employeeIds: string[]) => {
+                      return employeeIds.map(empId => {
+                        const employee = employees.find(emp => emp.id === empId);
+                        if (!employee) return null;
+                        
+                        // Determine background color based on employee role
+                        let backgroundColor = '#642ab5'; // Default: non-trainee personnel (purple)
+                        
+                        if (employee.isTrainee) {
+                          backgroundColor = '#cda8f0'; // Trainee
+                        } else if (employee.roles?.includes('manager')) {
+                          backgroundColor = '#CC0000'; // Manager
+                        }
+                        
+                        return (
+                          <div
+                            key={empId}
+                            style={{
+                              backgroundColor,
+                              color: 'white',
+                              padding: '4px 8px',
+                              borderRadius: '4px',
+                              marginBottom: '2px',
+                              fontSize: '12px',
+                              textAlign: 'center',
+                              whiteSpace: 'nowrap',
+                              overflow: 'hidden',
+                              textOverflow: 'ellipsis'
+                            }}
+                            title={`${employee.firstname} ${employee.lastname}${employee.isTrainee ? ' (Trainee)' : ''}`}
+                          >
+                            {employee.firstname} {employee.lastname}
+                          </div>
+                        );
+                      }).filter(Boolean);
+                    };
+
+                    // Helper function to get fallback content
+                    const getFallbackContent = () => {
+                      const shiftsForSlot = shiftPlan?.shifts?.filter(s => 
+                        s.dayOfWeek === weekday.id && 
+                        s.timeSlotId === timeSlot.id
+                      ) || [];
+                      const totalRequired = shiftsForSlot.reduce((sum, s) => sum + s.requiredEmployees, 0);
+                      return totalRequired === 0 ? '-' : `0/${totalRequired}`;
+                    };
 
                     if (shiftPlan?.status === 'published') {
                       // For published plans, use actual assignments from scheduled shifts
@@ -935,15 +980,21 @@ const ShiftPlanView: React.FC = () => {
                       if (scheduledShift) {
                         assignedEmployees = scheduledShift.assignedEmployees || [];
                         
-                        // DEBUG: Log if we're still seeing old data
+                        // Log if we're still seeing old data
                         if (assignedEmployees.length > 0) {
                           console.warn(`⚠️ Found non-empty assignments for ${weekday.name} ${timeSlot.name}:`, assignedEmployees);
                         }
                         
-                        displayText = assignedEmployees.map(empId => {
+                        const employeeBoxes = createEmployeeBoxes(assignedEmployees);
-                          const employee = employees.find(emp => emp.id === empId);
+                        displayContent = employeeBoxes.length > 0 ? (
-                          return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
+                          <div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
-                        }).join(', ');
+                            {employeeBoxes}
+                          </div>
+                        ) : (
+                          <div style={{ color: '#666', fontStyle: 'italic' }}>
+                            {getFallbackContent()}
+                          </div>
+                        );
                       }
                     } else if (assignmentResult) {
                       // For draft with preview, use assignment result
@@ -955,30 +1006,26 @@ const ShiftPlanView: React.FC = () => {
                       
                       if (scheduledShift) {
                         assignedEmployees = getAssignmentsForScheduledShift(scheduledShift);
-                        displayText = assignedEmployees.map(empId => {
+                        const employeeBoxes = createEmployeeBoxes(assignedEmployees);
-                          const employee = employees.find(emp => emp.id === empId);
+                        displayContent = employeeBoxes.length > 0 ? (
-                          return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
+                          <div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
-                        }).join(', ');
+                            {employeeBoxes}
+                          </div>
+                        ) : (
+                          <div style={{ color: '#666', fontStyle: 'italic' }}>
+                            {getFallbackContent()}
+                          </div>
+                        );
                       }
                     }
 
-                    // If no assignments yet, show empty or required count
+                    // If no display content set yet, use fallback
-                    if (!displayText) {
+                    if (!displayContent) {
-                      const shiftsForSlot = shiftPlan?.shifts?.filter(s => 
+                      displayContent = (
-                        s.dayOfWeek === weekday.id && 
+                        <div style={{ color: '#666', fontStyle: 'italic' }}>
-                        s.timeSlotId === timeSlot.id
+                          {getFallbackContent()}
-                      ) || [];
+                        </div>
-                      
+                      );
-                      const totalRequired = shiftsForSlot.reduce((sum, s) => 
-                        sum + s.requiredEmployees, 0);
-                      
-                      // Show "0/2" instead of just "0" to indicate it's empty
-                      displayText = `0/${totalRequired}`;
-                      
-                      // Optional: Show empty state more clearly
-                      if (totalRequired === 0) {
-                        displayText = '-';
-                      }
                     }
 
                     return (
@@ -1013,7 +1060,7 @@ const ShiftPlanView: React.FC = () => {
                           </div>
                         )}
 
-                        {displayText}
+                        {displayContent}
 
                         {/* Shift debug info - SAME AS AVAILABILITYMANAGER */}
                         <div style={{ 
@@ -1023,8 +1070,6 @@ const ShiftPlanView: React.FC = () => {
                           textAlign: 'left',
                           fontFamily: 'monospace'
                         }}>
-                          <div>Shift: {shift.id.substring(0, 6)}...</div>
-                          <div>Day: {shift.dayOfWeek}</div>
                           {!isValidShift && (
                             <div style={{ color: '#e74c3c', fontWeight: 'bold' }}>
                               VALIDATION ERROR
@@ -1039,7 +1084,6 @@ const ShiftPlanView: React.FC = () => {
             </tbody>
           </table>
         </div>
-
       </div>
     );
   };
@@ -1123,7 +1167,7 @@ const ShiftPlanView: React.FC = () => {
             </>
           )}
           
-          {/* Your existing "Zuweisungen neu berechnen" button */}
+          {/* "Zuweisungen neu berechnen" button */}
           {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
             <button
               onClick={handleRecreateAssignments}
@@ -1405,7 +1449,7 @@ const ShiftPlanView: React.FC = () => {
                 Abbrechen
               </button>
               
-              {/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
+              {/* BUTTON zum publishen */}
               <button
                 onClick={handlePublish}
                 disabled={publishing || !canPublishAssignment()}