more fancy excel export

backend/src/controllers/shiftPlanController.ts

@@ -969,19 +969,129 @@ export const clearAssignments = async (req: Request, res: Response): Promise<voi
   }
 };
 
+
+// Helper interfaces for export
+interface ExportDay {
+  id: number;
+  name: string;
+}
+
+interface ExportTimeSlot {
+  id: string;
+  name: string;
+  startTime: string;
+  endTime: string;
+  shiftsByDay: { [dayId: number]: any };
+}
+
+interface ExportTimetableData {
+  days: ExportDay[];
+  allTimeSlots: ExportTimeSlot[];
+}
+
+function getTimetableDataForExport(plan: any): ExportTimetableData {
+  const weekdays = [
+    { id: 1, name: 'Montag' },
+    { id: 2, name: 'Dienstag' },
+    { id: 3, name: 'Mittwoch' },
+    { id: 4, name: 'Donnerstag' },
+    { id: 5, name: 'Freitag' },
+    { id: 6, name: 'Samstag' },
+    { id: 7, name: 'Sonntag' }
+  ];
+
+  if (!plan.shifts || !plan.timeSlots) {
+    return { days: [], allTimeSlots: [] };
+  }
+
+  // Create a map for quick time slot lookups with proper typing
+  const timeSlotMap = new Map<string, any>();
+  plan.timeSlots.forEach((ts: any) => {
+    timeSlotMap.set(ts.id, ts);
+  });
+
+  // Group shifts by day
+  const shiftsByDay: { [dayId: number]: any[] } = plan.shifts.reduce((acc: any, shift: any) => {
+    if (!acc[shift.dayOfWeek]) {
+      acc[shift.dayOfWeek] = [];
+    }
+
+    const timeSlot = timeSlotMap.get(shift.timeSlotId);
+    const enhancedShift = {
+      ...shift,
+      timeSlotName: timeSlot?.name,
+      startTime: timeSlot?.startTime,
+      endTime: timeSlot?.endTime
+    };
+
+    acc[shift.dayOfWeek].push(enhancedShift);
+    return acc;
+  }, {});
+
+  // Sort shifts within each day by start time
+  Object.keys(shiftsByDay).forEach(day => {
+    const dayNum = parseInt(day);
+    shiftsByDay[dayNum].sort((a: any, b: any) => {
+      const timeA = a.startTime || '';
+      const timeB = b.startTime || '';
+      return timeA.localeCompare(timeB);
+    });
+  });
+
+  // Get unique days that have shifts
+  const days: ExportDay[] = Array.from(new Set(plan.shifts.map((shift: any) => shift.dayOfWeek)))
+    .sort()
+    .map(dayId => {
+      return weekdays.find(day => day.id === dayId) || { id: dayId as number, name: `Tag ${dayId}` };
+    });
+
+  // Get all unique time slots (rows) by collecting from all shifts
+  const allTimeSlotsMap = new Map<string, ExportTimeSlot>();
+  days.forEach(day => {
+    shiftsByDay[day.id]?.forEach((shift: any) => {
+      const timeSlot = timeSlotMap.get(shift.timeSlotId);
+      if (timeSlot && !allTimeSlotsMap.has(timeSlot.id)) {
+        const exportTimeSlot: ExportTimeSlot = {
+          id: timeSlot.id,
+          name: timeSlot.name,
+          startTime: timeSlot.startTime,
+          endTime: timeSlot.endTime,
+          shiftsByDay: {}
+        };
+        allTimeSlotsMap.set(timeSlot.id, exportTimeSlot);
+      }
+    });
+  });
+
+  // Populate shifts for each time slot by day
+  days.forEach(day => {
+    shiftsByDay[day.id]?.forEach((shift: any) => {
+      const timeSlot = allTimeSlotsMap.get(shift.timeSlotId);
+      if (timeSlot) {
+        timeSlot.shiftsByDay[day.id] = shift;
+      }
+    });
+  });
+
+  // Convert to array and sort by start time
+  const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a: ExportTimeSlot, b: ExportTimeSlot) => {
+    return (a.startTime || '').localeCompare(b.startTime || '');
+  });
+
+  return { days, allTimeSlots };
+}
+
+// Export shift plan to Excel
 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;
@@ -992,13 +1102,13 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
     workbook.creator = 'Schichtplaner System';
     workbook.created = new Date();
 
-    // Add Summary Sheet
+    /* -------------------------------------------------------------------------- */
+    /*                           🧾 1. Summary Sheet                              */
+    /* -------------------------------------------------------------------------- */
     const summarySheet = workbook.addWorksheet('Planübersicht');
