mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 06:55:45 +01:00
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 822b170920 | |||
| c6dfa5b4c6 | |||
| d0be1b4a61 | |||
| b337fd0e0a | |||
| badccb4f55 | |||
| 9eb9afce1e | |||
| 17d68c2426 | |||
| cff2374f41 | |||
| 3a787875e6 | |||
| 0b46919e46 | |||
| 65cb3e72ba | |||
| dab5164704 | |||
| 7c63bee1b3 | |||
| 4c275993e6 | |||
| 5c925e3b54 | |||
| 11b6ee7672 | |||
| 19357d12c1 | |||
| 8ccd506b7d | |||
| e09979aa77 | |||
| 0eda1ac125 | |||
| 6aa9511fbe | |||
| ab24f5cf35 | |||
| 2e81ed48c4 | |||
| da2b3b0126 | |||
| 7a87c49703 | |||
| 52f559199d |
@@ -1,27 +1,29 @@
|
|||||||
# === SCHICHTPLANER DOCKER COMPOSE ENVIRONMENT VARIABLES ===
|
# .env.template
|
||||||
# Diese Datei wird von docker-compose automatisch geladen
|
# ============================================
|
||||||
|
# DOCKER COMPOSE ENVIRONMENT TEMPLATE
|
||||||
|
# Copy this file to .env and adjust values
|
||||||
|
# ============================================
|
||||||
|
|
||||||
# Security
|
# Application settings
|
||||||
JWT_SECRET=${JWT_SECRET:-your-secret-key-please-change}
|
NODE_ENV=production
|
||||||
NODE_ENV=${NODE_ENV:-production}
|
JWT_SECRET=your-secret-key-please-change
|
||||||
|
HOSTNAME=localhost
|
||||||
|
|
||||||
|
# Security & Network
|
||||||
|
TRUST_PROXY_ENABLED=false
|
||||||
|
TRUSTED_PROXY_IPS=127.0.0.1,::1
|
||||||
|
FORCE_HTTPS=false
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
DB_PATH=${DB_PATH:-/app/data/database.db}
|
DATABASE_PATH=/app/data/schichtplaner.db
|
||||||
|
|
||||||
# Server
|
# Optional features
|
||||||
PORT=${PORT:-3002}
|
ENABLE_PRO=false
|
||||||
|
DEBUG=false
|
||||||
|
|
||||||
# App Configuration
|
# Port configuration
|
||||||
APP_TITLE="Shift Planning App"
|
APP_PORT=3002
|
||||||
ENABLE_PRO=${ENABLE_PRO:-false}
|
|
||||||
|
|
||||||
# Trust Proxy Configuration
|
# ============================================
|
||||||
TRUST_PROXY_ENABLED=false
|
# END OF TEMPLATE
|
||||||
TRUSTED_PROXY_IPS= # Your load balancer/reverse proxy IPs
|
# ============================================
|
||||||
TRUSTED_PROXY_HEADER=x-forwarded-for
|
|
||||||
|
|
||||||
# Rate Limiting Configuration
|
|
||||||
RATE_LIMIT_WINDOW_MS=900000
|
|
||||||
RATE_LIMIT_MAX_REQUESTS=100
|
|
||||||
RATE_LIMIT_SKIP_PATHS=/api/health,/api/status
|
|
||||||
RATE_LIMIT_WHITELIST=127.0.0.1,::1
|
|
||||||
6
.github/workflows/docker.yml
vendored
6
.github/workflows/docker.yml
vendored
@@ -83,9 +83,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: '20'
|
||||||
|
|
||||||
|
- name: Create package-lock.json
|
||||||
|
working-directory: .
|
||||||
|
run: npm i --package-lock-only
|
||||||
|
|
||||||
- name: Install backend dependencies
|
- name: Install backend dependencies
|
||||||
working-directory: ./backend
|
working-directory: ./backend
|
||||||
run: npm install
|
run: npm ci
|
||||||
|
|
||||||
- name: Run TypeScript check
|
- name: Run TypeScript check
|
||||||
working-directory: ./backend
|
working-directory: ./backend
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -57,6 +57,7 @@ yarn-error.log*
|
|||||||
# Build outputs
|
# Build outputs
|
||||||
dist/
|
dist/
|
||||||
build/
|
build/
|
||||||
|
package-lock.json
|
||||||
|
|
||||||
# Environment variables
|
# Environment variables
|
||||||
.env
|
.env
|
||||||
|
|||||||
33
Dockerfile
33
Dockerfile
@@ -1,22 +1,17 @@
|
|||||||
# Single stage build for workspaces
|
# Single stage build for workspaces
|
||||||
FROM node:20-bullseye AS builder
|
FROM node:20-bookworm AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install Python + OR-Tools
|
|
||||||
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
|
|
||||||
&& pip install --no-cache-dir ortools
|
|
||||||
|
|
||||||
# Create symlink so python3 is callable as python
|
|
||||||
RUN ln -sf /usr/bin/python3 /usr/bin/python
|
|
||||||
|
|
||||||
# Copy root package files first
|
# Copy root package files first
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
COPY tsconfig.base.json ./
|
COPY tsconfig.base.json ./
|
||||||
COPY ecosystem.config.cjs ./
|
COPY ecosystem.config.cjs ./
|
||||||
|
|
||||||
# Install root dependencies
|
# Install root dependencies
|
||||||
RUN npm install --only=production
|
#RUN npm install --only=production
|
||||||
|
RUN npm i --package-lock-only
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
# Copy workspace files
|
# Copy workspace files
|
||||||
COPY backend/ ./backend/
|
COPY backend/ ./backend/
|
||||||
@@ -30,10 +25,7 @@ RUN npm install --workspace=frontend
|
|||||||
RUN npm run build --only=production --workspace=backend
|
RUN npm run build --only=production --workspace=backend
|
||||||
|
|
||||||
# Build frontend
|
# Build frontend
|
||||||
RUN npm run build --workspace=frontend
|
RUN npm run build --only=production --workspace=frontend
|
||||||
|
|
||||||
# Verify Python and OR-Tools installation
|
|
||||||
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
|
||||||
|
|
||||||
# Production stage
|
# Production stage
|
||||||
FROM node:20-bookworm
|
FROM node:20-bookworm
|
||||||
@@ -57,7 +49,20 @@ COPY --from=builder /app/frontend/dist/ ./frontend-build/
|
|||||||
COPY --from=builder /app/ecosystem.config.cjs ./
|
COPY --from=builder /app/ecosystem.config.cjs ./
|
||||||
|
|
||||||
COPY --from=builder /app/backend/src/database/ ./dist/database/
|
COPY --from=builder /app/backend/src/database/ ./dist/database/
|
||||||
COPY --from=builder /app/backend/src/database/ ./database/
|
# should be obsolete with the line above
|
||||||
|
#COPY --from=builder /app/backend/src/database/ ./database/
|
||||||
|
|
||||||
|
COPY --from=builder /app/backend/src/python-scripts/ ./python-scripts/
|
||||||
|
|
||||||
|
# Install Python + OR-Tools
|
||||||
|
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
|
||||||
|
&& pip install --no-cache-dir --break-system-packages ortools
|
||||||
|
|
||||||
|
# Create symlink so python3 is callable as python
|
||||||
|
RUN ln -sf /usr/bin/python3 /usr/bin/python
|
||||||
|
|
||||||
|
# Verify Python and OR-Tools installation
|
||||||
|
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
|
||||||
|
|
||||||
# Copy init script and env template
|
# Copy init script and env template
|
||||||
COPY docker-init.sh /usr/local/bin/
|
COPY docker-init.sh /usr/local/bin/
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
"uuid": "^9.0.0",
|
"uuid": "^9.0.0",
|
||||||
"express-rate-limit": "8.1.0",
|
"express-rate-limit": "8.1.0",
|
||||||
"helmet": "8.1.0",
|
"helmet": "8.1.0",
|
||||||
"express-validator": "7.3.0"
|
"express-validator": "7.3.0",
|
||||||
|
"exceljs": "4.4.0",
|
||||||
|
"playwright": "^1.37.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bcryptjs": "^2.4.2",
|
"@types/bcryptjs": "^2.4.2",
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import {
|
|||||||
} from '../models/ShiftPlan.js';
|
} from '../models/ShiftPlan.js';
|
||||||
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 { chromium } from 'playwright';
|
||||||
|
|
||||||
async function getPlanWithDetails(planId: string) {
|
async function getPlanWithDetails(planId: string) {
|
||||||
const plan = await db.get<any>(`
|
const plan = await db.get<any>(`
|
||||||
@@ -592,6 +594,26 @@ async function getShiftPlanById(planId: string): Promise<any> {
|
|||||||
`, [planId]);
|
`, [planId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Load employees without role column + join with employee_roles
|
||||||
|
const employees = await db.all<any>(`
|
||||||
|
SELECT
|
||||||
|
e.id,
|
||||||
|
e.firstname,
|
||||||
|
e.lastname,
|
||||||
|
e.email,
|
||||||
|
e.employee_type,
|
||||||
|
e.contract_type,
|
||||||
|
e.can_work_alone,
|
||||||
|
e.is_trainee,
|
||||||
|
e.is_active as isActive,
|
||||||
|
GROUP_CONCAT(er.role) as roles
|
||||||
|
FROM employees e
|
||||||
|
LEFT JOIN employee_roles er ON e.id = er.employee_id
|
||||||
|
WHERE e.is_active = 1
|
||||||
|
GROUP BY e.id
|
||||||
|
ORDER BY e.firstname, e.lastname
|
||||||
|
`, []);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...plan,
|
...plan,
|
||||||
isTemplate: plan.is_template === 1,
|
isTemplate: plan.is_template === 1,
|
||||||
@@ -629,6 +651,19 @@ async function getShiftPlanById(planId: string): Promise<any> {
|
|||||||
requiredEmployees: shift.required_employees,
|
requiredEmployees: shift.required_employees,
|
||||||
assignedEmployees: JSON.parse(shift.assigned_employees || '[]'),
|
assignedEmployees: JSON.parse(shift.assigned_employees || '[]'),
|
||||||
timeSlotName: shift.time_slot_name
|
timeSlotName: shift.time_slot_name
|
||||||
|
})),
|
||||||
|
// Include employees with proper role handling
|
||||||
|
employees: employees.map(emp => ({
|
||||||
|
id: emp.id,
|
||||||
|
firstname: emp.firstname,
|
||||||
|
lastname: emp.lastname,
|
||||||
|
email: emp.email,
|
||||||
|
employeeType: emp.employee_type,
|
||||||
|
contractType: emp.contract_type,
|
||||||
|
canWorkAlone: emp.can_work_alone === 1,
|
||||||
|
isTrainee: emp.is_trainee === 1,
|
||||||
|
isActive: emp.isActive === 1,
|
||||||
|
roles: emp.roles ? emp.roles.split(',') : [] // Convert comma-separated roles to array
|
||||||
}))
|
}))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -933,3 +968,831 @@ export const clearAssignments = async (req: Request, res: Response): Promise<voi
|
|||||||
res.status(500).json({ error: 'Internal server error' });
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// 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 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);
|
||||||
|
|
||||||
|
const plan = await getShiftPlanById(id);
|
||||||
|
if (!plan) {
|
||||||
|
res.status(404).json({ error: 'Shift plan not found' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (plan.status !== 'published') {
|
||||||
|
res.status(400).json({ error: 'Can only export published shift plans' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create workbook
|
||||||
|
const workbook = new ExcelJS.Workbook();
|
||||||
|
workbook.creator = 'Schichtplaner System';
|
||||||
|
workbook.created = new Date();
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* 📋 1. Summary Sheet */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
const summarySheet = workbook.addWorksheet('Planübersicht');
|
||||||
|
summarySheet.columns = [
|
||||||
|
{ header: 'Eigenschaft', key: 'property', width: 25 },
|
||||||
|
{ header: 'Wert', key: 'value', width: 35 }
|
||||||
|
];
|
||||||
|
|
||||||
|
summarySheet.addRows([
|
||||||
|
{ property: 'Plan Name', value: plan.name },
|
||||||
|
{ property: 'Beschreibung', value: plan.description || 'Keine' },
|
||||||
|
{ property: 'Zeitraum', value: `${plan.startDate} bis ${plan.endDate}` },
|
||||||
|
{ property: 'Status', value: plan.status },
|
||||||
|
{ property: 'Erstellt von', value: plan.created_by_name || 'Unbekannt' },
|
||||||
|
{ property: 'Erstellt am', value: new Date(plan.createdAt).toLocaleString('de-DE') },
|
||||||
|
{ property: 'Anzahl Schichten', value: plan.scheduledShifts?.length || 0 },
|
||||||
|
{ property: 'Anzahl Mitarbeiter', value: plan.employees?.length || 0 }
|
||||||
|
]);
|
||||||
|
|
||||||
|
// 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 }));
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* 📅 2. Timetable / Schichtplan Sheet */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
const timetableSheet = workbook.addWorksheet('Schichtplan');
|
||||||
|
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);
|
||||||
|
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' },
|
||||||
|
bottom: { style: 'thin' },
|
||||||
|
right: { style: 'thin' }
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// Content rows - each time slot can have multiple employee rows
|
||||||
|
for (const timeSlot of allTimeSlots) {
|
||||||
|
// 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(empIndex === 0 ? '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) {
|
||||||
|
if (empIndex < scheduledShift.assignedEmployees.length) {
|
||||||
|
const empId = scheduledShift.assignedEmployees[empIndex];
|
||||||
|
const emp = plan.employees?.find((e: any) => e.id === empId);
|
||||||
|
|
||||||
|
if (!emp) {
|
||||||
|
rowData.push({ text: 'Unbekannt', color: 'FF888888' });
|
||||||
|
} else if (emp.isTrainee) {
|
||||||
|
rowData.push({
|
||||||
|
text: `${emp.firstname} ${emp.lastname} (T)`,
|
||||||
|
color: 'FFCDA8F0'
|
||||||
|
});
|
||||||
|
} else if (emp.employeeType === 'manager') {
|
||||||
|
rowData.push({
|
||||||
|
text: `${emp.firstname} ${emp.lastname} (M)`,
|
||||||
|
color: 'FFCC0000'
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
rowData.push({
|
||||||
|
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(
|
||||||
|
(sum: number, s: any) => sum + s.requiredEmployees,
|
||||||
|
0
|
||||||
|
);
|
||||||
|
rowData.push(totalRequired === 0 ? '-' : `0/${totalRequired}`);
|
||||||
|
} else {
|
||||||
|
rowData.push('');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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: '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 (colNumber === 1) {
|
||||||
|
cell.alignment = { horizontal: 'left', vertical: 'middle', wrapText: true };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
row.height = 25;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge time slot cells vertically if multiple rows were created
|
||||||
|
if (rowsToCreate > 1) {
|
||||||
|
const currentRow = timetableSheet.lastRow!.number;
|
||||||
|
const startRow = currentRow - rowsToCreate + 1;
|
||||||
|
timetableSheet.mergeCells(startRow, 1, currentRow, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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([
|
||||||
|
'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: 18 },
|
||||||
|
{ header: 'Mitarbeiter Typ', key: 'type', width: 15 },
|
||||||
|
{ header: 'Vertragstyp', key: 'contract', width: 18 },
|
||||||
|
{ header: 'Trainee', key: 'trainee', width: 10 }
|
||||||
|
];
|
||||||
|
|
||||||
|
plan.employees?.forEach((e: any) =>
|
||||||
|
employeeSheet.addRow({
|
||||||
|
name: `${e.firstname} ${e.lastname}`,
|
||||||
|
email: e.email,
|
||||||
|
role: e.roles?.join(', ') || 'Benutzer',
|
||||||
|
type: e.employeeType || 'Unbekannt',
|
||||||
|
contract: e.contractType || 'Nicht angegeben',
|
||||||
|
trainee: e.isTrainee ? 'Ja' : 'Nein'
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
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' };
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* 📤 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="${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' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get timetable data (same as Excel)
|
||||||
|
const timetableData = getTimetableDataForExport(plan);
|
||||||
|
const { days, allTimeSlots } = timetableData;
|
||||||
|
|
||||||
|
// Generate HTML content
|
||||||
|
const html = `
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Schichtplan - ${plan.name}</title>
|
||||||
|
<style>
|
||||||
|
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||||
|
body {
|
||||||
|
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||||
|
font-size: 10pt;
|
||||||
|
line-height: 1.4;
|
||||||
|
color: #2c3e50;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
.header {
|
||||||
|
margin-bottom: 30px;
|
||||||
|
padding-bottom: 20px;
|
||||||
|
border-bottom: 3px solid #2c3e50;
|
||||||
|
}
|
||||||
|
h1 {
|
||||||
|
font-size: 24pt;
|
||||||
|
color: #2c3e50;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
.subtitle {
|
||||||
|
font-size: 11pt;
|
||||||
|
color: #7f8c8d;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
.info-section {
|
||||||
|
background: #f8f9fa;
|
||||||
|
padding: 15px;
|
||||||
|
border-radius: 5px;
|
||||||
|
margin-bottom: 30px;
|
||||||
|
page-break-inside: avoid;
|
||||||
|
}
|
||||||
|
.info-section h2 {
|
||||||
|
font-size: 14pt;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
color: #34495e;
|
||||||
|
border-bottom: 2px solid #34495e;
|
||||||
|
padding-bottom: 5px;
|
||||||
|
}
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Timetable styles */
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Legend */
|
||||||
|
.legend {
|
||||||
|
margin-top: 15px;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Employee section */
|
||||||
|
.employee-section {
|
||||||
|
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];
|
||||||
|
|
||||||
|
if (!shift) {
|
||||||
|
return '<td class="no-shift">Keine Schicht</td>';
|
||||||
|
}
|
||||||
|
|
||||||
|
const scheduledShift = plan.scheduledShifts?.find((s: any) =>
|
||||||
|
getDayOfWeek(s.date) === day.id && s.timeSlotId === timeSlot.id
|
||||||
|
);
|
||||||
|
|
||||||
|
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)';
|
||||||
|
}
|
||||||
|
|
||||||
|
return `<li class="${cssClass}">${emp.firstname} ${emp.lastname}${suffix}</li>`;
|
||||||
|
}).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' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 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();
|
||||||
|
}
|
||||||
@@ -72,8 +72,8 @@ const getRateLimitConfig = () => {
|
|||||||
return {
|
return {
|
||||||
windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || '900000'), // 15 minutes default
|
windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || '900000'), // 15 minutes default
|
||||||
max: isProduction
|
max: isProduction
|
||||||
? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '100') // Stricter in production
|
? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '1000') // Stricter in production
|
||||||
: parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '1000'), // More lenient in development
|
: parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '5000'), // More lenient in development
|
||||||
|
|
||||||
// Development-specific relaxations
|
// Development-specific relaxations
|
||||||
skip: (req: Request) => {
|
skip: (req: Request) => {
|
||||||
@@ -112,7 +112,7 @@ export const apiLimiter = rateLimit({
|
|||||||
// Strict limiter for auth endpoints
|
// Strict limiter for auth endpoints
|
||||||
export const authLimiter = rateLimit({
|
export const authLimiter = rateLimit({
|
||||||
windowMs: 15 * 60 * 1000,
|
windowMs: 15 * 60 * 1000,
|
||||||
max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '5'),
|
max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '100'),
|
||||||
message: {
|
message: {
|
||||||
error: 'Zu viele Login-Versuche, bitte versuchen Sie es später erneut'
|
error: 'Zu viele Login-Versuche, bitte versuchen Sie es später erneut'
|
||||||
},
|
},
|
||||||
@@ -135,7 +135,7 @@ export const authLimiter = rateLimit({
|
|||||||
// Separate limiter for expensive endpoints
|
// Separate limiter for expensive endpoints
|
||||||
export const expensiveEndpointLimiter = rateLimit({
|
export const expensiveEndpointLimiter = rateLimit({
|
||||||
windowMs: 15 * 60 * 1000,
|
windowMs: 15 * 60 * 1000,
|
||||||
max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '10'),
|
max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '100'),
|
||||||
message: {
|
message: {
|
||||||
error: 'Zu viele Anfragen für diese Ressource'
|
error: 'Zu viele Anfragen für diese Ressource'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ import {
|
|||||||
updateShiftPlan,
|
updateShiftPlan,
|
||||||
deleteShiftPlan,
|
deleteShiftPlan,
|
||||||
createFromPreset,
|
createFromPreset,
|
||||||
clearAssignments
|
clearAssignments,
|
||||||
|
exportShiftPlanToExcel,
|
||||||
|
exportShiftPlanToPDF
|
||||||
} from '../controllers/shiftPlanController.js';
|
} from '../controllers/shiftPlanController.js';
|
||||||
import {
|
import {
|
||||||
validateShiftPlan,
|
validateShiftPlan,
|
||||||
@@ -30,4 +32,7 @@ router.put('/:id', validateId, validateShiftPlanUpdate, handleValidationErrors,
|
|||||||
router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShiftPlan);
|
router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShiftPlan);
|
||||||
router.post('/:id/clear-assignments', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), clearAssignments);
|
router.post('/:id/clear-assignments', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), clearAssignments);
|
||||||
|
|
||||||
|
router.get('/:id/export/excel', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToExcel);
|
||||||
|
router.get('/:id/export/pdf', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToPDF);
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
@@ -85,7 +85,7 @@ if (process.env.NODE_ENV === 'production') {
|
|||||||
|
|
||||||
const configureTrustProxy = (): string | string[] | boolean | number => {
|
const configureTrustProxy = (): string | string[] | boolean | number => {
|
||||||
const trustedProxyIps = process.env.TRUSTED_PROXY_IPS;
|
const trustedProxyIps = process.env.TRUSTED_PROXY_IPS;
|
||||||
const trustProxyEnabled = process.env.TRUST_PROXY_ENABLED !== 'false'; // Default true for production
|
const trustProxyEnabled = process.env.TRUST_PROXY_ENABLED !== 'false';
|
||||||
|
|
||||||
// If explicitly disabled
|
// If explicitly disabled
|
||||||
if (!trustProxyEnabled) {
|
if (!trustProxyEnabled) {
|
||||||
@@ -106,25 +106,28 @@ const configureTrustProxy = (): string | string[] | boolean | number => {
|
|||||||
return trustedProxyIps.trim();
|
return trustedProxyIps.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default behavior based on environment
|
// Default behavior for reverse proxy setup
|
||||||
if (process.env.NODE_ENV === 'production') {
|
console.log('🔒 Trust proxy: Using reverse proxy defaults (trust all)');
|
||||||
console.log('🔒 Trust proxy: Using production defaults (private networks)');
|
return true; // Trust all proxies when behind nginx
|
||||||
return [
|
|
||||||
'loopback',
|
|
||||||
'linklocal',
|
|
||||||
'uniquelocal',
|
|
||||||
'10.0.0.0/8',
|
|
||||||
'172.16.0.0/12',
|
|
||||||
'192.168.0.0/16'
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
console.log('🔒 Trust proxy: Development mode (disabled)');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
app.set('trust proxy', configureTrustProxy());
|
app.set('trust proxy', configureTrustProxy());
|
||||||
|
|
||||||
|
app.use((req, res, next) => {
|
||||||
|
const protocol = req.headers['x-forwarded-proto'] || req.protocol;
|
||||||
|
const isHttps = protocol === 'https';
|
||||||
|
|
||||||
|
// Add security warning for HTTP requests
|
||||||
|
if (!isHttps && process.env.NODE_ENV === 'production') {
|
||||||
|
res.setHeader('X-Security-Warning', 'This application is being accessed over HTTP. For secure communication, please use HTTPS.');
|
||||||
|
|
||||||
|
// Log HTTP access in production
|
||||||
|
console.warn(`⚠️ HTTP access detected: ${req.method} ${req.path} from ${req.ip}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
|
||||||
// Security headers
|
// Security headers
|
||||||
app.use(helmet({
|
app.use(helmet({
|
||||||
contentSecurityPolicy: {
|
contentSecurityPolicy: {
|
||||||
@@ -138,9 +141,14 @@ app.use(helmet({
|
|||||||
objectSrc: ["'none'"],
|
objectSrc: ["'none'"],
|
||||||
mediaSrc: ["'self'"],
|
mediaSrc: ["'self'"],
|
||||||
frameSrc: ["'none'"],
|
frameSrc: ["'none'"],
|
||||||
|
upgradeInsecureRequests: process.env.FORCE_HTTPS === 'true' ? [] : null
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
hsts: false,
|
hsts: {
|
||||||
|
maxAge: 31536000,
|
||||||
|
includeSubDomains: true,
|
||||||
|
preload: true
|
||||||
|
}, // Enable HSTS for HTTPS
|
||||||
crossOriginEmbedderPolicy: false
|
crossOriginEmbedderPolicy: false
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -6,17 +6,22 @@ services:
|
|||||||
image: ghcr.io/donpat1to/schichtenplaner:v1.0.0
|
image: ghcr.io/donpat1to/schichtenplaner:v1.0.0
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- JWT_SECRET=${JWT_SECRET:-your-secret-key-please-change}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
ports:
|
- TRUST_PROXY_ENABLED=true
|
||||||
- "3002:3002"
|
- TRUSTED_PROXY_IPS=nginx-proxy,172.0.0.0/8,10.0.0.0/8,192.168.0.0/16
|
||||||
|
- FORCE_HTTPS=${FORCE_HTTPS:-false}
|
||||||
|
networks:
|
||||||
|
- app-network
|
||||||
volumes:
|
volumes:
|
||||||
- app_data:/app/data
|
- app_data:/app/data
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:3002/api/health"]
|
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3002/api/health"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
expose:
|
||||||
|
- "3002"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
app_data:
|
app_data:
|
||||||
@@ -3,17 +3,15 @@ set -e
|
|||||||
|
|
||||||
echo "🚀 Container Initialisierung gestartet..."
|
echo "🚀 Container Initialisierung gestartet..."
|
||||||
|
|
||||||
# Funktion zum Generieren eines sicheren Secrets
|
|
||||||
generate_secret() {
|
generate_secret() {
|
||||||
length=$1
|
length=$1
|
||||||
tr -dc 'A-Za-z0-9!@#$%^&*()_+-=' < /dev/urandom | head -c $length
|
tr -dc 'A-Za-z0-9!@#$%^&*()_+-=' < /dev/urandom | head -c $length
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prüfe ob .env existiert
|
# Create .env if it doesn't exist
|
||||||
if [ ! -f /app/.env ]; then
|
if [ ! -f /app/.env ]; then
|
||||||
echo "📝 Erstelle .env Datei..."
|
echo "📝 Erstelle .env Datei..."
|
||||||
|
|
||||||
# Verwende vorhandenes JWT_SECRET oder generiere ein neues
|
|
||||||
if [ -z "$JWT_SECRET" ] || [ "$JWT_SECRET" = "your-secret-key-please-change" ]; then
|
if [ -z "$JWT_SECRET" ] || [ "$JWT_SECRET" = "your-secret-key-please-change" ]; then
|
||||||
export JWT_SECRET=$(generate_secret 64)
|
export JWT_SECRET=$(generate_secret 64)
|
||||||
echo "🔑 Automatisch sicheres JWT Secret generiert"
|
echo "🔑 Automatisch sicheres JWT Secret generiert"
|
||||||
@@ -21,30 +19,37 @@ if [ ! -f /app/.env ]; then
|
|||||||
echo "🔑 Verwende vorhandenes JWT Secret aus Umgebungsvariable"
|
echo "🔑 Verwende vorhandenes JWT Secret aus Umgebungsvariable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Erstelle .env aus Template mit envsubst
|
# Create .env with all proxy settings
|
||||||
envsubst < /app/.env.template > /app/.env
|
cat > /app/.env << EOF
|
||||||
echo "✅ .env Datei erstellt"
|
NODE_ENV=production
|
||||||
|
JWT_SECRET=${JWT_SECRET}
|
||||||
|
TRUST_PROXY_ENABLED=${TRUST_PROXY_ENABLED:-true}
|
||||||
|
TRUSTED_PROXY_IPS=${TRUSTED_PROXY_IPS:-172.0.0.0/8,10.0.0.0/8,192.168.0.0/16}
|
||||||
|
HOSTNAME=${HOSTNAME:-localhost}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "✅ .env Datei erstellt"
|
||||||
else
|
else
|
||||||
echo "ℹ️ .env Datei existiert bereits"
|
echo "ℹ️ .env Datei existiert bereits"
|
||||||
|
|
||||||
# Wenn .env existiert, aber JWT_SECRET Umgebungsvariable gesetzt ist, aktualisiere sie
|
# Update JWT_SECRET if provided
|
||||||
if [ -n "$JWT_SECRET" ] && [ "$JWT_SECRET" != "your-secret-key-please-change" ]; then
|
if [ -n "$JWT_SECRET" ] && [ "$JWT_SECRET" != "your-secret-key-please-change" ]; then
|
||||||
echo "🔑 Aktualisiere JWT Secret in .env Datei"
|
echo "🔑 Aktualisiere JWT Secret in .env Datei"
|
||||||
# Aktualisiere nur das JWT_SECRET in der .env Datei
|
|
||||||
sed -i "s/^JWT_SECRET=.*/JWT_SECRET=$JWT_SECRET/" /app/.env
|
sed -i "s/^JWT_SECRET=.*/JWT_SECRET=$JWT_SECRET/" /app/.env
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Validiere dass JWT_SECERT nicht der Standardwert ist
|
# Validate JWT_SECRET
|
||||||
if grep -q "JWT_SECRET=your-secret-key-please-change" /app/.env; then
|
if grep -q "JWT_SECRET=your-secret-key-please-change" /app/.env; then
|
||||||
echo "❌ FEHLER: Standard JWT Secret in .env gefunden!"
|
echo "❌ FEHLER: Standard JWT Secret in .env gefunden!"
|
||||||
echo "❌ Bitte setzen Sie JWT_SECRET Umgebungsvariable"
|
echo "❌ Bitte setzen Sie JWT_SECRET Umgebungsvariable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setze sichere Berechtigungen
|
|
||||||
chmod 600 /app/.env
|
chmod 600 /app/.env
|
||||||
|
|
||||||
|
echo "🔧 Proxy Configuration:"
|
||||||
|
echo " - TRUST_PROXY_ENABLED: ${TRUST_PROXY_ENABLED:-true}"
|
||||||
|
echo " - TRUSTED_PROXY_IPS: ${TRUSTED_PROXY_IPS:-172.0.0.0/8,10.0.0.0/8,192.168.0.0/16}"
|
||||||
echo "🔧 Starte Anwendung..."
|
echo "🔧 Starte Anwendung..."
|
||||||
exec "$@"
|
exec "$@"
|
||||||
178
frontend/donpat1to.svg
Normal file
178
frontend/donpat1to.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 102 KiB |
@@ -2,7 +2,7 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
<link rel="icon" type="image/svg+xml" href="/donpat1to.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Shift Planning App</title>
|
<title>Shift Planning App</title>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-router-dom": "^6.28.0",
|
"react-router-dom": "^6.28.0",
|
||||||
"date-fns": "4.1.0"
|
"date-fns": "4.1.0",
|
||||||
|
"@vitejs/plugin-react": "^4.3.3",
|
||||||
|
"vite": "^6.0.7"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "20.19.23",
|
"@types/node": "20.19.23",
|
||||||
@@ -25,7 +27,9 @@
|
|||||||
"esbuild": "^0.21.0",
|
"esbuild": "^0.21.0",
|
||||||
"terser": "5.44.0",
|
"terser": "5.44.0",
|
||||||
"babel-plugin-transform-remove-console": "6.9.4",
|
"babel-plugin-transform-remove-console": "6.9.4",
|
||||||
"framer-motion": "12.23.24"
|
"framer-motion": "12.23.24",
|
||||||
|
"file-saver": "2.0.5",
|
||||||
|
"@types/file-saver": "2.0.5"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ import EmployeeManagement from './pages/Employees/EmployeeManagement';
|
|||||||
import Settings from './pages/Settings/Settings';
|
import Settings from './pages/Settings/Settings';
|
||||||
import Help from './pages/Help/Help';
|
import Help from './pages/Help/Help';
|
||||||
import Setup from './pages/Setup/Setup';
|
import Setup from './pages/Setup/Setup';
|
||||||
|
import ErrorBoundary from './components/ErrorBoundary/ErrorBoundary';
|
||||||
|
import SecurityWarning from './components/SecurityWarning/SecurityWarning';
|
||||||
|
|
||||||
// Free Footer Link Pages (always available)
|
// Free Footer Link Pages (always available)
|
||||||
import FAQ from './components/Layout/FooterLinks/FAQ/FAQ';
|
import FAQ from './components/Layout/FooterLinks/FAQ/FAQ';
|
||||||
@@ -160,14 +162,17 @@ const AppContent: React.FC = () => {
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
|
<ErrorBoundary>
|
||||||
<NotificationProvider>
|
<NotificationProvider>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<Router>
|
<Router>
|
||||||
|
<SecurityWarning />
|
||||||
<NotificationContainer />
|
<NotificationContainer />
|
||||||
<AppContent />
|
<AppContent />
|
||||||
</Router>
|
</Router>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</NotificationProvider>
|
</NotificationProvider>
|
||||||
|
</ErrorBoundary>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
101
frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
101
frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
// src/components/ErrorBoundary/ErrorBoundary.tsx
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: React.ReactNode;
|
||||||
|
fallback?: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface State {
|
||||||
|
hasError: boolean;
|
||||||
|
error?: Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
class ErrorBoundary extends React.Component<Props, State> {
|
||||||
|
constructor(props: Props) {
|
||||||
|
super(props);
|
||||||
|
this.state = { hasError: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
static getDerivedStateFromError(error: Error): State {
|
||||||
|
return { hasError: true, error };
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
|
||||||
|
console.error('🚨 Application Error:', error);
|
||||||
|
console.error('📋 Error Details:', errorInfo);
|
||||||
|
|
||||||
|
// In production, send to your error reporting service
|
||||||
|
// logErrorToService(error, errorInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
if (this.state.hasError) {
|
||||||
|
// You can render any custom fallback UI
|
||||||
|
return this.props.fallback || (
|
||||||
|
<div style={{
|
||||||
|
padding: '40px',
|
||||||
|
textAlign: 'center',
|
||||||
|
fontFamily: 'Arial, sans-serif'
|
||||||
|
}}>
|
||||||
|
<div style={{ fontSize: '48px', marginBottom: '20px' }}>⚠️</div>
|
||||||
|
<h2>Oops! Something went wrong</h2>
|
||||||
|
<p style={{ margin: '20px 0', color: '#666' }}>
|
||||||
|
We encountered an unexpected error. Please try refreshing the page.
|
||||||
|
</p>
|
||||||
|
<div style={{ marginTop: '30px' }}>
|
||||||
|
<button
|
||||||
|
onClick={() => window.location.reload()}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#007bff',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: 'pointer',
|
||||||
|
marginRight: '10px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Refresh Page
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => this.setState({ hasError: false })}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#6c757d',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: 'pointer'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Try Again
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{process.env.NODE_ENV === 'development' && this.state.error && (
|
||||||
|
<details style={{
|
||||||
|
marginTop: '20px',
|
||||||
|
textAlign: 'left',
|
||||||
|
background: '#f8f9fa',
|
||||||
|
padding: '15px',
|
||||||
|
borderRadius: '4px'
|
||||||
|
}}>
|
||||||
|
<summary>Error Details (Development)</summary>
|
||||||
|
<pre style={{
|
||||||
|
whiteSpace: 'pre-wrap',
|
||||||
|
fontSize: '12px',
|
||||||
|
color: '#dc3545'
|
||||||
|
}}>
|
||||||
|
{this.state.error.stack}
|
||||||
|
</pre>
|
||||||
|
</details>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.props.children;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ErrorBoundary;
|
||||||
59
frontend/src/components/SecurityWarning/SecurityWarning.tsx
Normal file
59
frontend/src/components/SecurityWarning/SecurityWarning.tsx
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
// src/components/SecurityWarning/SecurityWarning.tsx
|
||||||
|
import React, { useState, useEffect } from 'react';
|
||||||
|
|
||||||
|
const SecurityWarning: React.FC = () => {
|
||||||
|
const [isHttp, setIsHttp] = useState(false);
|
||||||
|
const [isDismissed, setIsDismissed] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
// Check if current protocol is HTTP
|
||||||
|
const checkProtocol = () => {
|
||||||
|
setIsHttp(window.location.protocol === 'http:');
|
||||||
|
};
|
||||||
|
|
||||||
|
checkProtocol();
|
||||||
|
window.addEventListener('load', checkProtocol);
|
||||||
|
|
||||||
|
return () => window.removeEventListener('load', checkProtocol);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (!isHttp || isDismissed) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{
|
||||||
|
position: 'fixed',
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
backgroundColor: '#ff6b35',
|
||||||
|
color: 'white',
|
||||||
|
padding: '10px 20px',
|
||||||
|
textAlign: 'center',
|
||||||
|
zIndex: 10000,
|
||||||
|
fontSize: '14px',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
boxShadow: '0 2px 4px rgba(0,0,0,0.2)'
|
||||||
|
}}>
|
||||||
|
⚠️ SECURITY WARNING: This site is being accessed over HTTP.
|
||||||
|
For secure communication, please use HTTPS.
|
||||||
|
<button
|
||||||
|
onClick={() => setIsDismissed(true)}
|
||||||
|
style={{
|
||||||
|
marginLeft: '15px',
|
||||||
|
background: 'rgba(255,255,255,0.2)',
|
||||||
|
border: '1px solid white',
|
||||||
|
color: 'white',
|
||||||
|
padding: '2px 8px',
|
||||||
|
borderRadius: '3px',
|
||||||
|
cursor: 'pointer'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Dismiss
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default SecurityWarning;
|
||||||
@@ -20,6 +20,8 @@ export const designTokens = {
|
|||||||
10: '#ebd7fa',
|
10: '#ebd7fa',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
manager: '#CC0000',
|
||||||
|
|
||||||
// Semantic Colors
|
// Semantic Colors
|
||||||
primary: '#51258f',
|
primary: '#51258f',
|
||||||
secondary: '#642ab5',
|
secondary: '#642ab5',
|
||||||
|
|||||||
@@ -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';
|
||||||
@@ -10,6 +10,7 @@ import { ShiftPlan, TimeSlot, ScheduledShift } from '../../models/ShiftPlan';
|
|||||||
import { Employee, EmployeeAvailability } from '../../models/Employee';
|
import { Employee, EmployeeAvailability } from '../../models/Employee';
|
||||||
import { useNotification } from '../../contexts/NotificationContext';
|
import { useNotification } from '../../contexts/NotificationContext';
|
||||||
import { formatDate, formatTime } from '../../utils/foramatters';
|
import { formatDate, formatTime } from '../../utils/foramatters';
|
||||||
|
import { saveAs } from 'file-saver';
|
||||||
|
|
||||||
// Local interface extensions (same as AvailabilityManager)
|
// Local interface extensions (same as AvailabilityManager)
|
||||||
interface ExtendedTimeSlot extends TimeSlot {
|
interface ExtendedTimeSlot extends TimeSlot {
|
||||||
@@ -54,6 +55,13 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
const [scheduledShifts, setScheduledShifts] = useState<ScheduledShift[]>([]);
|
const [scheduledShifts, setScheduledShifts] = useState<ScheduledShift[]>([]);
|
||||||
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 [exportDropdownOpen, setExportDropdownOpen] = useState(false);
|
||||||
|
const [selectedExportType, setSelectedExportType] = useState('');
|
||||||
|
const [showExportButton, setShowExportButton] = useState(false);
|
||||||
|
const [dropdownWidth, setDropdownWidth] = useState(0);
|
||||||
|
|
||||||
|
const dropdownRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadShiftPlanData();
|
loadShiftPlanData();
|
||||||
@@ -88,6 +96,13 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Measure dropdown width when it opens
|
||||||
|
useEffect(() => {
|
||||||
|
if (exportDropdownOpen && dropdownRef.current) {
|
||||||
|
setDropdownWidth(dropdownRef.current.offsetWidth);
|
||||||
|
}
|
||||||
|
}, [exportDropdownOpen]);
|
||||||
|
|
||||||
// Add this useEffect to debug state changes
|
// Add this useEffect to debug state changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('🔍 STATE DEBUG - showAssignmentPreview:', showAssignmentPreview);
|
console.log('🔍 STATE DEBUG - showAssignmentPreview:', showAssignmentPreview);
|
||||||
@@ -240,6 +255,53 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleExport = async () => {
|
||||||
|
if (!shiftPlan || !selectedExportType) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setExporting(true);
|
||||||
|
|
||||||
|
let blob: Blob;
|
||||||
|
if (selectedExportType === 'PDF') {
|
||||||
|
// Call the PDF export service
|
||||||
|
blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
|
||||||
|
} else {
|
||||||
|
// Call the Excel export service
|
||||||
|
blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use file-saver to download the file
|
||||||
|
const fileExtension = selectedExportType.toLowerCase();
|
||||||
|
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.${fileExtension}`);
|
||||||
|
|
||||||
|
showNotification({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Export erfolgreich',
|
||||||
|
message: `Der Schichtplan wurde als ${selectedExportType}-Datei exportiert.`
|
||||||
|
});
|
||||||
|
|
||||||
|
// Reset export state
|
||||||
|
setSelectedExportType('');
|
||||||
|
setShowExportButton(false);
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`Error exporting to ${selectedExportType}:`, error);
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Export fehlgeschlagen',
|
||||||
|
message: `Der ${selectedExportType}-Export konnte nicht durchgeführt werden.`
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setExporting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleExportTypeSelect = (type: string) => {
|
||||||
|
setSelectedExportType(type);
|
||||||
|
setExportDropdownOpen(false);
|
||||||
|
setShowExportButton(true);
|
||||||
|
};
|
||||||
|
|
||||||
const loadShiftPlanData = async () => {
|
const loadShiftPlanData = async () => {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
|
|
||||||
@@ -398,14 +460,6 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
console.log('- Shift Patterns:', shiftPlan.shifts?.length || 0);
|
console.log('- Shift Patterns:', shiftPlan.shifts?.length || 0);
|
||||||
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
||||||
|
|
||||||
// DEBUG: Show shift pattern IDs
|
|
||||||
if (shiftPlan.shifts) {
|
|
||||||
console.log('📋 SHIFT PATTERN IDs:');
|
|
||||||
shiftPlan.shifts.forEach((shift, index) => {
|
|
||||||
console.log(` ${index + 1}. ${shift.id} (Day ${shift.dayOfWeek}, TimeSlot ${shift.timeSlotId})`);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const constraints = {
|
const constraints = {
|
||||||
enforceNoTraineeAlone: true,
|
enforceNoTraineeAlone: true,
|
||||||
enforceExperiencedWithChef: true,
|
enforceExperiencedWithChef: true,
|
||||||
@@ -650,6 +704,20 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
return employeesWithoutAvailabilities.length === 0;
|
return employeesWithoutAvailabilities.length === 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const canPublishAssignment = (): boolean => {
|
||||||
|
if (!assignmentResult) return false;
|
||||||
|
|
||||||
|
// Check if assignment was successful
|
||||||
|
if (assignmentResult.success === false) return false;
|
||||||
|
|
||||||
|
// Check if there are any critical violations
|
||||||
|
const hasCriticalViolations = assignmentResult.violations.some(v =>
|
||||||
|
v.includes('ERROR:') || v.includes('KRITISCH:')
|
||||||
|
);
|
||||||
|
|
||||||
|
return !hasCriticalViolations;
|
||||||
|
};
|
||||||
|
|
||||||
const getAvailabilityStatus = () => {
|
const getAvailabilityStatus = () => {
|
||||||
const totalEmployees = employees.length;
|
const totalEmployees = employees.length;
|
||||||
const employeesWithAvailabilities = new Set(
|
const employeesWithAvailabilities = new Set(
|
||||||
@@ -820,9 +888,6 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
<div style={{ fontSize: '14px', color: '#666' }}>
|
<div style={{ fontSize: '14px', color: '#666' }}>
|
||||||
{formatTime(timeSlot.startTime)} - {formatTime(timeSlot.endTime)}
|
{formatTime(timeSlot.startTime)} - {formatTime(timeSlot.endTime)}
|
||||||
</div>
|
</div>
|
||||||
<div style={{ fontSize: '11px', color: '#999', marginTop: '4px' }}>
|
|
||||||
ID: {timeSlot.id.substring(0, 8)}...
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
{days.map(weekday => {
|
{days.map(weekday => {
|
||||||
const shift = timeSlot.shiftsByDay[weekday.id];
|
const shift = timeSlot.shiftsByDay[weekday.id];
|
||||||
@@ -846,7 +911,55 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
const isValidShift = shift.timeSlotId === timeSlot.id && shift.dayOfWeek === weekday.id;
|
const isValidShift = shift.timeSlotId === timeSlot.id && shift.dayOfWeek === weekday.id;
|
||||||
|
|
||||||
let assignedEmployees: string[] = [];
|
let assignedEmployees: string[] = [];
|
||||||
let displayText = '';
|
let displayContent: React.ReactNode = null;
|
||||||
|
|
||||||
|
// Helper function to create employee boxes
|
||||||
|
const createEmployeeBoxes = (employeeIds: string[]) => {
|
||||||
|
return employeeIds.map(empId => {
|
||||||
|
const employee = employees.find(emp => emp.id === empId);
|
||||||
|
if (!employee) return null;
|
||||||
|
|
||||||
|
// Determine background color based on employee role
|
||||||
|
let backgroundColor = '#642ab5'; // Default: non-trainee personnel (purple)
|
||||||
|
|
||||||
|
if (employee.isTrainee) {
|
||||||
|
backgroundColor = '#cda8f0'; // Trainee
|
||||||
|
} else if (employee.employeeType === 'manager') {
|
||||||
|
backgroundColor = '#CC0000'; // Manager
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={empId}
|
||||||
|
style={{
|
||||||
|
backgroundColor,
|
||||||
|
color: 'white',
|
||||||
|
padding: '4px 8px',
|
||||||
|
borderRadius: '4px',
|
||||||
|
marginBottom: '2px',
|
||||||
|
fontSize: '12px',
|
||||||
|
textAlign: 'center',
|
||||||
|
whiteSpace: 'nowrap',
|
||||||
|
overflow: 'hidden',
|
||||||
|
textOverflow: 'ellipsis'
|
||||||
|
}}
|
||||||
|
title={`${employee.firstname} ${employee.lastname}${employee.isTrainee ? ' (Trainee)' : ''}`}
|
||||||
|
>
|
||||||
|
{employee.firstname} {employee.lastname}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}).filter(Boolean);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Helper function to get fallback content
|
||||||
|
const getFallbackContent = () => {
|
||||||
|
const shiftsForSlot = shiftPlan?.shifts?.filter(s =>
|
||||||
|
s.dayOfWeek === weekday.id &&
|
||||||
|
s.timeSlotId === timeSlot.id
|
||||||
|
) || [];
|
||||||
|
const totalRequired = shiftsForSlot.reduce((sum, s) => sum + s.requiredEmployees, 0);
|
||||||
|
return totalRequired === 0 ? '-' : `0/${totalRequired}`;
|
||||||
|
};
|
||||||
|
|
||||||
if (shiftPlan?.status === 'published') {
|
if (shiftPlan?.status === 'published') {
|
||||||
// For published plans, use actual assignments from scheduled shifts
|
// For published plans, use actual assignments from scheduled shifts
|
||||||
@@ -859,15 +972,21 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
if (scheduledShift) {
|
if (scheduledShift) {
|
||||||
assignedEmployees = scheduledShift.assignedEmployees || [];
|
assignedEmployees = scheduledShift.assignedEmployees || [];
|
||||||
|
|
||||||
// DEBUG: Log if we're still seeing old data
|
// Log if we're still seeing old data
|
||||||
if (assignedEmployees.length > 0) {
|
if (assignedEmployees.length > 0) {
|
||||||
console.warn(`⚠️ Found non-empty assignments for ${weekday.name} ${timeSlot.name}:`, assignedEmployees);
|
console.warn(`⚠️ Found non-empty assignments for ${weekday.name} ${timeSlot.name}:`, assignedEmployees);
|
||||||
}
|
}
|
||||||
|
|
||||||
displayText = assignedEmployees.map(empId => {
|
const employeeBoxes = createEmployeeBoxes(assignedEmployees);
|
||||||
const employee = employees.find(emp => emp.id === empId);
|
displayContent = employeeBoxes.length > 0 ? (
|
||||||
return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
|
||||||
}).join(', ');
|
{employeeBoxes}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div style={{ color: '#666', fontStyle: 'italic' }}>
|
||||||
|
{getFallbackContent()}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} else if (assignmentResult) {
|
} else if (assignmentResult) {
|
||||||
// For draft with preview, use assignment result
|
// For draft with preview, use assignment result
|
||||||
@@ -879,30 +998,26 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
|
|
||||||
if (scheduledShift) {
|
if (scheduledShift) {
|
||||||
assignedEmployees = getAssignmentsForScheduledShift(scheduledShift);
|
assignedEmployees = getAssignmentsForScheduledShift(scheduledShift);
|
||||||
displayText = assignedEmployees.map(empId => {
|
const employeeBoxes = createEmployeeBoxes(assignedEmployees);
|
||||||
const employee = employees.find(emp => emp.id === empId);
|
displayContent = employeeBoxes.length > 0 ? (
|
||||||
return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
|
||||||
}).join(', ');
|
{employeeBoxes}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div style={{ color: '#666', fontStyle: 'italic' }}>
|
||||||
|
{getFallbackContent()}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If no assignments yet, show empty or required count
|
// If no display content set yet, use fallback
|
||||||
if (!displayText) {
|
if (!displayContent) {
|
||||||
const shiftsForSlot = shiftPlan?.shifts?.filter(s =>
|
displayContent = (
|
||||||
s.dayOfWeek === weekday.id &&
|
<div style={{ color: '#666', fontStyle: 'italic' }}>
|
||||||
s.timeSlotId === timeSlot.id
|
{getFallbackContent()}
|
||||||
) || [];
|
</div>
|
||||||
|
);
|
||||||
const totalRequired = shiftsForSlot.reduce((sum, s) =>
|
|
||||||
sum + s.requiredEmployees, 0);
|
|
||||||
|
|
||||||
// Show "0/2" instead of just "0" to indicate it's empty
|
|
||||||
displayText = `0/${totalRequired}`;
|
|
||||||
|
|
||||||
// Optional: Show empty state more clearly
|
|
||||||
if (totalRequired === 0) {
|
|
||||||
displayText = '-';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -937,7 +1052,7 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{displayText}
|
{displayContent}
|
||||||
|
|
||||||
{/* Shift debug info - SAME AS AVAILABILITYMANAGER */}
|
{/* Shift debug info - SAME AS AVAILABILITYMANAGER */}
|
||||||
<div style={{
|
<div style={{
|
||||||
@@ -947,8 +1062,6 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
fontFamily: 'monospace'
|
fontFamily: 'monospace'
|
||||||
}}>
|
}}>
|
||||||
<div>Shift: {shift.id.substring(0, 6)}...</div>
|
|
||||||
<div>Day: {shift.dayOfWeek}</div>
|
|
||||||
{!isValidShift && (
|
{!isValidShift && (
|
||||||
<div style={{ color: '#e74c3c', fontWeight: 'bold' }}>
|
<div style={{ color: '#e74c3c', fontWeight: 'bold' }}>
|
||||||
VALIDATION ERROR
|
VALIDATION ERROR
|
||||||
@@ -964,6 +1077,77 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Export Dropdown - Only show when plan is published */}
|
||||||
|
{shiftPlan?.status === 'published' && (
|
||||||
|
<div style={{
|
||||||
|
padding: '15px 20px',
|
||||||
|
backgroundColor: '#f8f9fa',
|
||||||
|
borderTop: '1px solid #e0e0e0',
|
||||||
|
display: 'flex',
|
||||||
|
justifyContent: 'flex-end',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: '10px'
|
||||||
|
}}>
|
||||||
|
<div style={{ position: 'relative', display: 'inline-block' }}>
|
||||||
|
{/* Export Dropdown */}
|
||||||
|
<div
|
||||||
|
ref={dropdownRef}
|
||||||
|
style={{
|
||||||
|
position: 'relative',
|
||||||
|
transform: showExportButton ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
|
||||||
|
opacity: showExportButton ? 0 : 1,
|
||||||
|
transition: 'all 0.3s ease',
|
||||||
|
pointerEvents: showExportButton ? 'none' : 'auto'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
value=""
|
||||||
|
onChange={(e) => handleExportTypeSelect(e.target.value)}
|
||||||
|
onFocus={() => setExportDropdownOpen(true)}
|
||||||
|
onBlur={() => setTimeout(() => setExportDropdownOpen(false), 200)}
|
||||||
|
style={{
|
||||||
|
padding: '8px 16px',
|
||||||
|
border: '1px solid #ddd',
|
||||||
|
borderRadius: '4px',
|
||||||
|
backgroundColor: 'white',
|
||||||
|
cursor: 'pointer',
|
||||||
|
minWidth: '120px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<option value="">Export</option>
|
||||||
|
<option value="PDF">PDF</option>
|
||||||
|
<option value="Excel">Excel</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Export Button */}
|
||||||
|
{showExportButton && (
|
||||||
|
<button
|
||||||
|
onClick={handleExport}
|
||||||
|
disabled={exporting}
|
||||||
|
style={{
|
||||||
|
padding: '8px 16px',
|
||||||
|
backgroundColor: '#51258f',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: exporting ? 'not-allowed' : 'pointer',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
position: 'absolute',
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
opacity: showExportButton ? 1 : 0,
|
||||||
|
transform: showExportButton ? 'translateX(0)' : 'translateX(20px)',
|
||||||
|
transition: 'all 0.3s ease',
|
||||||
|
minWidth: '120px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{exporting ? 'Exportiert...' : 'EXPORT'}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1005,6 +1189,7 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
|
<div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
|
||||||
|
{/* "Zuweisungen neu berechnen" button */}
|
||||||
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
||||||
<button
|
<button
|
||||||
onClick={handleRecreateAssignments}
|
onClick={handleRecreateAssignments}
|
||||||
@@ -1197,15 +1382,13 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* KORRIGIERTE ZUSAMMENFASSUNG */}
|
{/* ZUSAMMENFASSUNG */}
|
||||||
{assignmentResult && (
|
{assignmentResult && (
|
||||||
<div style={{ marginBottom: '20px' }}>
|
<div style={{ marginBottom: '20px' }}>
|
||||||
<h4>Zusammenfassung:</h4>
|
<h4>Zusammenfassung:</h4>
|
||||||
|
|
||||||
{/* Entscheidung basierend auf tatsächlichen kritischen Problemen */}
|
{/* Entscheidung basierend auf tatsächlichen kritischen Problemen */}
|
||||||
{assignmentResult.violations.filter(v =>
|
{(assignmentResult.violations.length === 0) || assignmentResult.success == true ? (
|
||||||
v.includes('ERROR:') || v.includes('❌ KRITISCH:')
|
|
||||||
).length === 0 ? (
|
|
||||||
<div style={{
|
<div style={{
|
||||||
padding: '15px',
|
padding: '15px',
|
||||||
backgroundColor: '#d4edda',
|
backgroundColor: '#d4edda',
|
||||||
@@ -1288,32 +1471,24 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
Abbrechen
|
Abbrechen
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
|
{/* BUTTON zum publishen */}
|
||||||
<button
|
<button
|
||||||
onClick={handlePublish}
|
onClick={handlePublish}
|
||||||
disabled={publishing || (assignmentResult ? assignmentResult.violations.filter(v =>
|
disabled={publishing || !canPublishAssignment()}
|
||||||
v.includes('ERROR:') || v.includes('❌ KRITISCH:')
|
|
||||||
).length > 0 : true)}
|
|
||||||
style={{
|
style={{
|
||||||
padding: '10px 20px',
|
padding: '10px 20px',
|
||||||
backgroundColor: assignmentResult ? (assignmentResult.violations.filter(v =>
|
backgroundColor: canPublishAssignment() ? '#2ecc71' : '#95a5a6',
|
||||||
v.includes('ERROR:') || v.includes('❌ KRITISCH:')
|
|
||||||
).length === 0 ? '#2ecc71' : '#95a5a6') : '#95a5a6',
|
|
||||||
color: 'white',
|
color: 'white',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
cursor: assignmentResult ? (assignmentResult.violations.filter(v =>
|
cursor: canPublishAssignment() ? 'pointer' : 'not-allowed',
|
||||||
v.includes('ERROR:') || v.includes('❌ KRITISCH:')
|
|
||||||
).length === 0 ? 'pointer' : 'not-allowed') : 'not-allowed',
|
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
fontSize: '16px'
|
fontSize: '16px'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{publishing ? 'Veröffentliche...' : (
|
{publishing ? 'Veröffentliche...' : (
|
||||||
assignmentResult ? (
|
assignmentResult ? (
|
||||||
assignmentResult.violations.filter(v =>
|
canPublishAssignment()
|
||||||
v.includes('ERROR:') || v.includes('❌ KRITISCH:')
|
|
||||||
).length === 0
|
|
||||||
? 'Schichtplan veröffentlichen'
|
? 'Schichtplan veröffentlichen'
|
||||||
: 'Kritische Probleme müssen behoben werden'
|
: 'Kritische Probleme müssen behoben werden'
|
||||||
) : 'Lade Zuordnungen...'
|
) : 'Lade Zuordnungen...'
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export class ApiClient {
|
|||||||
return token ? { 'Authorization': `Bearer ${token}` } : {};
|
return token ? { 'Authorization': `Bearer ${token}` } : {};
|
||||||
}
|
}
|
||||||
|
|
||||||
private async handleApiResponse<T>(response: Response): Promise<T> {
|
private async handleApiResponse<T>(response: Response, responseType: 'json' | 'blob' = 'json'): Promise<T> {
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
let errorData;
|
let errorData;
|
||||||
|
|
||||||
@@ -61,7 +61,12 @@ export class ApiClient {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// For successful responses, try to parse as JSON
|
// Handle blob responses (for file downloads)
|
||||||
|
if (responseType === 'blob') {
|
||||||
|
return response.blob() as Promise<T>;
|
||||||
|
}
|
||||||
|
|
||||||
|
// For successful JSON responses, try to parse as JSON
|
||||||
try {
|
try {
|
||||||
const responseText = await response.text();
|
const responseText = await response.text();
|
||||||
return responseText ? JSON.parse(responseText) : {} as T;
|
return responseText ? JSON.parse(responseText) : {} as T;
|
||||||
@@ -71,7 +76,7 @@ export class ApiClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async request<T>(endpoint: string, options: RequestInit = {}): Promise<T> {
|
async request<T>(endpoint: string, options: RequestInit = {}, responseType: 'json' | 'blob' = 'json'): Promise<T> {
|
||||||
const url = `${this.baseURL}${endpoint}`;
|
const url = `${this.baseURL}${endpoint}`;
|
||||||
|
|
||||||
const config: RequestInit = {
|
const config: RequestInit = {
|
||||||
@@ -85,7 +90,7 @@ export class ApiClient {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await fetch(url, config);
|
const response = await fetch(url, config);
|
||||||
return await this.handleApiResponse<T>(response);
|
return await this.handleApiResponse<T>(response, responseType);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Re-throw the error to be caught by useBackendValidation
|
// Re-throw the error to be caught by useBackendValidation
|
||||||
if (error instanceof ApiError) {
|
if (error instanceof ApiError) {
|
||||||
|
|||||||
@@ -126,4 +126,60 @@ export const shiftPlanService = {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async exportShiftPlanToExcel(planId: string): Promise<Blob> {
|
||||||
|
try {
|
||||||
|
console.log('📊 Exporting shift plan to Excel:', planId);
|
||||||
|
|
||||||
|
// Use the apiClient with blob response handling
|
||||||
|
const blob = await apiClient.request<Blob>(`/shift-plans/${planId}/export/excel`, {
|
||||||
|
method: 'GET',
|
||||||
|
}, 'blob');
|
||||||
|
|
||||||
|
console.log('✅ Excel export successful');
|
||||||
|
return blob;
|
||||||
|
} catch (error: any) {
|
||||||
|
console.error('❌ Error exporting to Excel:', error);
|
||||||
|
|
||||||
|
if (error.statusCode === 401) {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('employee');
|
||||||
|
throw new Error('Nicht authorisiert - bitte erneut anmelden');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.statusCode === 404) {
|
||||||
|
throw new Error('Schichtplan nicht gefunden');
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error('Fehler beim Excel-Export des Schichtplans');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async exportShiftPlanToPDF(planId: string): Promise<Blob> {
|
||||||
|
try {
|
||||||
|
console.log('📄 Exporting shift plan to PDF:', planId);
|
||||||
|
|
||||||
|
// Use the apiClient with blob response handling
|
||||||
|
const blob = await apiClient.request<Blob>(`/shift-plans/${planId}/export/pdf`, {
|
||||||
|
method: 'GET',
|
||||||
|
}, 'blob');
|
||||||
|
|
||||||
|
console.log('✅ PDF export successful');
|
||||||
|
return blob;
|
||||||
|
} catch (error: any) {
|
||||||
|
console.error('❌ Error exporting to PDF:', error);
|
||||||
|
|
||||||
|
if (error.statusCode === 401) {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
localStorage.removeItem('employee');
|
||||||
|
throw new Error('Nicht authorisiert - bitte erneut anmelden');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error.statusCode === 404) {
|
||||||
|
throw new Error('Schichtplan nicht gefunden');
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error('Fehler beim PDF-Export des Schichtplans');
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
5511
package-lock.json
generated
5511
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user