Compare commits

...

11 Commits

10 changed files with 1475 additions and 571 deletions

View File

@@ -4,7 +4,9 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "npm run build && npx tsx src/server.ts", "dev": "npm run build && npx tsx src/server.ts",
"dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false npx tsx src/server.ts", "dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false SEED_TEST_DATA=true npx tsx src/server.ts",
"seed:test-data": "npx tsx src/scripts/seedTestData.ts",
"dev:all": "npm run dev:single",
"build": "tsc", "build": "tsc",
"start": "node dist/server.js", "start": "node dist/server.js",
"prestart": "npm run build", "prestart": "npm run build",
@@ -27,8 +29,7 @@
"helmet": "8.1.0", "helmet": "8.1.0",
"express-validator": "7.3.0", "express-validator": "7.3.0",
"exceljs": "4.4.0", "exceljs": "4.4.0",
"pdfkit": "0.12.3", "playwright-chromium": "^1.37.0"
"@types/pdfkit": "^0.12.3"
}, },
"devDependencies": { "devDependencies": {
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",

View File

@@ -9,7 +9,7 @@ import {
import { AuthRequest } from '../middleware/auth.js'; import { AuthRequest } from '../middleware/auth.js';
import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js'; import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js';
import ExcelJS from 'exceljs'; import ExcelJS from 'exceljs';
import PDFDocument from 'pdfkit'; import { chromium } from 'playwright-chromium';
async function getPlanWithDetails(planId: string) { async function getPlanWithDetails(planId: string) {
const plan = await db.get<any>(` const plan = await db.get<any>(`
@@ -989,6 +989,20 @@ interface ExportTimetableData {
allTimeSlots: ExportTimeSlot[]; allTimeSlots: ExportTimeSlot[];
} }
function sortTimeSlotsByStartTime(timeSlots: any[]): any[] {
const timeToMinutes = (timeStr: string) => {
if (!timeStr) return 0;
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
};
return [...timeSlots].sort((a, b) => {
const minutesA = timeToMinutes(a.startTime);
const minutesB = timeToMinutes(b.startTime);
return minutesA - minutesB; // Ascending order (earliest first)
});
}
function getTimetableDataForExport(plan: any): ExportTimetableData { function getTimetableDataForExport(plan: any): ExportTimetableData {
const weekdays = [ const weekdays = [
{ id: 1, name: 'Montag' }, { id: 1, name: 'Montag' },
@@ -1032,9 +1046,16 @@ function getTimetableDataForExport(plan: any): ExportTimetableData {
Object.keys(shiftsByDay).forEach(day => { Object.keys(shiftsByDay).forEach(day => {
const dayNum = parseInt(day); const dayNum = parseInt(day);
shiftsByDay[dayNum].sort((a: any, b: any) => { shiftsByDay[dayNum].sort((a: any, b: any) => {
const timeA = a.startTime || ''; // Use numeric comparison for proper time sorting
const timeB = b.startTime || ''; const timeToMinutes = (timeStr: string) => {
return timeA.localeCompare(timeB); if (!timeStr) return 0;
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
};
const minutesA = timeToMinutes(a.startTime);
const minutesB = timeToMinutes(b.startTime);
return minutesA - minutesB;
}); });
}); });
@@ -1073,10 +1094,8 @@ function getTimetableDataForExport(plan: any): ExportTimetableData {
}); });
}); });
// Convert to array and sort by start time // Convert to array and sort by start time using numeric comparison
const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a: ExportTimeSlot, b: ExportTimeSlot) => { const allTimeSlots = sortTimeSlotsByStartTime(Array.from(allTimeSlotsMap.values()));
return (a.startTime || '').localeCompare(b.startTime || '');
});
return { days, allTimeSlots }; return { days, allTimeSlots };
} }
@@ -1103,7 +1122,7 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
workbook.created = new Date(); workbook.created = new Date();
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* 🧾 1. Summary Sheet */ /* 📋 1. Summary Sheet */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
const summarySheet = workbook.addWorksheet('Planübersicht'); const summarySheet = workbook.addWorksheet('Planübersicht');
summarySheet.columns = [ summarySheet.columns = [
@@ -1135,6 +1154,19 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
const timetableData = getTimetableDataForExport(plan); const timetableData = getTimetableDataForExport(plan);
const { days, allTimeSlots } = timetableData; 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 // Header
const headerRow = ['Schicht (Zeit)', ...days.map(d => d.name)]; const headerRow = ['Schicht (Zeit)', ...days.map(d => d.name)];
const header = timetableSheet.addRow(headerRow); const header = timetableSheet.addRow(headerRow);
@@ -1150,14 +1182,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) { 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) { for (const day of days) {
const shift = timeSlot.shiftsByDay[day.id]; const shift = timeSlot.shiftsByDay[day.id];
if (!shift) { if (!shift) {
rowData.push('Keine Schicht'); rowData.push(empIndex === 0 ? 'Keine Schicht' : '');
continue; continue;
} }
@@ -1166,20 +1222,35 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
); );
if (scheduledShift && scheduledShift.assignedEmployees?.length > 0) { 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); 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 { } 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 (s: any) => s.dayOfWeek === day.id && s.timeSlotId === timeSlot.id
) || []; ) || [];
const totalRequired = shiftsForSlot.reduce( const totalRequired = shiftsForSlot.reduce(
@@ -1187,6 +1258,9 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
0 0
); );
rowData.push(totalRequired === 0 ? '-' : `0/${totalRequired}`); rowData.push(totalRequired === 0 ? '-' : `0/${totalRequired}`);
} else {
rowData.push('');
}
} }
} }
@@ -1199,38 +1273,42 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
bottom: { style: 'thin' }, bottom: { style: 'thin' },
right: { 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') { if (cell.value === 'Keine Schicht') {
cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFEDEDED' } }; cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFEDEDED' } };
cell.font = { color: { argb: 'FF888888' }, italic: true }; 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) { if (colNumber === 1) {
cell.alignment = { horizontal: 'left', vertical: 'middle', wrapText: true }; 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 // Add legend row at bottom
const legendRow = timetableSheet.addRow([ const legendRow = timetableSheet.addRow([
@@ -1271,7 +1349,7 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
name: `${e.firstname} ${e.lastname}`, name: `${e.firstname} ${e.lastname}`,
email: e.email, email: e.email,
role: e.roles?.join(', ') || 'Benutzer', role: e.roles?.join(', ') || 'Benutzer',
type: e.employee_type || 'Unbekannt', type: e.employeeType || 'Unbekannt',
contract: e.contractType || 'Nicht angegeben', contract: e.contractType || 'Nicht angegeben',
trainee: e.isTrainee ? 'Ja' : 'Nein' trainee: e.isTrainee ? 'Ja' : 'Nein'
}) })
@@ -1298,12 +1376,11 @@ export const exportShiftPlanToExcel = async (req: Request, res: Response): Promi
}; };
export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise<void> => { export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise<void> => {
let browser;
try { try {
const { id } = req.params; const { id } = req.params;
console.log('📄 Starting PDF export for plan:', id); console.log('📄 Starting PDF export for plan:', id);
// Check if plan exists
const plan = await getShiftPlanById(id); const plan = await getShiftPlanById(id);
if (!plan) { if (!plan) {
res.status(404).json({ error: 'Shift plan not found' }); res.status(404).json({ error: 'Shift plan not found' });
@@ -1315,235 +1392,419 @@ export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise
return; 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 timetableData = getTimetableDataForExport(plan);
const { days, allTimeSlots } = timetableData; 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]; const shift = timeSlot.shiftsByDay[day.id];
doc.rect(xPos, currentY, dayColWidth, 40).fillAndStroke(rowBgColor, '#dee2e6');
if (!shift) { 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); console.log('✅ PDF export completed for plan:', id);
} catch (error) { } catch (error) {
console.error('❌ Error exporting to PDF:', error); console.error('❌ Error exporting to PDF:', error);
if (browser) {
await browser.close();
}
res.status(500).json({ error: 'Internal server error during PDF export' }); res.status(500).json({ error: 'Internal server error during PDF export' });
} }
}; };
@@ -1553,9 +1814,3 @@ function getDayOfWeek(dateString: string): number {
const date = new Date(dateString); const date = new Date(dateString);
return date.getDay() === 0 ? 7 : date.getDay(); 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];
}