-
-    // Summary data
     summarySheet.columns = [
-      { header: 'Eigenschaft', key: 'property', width: 20 },
-      { header: 'Wert', key: 'value', width: 30 }
+      { header: 'Eigenschaft', key: 'property', width: 25 },
+      { header: 'Wert', key: 'value', width: 35 }
     ];
 
     summarySheet.addRows([
@@ -1007,82 +1117,31 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
       { 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: 'Erstellt am', value: new Date(plan.createdAt).toLocaleString('de-DE') },
       { 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 };
+    // Style header
+    const header1 = summarySheet.getRow(1);
+    header1.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+    header1.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF2C3E50' } };
+    summarySheet.columns.forEach(col => (col.alignment = { vertical: 'middle', wrapText: true }));
 
-    // Add Assignments Sheet
-    const assignmentsSheet = workbook.addWorksheet('Schichtzuweisungen');
+    /* -------------------------------------------------------------------------- */
+    /*                        📅 2. Timetable / Schichtplan Sheet                 */
+    /* -------------------------------------------------------------------------- */
+    const timetableSheet = workbook.addWorksheet('Schichtplan');
+    const timetableData = getTimetableDataForExport(plan);
+    const { days, allTimeSlots } = timetableData;
 
-    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) => {
+    // Header
+    const headerRow = ['Schicht (Zeit)', ...days.map(d => d.name)];
+    const header = timetableSheet.addRow(headerRow);
+    header.eachCell(cell => {
+      cell.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+      cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF2C3E50' } };
+      cell.alignment = { horizontal: 'center', vertical: 'middle' };
       cell.border = {
         top: { style: 'thin' },
         left: { style: 'thin' },
@@ -1090,48 +1149,148 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
         right: { style: 'thin' }
       };
     });
+
+    // Content rows
+    for (const timeSlot of allTimeSlots) {
+      const rowData: any[] = [`${timeSlot.name}\n${timeSlot.startTime} - ${timeSlot.endTime}`];
+
+      for (const day of days) {
+        const shift = timeSlot.shiftsByDay[day.id];
+        if (!shift) {
+          rowData.push('Keine Schicht');
+          continue;
+        }
+
+        const scheduledShift = plan.scheduledShifts?.find(
+          (s: any) => getDayOfWeek(s.date) === day.id && s.timeSlotId === timeSlot.id
+        );
+
+        if (scheduledShift && scheduledShift.assignedEmployees?.length > 0) {
+          const employees = scheduledShift.assignedEmployees.map((empId: string) => {
+            const emp = plan.employees?.find((e: any) => e.id === empId);
+            if (!emp) return { text: 'Unbekannt', color: 'FF888888' };
+
+            if (emp.isTrainee)
+              return { text: `${emp.firstname} ${emp.lastname} (T)`, color: 'FFCDA8F0' };
+            if (emp.employee_type === 'manager')
+              return { text: `${emp.firstname} ${emp.lastname} (M)`, color: 'FFCC0000' };
+            return { text: `${emp.firstname} ${emp.lastname}`, color: 'FF642AB5' };
+          });
+          rowData.push(employees);
+        } 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
+          );
+          rowData.push(totalRequired === 0 ? '-' : `0/${totalRequired}`);
+        }
+      }
+
+      const row = timetableSheet.addRow(rowData);
+
+      row.eachCell((cell, colNumber) => {
+        cell.border = {
+          top: { style: 'thin' },
+          left: { style: 'thin' },
+          bottom: { style: 'thin' },
+          right: { style: 'thin' }
+        };
+        cell.alignment = { vertical: 'top', wrapText: true };
+
+        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 };
         }
       });
+    }
 
-    // Add Employee Overview Sheet
+    // Adjust layout
+    timetableSheet.eachRow((row, i) => (row.height = i === 1 ? 30 : 70));
+    timetableSheet.columns.forEach(col => {
+      let max = 12;
+      col.eachCell?.({ includeEmpty: true }, c => {
+        const len = typeof c.value === 'string' ? c.value.length : 10;
+        if (len > max) max = len;
+      });
+      col.width = Math.min(max + 5, 40);
+    });
+
+    // Add legend row at bottom
+    const legendRow = timetableSheet.addRow([
+      'Legende:',
+      '■ Manager',
+      '■ Trainee',
+      '■ Mitarbeiter',
+      '■ Keine Schicht'
+    ]);
+
+    // Style each square with its respective color
+    legendRow.getCell(1).font = { bold: true };
+    legendRow.getCell(2).font = { color: { argb: 'FFCC0000' } };   // Red = Manager
+    legendRow.getCell(3).font = { color: { argb: 'FFCDA8F0' } };   // Purple = Trainee
+    legendRow.getCell(4).font = { color: { argb: 'FF642AB5' } };   // Blue = Mitarbeiter
+    legendRow.getCell(5).font = { color: { argb: 'FF888888' } };   // Gray = Keine Schicht
+
+    legendRow.eachCell(cell => {
+      cell.alignment = { vertical: 'middle', horizontal: 'left' };
+      cell.font = { ...cell.font, italic: true };
+    });
+
+    /* -------------------------------------------------------------------------- */
+    /*                        👥 3. 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: 'Rolle', key: 'role', width: 18 },
       { header: 'Mitarbeiter Typ', key: 'type', width: 15 },
-      { header: 'Vertragstyp', key: 'contract', width: 15 }
+      { header: 'Vertragstyp', key: 'contract', width: 18 },
+      { header: 'Trainee', key: 'trainee', width: 10 }
     ];
 
-    plan.employees?.forEach((employee: any) => {
+    plan.employees?.forEach((e: any) =>
       employeeSheet.addRow({
-        name: `${employee.firstname} ${employee.lastname}`,
-        email: employee.email,
-        role: employee.roles?.join(', ') || 'Benutzer',
-        type: employee.employeeType,
-        contract: employee.contractType || 'Nicht angegeben'
-      });
-    });
+        name: `${e.firstname} ${e.lastname}`,
+        email: e.email,
+        role: e.roles?.join(', ') || 'Benutzer',
+        type: e.employee_type || 'Unbekannt',
+        contract: e.contractType || 'Nicht angegeben',
+        trainee: e.isTrainee ? 'Ja' : 'Nein'
+      })
+    );
 
-    // 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 };
+    const empHeader = employeeSheet.getRow(1);
+    empHeader.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+    empHeader.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF34495E' } };
+    empHeader.alignment = { horizontal: 'center', vertical: 'middle' };
 
-    // Set response headers
+    /* -------------------------------------------------------------------------- */
+    /*                            📤 4. Send Response                             */
+    /* -------------------------------------------------------------------------- */
+    const fileName = `Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.xlsx`;
     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
