mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3a787875e6 | |||
| 0b46919e46 | |||
| 65cb3e72ba | |||
| dab5164704 | |||
| 7c63bee1b3 | |||
| 4c275993e6 | |||
| 5c925e3b54 | |||
| 11b6ee7672 | |||
| 19357d12c1 | |||
| 8ccd506b7d | |||
| e09979aa77 | |||
| 0eda1ac125 | |||
| 6aa9511fbe | |||
| ab24f5cf35 | |||
| 2e81ed48c4 |
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/
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/bcrypt": "^6.0.0",
|
"@types/bcrypt": "^6.0.0",
|
||||||
"@types/node": "24.9.2",
|
"@types/node": "24.9.2",
|
||||||
"vite":"7.1.12",
|
"vite": "7.1.12",
|
||||||
"bcrypt": "^6.0.0",
|
"bcrypt": "^6.0.0",
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
@@ -25,7 +25,10 @@
|
|||||||
"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",
|
||||||
|
"pdfkit": "0.12.3",
|
||||||
|
"@types/pdfkit": "^0.12.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bcryptjs": "^2.4.2",
|
"@types/bcryptjs": "^2.4.2",
|
||||||
|
|||||||
@@ -2,12 +2,14 @@
|
|||||||
import { Request, Response } from 'express';
|
import { Request, Response } from 'express';
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
import { db } from '../services/databaseService.js';
|
import { db } from '../services/databaseService.js';
|
||||||
import {
|
import {
|
||||||
CreateShiftPlanRequest,
|
CreateShiftPlanRequest,
|
||||||
UpdateShiftPlanRequest,
|
UpdateShiftPlanRequest,
|
||||||
} 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 PDFDocument from 'pdfkit';
|
||||||
|
|
||||||
async function getPlanWithDetails(planId: string) {
|
async function getPlanWithDetails(planId: string) {
|
||||||
const plan = await db.get<any>(`
|
const plan = await db.get<any>(`
|
||||||
@@ -182,7 +184,7 @@ export const getShiftPlan = async (req: Request, res: Response): Promise<void> =
|
|||||||
export const createDefaultTemplate = async (userId: string): Promise<string> => {
|
export const createDefaultTemplate = async (userId: string): Promise<string> => {
|
||||||
try {
|
try {
|
||||||
const planId = uuidv4();
|
const planId = uuidv4();
|
||||||
|
|
||||||
await db.run('BEGIN TRANSACTION');
|
await db.run('BEGIN TRANSACTION');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -278,7 +280,7 @@ export const createShiftPlan = async (req: Request, res: Response): Promise<void
|
|||||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
[timeSlotId, planId, timeSlot.name, timeSlot.startTime, timeSlot.endTime, timeSlot.description || '']
|
[timeSlotId, planId, timeSlot.name, timeSlot.startTime, timeSlot.endTime, timeSlot.description || '']
|
||||||
);
|
);
|
||||||
|
|
||||||
// Store the mapping if the timeSlot had a temporary ID
|
// Store the mapping if the timeSlot had a temporary ID
|
||||||
if ((timeSlot as any).id) {
|
if ((timeSlot as any).id) {
|
||||||
timeSlotIdMap.set((timeSlot as any).id, timeSlotId);
|
timeSlotIdMap.set((timeSlot as any).id, timeSlotId);
|
||||||
@@ -289,12 +291,12 @@ export const createShiftPlan = async (req: Request, res: Response): Promise<void
|
|||||||
for (const shift of shifts) {
|
for (const shift of shifts) {
|
||||||
const shiftId = uuidv4();
|
const shiftId = uuidv4();
|
||||||
let finalTimeSlotId = shift.timeSlotId;
|
let finalTimeSlotId = shift.timeSlotId;
|
||||||
|
|
||||||
// If timeSlotId exists in mapping, use the new ID
|
// If timeSlotId exists in mapping, use the new ID
|
||||||
if (timeSlotIdMap.has(shift.timeSlotId)) {
|
if (timeSlotIdMap.has(shift.timeSlotId)) {
|
||||||
finalTimeSlotId = timeSlotIdMap.get(shift.timeSlotId)!;
|
finalTimeSlotId = timeSlotIdMap.get(shift.timeSlotId)!;
|
||||||
}
|
}
|
||||||
|
|
||||||
await db.run(
|
await db.run(
|
||||||
`INSERT INTO shifts (id, plan_id, day_of_week, time_slot_id, required_employees, color)
|
`INSERT INTO shifts (id, plan_id, day_of_week, time_slot_id, required_employees, color)
|
||||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
@@ -368,7 +370,7 @@ export const createFromPreset = async (req: Request, res: Response): Promise<voi
|
|||||||
// Insert time slots and create mapping
|
// Insert time slots and create mapping
|
||||||
for (const timeSlot of preset.timeSlots) {
|
for (const timeSlot of preset.timeSlots) {
|
||||||
const timeSlotId = uuidv4();
|
const timeSlotId = uuidv4();
|
||||||
|
|
||||||
await db.run(
|
await db.run(
|
||||||
`INSERT INTO time_slots (id, plan_id, name, start_time, end_time, description)
|
`INSERT INTO time_slots (id, plan_id, name, start_time, end_time, description)
|
||||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
@@ -381,7 +383,7 @@ export const createFromPreset = async (req: Request, res: Response): Promise<voi
|
|||||||
timeSlotMap.set((timeSlot as any).timeSlotId, timeSlotId);
|
timeSlotMap.set((timeSlot as any).timeSlotId, timeSlotId);
|
||||||
}
|
}
|
||||||
timeSlotMap.set(timeSlot.name, timeSlotId);
|
timeSlotMap.set(timeSlot.name, timeSlotId);
|
||||||
|
|
||||||
console.log(`✅ Created time slot: ${timeSlot.name} -> ${timeSlotId}`);
|
console.log(`✅ Created time slot: ${timeSlot.name} -> ${timeSlotId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,14 +393,14 @@ export const createFromPreset = async (req: Request, res: Response): Promise<voi
|
|||||||
let shiftCount = 0;
|
let shiftCount = 0;
|
||||||
for (const shift of preset.shifts) {
|
for (const shift of preset.shifts) {
|
||||||
const shiftId = uuidv4();
|
const shiftId = uuidv4();
|
||||||
|
|
||||||
// Try to find the timeSlotId using different strategies
|
// Try to find the timeSlotId using different strategies
|
||||||
let timeSlotId = timeSlotMap.get(shift.timeSlotId);
|
let timeSlotId = timeSlotMap.get(shift.timeSlotId);
|
||||||
|
|
||||||
if (!timeSlotId) {
|
if (!timeSlotId) {
|
||||||
// Fallback: try to find by name or other properties
|
// Fallback: try to find by name or other properties
|
||||||
console.warn(`⚠️ Time slot not found by ID: ${shift.timeSlotId}, trying fallback...`);
|
console.warn(`⚠️ Time slot not found by ID: ${shift.timeSlotId}, trying fallback...`);
|
||||||
|
|
||||||
// Look for time slot by name or other matching logic
|
// Look for time slot by name or other matching logic
|
||||||
for (const [key, value] of timeSlotMap.entries()) {
|
for (const [key, value] of timeSlotMap.entries()) {
|
||||||
if (key.includes(shift.timeSlotId) || shift.timeSlotId.includes(key)) {
|
if (key.includes(shift.timeSlotId) || shift.timeSlotId.includes(key)) {
|
||||||
@@ -421,7 +423,7 @@ export const createFromPreset = async (req: Request, res: Response): Promise<voi
|
|||||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
[shiftId, planId, shift.dayOfWeek, timeSlotId, shift.requiredEmployees, shift.color || '#3498db']
|
[shiftId, planId, shift.dayOfWeek, timeSlotId, shift.requiredEmployees, shift.color || '#3498db']
|
||||||
);
|
);
|
||||||
|
|
||||||
shiftCount++;
|
shiftCount++;
|
||||||
console.log(`✅ Created shift ${shiftCount}: day ${shift.dayOfWeek}, timeSlot ${timeSlotId}`);
|
console.log(`✅ Created shift ${shiftCount}: day ${shift.dayOfWeek}, timeSlot ${timeSlotId}`);
|
||||||
}
|
}
|
||||||
@@ -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,15 +651,28 @@ 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
|
||||||
}))
|
}))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper function to generate scheduled shifts from template
|
// Helper function to generate scheduled shifts from template
|
||||||
export const generateScheduledShifts = async(planId: string, startDate: string, endDate: string): Promise<void> => {
|
export const generateScheduledShifts = async (planId: string, startDate: string, endDate: string): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
console.log(`🔄 Generating scheduled shifts for Plan ${planId} from ${startDate} to ${endDate}`);
|
console.log(`🔄 Generating scheduled shifts for Plan ${planId} from ${startDate} to ${endDate}`);
|
||||||
|
|
||||||
// Get plan with shifts and time slots
|
// Get plan with shifts and time slots
|
||||||
const plan = await getShiftPlanById(planId);
|
const plan = await getShiftPlanById(planId);
|
||||||
if (!plan) {
|
if (!plan) {
|
||||||
@@ -661,7 +696,7 @@ export const generateScheduledShifts = async(planId: string, startDate: string,
|
|||||||
|
|
||||||
for (const shift of shiftsForDay) {
|
for (const shift of shiftsForDay) {
|
||||||
const scheduledShiftId = uuidv4();
|
const scheduledShiftId = uuidv4();
|
||||||
|
|
||||||
await db.run(
|
await db.run(
|
||||||
`INSERT INTO scheduled_shifts (id, plan_id, date, time_slot_id, required_employees, assigned_employees)
|
`INSERT INTO scheduled_shifts (id, plan_id, date, time_slot_id, required_employees, assigned_employees)
|
||||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||||
@@ -674,13 +709,13 @@ export const generateScheduledShifts = async(planId: string, startDate: string,
|
|||||||
JSON.stringify([]) // Start with empty assignments
|
JSON.stringify([]) // Start with empty assignments
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log(`✅ Created scheduled shift: ${scheduledShiftId}`);
|
console.log(`✅ Created scheduled shift: ${scheduledShiftId}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`✅ Scheduled shifts generated for Plan ${planId}`);
|
console.log(`✅ Scheduled shifts generated for Plan ${planId}`);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error generating scheduled shifts:', error);
|
console.error('❌ Error generating scheduled shifts:', error);
|
||||||
throw error;
|
throw error;
|
||||||
@@ -726,7 +761,7 @@ export const generateScheduledShiftsForPlan = async (req: Request, res: Response
|
|||||||
|
|
||||||
// Return updated plan
|
// Return updated plan
|
||||||
const updatedPlan = await getShiftPlanById(id);
|
const updatedPlan = await getShiftPlanById(id);
|
||||||
|
|
||||||
console.log('✅ Successfully generated scheduled shifts:', {
|
console.log('✅ Successfully generated scheduled shifts:', {
|
||||||
scheduledShifts: updatedPlan.scheduledShifts?.length || 0
|
scheduledShifts: updatedPlan.scheduledShifts?.length || 0
|
||||||
});
|
});
|
||||||
@@ -760,7 +795,7 @@ export const regenerateScheduledShifts = async (req: Request, res: Response): Pr
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log(`✅ Regenerated scheduled shifts for plan ${id}`);
|
console.log(`✅ Regenerated scheduled shifts for plan ${id}`);
|
||||||
|
|
||||||
// Return updated plan
|
// Return updated plan
|
||||||
const updatedPlan = await getShiftPlanById(id);
|
const updatedPlan = await getShiftPlanById(id);
|
||||||
res.json(updatedPlan);
|
res.json(updatedPlan);
|
||||||
@@ -774,7 +809,7 @@ export const regenerateScheduledShifts = async (req: Request, res: Response): Pr
|
|||||||
export const getScheduledShiftsFromPlan = async (req: AuthRequest, res: Response): Promise<void> => {
|
export const getScheduledShiftsFromPlan = async (req: AuthRequest, res: Response): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const { planId } = req.params;
|
const { planId } = req.params;
|
||||||
|
|
||||||
const shifts = await db.all(
|
const shifts = await db.all(
|
||||||
`SELECT * FROM scheduled_shifts WHERE plan_id = ? ORDER BY date, time_slot_id`,
|
`SELECT * FROM scheduled_shifts WHERE plan_id = ? ORDER BY date, time_slot_id`,
|
||||||
[planId]
|
[planId]
|
||||||
@@ -806,7 +841,7 @@ export const getScheduledShiftsFromPlan = async (req: AuthRequest, res: Response
|
|||||||
export const getScheduledShift = async (req: AuthRequest, res: Response): Promise<void> => {
|
export const getScheduledShift = async (req: AuthRequest, res: Response): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
|
|
||||||
const shift = await db.get(
|
const shift = await db.get(
|
||||||
'SELECT * FROM scheduled_shifts WHERE id = ?',
|
'SELECT * FROM scheduled_shifts WHERE id = ?',
|
||||||
[id]
|
[id]
|
||||||
@@ -834,10 +869,10 @@ export const updateScheduledShift = async (req: AuthRequest, res: Response): Pro
|
|||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
const { assignedEmployees } = req.body;
|
const { assignedEmployees } = req.body;
|
||||||
|
|
||||||
console.log('🔄 Updating scheduled shift:', {
|
console.log('🔄 Updating scheduled shift:', {
|
||||||
id,
|
id,
|
||||||
assignedEmployees,
|
assignedEmployees,
|
||||||
body: req.body
|
body: req.body
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!Array.isArray(assignedEmployees)) {
|
if (!Array.isArray(assignedEmployees)) {
|
||||||
@@ -862,8 +897,8 @@ export const updateScheduledShift = async (req: AuthRequest, res: Response): Pro
|
|||||||
);
|
);
|
||||||
|
|
||||||
console.log('✅ Scheduled shift updated successfully');
|
console.log('✅ Scheduled shift updated successfully');
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
message: 'Scheduled shift updated successfully',
|
message: 'Scheduled shift updated successfully',
|
||||||
id: id,
|
id: id,
|
||||||
assignedEmployees: assignedEmployees
|
assignedEmployees: assignedEmployees
|
||||||
@@ -918,9 +953,9 @@ export const clearAssignments = async (req: Request, res: Response): Promise<voi
|
|||||||
|
|
||||||
console.log(`✅ Successfully cleared all assignments for plan ${id}`);
|
console.log(`✅ Successfully cleared all assignments for plan ${id}`);
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
message: 'Assignments cleared successfully',
|
message: 'Assignments cleared successfully',
|
||||||
clearedShifts: scheduledShifts.length
|
clearedShifts: scheduledShifts.length
|
||||||
});
|
});
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -932,4 +967,493 @@ export const clearAssignments = async (req: Request, res: Response): Promise<voi
|
|||||||
console.error('❌ Error clearing assignments:', error);
|
console.error('❌ Error clearing assignments:', error);
|
||||||
res.status(500).json({ error: 'Internal server error' });
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const exportShiftPlanToExcel = async (req: Request, res: Response): Promise<void> => {
|
||||||
|
try {
|
||||||
|
const { id } = req.params;
|
||||||
|
|
||||||
|
console.log('📊 Starting Excel export for plan:', id);
|
||||||
|
|
||||||
|
// Check if plan exists
|
||||||
|
const plan = await getShiftPlanById(id);
|
||||||
|
if (!plan) {
|
||||||
|
res.status(404).json({ error: 'Shift plan not found' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (plan.status !== 'published') {
|
||||||
|
res.status(400).json({ error: 'Can only export published shift plans' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create workbook
|
||||||
|
const workbook = new ExcelJS.Workbook();
|
||||||
|
workbook.creator = 'Schichtplaner System';
|
||||||
|
workbook.created = new Date();
|
||||||
|
|
||||||
|
// Add Summary Sheet
|
||||||
|
const summarySheet = workbook.addWorksheet('Planübersicht');
|
||||||
|
|
||||||
|
// Summary data
|
||||||
|
summarySheet.columns = [
|
||||||
|
{ header: 'Eigenschaft', key: 'property', width: 20 },
|
||||||
|
{ header: 'Wert', key: 'value', width: 30 }
|
||||||
|
];
|
||||||
|
|
||||||
|
summarySheet.addRows([
|
||||||
|
{ property: 'Plan Name', value: plan.name },
|
||||||
|
{ property: 'Beschreibung', value: plan.description || 'Keine' },
|
||||||
|
{ property: 'Zeitraum', value: `${plan.startDate} bis ${plan.endDate}` },
|
||||||
|
{ property: 'Status', value: plan.status },
|
||||||
|
{ property: 'Erstellt von', value: plan.created_by_name || 'Unbekannt' },
|
||||||
|
{ property: 'Erstellt am', value: plan.createdAt },
|
||||||
|
{ property: 'Anzahl Schichten', value: plan.scheduledShifts?.length || 0 },
|
||||||
|
{ property: 'Anzahl Mitarbeiter', value: plan.employees?.length || 0 }
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Style summary sheet
|
||||||
|
summarySheet.getRow(1).font = { bold: true };
|
||||||
|
summarySheet.getRow(1).fill = {
|
||||||
|
type: 'pattern',
|
||||||
|
pattern: 'solid',
|
||||||
|
fgColor: { argb: 'FF2C3E50' }
|
||||||
|
};
|
||||||
|
summarySheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
|
||||||
|
|
||||||
|
// Add Assignments Sheet
|
||||||
|
const assignmentsSheet = workbook.addWorksheet('Schichtzuweisungen');
|
||||||
|
|
||||||
|
assignmentsSheet.columns = [
|
||||||
|
{ header: 'Datum', key: 'date', width: 12 },
|
||||||
|
{ header: 'Tag', key: 'day', width: 10 },
|
||||||
|
{ header: 'Schicht', key: 'shift', width: 15 },
|
||||||
|
{ header: 'Zeit', key: 'time', width: 15 },
|
||||||
|
{ header: 'Zugewiesene Mitarbeiter', key: 'employees', width: 30 },
|
||||||
|
{ header: 'Benötigte Mitarbeiter', key: 'required', width: 18 }
|
||||||
|
];
|
||||||
|
|
||||||
|
// Group scheduled shifts by date
|
||||||
|
const shiftsByDate = new Map();
|
||||||
|
plan.scheduledShifts?.forEach((scheduledShift: any) => {
|
||||||
|
const date = scheduledShift.date;
|
||||||
|
if (!shiftsByDate.has(date)) {
|
||||||
|
shiftsByDate.set(date, []);
|
||||||
|
}
|
||||||
|
shiftsByDate.get(date).push(scheduledShift);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Sort dates chronologically
|
||||||
|
const sortedDates = Array.from(shiftsByDate.keys()).sort();
|
||||||
|
|
||||||
|
// Add data to sheet
|
||||||
|
sortedDates.forEach(date => {
|
||||||
|
const dateShifts = shiftsByDate.get(date);
|
||||||
|
const dateObj = new Date(date);
|
||||||
|
const dayName = getGermanDayName(dateObj.getDay());
|
||||||
|
|
||||||
|
dateShifts.forEach((scheduledShift: any) => {
|
||||||
|
const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
|
||||||
|
const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
|
||||||
|
const employee = plan.employees?.find((emp: any) => emp.id === empId);
|
||||||
|
return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
|
||||||
|
}).join(', ') || 'Keine Zuweisungen';
|
||||||
|
|
||||||
|
assignmentsSheet.addRow({
|
||||||
|
date: date,
|
||||||
|
day: dayName,
|
||||||
|
shift: timeSlot?.name || 'Unbekannt',
|
||||||
|
time: timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : '',
|
||||||
|
employees: employeeNames,
|
||||||
|
required: scheduledShift.requiredEmployees || 2
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Style assignments sheet
|
||||||
|
assignmentsSheet.getRow(1).font = { bold: true };
|
||||||
|
assignmentsSheet.getRow(1).fill = {
|
||||||
|
type: 'pattern',
|
||||||
|
pattern: 'solid',
|
||||||
|
fgColor: { argb: 'FF34495E' }
|
||||||
|
};
|
||||||
|
assignmentsSheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
|
||||||
|
|
||||||
|
// Add border to all cells with data
|
||||||
|
assignmentsSheet.eachRow((row, rowNumber) => {
|
||||||
|
if (rowNumber > 1) {
|
||||||
|
row.eachCell((cell) => {
|
||||||
|
cell.border = {
|
||||||
|
top: { style: 'thin' },
|
||||||
|
left: { style: 'thin' },
|
||||||
|
bottom: { style: 'thin' },
|
||||||
|
right: { style: 'thin' }
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add Employee Overview Sheet
|
||||||
|
const employeeSheet = workbook.addWorksheet('Mitarbeiterübersicht');
|
||||||
|
|
||||||
|
employeeSheet.columns = [
|
||||||
|
{ header: 'Name', key: 'name', width: 25 },
|
||||||
|
{ header: 'E-Mail', key: 'email', width: 25 },
|
||||||
|
{ header: 'Rolle', key: 'role', width: 15 },
|
||||||
|
{ header: 'Mitarbeiter Typ', key: 'type', width: 15 },
|
||||||
|
{ header: 'Vertragstyp', key: 'contract', width: 15 }
|
||||||
|
];
|
||||||
|
|
||||||
|
plan.employees?.forEach((employee: any) => {
|
||||||
|
employeeSheet.addRow({
|
||||||
|
name: `${employee.firstname} ${employee.lastname}`,
|
||||||
|
email: employee.email,
|
||||||
|
role: employee.roles?.join(', ') || 'Benutzer',
|
||||||
|
type: employee.employeeType,
|
||||||
|
contract: employee.contractType || 'Nicht angegeben'
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Style employee sheet
|
||||||
|
employeeSheet.getRow(1).font = { bold: true };
|
||||||
|
employeeSheet.getRow(1).fill = {
|
||||||
|
type: 'pattern',
|
||||||
|
pattern: 'solid',
|
||||||
|
fgColor: { argb: 'FF34495E' }
|
||||||
|
};
|
||||||
|
employeeSheet.getRow(1).font = { color: { argb: 'FFFFFFFF' }, bold: true };
|
||||||
|
|
||||||
|
// Set response headers
|
||||||
|
res.setHeader('Content-Type', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
|
||||||
|
res.setHeader('Content-Disposition', `attachment; filename="Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.xlsx"`);
|
||||||
|
|
||||||
|
// Write to response
|
||||||
|
await workbook.xlsx.write(res);
|
||||||
|
|
||||||
|
console.log('✅ Excel export completed for plan:', id);
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Error exporting to Excel:', error);
|
||||||
|
res.status(500).json({ error: 'Internal server error during Excel export' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const exportShiftPlanToPDF = async (req: Request, res: Response): Promise<void> => {
|
||||||
|
try {
|
||||||
|
const { id } = req.params;
|
||||||
|
|
||||||
|
console.log('📄 Starting PDF export for plan:', id);
|
||||||
|
|
||||||
|
// Check if plan exists
|
||||||
|
const plan = await getShiftPlanById(id);
|
||||||
|
if (!plan) {
|
||||||
|
res.status(404).json({ error: 'Shift plan not found' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (plan.status !== 'published') {
|
||||||
|
res.status(400).json({ error: 'Can only export published shift plans' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create PDF document
|
||||||
|
const doc = new PDFDocument({ margin: 50 });
|
||||||
|
|
||||||
|
// Set response headers
|
||||||
|
res.setHeader('Content-Type', 'application/pdf');
|
||||||
|
res.setHeader('Content-Disposition', `attachment; filename="Schichtplan_${plan.name}_${new Date().toISOString().split('T')[0]}.pdf"`);
|
||||||
|
|
||||||
|
// Pipe PDF to response
|
||||||
|
doc.pipe(res);
|
||||||
|
|
||||||
|
// Add title
|
||||||
|
doc.fontSize(20).font('Helvetica-Bold').text(`Schichtplan: ${plan.name}`, 50, 50);
|
||||||
|
doc.fontSize(12).font('Helvetica').text(`Erstellt am: ${new Date().toLocaleDateString('de-DE')}`, 50, 80);
|
||||||
|
|
||||||
|
// Plan summary
|
||||||
|
let yPosition = 120;
|
||||||
|
doc.fontSize(14).font('Helvetica-Bold').text('Plan Informationen', 50, yPosition);
|
||||||
|
yPosition += 30;
|
||||||
|
|
||||||
|
doc.fontSize(10).font('Helvetica');
|
||||||
|
doc.text(`Plan Name: ${plan.name}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
|
||||||
|
if (plan.description) {
|
||||||
|
doc.text(`Beschreibung: ${plan.description}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
}
|
||||||
|
|
||||||
|
doc.text(`Zeitraum: ${plan.startDate} bis ${plan.endDate}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
doc.text(`Status: ${plan.status}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
doc.text(`Erstellt von: ${plan.created_by_name || 'Unbekannt'}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
doc.text(`Erstellt am: ${plan.createdAt}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
doc.text(`Anzahl Schichten: ${plan.scheduledShifts?.length || 0}`, 50, yPosition);
|
||||||
|
yPosition += 20;
|
||||||
|
doc.text(`Anzahl Mitarbeiter: ${plan.employees?.length || 0}`, 50, yPosition);
|
||||||
|
yPosition += 40;
|
||||||
|
|
||||||
|
// Group scheduled shifts by date
|
||||||
|
const shiftsByDate = new Map();
|
||||||
|
plan.scheduledShifts?.forEach((scheduledShift: any) => {
|
||||||
|
const date = scheduledShift.date;
|
||||||
|
if (!shiftsByDate.has(date)) {
|
||||||
|
shiftsByDate.set(date, []);
|
||||||
|
}
|
||||||
|
shiftsByDate.get(date).push(scheduledShift);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Sort dates chronologically
|
||||||
|
const sortedDates = Array.from(shiftsByDate.keys()).sort();
|
||||||
|
|
||||||
|
// Add assignments section
|
||||||
|
doc.addPage();
|
||||||
|
doc.fontSize(16).font('Helvetica-Bold').text('Schichtzuweisungen', 50, 50);
|
||||||
|
|
||||||
|
let currentY = 80;
|
||||||
|
|
||||||
|
sortedDates.forEach(date => {
|
||||||
|
const dateShifts = shiftsByDate.get(date);
|
||||||
|
const dateObj = new Date(date);
|
||||||
|
const dayName = getGermanDayName(dateObj.getDay());
|
||||||
|
|
||||||
|
// Check if we need a new page
|
||||||
|
if (currentY > 650) {
|
||||||
|
doc.addPage();
|
||||||
|
currentY = 50;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Date header
|
||||||
|
doc.fontSize(12).font('Helvetica-Bold').text(`${date} (${dayName})`, 50, currentY);
|
||||||
|
currentY += 20;
|
||||||
|
|
||||||
|
// Table headers
|
||||||
|
doc.fontSize(10).font('Helvetica-Bold');
|
||||||
|
doc.text('Schicht', 50, currentY);
|
||||||
|
doc.text('Zeit', 150, currentY);
|
||||||
|
doc.text('Mitarbeiter', 250, currentY);
|
||||||
|
doc.text('Benötigt', 450, currentY);
|
||||||
|
currentY += 15;
|
||||||
|
|
||||||
|
// Horizontal line
|
||||||
|
doc.moveTo(50, currentY).lineTo(550, currentY).stroke();
|
||||||
|
currentY += 10;
|
||||||
|
|
||||||
|
doc.fontSize(9).font('Helvetica');
|
||||||
|
|
||||||
|
dateShifts.forEach((scheduledShift: any) => {
|
||||||
|
// Check if we need a new page for this shift
|
||||||
|
if (currentY > 700) {
|
||||||
|
doc.addPage();
|
||||||
|
currentY = 50;
|
||||||
|
// Re-add headers for new page
|
||||||
|
doc.fontSize(10).font('Helvetica-Bold');
|
||||||
|
doc.text('Schicht', 50, currentY);
|
||||||
|
doc.text('Zeit', 150, currentY);
|
||||||
|
doc.text('Mitarbeiter', 250, currentY);
|
||||||
|
doc.text('Benötigt', 450, currentY);
|
||||||
|
currentY += 25;
|
||||||
|
}
|
||||||
|
|
||||||
|
const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
|
||||||
|
const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
|
||||||
|
const employee = plan.employees?.find((emp: any) => emp.id === empId);
|
||||||
|
return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
|
||||||
|
}).join(', ') || 'Keine Zuweisungen';
|
||||||
|
|
||||||
|
// Split employee names if too long
|
||||||
|
const employeesLines = doc.heightOfString(employeeNames, { width: 190 });
|
||||||
|
|
||||||
|
doc.text(timeSlot?.name || 'Unbekannt', 50, currentY);
|
||||||
|
doc.text(timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : '', 150, currentY);
|
||||||
|
|
||||||
|
// Handle multi-line employee names
|
||||||
|
const employeeText = doc.heightOfString(employeeNames, { width: 190 }) > 20 ?
|
||||||
|
employeeNames.split(', ').join(',\n') : employeeNames;
|
||||||
|
|
||||||
|
doc.text(employeeText, 250, currentY, { width: 190, align: 'left' });
|
||||||
|
doc.text(String(scheduledShift.requiredEmployees || 2), 450, currentY);
|
||||||
|
|
||||||
|
currentY += Math.max(20, employeesLines) + 5;
|
||||||
|
});
|
||||||
|
|
||||||
|
currentY += 20; // Space between dates
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add employee overview page
|
||||||
|
doc.addPage();
|
||||||
|
doc.fontSize(16).font('Helvetica-Bold').text('Mitarbeiterübersicht', 50, 50);
|
||||||
|
|
||||||
|
currentY = 80;
|
||||||
|
|
||||||
|
// Table headers
|
||||||
|
doc.fontSize(10).font('Helvetica-Bold');
|
||||||
|
doc.text('Name', 50, currentY);
|
||||||
|
doc.text('E-Mail', 200, currentY);
|
||||||
|
doc.text('Rolle', 350, currentY);
|
||||||
|
doc.text('Typ', 450, currentY);
|
||||||
|
currentY += 15;
|
||||||
|
|
||||||
|
// Horizontal line
|
||||||
|
doc.moveTo(50, currentY).lineTo(550, currentY).stroke();
|
||||||
|
currentY += 10;
|
||||||
|
|
||||||
|
doc.fontSize(9).font('Helvetica');
|
||||||
|
|
||||||
|
plan.employees?.forEach((employee: any) => {
|
||||||
|
if (currentY > 700) {
|
||||||
|
doc.addPage();
|
||||||
|
currentY = 50;
|
||||||
|
// Re-add headers
|
||||||
|
doc.fontSize(10).font('Helvetica-Bold');
|
||||||
|
doc.text('Name', 50, currentY);
|
||||||
|
doc.text('E-Mail', 200, currentY);
|
||||||
|
doc.text('Rolle', 350, currentY);
|
||||||
|
doc.text('Typ', 450, currentY);
|
||||||
|
currentY += 25;
|
||||||
|
}
|
||||||
|
|
||||||
|
doc.text(`${employee.firstname} ${employee.lastname}`, 50, currentY);
|
||||||
|
doc.text(employee.email, 200, currentY, { width: 140 });
|
||||||
|
doc.text(employee.roles?.join(', ') || 'Benutzer', 350, currentY, { width: 90 });
|
||||||
|
doc.text(employee.employeeType, 450, currentY);
|
||||||
|
|
||||||
|
currentY += 20;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Add footer to each page
|
||||||
|
const pages = doc.bufferedPageRange();
|
||||||
|
for (let i = 0; i < pages.count; i++) {
|
||||||
|
doc.switchToPage(i);
|
||||||
|
|
||||||
|
doc.fontSize(8).font('Helvetica');
|
||||||
|
doc.text(
|
||||||
|
`Seite ${i + 1} von ${pages.count} • Erstellt am: ${new Date().toLocaleString('de-DE')} • Schichtplaner System`,
|
||||||
|
50,
|
||||||
|
800,
|
||||||
|
{ align: 'center', width: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Finalize PDF
|
||||||
|
doc.end();
|
||||||
|
|
||||||
|
console.log('✅ PDF export completed for plan:', id);
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Error exporting to PDF:', error);
|
||||||
|
res.status(500).json({ error: 'Internal server error during PDF export' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Helper function to generate HTML data
|
||||||
|
function generateHTMLFromPlan(plan: any): string {
|
||||||
|
const shiftsByDate = new Map();
|
||||||
|
|
||||||
|
plan.scheduledShifts?.forEach((scheduledShift: any) => {
|
||||||
|
const date = scheduledShift.date;
|
||||||
|
if (!shiftsByDate.has(date)) {
|
||||||
|
shiftsByDate.set(date, []);
|
||||||
|
}
|
||||||
|
shiftsByDate.get(date).push(scheduledShift);
|
||||||
|
});
|
||||||
|
|
||||||
|
const sortedDates = Array.from(shiftsByDate.keys()).sort();
|
||||||
|
|
||||||
|
let html = `
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>Schichtplan: ${plan.name}</title>
|
||||||
|
<style>
|
||||||
|
body { font-family: Arial, sans-serif; margin: 20px; }
|
||||||
|
h1 { color: #2c3e50; }
|
||||||
|
h2 { color: #34495e; margin-top: 30px; }
|
||||||
|
table { width: 100%; border-collapse: collapse; margin-bottom: 20px; }
|
||||||
|
th, td { border: 1px solid #ddd; padding: 12px; text-align: left; }
|
||||||
|
th { background-color: #f2f2f2; font-weight: bold; }
|
||||||
|
tr:nth-child(even) { background-color: #f9f9f9; }
|
||||||
|
.summary { background-color: #e8f4fd; padding: 15px; border-radius: 5px; margin-bottom: 20px; }
|
||||||
|
.date-section { margin-bottom: 30px; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>Schichtplan: ${plan.name}</h1>
|
||||||
|
|
||||||
|
<div class="summary">
|
||||||
|
<h2>Plan Informationen</h2>
|
||||||
|
<p><strong>Zeitraum:</strong> ${plan.startDate} bis ${plan.endDate}</p>
|
||||||
|
<p><strong>Status:</strong> ${plan.status}</p>
|
||||||
|
<p><strong>Erstellt von:</strong> ${plan.created_by_name || 'Unbekannt'}</p>
|
||||||
|
<p><strong>Erstellt am:</strong> ${plan.createdAt}</p>
|
||||||
|
<p><strong>Anzahl Schichten:</strong> ${plan.scheduledShifts?.length || 0}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2>Schichtzuweisungen</h2>
|
||||||
|
`;
|
||||||
|
|
||||||
|
sortedDates.forEach(date => {
|
||||||
|
const dateShifts = shiftsByDate.get(date);
|
||||||
|
const dateObj = new Date(date);
|
||||||
|
const dayName = getGermanDayName(dateObj.getDay());
|
||||||
|
|
||||||
|
html += `
|
||||||
|
<div class="date-section">
|
||||||
|
<h3>${date} (${dayName})</h3>
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Schicht</th>
|
||||||
|
<th>Zeit</th>
|
||||||
|
<th>Zugewiesene Mitarbeiter</th>
|
||||||
|
<th>Benötigte Mitarbeiter</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
`;
|
||||||
|
|
||||||
|
dateShifts.forEach((scheduledShift: any) => {
|
||||||
|
const timeSlot = plan.timeSlots?.find((ts: any) => ts.id === scheduledShift.timeSlotId);
|
||||||
|
const employeeNames = scheduledShift.assignedEmployees.map((empId: string) => {
|
||||||
|
const employee = plan.employees?.find((emp: any) => emp.id === empId);
|
||||||
|
return employee ? `${employee.firstname} ${employee.lastname}` : 'Unbekannt';
|
||||||
|
}).join(', ') || 'Keine Zuweisungen';
|
||||||
|
|
||||||
|
html += `
|
||||||
|
<tr>
|
||||||
|
<td>${timeSlot?.name || 'Unbekannt'}</td>
|
||||||
|
<td>${timeSlot ? `${timeSlot.startTime} - ${timeSlot.endTime}` : ''}</td>
|
||||||
|
<td>${employeeNames}</td>
|
||||||
|
<td>${scheduledShift.requiredEmployees || 2}</td>
|
||||||
|
</tr>
|
||||||
|
`;
|
||||||
|
});
|
||||||
|
|
||||||
|
html += `
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
});
|
||||||
|
|
||||||
|
html += `
|
||||||
|
<div style="margin-top: 40px; font-size: 12px; color: #666; text-align: center;">
|
||||||
|
Erstellt am: ${new Date().toLocaleString('de-DE')}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`;
|
||||||
|
|
||||||
|
return html;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper function to get German day names
|
||||||
|
function getGermanDayName(dayIndex: number): string {
|
||||||
|
const days = ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'];
|
||||||
|
return days[dayIndex];
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
@@ -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",
|
||||||
|
|||||||
@@ -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,7 @@ 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);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadShiftPlanData();
|
loadShiftPlanData();
|
||||||
@@ -240,6 +242,66 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleExportExcel = async () => {
|
||||||
|
if (!shiftPlan) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setExporting(true);
|
||||||
|
|
||||||
|
// Call the export service
|
||||||
|
const 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`);
|
||||||
|
|
||||||
|
showNotification({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Export erfolgreich',
|
||||||
|
message: 'Der Schichtplan wurde als Excel-Datei exportiert.'
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error exporting to Excel:', error);
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Export fehlgeschlagen',
|
||||||
|
message: 'Der Excel-Export konnte nicht durchgeführt werden.'
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setExporting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleExportPDF = async () => {
|
||||||
|
if (!shiftPlan) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setExporting(true);
|
||||||
|
|
||||||
|
// Call the PDF export service
|
||||||
|
const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
|
||||||
|
|
||||||
|
// Use file-saver to download the file
|
||||||
|
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
|
||||||
|
|
||||||
|
showNotification({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Export erfolgreich',
|
||||||
|
message: 'Der Schichtplan wurde als PDF exportiert.'
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error exporting to PDF:', error);
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Export fehlgeschlagen',
|
||||||
|
message: 'Der PDF-Export konnte nicht durchgeführt werden.'
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setExporting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const loadShiftPlanData = async () => {
|
const loadShiftPlanData = async () => {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
|
|
||||||
@@ -399,12 +461,12 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
||||||
|
|
||||||
// DEBUG: Show shift pattern IDs
|
// DEBUG: Show shift pattern IDs
|
||||||
if (shiftPlan.shifts) {
|
/*if (shiftPlan.shifts) {
|
||||||
console.log('📋 SHIFT PATTERN IDs:');
|
console.log('📋 SHIFT PATTERN IDs:');
|
||||||
shiftPlan.shifts.forEach((shift, index) => {
|
shiftPlan.shifts.forEach((shift, index) => {
|
||||||
console.log(` ${index + 1}. ${shift.id} (Day ${shift.dayOfWeek}, TimeSlot ${shift.timeSlotId})`);
|
console.log(` ${index + 1}. ${shift.id} (Day ${shift.dayOfWeek}, TimeSlot ${shift.timeSlotId})`);
|
||||||
});
|
});
|
||||||
}
|
}*/
|
||||||
|
|
||||||
const constraints = {
|
const constraints = {
|
||||||
enforceNoTraineeAlone: true,
|
enforceNoTraineeAlone: true,
|
||||||
@@ -650,6 +712,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(
|
||||||
@@ -1005,7 +1081,50 @@ 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']) && (
|
{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>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Your existing "Zuweisungen neu berechnen" button */}
|
||||||
|
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
||||||
<button
|
<button
|
||||||
onClick={handleRecreateAssignments}
|
onClick={handleRecreateAssignments}
|
||||||
disabled={recreating}
|
disabled={recreating}
|
||||||
@@ -1197,15 +1316,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',
|
||||||
@@ -1291,29 +1408,21 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
{/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
|
{/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
|
||||||
<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