View File

@@ -41,6 +41,28 @@ const getClientIP = (req: Request): string => {
return remoteAddress; return remoteAddress;
}; };
// Helper to check if an IP is a loopback address (IPv4 or IPv6)
const isLoopbackAddress = (ip: string): boolean => {
// IPv4 loopback: 127.0.0.0/8
if (ip.startsWith('127.') || ip === 'localhost') {
return true;
}
// IPv6 loopback: ::1
// Also handle IPv4-mapped IPv6 addresses like ::ffff:127.0.0.1
if (ip === '::1' || ip === '::ffff:127.0.0.1') {
return true;
}
// Handle full IPv6 loopback notation
if (ip.toLowerCase().startsWith('0000:0000:0000:0000:0000:0000:0000:0001') ||
ip.toLowerCase() === '0:0:0:0:0:0:0:1') {
return true;
}
return false;
};
// Helper to check if request should be limited // Helper to check if request should be limited
const shouldSkipLimit = (req: Request): boolean => { const shouldSkipLimit = (req: Request): boolean => {
const skipPaths = [ const skipPaths = [
@@ -54,9 +76,16 @@ const shouldSkipLimit = (req: Request): boolean => {
return true; return true;
} }
const clientIP = getClientIP(req);
// Skip for loopback addresses (local development)
if (isLoopbackAddress(clientIP)) {
console.log(`✅ Loopback address skipped: ${clientIP}`);
return true;
}
// Skip for whitelisted IPs from environment // Skip for whitelisted IPs from environment
const whitelist = process.env.RATE_LIMIT_WHITELIST?.split(',') || []; const whitelist = process.env.RATE_LIMIT_WHITELIST?.split(',') || [];
const clientIP = getClientIP(req);
if (whitelist.includes(clientIP)) { if (whitelist.includes(clientIP)) {
console.log(`✅ IP whitelisted: ${clientIP}`); console.log(`✅ IP whitelisted: ${clientIP}`);
return true; return true;

View File

@@ -0,0 +1,347 @@
// backend/src/scripts/seedTestData.ts
import { db } from '../services/databaseService.js';
import bcrypt from 'bcryptjs';
import { v4 as uuidv4 } from 'uuid';
import fs from 'fs';
import path from 'path';
import { fileURLToPath } from 'url';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
interface TestData {
plan_name: string;
description: string;
period: string;
status: string;
created_by: string;
shifts: {
[day: string]: {
[shiftType: string]: {
time: string;
assignments: { [employeeName: string]: number };
};
};
};
employee_info: {
contract_sizes: { [name: string]: string };
employee_types: { [name: string]: string };
roles: { [name: string]: string };
trainees: { [name: string]: boolean };
can_work_alone: { [name: string]: boolean };
};
availability_scale: {
[key: string]: string;
};
}
function generateEmail(firstname: string, lastname: string): string {
const convertUmlauts = (str: string): string => {
return str
.toLowerCase()
.replace(/ü/g, 'ue')
.replace(/ö/g, 'oe')
.replace(/ä/g, 'ae')
.replace(/ß/g, 'ss');
};
const cleanFirstname = convertUmlauts(firstname).replace(/[^a-z0-9]/g, '');
const cleanLastname = convertUmlauts(lastname).replace(/[^a-z0-9]/g, '');
return `${cleanFirstname}.${cleanLastname}@sp.de`;
}
function mapContractType(germanType: string): 'small' | 'large' | 'flexible' {
switch (germanType) {
case 'groß': return 'large';
case 'klein': return 'small';
case 'flexible': return 'flexible';
default: return 'small';
}
}
function mapDayToNumber(day: string): number {
const dayMap: { [key: string]: number } = {
'monday': 1,
'tuesday': 2,
'wednesday': 3,
'thursday': 4,
'friday': 5,
'saturday': 6,
'sunday': 7
};
return dayMap[day.toLowerCase()] || 1;
}
function parseTimeSlot(time: string): { startTime: string; endTime: string } {
const [start, end] = time.split(' - ');
return {
startTime: start.trim(),
endTime: end.trim()
};
}
export async function seedTestData(): Promise<void> {
try {
console.log('🌱 Starting test data seeding...');
// Read test.json file - adjust path to be relative to project root
//const testDataPath = path.resolve(process.cwd(), './test.json');
const testDataPath = path.resolve(__dirname, './test.json');
console.log('🔍 Looking for test.json at:', testDataPath);
if (!fs.existsSync(testDataPath)) {
console.log('❌ test.json file not found at:', testDataPath);
// Try alternative paths
const alternativePaths = [
//path.resolve(__dirname, '../../../test.json'),
//path.resolve(process.cwd(), '../test.json'),
//path.resolve(__dirname, '../../test.json'),
path.resolve(__dirname, './test.json')
];
for (const altPath of alternativePaths) {
console.log('🔍 Trying alternative path:', altPath);
if (fs.existsSync(altPath)) {
console.log('✅ Found test.json at:', altPath);
// Continue with the found path
break;
}
}
return;
}
const testDataRaw = fs.readFileSync(testDataPath, 'utf-8');
const testData: TestData = JSON.parse(testDataRaw);
console.log('📊 Loaded test data:', {
planName: testData.plan_name,
employeeCount: Object.keys(testData.employee_info.contract_sizes).length,
days: Object.keys(testData.shifts).length
});
// Start transaction
await db.run('BEGIN TRANSACTION');
try {
// 1. Create employees
console.log('👥 Creating employees...');
const employeeMap: { [name: string]: string } = {};
const employeeNames = Object.keys(testData.employee_info.contract_sizes);
for (const name of employeeNames) {
const employeeId = uuidv4();
employeeMap[name] = employeeId;
const [firstname, lastname = ''] = name.split(' ');
const email = generateEmail(firstname, lastname || 'Test');
const passwordHash = await bcrypt.hash('ZebraAux123!', 10);
const contractType = mapContractType(testData.employee_info.contract_sizes[name]);
const employeeType = testData.employee_info.employee_types[name];
const role = testData.employee_info.roles[name];
const isTrainee = testData.employee_info.trainees[name];
const canWorkAlone = testData.employee_info.can_work_alone[name];
// Insert employee
await db.run(
`INSERT INTO employees (
id, email, password, firstname, lastname,
employee_type, contract_type, can_work_alone,
is_trainee, is_active
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[
employeeId,
email,
passwordHash,
firstname,
lastname || 'Test',
employeeType,
contractType,
canWorkAlone ? 1 : 0,
isTrainee ? 1 : 0,
1
]
);
// Insert role
await db.run(
`INSERT INTO employee_roles (employee_id, role) VALUES (?, ?)`,
[employeeId, role]
);
console.log(`✅ Created employee: ${name} (${email})`);
}
// 2. Create shift plan
console.log('📅 Creating shift plan...');
const planId = uuidv4();
const [startDate, endDate] = testData.period.split(' bis ');
// Use the first admin employee as creator
const adminEmployee = Object.entries(testData.employee_info.roles)
.find(([_, role]) => role === 'admin');
const createdBy = adminEmployee ? employeeMap[adminEmployee[0]] : employeeMap[employeeNames[0]];
await db.run(
`INSERT INTO shift_plans (
id, name, description, start_date, end_date,
is_template, status, created_by
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
[
planId,
testData.plan_name,
testData.description,
startDate.trim(),
endDate.trim(),
0, // is_template = false
'published',
createdBy
]
);
// 3. Create time slots
console.log('⏰ Creating time slots...');
const timeSlotMap: { [key: string]: string } = {};
// Extract unique time slots from shifts
const uniqueTimeSlots = new Set<string>();
Object.values(testData.shifts).forEach(dayShifts => {
Object.values(dayShifts).forEach(shift => {
uniqueTimeSlots.add(shift.time);
});
});
let timeSlotIndex = 0;
for (const time of uniqueTimeSlots) {
const timeSlotId = uuidv4();
const { startTime, endTime } = parseTimeSlot(time);
const name = timeSlotIndex === 0 ? 'Vormittag' : 'Nachmittag';
await db.run(
`INSERT INTO time_slots (id, plan_id, name, start_time, end_time, description)
VALUES (?, ?, ?, ?, ?, ?)`,
[timeSlotId, planId, name, startTime, endTime, `Time slot: ${time}`]
);
timeSlotMap[time] = timeSlotId;
timeSlotIndex++;
}
// 4. Create shifts
console.log('🔄 Creating shifts...');
const shiftMap: { [dayTime: string]: string } = {};
for (const [dayName, dayShifts] of Object.entries(testData.shifts)) {
const dayOfWeek = mapDayToNumber(dayName);
for (const [shiftType, shiftData] of Object.entries(dayShifts)) {
const shiftId = uuidv4();
const timeSlotId = timeSlotMap[shiftData.time];
await db.run(
`INSERT INTO shifts (id, plan_id, time_slot_id, day_of_week, required_employees, color)
VALUES (?, ?, ?, ?, ?, ?)`,
[shiftId, planId, timeSlotId, dayOfWeek, 2, '#3498db']
);
shiftMap[`${dayName}_${shiftType}`] = shiftId;
}
}
// 5. Generate scheduled shifts for one week (for template demonstration)
console.log('📋 Generating scheduled shifts...');
const start = new Date(startDate.trim());
for (let dayOffset = 0; dayOffset < 7; dayOffset++) {
const currentDate = new Date(start);
currentDate.setDate(start.getDate() + dayOffset);
const dayOfWeek = currentDate.getDay() === 0 ? 7 : currentDate.getDay();
const dayName = Object.keys(testData.shifts).find(day =>
mapDayToNumber(day) === dayOfWeek
);
if (dayName && testData.shifts[dayName]) {
for (const [shiftType, shiftData] of Object.entries(testData.shifts[dayName])) {
const scheduledShiftId = uuidv4();
const timeSlotId = timeSlotMap[shiftData.time];
await db.run(
`INSERT INTO scheduled_shifts (id, plan_id, date, time_slot_id, required_employees, assigned_employees)
VALUES (?, ?, ?, ?, ?, ?)`,
[
scheduledShiftId,
planId,
currentDate.toISOString().split('T')[0],
timeSlotId,
2,
JSON.stringify([])
]
);
}
}
}
// 6. Create employee availabilities
console.log('📝 Creating employee availabilities...');
for (const [dayName, dayShifts] of Object.entries(testData.shifts)) {
const dayOfWeek = mapDayToNumber(dayName);
for (const [shiftType, shiftData] of Object.entries(dayShifts)) {
const shiftId = shiftMap[`${dayName}_${shiftType}`];
for (const [employeeName, preferenceLevel] of Object.entries(shiftData.assignments)) {
const employeeId = employeeMap[employeeName];
if (employeeId) {
const availabilityId = uuidv4();
await db.run(
`INSERT INTO employee_availability (id, employee_id, plan_id, shift_id, preference_level)
VALUES (?, ?, ?, ?, ?)`,
[availabilityId, employeeId, planId, shiftId, preferenceLevel]
);
}
}
}
}
await db.run('COMMIT');
console.log('🎉 Test data seeded successfully!');
console.log('📊 Summary:');
console.log(` - Employees: ${employeeNames.length}`);
console.log(` - Shift Plan: ${testData.plan_name}`);
console.log(` - Time Slots: ${Object.keys(timeSlotMap).length}`);
console.log(` - Shifts: ${Object.keys(shiftMap).length}`);
console.log(` - Period: ${testData.period}`);
} catch (error) {
await db.run('ROLLBACK');
console.error('❌ Error during test data seeding:', error);
throw error;
}
} catch (error) {
console.error('❌ Failed to seed test data:', error);
throw error;
}
}
// Run if called directly
if (import.meta.url === `file://${process.argv[1]}`) {
seedTestData()
.then(() => {
console.log('✅ Seed script completed');
process.exit(0);
})
.catch((error) => {
console.error('❌ Seed script failed:', error);
process.exit(1);
});
}

View File

@@ -0,0 +1,235 @@
{
"plan_name": "test",
"description": "Standard Vorlage für ZEBRA: Mo-Do Vormittag+Nachmittag, Fr nur Vormittag",
"period": "2025-10-01 bis 2026-02-01",
"status": "published",
"created_by": "Max Mustermann",
"shifts": {
"monday": {
"early": {
"time": "8:00 - 12:00",
"assignments": {
"Jerome": 2,
"Patrick": 2,
"Andrey": 1,
"Fabian": 2,
"Lu": 3,
"Basti": 1,
"Kilian": 3,
"Gerald": 1,
"Uliana": 2,
"Nico": 1,
"Linuuuus": 1
}
},
"late": {
"time": "11:30 - 15:30",
"assignments": {
"Jerome": 1,
"Patrick": 3,
"Andrey": 1,
"Fabian": 3,
"Lu": 1,
"Basti": 1,
"Kilian": 3,
"Gerald": 3,
"Uliana": 3,
"Nico": 1,
"Linuuuus": 3
}
}
},
"tuesday": {
"early": {
"time": "8:00 - 12:00",
"assignments": {
"Jerome": 2,
"Patrick": 2,
"Andrey": 1,
"Fabian": 2,
"Lu": 3,
"Basti": 1,
"Kilian": 3,
"Gerald": 2,
"Uliana": 1,
"Nico": 1,
"Linuuuus": 2
}
},
"late": {
"time": "11:30 - 15:30",
"assignments": {
"Jerome": 1,
"Patrick": 3,
"Andrey": 1,
"Fabian": 3,
"Lu": 3,
"Basti": 1,
"Kilian": 3,
"Gerald": 2,
"Uliana": 2,
"Nico": 3,
"Linuuuus": 2
}
}
},
"wednesday": {
"early": {
"time": "8:00 - 12:00",
"assignments": {
"Jerome": 2,
"Patrick": 2,
"Andrey": 1,
"Fabian": 2,
"Lu": 3,
"Basti": 3,
"Kilian": 3,
"Gerald": 3,
"Uliana": 2,
"Nico": 3,
"Linuuuus": 2
}
},
"late": {
"time": "11:30 - 15:30",
"assignments": {
"Jerome": 2,
"Patrick": 3,
"Andrey": 1,
"Fabian": 3,
"Lu": 3,
"Basti": 3,
"Kilian": 3,
"Gerald": 3,
"Uliana": 3,
"Nico": 1,
"Linuuuus": 3
}
}
},
"thursday": {
"early": {
"time": "8:00 - 12:00",
"assignments": {
"Jerome": 3,
"Patrick": 3,
"Andrey": 1,
"Fabian": 3,
"Lu": 3,
"Basti": 3,
"Kilian": 3,
"Gerald": 3,
"Uliana": 3,
"Nico": 2,
"Linuuuus": 2
}
},
"late": {
"time": "11:30 - 15:30",
"assignments": {
"Jerome": 1,
"Patrick": 1,
"Andrey": 1,
"Fabian": 1,
"Lu": 3,
"Basti": 3,
"Kilian": 1,
"Gerald": 2,
"Uliana": 3,
"Nico": 3,
"Linuuuus": 3
}
}
},
"friday": {
"early": {
"time": "8:00 - 12:00",
"assignments": {
"Jerome": 1,
"Patrick": 1,
"Andrey": 1,
"Fabian": 1,
"Lu": 1,
"Basti": 3,
"Kilian": 1,
"Gerald": 1,
"Uliana": 1,
"Nico": 3,
"Linuuuus": 3
}
}
}
},
"employee_info": {
"contract_sizes": {
"Jerome": "groß",
"Patrick": "groß",
"Andrey": "groß",
"Fabian": "klein",
"Lu": "klein",
"Basti": "flexible",
"Kilian": "klein",
"Gerald": "groß",
"Uliana": "groß",
"Nico": "klein",
"Linuuuus": "klein"
},
"employee_types": {
"Jerome": "personell",
"Patrick": "personell",
"Andrey": "personell",
"Fabian": "personell",
"Lu": "personell",
"Basti": "manager",
"Kilian": "personell",
"Gerald": "personell",
"Uliana": "personell",
"Nico": "personell",
"Linuuuus": "personell"
},
"roles": {
"Jerome": "user",
"Patrick": "maintenance",
"Andrey": "user",
"Fabian": "user",
"Lu": "user",
"Basti": "admin",
"Kilian": "user",
"Gerald": "user",
"Uliana": "user",
"Nico": "user",
"Linuuuus": "user"
},
"trainees": {
"Jerome": false,
"Patrick": false,
"Andrey": false,
"Fabian": false,
"Lu": false,
"Basti": false,
"Kilian": true,
"Gerald": true,
"Uliana": true,
"Nico": true,
"Linuuuus": false
},
"can_work_alone": {
"Jerome": true,
"Patrick": true,
"Andrey": false,
"Fabian": true,
"Lu": false,
"Basti": false,
"Kilian": false,
"Gerald": false,
"Uliana": false,
"Nico": false,
"Linuuuus": true
}
},
"availability_scale": {
"1": "available",
"2": "limited",
"3": "unavailable"
}
}

View File

@@ -27,6 +27,15 @@ const __dirname = path.dirname(__filename);
const app = express(); const app = express();
const PORT = 3002; const PORT = 3002;
const isDevelopment = process.env.NODE_ENV === 'development'; const isDevelopment = process.env.NODE_ENV === 'development';
if (isDevelopment) {
console.log('🔧 Running in Development mode');
} else if (process.env.NODE_ENV === 'production') {
console.log('🚀 Running in Production mode');
} else {
console.log('⚠️ NODE_ENV not set, defaulting to Development mode');
console.error('❌ Please set NODE_ENV to "production" or "development" for proper behavior.');
process.exit(1);
}
app.use(authIpCheck); app.use(authIpCheck);
@@ -311,6 +320,16 @@ const initializeApp = async () => {
const { applyMigration } = await import('./scripts/applyMigration.js'); const { applyMigration } = await import('./scripts/applyMigration.js');
await applyMigration(); await applyMigration();
if (isDevelopment && process.env.SEED_TEST_DATA === 'true') {
try {
const { seedTestData } = await import('./scripts/seedTestData.js');
await seedTestData();
console.log('✅ Test data seeded successfully');
} catch (error) {
console.log('⚠️ Test data seeding skipped or failed:', error);
}
}
app.listen(PORT, () => { app.listen(PORT, () => {
console.log('🎉 APPLICATION STARTED SUCCESSFULLY!'); console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
console.log(`📍 Port: ${PORT}`); console.log(`📍 Port: ${PORT}`);

View File

@@ -317,7 +317,17 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
// Convert to array and sort by start time // Convert to array and sort by start time
const sortedTimeSlots = Array.from(allTimeSlots.values()).sort((a, b) => { const sortedTimeSlots = Array.from(allTimeSlots.values()).sort((a, b) => {
return (a.startTime || '').localeCompare(b.startTime || ''); // Convert time strings to minutes for proper numeric comparison
const timeToMinutes = (timeStr: string) => {
if (!timeStr) return 0;
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
};
const minutesA = timeToMinutes(a.startTime);
const minutesB = timeToMinutes(b.startTime);
return minutesA - minutesB; // Ascending order (earliest first)
}); });
return ( return (

View File

@@ -1,5 +1,5 @@
// frontend/src/pages/ShiftPlans/ShiftPlanView.tsx // 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 { useParams, useNavigate } from 'react-router-dom';
import { useAuth } from '../../contexts/AuthContext'; import { useAuth } from '../../contexts/AuthContext';
import { shiftPlanService } from '../../services/shiftPlanService'; import { shiftPlanService } from '../../services/shiftPlanService';
@@ -56,6 +56,9 @@ const ShiftPlanView: React.FC = () => {
const [showAssignmentPreview, setShowAssignmentPreview] = useState(false); const [showAssignmentPreview, setShowAssignmentPreview] = useState(false);
const [recreating, setRecreating] = useState(false); const [recreating, setRecreating] = useState(false);
const [exporting, setExporting] = 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(() => { useEffect(() => {
loadShiftPlanData(); loadShiftPlanData();
@@ -121,6 +124,12 @@ const ShiftPlanView: React.FC = () => {
} }
}, [availabilities]); }, [availabilities]);
useEffect(() => {
if (dropdownRef.current) {
setDropdownWidth(dropdownRef.current.offsetWidth / 40); // Adjust divisor for desired slide distance
}
}, [exportType]);
// Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER // Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER
const getTimetableData = () => { const getTimetableData = () => {
if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) { if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) {
@@ -191,7 +200,17 @@ const ShiftPlanView: React.FC = () => {
// Convert to array and sort by start time - SAME LOGIC AS AVAILABILITYMANAGER // Convert to array and sort by start time - SAME LOGIC AS AVAILABILITYMANAGER
const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a, b) => { const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a, b) => {
return (a.startTime || '').localeCompare(b.startTime || ''); // Convert time strings to minutes for proper numeric comparison
const timeToMinutes = (timeStr: string) => {
if (!timeStr) return 0;
const [hours, minutes] = timeStr.split(':').map(Number);
return hours * 60 + minutes;
};
const minutesA = timeToMinutes(a.startTime);
const minutesB = timeToMinutes(b.startTime);
return minutesA - minutesB; // Ascending order (earliest first)
}); });
return { days, shiftsByDay, allTimeSlots }; return { days, shiftsByDay, allTimeSlots };
@@ -242,60 +261,33 @@ const ShiftPlanView: React.FC = () => {
}; };
}; };
const handleExportExcel = async () => { const handleExport = async () => {
if (!shiftPlan) return; if (!shiftPlan || !exportType) return;
try { try {
setExporting(true); 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`); 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`); saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
}
showNotification({ showNotification({
type: 'success', type: 'success',
title: 'Export erfolgreich', title: 'Export erfolgreich',
message: 'Der Schichtplan wurde als PDF exportiert.' message: `Der Schichtplan wurde als ${exportType === 'excel' ? 'Excel' : 'PDF'} exportiert.`
}); });
} catch (error) { } catch (error) {
console.error('Error exporting to PDF:', error); console.error(`Error exporting to ${exportType}:`, error);
showNotification({ showNotification({
type: 'error', type: 'error',
title: 'Export fehlgeschlagen', 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 { } finally {
setExporting(false); setExporting(false);
@@ -932,7 +924,7 @@ const ShiftPlanView: React.FC = () => {
if (employee.isTrainee) { if (employee.isTrainee) {
backgroundColor = '#cda8f0'; // Trainee backgroundColor = '#cda8f0'; // Trainee
} else if (employee.roles?.includes('manager')) { } else if (employee.employeeType === 'manager') {
backgroundColor = '#CC0000'; // Manager backgroundColor = '#CC0000'; // Manager
} }
@@ -1125,48 +1117,6 @@ const ShiftPlanView: React.FC = () => {
</div> </div>
</div> </div>
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}> <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 */} {/* "Zuweisungen neu berechnen" button */}
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && ( {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<button <button
@@ -1492,6 +1442,64 @@ const ShiftPlanView: React.FC = () => {
{renderTimetable()} {renderTimetable()}
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<div style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
marginTop: '20px',
gap: '10px'
}}>
{/* Export Dropdown Container */}
<div
ref={dropdownRef}
style={{
transform: exportType ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
transition: 'transform 0.3s ease-in-out',
position: 'relative'
}}
>
<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 - erscheint nur wenn eine Option ausgewählt ist */}
{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',
opacity: exporting ? 0.7 : 1,
transition: 'opacity 0.2s ease'
}}
>
{exporting ? '🔄 Exportiert...' : 'EXPORT'}
</button>
)}
</div>
)}
{/* Summary */} {/* Summary */}
{days.length > 0 && ( {days.length > 0 && (
<div style={{ <div style={{

View File

@@ -12,7 +12,7 @@
"build:all": "npm run build --workspace=backend && npm run build --workspace=frontend", "build:all": "npm run build --workspace=backend && npm run build --workspace=frontend",
"dev": "concurrently \"npm run dev:backend\" \"npm run dev:frontend\"", "dev": "concurrently \"npm run dev:backend\" \"npm run dev:frontend\"",
"dev:frontend": "cd frontend && npm run dev", "dev:frontend": "cd frontend && npm run dev",
"dev:backend": "cd backend && npm run dev:single" "dev:backend": "cd backend && npm run dev:all"
}, },
"devDependencies": { "devDependencies": {
"typescript": "^5.3.3", "typescript": "^5.3.3",