+    res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
     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' });
@@ -1197,91 +1356,130 @@ export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise
     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);
-    });
+    // Get timetable data for PDF
+    const timetableData = getTimetableDataForExport(plan);
+    const { days, allTimeSlots } = timetableData;
 
-    // Sort dates chronologically
-    const sortedDates = Array.from(shiftsByDate.keys()).sort();
-
-    // Add assignments section
+    // Add timetable section
     doc.addPage();
-    doc.fontSize(16).font('Helvetica-Bold').text('Schichtzuweisungen', 50, 50);
+    doc.fontSize(16).font('Helvetica-Bold').text('Schichtplan Timetable', 50, 50);
 
     let currentY = 80;
 
-    sortedDates.forEach(date => {
-      const dateShifts = shiftsByDate.get(date);
-      const dateObj = new Date(date);
-      const dayName = getGermanDayName(dateObj.getDay());
+    // Define column widths
+    const timeSlotColWidth = 100;
+    const dayColWidth = (500 - timeSlotColWidth) / days.length;
 
+    // Table headers
+    doc.fontSize(10).font('Helvetica-Bold');
+
+    // Time slot header
+    doc.rect(50, currentY, timeSlotColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+    doc.fillColor('white').text('Schicht (Zeit)', 55, currentY + 5, { width: timeSlotColWidth - 10, align: 'left' });
+
+    // Day headers
+    days.forEach((day, index) => {
+      const xPos = 50 + timeSlotColWidth + (index * dayColWidth);
+      doc.rect(xPos, currentY, dayColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+      doc.fillColor('white').text(day.name, xPos + 5, currentY + 5, { width: dayColWidth - 10, align: 'center' });
+    });
+
+    doc.fillColor('black');
+    currentY += 20;
+
+    // Time slot rows
+    allTimeSlots.forEach((timeSlot, rowIndex) => {
       // 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
+        // Redraw headers on 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 += 15;
+        doc.rect(50, currentY, timeSlotColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+        doc.fillColor('white').text('Schicht (Zeit)', 55, currentY + 5, { width: timeSlotColWidth - 10, align: 'left' });
 
-      // 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;
+        days.forEach((day, index) => {
+          const xPos = 50 + timeSlotColWidth + (index * dayColWidth);
+          doc.rect(xPos, currentY, dayColWidth, 20).fillAndStroke('#2c3e50', '#2c3e50');
+          doc.fillColor('white').text(day.name, xPos + 5, currentY + 5, { width: dayColWidth - 10, align: 'center' });
         });
 
-      currentY += 20; // Space between dates
+        doc.fillColor('black');
+        currentY += 20;
+      }
+
+      // Alternate row background
+      const rowBgColor = rowIndex % 2 === 0 ? '#f8f9fa' : 'white';
+
+      // Time slot cell
+      doc.rect(50, currentY, timeSlotColWidth, 40).fillAndStroke(rowBgColor, '#dee2e6');
+      doc.fontSize(9).font('Helvetica-Bold').text(timeSlot.name, 55, currentY + 5, { width: timeSlotColWidth - 10 });
+      doc.fontSize(8).font('Helvetica').text(`${timeSlot.startTime} - ${timeSlot.endTime}`, 55, currentY + 18, { width: timeSlotColWidth - 10 });
+
+      // Day cells
+      days.forEach((day, colIndex) => {
+        const xPos = 50 + timeSlotColWidth + (colIndex * dayColWidth);
+        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, {
+            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}`;
+                  doc.text(name, xPos + 5, textY, { width: dayColWidth - 10, align: 'left' });
+                  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
@@ -1350,106 +1548,10 @@ export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise
   }
 };
 
-// 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 day of week from date string
+function getDayOfWeek(dateString: string): number {
+  const date = new Date(dateString);
+  return date.getDay() === 0 ? 7 : date.getDay();
 }
 
 // Helper function to get German day names