added dropdown menu

backend/package.json

@@ -27,8 +27,7 @@
     "helmet": "8.1.0",
     "express-validator": "7.3.0",
     "exceljs": "4.4.0",
-    "pdfkit": "0.12.3",
+    "playwright": "^1.37.0"
-    "@types/pdfkit": "^0.12.3"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",

backend/src/controllers/shiftPlanController.ts

@@ -9,7 +9,7 @@ import {
 import { AuthRequest } from '../middleware/auth.js';
 import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js';
 import ExcelJS from 'exceljs';
-import PDFDocument from 'pdfkit';
+import { chromium } from 'playwright';
 
 async function getPlanWithDetails(planId: string) {
   const plan = await db.get<any>(`
@@ -1081,6 +1081,7 @@ function getTimetableDataForExport(plan: any): ExportTimetableData {
   return { days, allTimeSlots };
 }
 
+// Export shift plan to Excel
 // Export shift plan to Excel
 export const exportShiftPlanToExcel = async (req: Request, res: Response): Promise<void> => {
   try {
@@ -1103,7 +1104,7 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
     workbook.created = new Date();
 
     /* -------------------------------------------------------------------------- */
-    /*                           🧾 1. Summary Sheet                              */
+    /*                           📋 1. Summary Sheet                              */
     /* -------------------------------------------------------------------------- */
     const summarySheet = workbook.addWorksheet('Planübersicht');
     summarySheet.columns = [
@@ -1135,6 +1136,19 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
     const timetableData = getTimetableDataForExport(plan);
     const { days, allTimeSlots } = timetableData;
 
+    // Calculate max employees per shift to determine row structure
+    let maxEmployeesPerShift = 1;
+    for (const timeSlot of allTimeSlots) {
+      for (const day of days) {
+        const scheduledShift = plan.scheduledShifts?.find(
+          (s: any) => getDayOfWeek(s.date) === day.id && s.timeSlotId === timeSlot.id
+        );
+        if (scheduledShift && scheduledShift.assignedEmployees?.length > maxEmployeesPerShift) {
+          maxEmployeesPerShift = scheduledShift.assignedEmployees.length;
+        }
+      }
+    }
+
     // Header
     const headerRow = ['Schicht (Zeit)', ...days.map(d => d.name)];
     const header = timetableSheet.addRow(headerRow);
@@ -1150,14 +1164,38 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
       };
     });
 
-    // Content rows
+    // Content rows - each time slot can have multiple employee rows
     for (const timeSlot of allTimeSlots) {
-      const rowData: any[] = [`${timeSlot.name}\n${timeSlot.startTime} - ${timeSlot.endTime}`];
+      // Find max employees for this time slot across all days
+      let maxEmployeesInTimeSlot = 0;
+      for (const day of days) {
+        const scheduledShift = plan.scheduledShifts?.find(
+          (s: any) => getDayOfWeek(s.date) === day.id && s.timeSlotId === timeSlot.id
+        );
+        if (scheduledShift && scheduledShift.assignedEmployees?.length > maxEmployeesInTimeSlot) {
+          maxEmployeesInTimeSlot = scheduledShift.assignedEmployees.length;
+        }
+      }
 
+      // If no employees assigned, show at least one row with requirement count
+      const rowsToCreate = Math.max(maxEmployeesInTimeSlot, 1);
+
+      for (let empIndex = 0; empIndex < rowsToCreate; empIndex++) {
+        const rowData: any[] = [];
+
+        // First cell: time slot name (only in first row, merged for others)
+        if (empIndex === 0) {
+          rowData.push(`${timeSlot.name}\n${timeSlot.startTime} - ${timeSlot.endTime}`);
+        } else {
+          rowData.push(''); // Empty for merged cells
+        }
+
+        // Day cells
         for (const day of days) {
           const shift = timeSlot.shiftsByDay[day.id];
+
           if (!shift) {
-          rowData.push('Keine Schicht');
+            rowData.push(empIndex === 0 ? 'Keine Schicht' : '');
             continue;
           }
 
@@ -1166,20 +1204,35 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
           );
 
           if (scheduledShift && scheduledShift.assignedEmployees?.length > 0) {
-          const employees = scheduledShift.assignedEmployees.map((empId: string) => {
+            if (empIndex < scheduledShift.assignedEmployees.length) {
+              const empId = scheduledShift.assignedEmployees[empIndex];
               const emp = plan.employees?.find((e: any) => e.id === empId);
-            if (!emp) return { text: 'Unbekannt', color: 'FF888888' };
 
-            if (emp.isTrainee)
+              if (!emp) {
-              return { text: `${emp.firstname} ${emp.lastname} (T)`, color: 'FFCDA8F0' };
+                rowData.push({ text: 'Unbekannt', color: 'FF888888' });
-            if (emp.employee_type === 'manager')
+              } else if (emp.isTrainee) {
-              return { text: `${emp.firstname} ${emp.lastname} (M)`, color: 'FFCC0000' };
+                rowData.push({
-            return { text: `${emp.firstname} ${emp.lastname}`, color: 'FF642AB5' };
+                  text: `${emp.firstname} ${emp.lastname} (T)`,
+                  color: 'FFCDA8F0'
+                });
+              } else if (emp.employeeType === 'manager') {
+                rowData.push({
+                  text: `${emp.firstname} ${emp.lastname} (M)`,
+                  color: 'FFCC0000'
                 });
-          rowData.push(employees);
               } else {
-          const shiftsForSlot =
+                rowData.push({
-            plan.shifts?.filter(
+                  text: `${emp.firstname} ${emp.lastname}`,
+                  color: 'FF642AB5'
+                });
+              }
+            } else {
+              rowData.push(''); // Empty cell if no more employees
+            }
+          } else {
+            // No employees assigned, show requirement count only in first row
+            if (empIndex === 0) {
+              const shiftsForSlot = plan.shifts?.filter(
                 (s: any) => s.dayOfWeek === day.id && s.timeSlotId === timeSlot.id
               ) || [];
               const totalRequired = shiftsForSlot.reduce(
@@ -1187,6 +1240,9 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
                 0
               );
               rowData.push(totalRequired === 0 ? '-' : `0/${totalRequired}`);
+            } else {
+              rowData.push('');
+            }
           }
         }
 
@@ -1199,38 +1255,42 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
             bottom: { style: 'thin' },
             right: { style: 'thin' }
           };
-        cell.alignment = { vertical: 'top', wrapText: true };
+          cell.alignment = { vertical: 'middle', wrapText: true, horizontal: 'center' };
+
+          // Handle colored employee names
+          if (typeof cell.value === 'object' && cell.value !== null && 'text' in cell.value) {
+            const employeeData = cell.value as unknown as { text: string; color: string };
+            cell.value = employeeData.text;
+            cell.font = { color: { argb: employeeData.color } };
+            cell.alignment = { vertical: 'middle', horizontal: 'left' };
+          }
 
           if (cell.value === 'Keine Schicht') {
             cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFEDEDED' } };
             cell.font = { color: { argb: 'FF888888' }, italic: true };
           }
 
-        if (Array.isArray(cell.value)) {
-          cell.value = {
-            richText: cell.value.map((e: any) => ({
-              text: e.text + '\n',
-              font: { color: { argb: e.color } }
-            }))
-          };
-        }
-
           if (colNumber === 1) {
             cell.alignment = { horizontal: 'left', vertical: 'middle', wrapText: true };
           }
         });
+
+        row.height = 25;
       }
 
-    // Adjust layout
+      // Merge time slot cells vertically if multiple rows were created
-    timetableSheet.eachRow((row, i) => (row.height = i === 1 ? 30 : 70));
+      if (rowsToCreate > 1) {
-    timetableSheet.columns.forEach(col => {
+        const currentRow = timetableSheet.lastRow!.number;
-      let max = 12;
+        const startRow = currentRow - rowsToCreate + 1;
-      col.eachCell?.({ includeEmpty: true }, c => {
+        timetableSheet.mergeCells(startRow, 1, currentRow, 1);
-        const len = typeof c.value === 'string' ? c.value.length : 10;
+      }
-        if (len > max) max = len;
+    }
-      });
+
-      col.width = Math.min(max + 5, 40);
+    // Adjust column widths
-    });
+    timetableSheet.getColumn(1).width = 25; // Time slot column
+    for (let i = 2; i <= days.length + 1; i++) {
+      timetableSheet.getColumn(i).width = 30;
+    }
 
     // Add legend row at bottom
     const legendRow = timetableSheet.addRow([
@@ -1271,7 +1331,7 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
         name: `${e.firstname} ${e.lastname}`,
         email: e.email,
         role: e.roles?.join(', ') || 'Benutzer',
-        type: e.employee_type || 'Unbekannt',
+        type: e.employeeType || 'Unbekannt',
         contract: e.contractType || 'Nicht angegeben',
         trainee: e.isTrainee ? 'Ja' : 'Nein'
       })
@@ -1298,12 +1358,11 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
 };
 
 export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise<void> => {
+  let browser;
   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' });
@@ -1315,235 +1374,419 @@ export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise
       return;
     }
 
-    // Create PDF document
+    // Get timetable data (same as Excel)
-    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;
-
-    // Get timetable data for PDF
     const timetableData = getTimetableDataForExport(plan);
     const { days, allTimeSlots } = timetableData;
 
-    // Add timetable section
+    // Generate HTML content
-    doc.addPage();
+    const html = `
-    doc.fontSize(16).font('Helvetica-Bold').text('Schichtplan Timetable', 50, 50);
+<!DOCTYPE html>
-
+<html lang="de">
-    let currentY = 80;
+<head>
-
+  <meta charset="UTF-8">
-    // Define column widths
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    const timeSlotColWidth = 100;
+  <title>Schichtplan - ${plan.name}</title>
-    const dayColWidth = (500 - timeSlotColWidth) / days.length;
+  <style>
-
+    * { margin: 0; padding: 0; box-sizing: border-box; }
-    // Table headers
+    body { 
-    doc.fontSize(10).font('Helvetica-Bold');
+      font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-
+      font-size: 10pt;
-    // Time slot header
+      line-height: 1.4;
-    doc.rect(50, currentY, timeSlotColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+      color: #2c3e50;
-    doc.fillColor('white').text('Schicht (Zeit)', 55, currentY + 5, { width: timeSlotColWidth - 10, align: 'left' });
+      padding: 20px;
-
+    }
-    // Day headers
+    .header { 
-    days.forEach((day, index) => {
+      margin-bottom: 30px; 
-      const xPos = 50 + timeSlotColWidth + (index * dayColWidth);
+      padding-bottom: 20px;
-      doc.rect(xPos, currentY, dayColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+      border-bottom: 3px solid #2c3e50;
-      doc.fillColor('white').text(day.name, xPos + 5, currentY + 5, { width: dayColWidth - 10, align: 'center' });
+    }
-    });
+    h1 { 
-
+      font-size: 24pt; 
-    doc.fillColor('black');
+      color: #2c3e50; 
-    currentY += 20;
+      margin-bottom: 10px;
-
+    }
-    // Time slot rows
+    .subtitle { 
-    allTimeSlots.forEach((timeSlot, rowIndex) => {
+      font-size: 11pt; 
-      // Check if we need a new page
+      color: #7f8c8d; 
-      if (currentY > 650) {
+      margin-bottom: 5px;
-        doc.addPage();
+    }
-        currentY = 50;
+    .info-section {
-
+      background: #f8f9fa;
-        // Redraw headers on new page
+      padding: 15px;
-        doc.fontSize(10).font('Helvetica-Bold');
+      border-radius: 5px;
-        doc.rect(50, currentY, timeSlotColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+      margin-bottom: 30px;
-        doc.fillColor('white').text('Schicht (Zeit)', 55, currentY + 5, { width: timeSlotColWidth - 10, align: 'left' });
+      page-break-inside: avoid;
-
+    }
-        days.forEach((day, index) => {
+    .info-section h2 {
-          const xPos = 50 + timeSlotColWidth + (index * dayColWidth);
+      font-size: 14pt;
-          doc.rect(xPos, currentY, dayColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+      margin-bottom: 12px;
-          doc.fillColor('white').text(day.name, xPos + 5, currentY + 5, { width: dayColWidth - 10, align: 'center' });
+      color: #34495e;
-        });
+      border-bottom: 2px solid #34495e;
-
+      padding-bottom: 5px;
-        doc.fillColor('black');
+    }
-        currentY += 20;
+    .info-grid {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 10px;
+    }
+    .info-item {
+      display: flex;
+      gap: 8px;
+    }
+    .info-label {
+      font-weight: 600;
+      color: #34495e;
+    }
+    .info-value {
+      color: #555;
     }
     
-      // Alternate row background
+    /* Timetable styles */
-      const rowBgColor = rowIndex % 2 === 0 ? '#f8f9fa' : 'white';
+    .timetable-section {
+      margin-top: 30px;
+      page-break-before: always;
+    }
+    .timetable-section h2 {
+      font-size: 16pt;
+      margin-bottom: 15px;
+      color: #2c3e50;
+    }
+    table {
+      width: 100%;
+      border-collapse: collapse;
+      margin-bottom: 20px;
+      page-break-inside: auto;
+    }
+    thead {
+      background: #2c3e50;
+      color: white;
+    }
+    thead th {
+      padding: 12px 8px;
+      text-align: center;
+      font-weight: 600;
+      border: 1px solid #2c3e50;
+      font-size: 10pt;
+    }
+    tbody tr {
+      page-break-inside: avoid;
+      page-break-after: auto;
+    }
+    tbody tr:nth-child(even) {
+      background: #f8f9fa;
+    }
+    td {
+      padding: 10px 8px;
+      border: 1px solid #dee2e6;
+      vertical-align: top;
+    }
+    .time-slot-cell {
+      font-weight: 600;
+      background: #ecf0f1;
+      white-space: nowrap;
+      min-width: 120px;
+    }
+    .time-slot-name {
+      font-size: 10pt;
+      color: #2c3e50;
+      margin-bottom: 3px;
+    }
+    .time-slot-time {
+      font-size: 9pt;
+      color: #7f8c8d;
+      font-weight: normal;
+    }
+    .employee-list {
+      list-style: none;
+      padding: 0;
+    }
+    .employee-list li {
+      margin-bottom: 4px;
+      font-size: 9pt;
+    }
+    .employee-manager { color: #CC0000; font-weight: 600; }
+    .employee-trainee { color: #CDA8F0; font-weight: 600; }
+    .employee-regular { color: #642AB5; }
+    .no-shift {
+      color: #999;
+      font-style: italic;
+      text-align: center;
+    }
+    .required-count {
+      color: #666;
+      font-style: italic;
+      text-align: center;
+    }
     
-      // Time slot cell
+    /* Legend */
-      doc.rect(50, currentY, timeSlotColWidth, 40).fillAndStroke(rowBgColor, '#dee2e6');
+    .legend {
-      doc.fontSize(9).font('Helvetica-Bold').text(timeSlot.name, 55, currentY + 5, { width: timeSlotColWidth - 10 });
+      margin-top: 15px;
-      doc.fontSize(8).font('Helvetica').text(`${timeSlot.startTime} - ${timeSlot.endTime}`, 55, currentY + 18, { width: timeSlotColWidth - 10 });
+      padding: 10px;
+      background: #f8f9fa;
+      border-radius: 5px;
+      display: flex;
+      gap: 20px;
+      flex-wrap: wrap;
+      page-break-inside: avoid;
+    }
+    .legend-item {
+      display: flex;
+      align-items: center;
+      gap: 5px;
+      font-size: 9pt;
+    }
+    .legend-square {
+      width: 12px;
+      height: 12px;
+      border-radius: 2px;
+    }
     
-      // Day cells
+    /* Employee section */
-      days.forEach((day, colIndex) => {
+    .employee-section {
-        const xPos = 50 + timeSlotColWidth + (colIndex * dayColWidth);
+      margin-top: 30px;
+      page-break-before: always;
+    }
+    .employee-section h2 {
+      font-size: 16pt;
+      margin-bottom: 15px;
+      color: #2c3e50;
+    }
+    .employee-table {
+      width: 100%;
+    }
+    .employee-table thead {
+      background: #34495e;
+    }
+    .employee-table td {
+      font-size: 9pt;
+    }
+    
+    /* Footer */
+    .footer {
+      position: fixed;
+      bottom: 15px;
+      left: 20px;
+      right: 20px;
+      text-align: center;
+      font-size: 8pt;
+      color: #7f8c8d;
+      border-top: 1px solid #dee2e6;
+      padding-top: 8px;
+    }
+    
+    @media print {
+      body { padding: 15px; }
+      .header { page-break-after: avoid; }
+      .info-section { page-break-after: avoid; }
+    }
+  </style>
+</head>
+<body>
+  <div class="header">
+    <h1>Schichtplan: ${plan.name}</h1>
+    <div class="subtitle">Erstellt am: ${new Date().toLocaleDateString('de-DE', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    })}</div>
+  </div>
+
+  <div class="info-section">
+    <h2>Plan Informationen</h2>
+    <div class="info-grid">
+      <div class="info-item">
+        <span class="info-label">Plan Name:</span>
+        <span class="info-value">${plan.name}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Status:</span>
+        <span class="info-value">${plan.status}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Beschreibung:</span>
+        <span class="info-value">${plan.description || 'Keine'}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Erstellt von:</span>
+        <span class="info-value">${plan.created_by_name || 'Unbekannt'}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Zeitraum:</span>
+        <span class="info-value">${plan.startDate} bis ${plan.endDate}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Erstellt am:</span>
+        <span class="info-value">${new Date(plan.createdAt).toLocaleString('de-DE')}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Anzahl Schichten:</span>
+        <span class="info-value">${plan.scheduledShifts?.length || 0}</span>
+      </div>
+      <div class="info-item">
+        <span class="info-label">Anzahl Mitarbeiter:</span>
+        <span class="info-value">${plan.employees?.length || 0}</span>
+      </div>
+    </div>
+  </div>
+
+  <div class="timetable-section">
+    <h2>Schichtplan Timetable</h2>
+    <table>
+      <thead>
+        <tr>
+          <th>Schicht (Zeit)</th>
+          ${days.map(day => `<th>${day.name}</th>`).join('')}
+        </tr>
+      </thead>
+      <tbody>
+        ${allTimeSlots.map(timeSlot => `
+          <tr>
+            <td class="time-slot-cell">
+              <div class="time-slot-name">${timeSlot.name}</div>
+              <div class="time-slot-time">${timeSlot.startTime} - ${timeSlot.endTime}</div>
+            </td>
+            ${days.map(day => {
       const shift = timeSlot.shiftsByDay[day.id];
 
-        doc.rect(xPos, currentY, dayColWidth, 40).fillAndStroke(rowBgColor, '#dee2e6');
-
       if (!shift) {
-          doc.fontSize(8).font('Helvetica-Oblique').fillColor('#ccc').text('Keine Schicht', xPos + 5, currentY + 15, {
+        return '<td class="no-shift">Keine Schicht</td>';
-            width: dayColWidth - 10,
-            align: 'center'
-          });
-        } else {
-          // Get assignments for this time slot and day
-          const scheduledShift = plan.scheduledShifts?.find((scheduled: any) => {
-            const scheduledDayOfWeek = getDayOfWeek(scheduled.date);
-            return scheduledDayOfWeek === day.id &&
-              scheduled.timeSlotId === timeSlot.id;
-          });
-
-          doc.fillColor('black').fontSize(8).font('Helvetica');
-
-          if (scheduledShift && scheduledShift.assignedEmployees.length > 0) {
-            let textY = currentY + 5;
-            scheduledShift.assignedEmployees.forEach((empId: string, empIndex: number) => {
-              if (textY < currentY + 35) { // Don't overflow cell
-                const employee = plan.employees?.find((emp: any) => emp.id === empId);
-                if (employee) {
-                  let roleIndicator = '';
-                  if (employee.isTrainee) {
-                    roleIndicator = ' (T)';
-                    doc.fillColor('#cda8f0'); // Trainee color
-                  } else if (employee.employee_type === 'manager') {
-                    roleIndicator = ' (M)';
-                    doc.fillColor('#CC0000'); // Manager color
-                  } else {
-                    doc.fillColor('#642ab5'); // Regular personnel color
       }
 
-                  const name = `${employee.firstname} ${employee.lastname}${roleIndicator}`;
+      const scheduledShift = plan.scheduledShifts?.find((s: any) =>
-                  doc.text(name, xPos + 5, textY, { width: dayColWidth - 10, align: 'left' });
+        getDayOfWeek(s.date) === day.id && s.timeSlotId === timeSlot.id
-                  textY += 10;
-                }
-              }
-            });
-            doc.fillColor('black');
-          } else {
-            // Show required count like in React component
-            const shiftsForSlot = plan.shifts?.filter((s: any) =>
-              s.dayOfWeek === day.id &&
-              s.timeSlotId === timeSlot.id
-            ) || [];
-            const totalRequired = shiftsForSlot.reduce((sum: number, s: any) => sum + s.requiredEmployees, 0);
-            const displayText = totalRequired === 0 ? '-' : `0/${totalRequired}`;
-
-            doc.fillColor('#666').fontSize(9).font('Helvetica-Oblique')
-              .text(displayText, xPos + 5, currentY + 15, { width: dayColWidth - 10, align: 'center' });
-            doc.fillColor('black');
-          }
-        }
-      });
-
-      currentY += 40;
-    });
-
-    // 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 }
       );
+
+      if (scheduledShift && scheduledShift.assignedEmployees?.length > 0) {
+        const employeeItems = scheduledShift.assignedEmployees.map((empId: string) => {
+          const emp = plan.employees?.find((e: any) => e.id === empId);
+          if (!emp) return '<li>Unbekannt</li>';
+
+          let cssClass = 'employee-regular';
+          let suffix = '';
+
+          if (emp.isTrainee) {
+            cssClass = 'employee-trainee';
+            suffix = ' (T)';
+          } else if (emp.employeeType === 'manager') {
+            cssClass = 'employee-manager';
+            suffix = ' (M)';
           }
 
-    // Finalize PDF
+          return `<li class="${cssClass}">${emp.firstname} ${emp.lastname}${suffix}</li>`;
-    doc.end();
+        }).join('');
+
+        return `<td><ul class="employee-list">${employeeItems}</ul></td>`;
+      } else {
+        const shiftsForSlot = plan.shifts?.filter((s: any) =>
+          s.dayOfWeek === day.id && s.timeSlotId === timeSlot.id
+        ) || [];
+        const totalRequired = shiftsForSlot.reduce((sum: number, s: any) =>
+          sum + s.requiredEmployees, 0
+        );
+        const displayText = totalRequired === 0 ? '-' : `0/${totalRequired}`;
+        return `<td class="required-count">${displayText}</td>`;
+      }
+    }).join('')}
+          </tr>
+        `).join('')}
+      </tbody>
+    </table>
+    
+    <div class="legend">
+      <div class="legend-item">
+        <div class="legend-square" style="background: #CC0000;"></div>
+        <span>Manager</span>
+      </div>
+      <div class="legend-item">
+        <div class="legend-square" style="background: #CDA8F0;"></div>
+        <span>Trainee</span>
+      </div>
+      <div class="legend-item">
+        <div class="legend-square" style="background: #642AB5;"></div>
+        <span>Mitarbeiter</span>
+      </div>
+      <div class="legend-item">
+        <div class="legend-square" style="background: #ededed;"></div>
+        <span>Keine Schicht</span>
+      </div>
+    </div>
+  </div>
+
+  <div class="employee-section">
+    <h2>Mitarbeiterübersicht</h2>
+    <table class="employee-table">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>E-Mail</th>
+          <th>Rolle</th>
+          <th>Mitarbeiter Typ</th>
+          <th>Vertragstyp</th>
+          <th>Trainee</th>
+        </tr>
+      </thead>
+      <tbody>
+        ${plan.employees?.map((emp: any) => `
+          <tr>
+            <td>${emp.firstname} ${emp.lastname}</td>
+            <td>${emp.email}</td>
+            <td>${emp.roles?.join(', ') || 'Benutzer'}</td>
+            <td>${emp.employeeType || 'Unbekannt'}</td>
+            <td>${emp.contractType || 'Nicht angegeben'}</td>
+            <td>${emp.isTrainee ? 'Ja' : 'Nein'}</td>
+          </tr>
+        `).join('') || '<tr><td colspan="6" style="text-align: center; color: #999;">Keine Mitarbeiter</td></tr>'}
+      </tbody>
+    </table>
+  </div>
+
+  <div class="footer">
+    Erstellt am: ${new Date().toLocaleString('de-DE')} • Schichtplaner System
+  </div>
+</body>
+</html>
+    `;
+
+    // Launch browser and generate PDF
+    browser = await chromium.launch({ headless: true });
+    const context = await browser.newContext();
+    const page = await context.newPage();
+
+    await page.setContent(html, { waitUntil: 'networkidle' });
+
+    const pdfBuffer = await page.pdf({
+      format: 'A4',
+      printBackground: true,
+      margin: {
+        top: '20mm',
+        right: '15mm',
+        bottom: '20mm',
+        left: '15mm'
+      },
+      displayHeaderFooter: true,
+      headerTemplate: '<div></div>',
+      footerTemplate: `
+        <div style="font-size: 8pt; text-align: center; width: 100%; color: #7f8c8d; padding-top: 5px;">
+          <span class="pageNumber"></span> / <span class="totalPages"></span>
+        </div>
+      `
+    });
+
+    await browser.close();
+
+    // Set response headers and send PDF
+    const fileName = `Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.pdf`;
+    res.setHeader('Content-Type', 'application/pdf');
+    res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+    res.send(pdfBuffer);
 
     console.log('✅ PDF export completed for plan:', id);
 
   } catch (error) {
     console.error('❌ Error exporting to PDF:', error);
+    if (browser) {
+      await browser.close();
+    }
     res.status(500).json({ error: 'Internal server error during PDF export' });
   }
 };
@@ -1553,9 +1796,3 @@ function getDayOfWeek(dateString: string): number {
   const date = new Date(dateString);
   return date.getDay() === 0 ? 7 : date.getDay();
 }
-
-// Helper function to get German day names
-function getGermanDayName(dayIndex: number): string {
-  const days = ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'];
-  return days[dayIndex];
-}

frontend/src/pages/ShiftPlans/ShiftPlanView.tsx

@@ -1,5 +1,5 @@
 // frontend/src/pages/ShiftPlans/ShiftPlanView.tsx
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { useAuth } from '../../contexts/AuthContext';
 import { shiftPlanService } from '../../services/shiftPlanService';
@@ -56,6 +56,9 @@ const ShiftPlanView: React.FC = () => {
   const [showAssignmentPreview, setShowAssignmentPreview] = useState(false);
   const [recreating, setRecreating] = useState(false);
   const [exporting, setExporting] = useState(false);
+  const [exportType, setExportType] = useState<'pdf' | 'excel' | null>(null);
+  const [dropdownWidth, setDropdownWidth] = useState(0);
+  const dropdownRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     loadShiftPlanData();
@@ -121,6 +124,12 @@ const ShiftPlanView: React.FC = () => {
     }
   }, [availabilities]);
 
+  useEffect(() => {
+    if (dropdownRef.current) {
+      setDropdownWidth(dropdownRef.current.offsetWidth);
+    }
+  }, [exportType]);
+
   // Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER
   const getTimetableData = () => {
     if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) {
@@ -242,60 +251,33 @@ const ShiftPlanView: React.FC = () => {
     };
   };
 
-  const handleExportExcel = async () => {
+  const handleExport = async () => {
-    if (!shiftPlan) return;
+    if (!shiftPlan || !exportType) return;
 
     try {
       setExporting(true);
 
-      // Call the export service
+      let blob: Blob;
-      const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
+      if (exportType === 'excel') {
-      
+        blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
-      // Use file-saver to download the file
         saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`);
-      
+      } else {
-      showNotification({
+        blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
-        type: 'success',
-        title: 'Export erfolgreich',
-        message: 'Der Schichtplan wurde als Excel-Datei exportiert.'
-      });
-      
-    } catch (error) {
-      console.error('Error exporting to Excel:', error);
-      showNotification({
-        type: 'error',
-        title: 'Export fehlgeschlagen',
-        message: 'Der Excel-Export konnte nicht durchgeführt werden.'
-      });
-    } finally {
-      setExporting(false);
-    }
-  };
-
-  const handleExportPDF = async () => {
-    if (!shiftPlan) return;
-
-    try {
-      setExporting(true);
-      
-      // Call the PDF export service
-      const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
-      
-      // Use file-saver to download the file
         saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
+      }
 
       showNotification({
         type: 'success',
         title: 'Export erfolgreich',
-        message: 'Der Schichtplan wurde als PDF exportiert.'
+        message: `Der Schichtplan wurde als ${exportType === 'excel' ? 'Excel' : 'PDF'} exportiert.`
       });
 
     } catch (error) {
-      console.error('Error exporting to PDF:', error);
+      console.error(`Error exporting to ${exportType}:`, error);
       showNotification({
         type: 'error',
         title: 'Export fehlgeschlagen',
-        message: 'Der PDF-Export konnte nicht durchgeführt werden.'
+        message: `Der ${exportType === 'excel' ? 'Excel' : 'PDF'}-Export konnte nicht durchgeführt werden.`
       });
     } finally {
       setExporting(false);
@@ -932,7 +914,7 @@ const ShiftPlanView: React.FC = () => {
 
                         if (employee.isTrainee) {
                           backgroundColor = '#cda8f0'; // Trainee
-                        } else if (employee.roles?.includes('manager')) {
+                        } else if (employee.employeeType === 'manager') {
                           backgroundColor = '#CC0000'; // Manager
                         }
 
@@ -1125,48 +1107,6 @@ const ShiftPlanView: React.FC = () => {
           </div>
         </div>
         <div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
-          {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
-            <>
-              <button
-                onClick={handleExportExcel}
-                disabled={exporting}
-                style={{
-                  padding: '10px 20px',
-                  backgroundColor: '#27ae60',
-                  color: 'white',
-                  border: 'none',
-                  borderRadius: '4px',
-                  cursor: exporting ? 'not-allowed' : 'pointer',
-                  fontWeight: 'bold',
-                  display: 'flex',
-                  alignItems: 'center',
-                  gap: '8px'
-                }}
-              >
-                {exporting ? '🔄' : '📊'} {exporting ? 'Exportiert...' : 'Excel Export'}
-              </button>
-              
-              <button
-                onClick={handleExportPDF}
-                disabled={exporting}
-                style={{
-                  padding: '10px 20px',
-                  backgroundColor: '#e74c3c',
-                  color: 'white',
-                  border: 'none',
-                  borderRadius: '4px',
-                  cursor: exporting ? 'not-allowed' : 'pointer',
-                  fontWeight: 'bold',
-                  display: 'flex',
-                  alignItems: 'center',
-                  gap: '8px'
-                }}
-              >
-                {exporting ? '🔄' : '📄'} {exporting ? 'Exportiert...' : 'PDF Export'}
-              </button>
-            </>
-          )}
-          
           {/* "Zuweisungen neu berechnen" button */}
           {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
             <button
@@ -1492,6 +1432,65 @@ const ShiftPlanView: React.FC = () => {
 
         {renderTimetable()}
 
+        {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
+          <div style={{
+            display: 'flex',
+            alignItems: 'center',
+            position: 'relative',
+            marginLeft: '10px'
+          }}>
+            {/* Export Dropdown */}
+            <div
+              ref={dropdownRef}
+              style={{
+                transform: exportType ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
+                transition: 'transform 0.3s ease-in-out',
+                position: exportType ? 'absolute' : 'relative',
+                right: exportType ? `-${dropdownWidth}px` : '0'
+              }}
+            >
+              <select
+                value={exportType || ''}
+                onChange={(e) => setExportType(e.target.value as 'pdf' | 'excel' | null)}
+                style={{
+                  padding: '10px 20px',
+                  backgroundColor: 'white',
+                  border: '1px solid #ddd',
+                  borderRadius: '4px',
+                  cursor: 'pointer',
+                  minWidth: '120px'
+                }}
+              >
+                <option value="">Export</option>
+                <option value="pdf">PDF</option>
+                <option value="excel">Excel</option>
+              </select>
+            </div>
+
+            {/* Export Button */}
+            {exportType && (
+              <button
+                onClick={handleExport}
+                disabled={exporting}
+                style={{
+                  padding: '10px 20px',
+                  backgroundColor: '#51258f',
+                  color: 'white',
+                  border: 'none',
+                  borderRadius: '4px',
+                  cursor: exporting ? 'not-allowed' : 'pointer',
+                  fontWeight: 'bold',
+                  marginLeft: '10px',
+                  opacity: exporting ? 0.7 : 1,
+                  transition: 'opacity 0.2s ease'
+                }}
+              >
+                {exporting ? '🔄 Exportiert...' : 'EXPORT'}
+              </button>
+            )}
+          </div>
+        )}
+
         {/* Summary */}
         {days.length > 0 && (
           <div style={{