Compare commits

...

29 Commits

Author SHA1 Message Date
ec86290d72 fixed package.json executing seeding script 2025-11-05 15:22:29 +01:00
eec9ea92d0 added seedtestData script 2025-11-05 15:09:03 +01:00
80cfe71362 added node_env detection 2025-11-05 15:03:31 +01:00
f6e19bc1ed added dropdown menu 2025-11-05 14:18:18 +01:00
e66c0f9e28 export drop down menu doesnt disappear when exporttype is selected 2025-11-05 13:22:00 +01:00
822b170920 added dropdown menu for export 2025-11-05 11:32:40 +01:00
c6dfa5b4c6 fixed manager detection 2025-11-05 09:43:28 +01:00
d0be1b4a61 excel timetable with employee with each cell 2025-11-05 09:40:26 +01:00
b337fd0e0a using playwright for pdf export instead of pdfkit 2025-11-05 09:20:24 +01:00
badccb4f55 more fancy excel export 2025-11-05 08:31:39 +01:00
9eb9afce1e added timetable export to the export funciton 2025-11-04 23:25:26 +01:00
17d68c2426 Merge branch 'staging' of https://github.com/donpat1to/Schichtenplaner into staging 2025-11-04 22:31:23 +01:00
cff2374f41 fixed klammer usage 2025-11-04 22:28:39 +01:00
3a787875e6 implemented export with pdf and excel library 2025-11-04 15:33:51 +01:00
0b46919e46 fixed role handling in getshiftplanbyid 2025-11-03 23:16:53 +01:00
65cb3e72ba added backend for shiftplan export 2025-11-03 22:50:02 +01:00
dab5164704 added exporting files 2025-11-03 22:07:32 +01:00
7c63bee1b3 updated python installation to break system packages 2025-11-03 10:55:07 +01:00
4c275993e6 changing debian versions from bookworm to bullseye 2025-11-03 10:40:46 +01:00
5c925e3b54 copying python files seperate for scheduling mechanism 2025-11-03 10:33:07 +01:00
11b6ee7672 moved python installation from builder to image 2025-11-03 09:39:42 +01:00
19357d12c1 changed ci to create its own pakcage-lock 2025-11-02 21:14:34 +01:00
8ccd506b7d changed ci to create its own pakcage-lock 2025-11-02 21:13:32 +01:00
e09979aa77 put package-lock.json into the .gitignore 2025-11-02 21:09:25 +01:00
0eda1ac125 creating package lock package on every ci seperate 2025-11-02 20:59:35 +01:00
6aa9511fbe brought package.json back from the grave 2025-11-02 20:57:34 +01:00
ab24f5cf35 npm ci install for prod 2025-11-02 20:48:43 +01:00
2e81ed48c4 more lenient api rate limit 2025-11-02 20:40:59 +01:00
da2b3b0126 pushed new svg 2025-11-01 18:25:36 +01:00
20 changed files with 2138 additions and 5771 deletions

View File

@@ -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
View File

@@ -57,6 +57,7 @@ yarn-error.log*
# Build outputs # Build outputs
dist/ dist/
build/ build/
package-lock.json
# Environment variables # Environment variables
.env .env

View File

@@ -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/

View File

@@ -4,7 +4,9 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "npm run build && npx tsx src/server.ts", "dev": "npm run build && npx tsx src/server.ts",
"dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false npx tsx src/server.ts", "dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false SEED_TEST_DATA=true npx tsx src/server.ts",
"seed:test-data": "npx tsx src/scripts/seedTestData.ts",
"dev:all": "npm run dev:single",
"build": "tsc", "build": "tsc",
"start": "node dist/server.js", "start": "node dist/server.js",
"prestart": "npm run build", "prestart": "npm run build",
@@ -16,7 +18,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 +27,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",

File diff suppressed because it is too large Load Diff

View File

@@ -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'
}, },

View File

@@ -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;

View File

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

View File

@@ -14,9 +14,9 @@ import shiftPlanRoutes from './routes/shiftPlans.js';
import setupRoutes from './routes/setup.js'; import setupRoutes from './routes/setup.js';
import scheduledShifts from './routes/scheduledShifts.js'; import scheduledShifts from './routes/scheduledShifts.js';
import schedulingRoutes from './routes/scheduling.js'; import schedulingRoutes from './routes/scheduling.js';
import { import {
apiLimiter, apiLimiter,
authLimiter, authLimiter,
expensiveEndpointLimiter expensiveEndpointLimiter
} from './middleware/rateLimit.js'; } from './middleware/rateLimit.js';
import { ipSecurityCheck as authIpCheck } from './middleware/auth.js'; import { ipSecurityCheck as authIpCheck } from './middleware/auth.js';
@@ -27,6 +27,15 @@ const __dirname = path.dirname(__filename);
const app = express(); const app = express();
const PORT = 3002; const PORT = 3002;
const isDevelopment = process.env.NODE_ENV === 'development'; const isDevelopment = process.env.NODE_ENV === 'development';
if (isDevelopment) {
console.log('🔧 Running in Development mode');
} else if (process.env.NODE_ENV === 'production') {
console.log('🚀 Running in Production mode');
} else {
console.log('⚠️ NODE_ENV not set, defaulting to Development mode');
console.error('❌ Please set NODE_ENV to "production" or "development" for proper behavior.');
process.exit(1);
}
app.use(authIpCheck); app.use(authIpCheck);
@@ -96,12 +105,12 @@ const configureTrustProxy = (): string | string[] | boolean | number => {
// If specific IPs are provided via environment variable // If specific IPs are provided via environment variable
if (trustedProxyIps) { if (trustedProxyIps) {
console.log('🔒 Trust proxy: Using configured IPs:', trustedProxyIps); console.log('🔒 Trust proxy: Using configured IPs:', trustedProxyIps);
// Handle comma-separated list of IPs/CIDR ranges // Handle comma-separated list of IPs/CIDR ranges
if (trustedProxyIps.includes(',')) { if (trustedProxyIps.includes(',')) {
return trustedProxyIps.split(',').map(ip => ip.trim()); return trustedProxyIps.split(',').map(ip => ip.trim());
} }
// Handle single IP/CIDR // Handle single IP/CIDR
return trustedProxyIps.trim(); return trustedProxyIps.trim();
} }
@@ -116,15 +125,15 @@ app.set('trust proxy', configureTrustProxy());
app.use((req, res, next) => { app.use((req, res, next) => {
const protocol = req.headers['x-forwarded-proto'] || req.protocol; const protocol = req.headers['x-forwarded-proto'] || req.protocol;
const isHttps = protocol === 'https'; const isHttps = protocol === 'https';
// Add security warning for HTTP requests // Add security warning for HTTP requests
if (!isHttps && process.env.NODE_ENV === 'production') { 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.'); res.setHeader('X-Security-Warning', 'This application is being accessed over HTTP. For secure communication, please use HTTPS.');
// Log HTTP access in production // Log HTTP access in production
console.warn(`⚠️ HTTP access detected: ${req.method} ${req.path} from ${req.ip}`); console.warn(`⚠️ HTTP access detected: ${req.method} ${req.path} from ${req.ip}`);
} }
next(); next();
}); });
@@ -273,7 +282,7 @@ app.get('*', (req, res, next) => {
// Serve React app for all other routes // Serve React app for all other routes
const frontendPath = '/app/frontend-build'; const frontendPath = '/app/frontend-build';
const indexPath = path.join(frontendPath, 'index.html'); const indexPath = path.join(frontendPath, 'index.html');
if (fs.existsSync(indexPath)) { if (fs.existsSync(indexPath)) {
res.sendFile(indexPath); res.sendFile(indexPath);
} else { } else {
@@ -311,6 +320,16 @@ const initializeApp = async () => {
const { applyMigration } = await import('./scripts/applyMigration.js'); const { applyMigration } = await import('./scripts/applyMigration.js');
await applyMigration(); await applyMigration();
if (isDevelopment && process.env.SEED_TEST_DATA === 'true') {
try {
const { seedTestData } = await import('./scripts/seedTestData.js');
await seedTestData();
console.log('✅ Test data seeded successfully');
} catch (error) {
console.log('⚠️ Test data seeding skipped or failed:', error);
}
}
app.listen(PORT, () => { app.listen(PORT, () => {
console.log('🎉 APPLICATION STARTED SUCCESSFULLY!'); console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
console.log(`📍 Port: ${PORT}`); console.log(`📍 Port: ${PORT}`);

235
backend/src/test.json Normal file
View File

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

178
frontend/donpat1to.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 102 KiB

View File

@@ -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>

View File

@@ -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",

View File

@@ -19,6 +19,8 @@ export const designTokens = {
9: '#cda8f0', 9: '#cda8f0',
10: '#ebd7fa', 10: '#ebd7fa',
}, },
manager: '#CC0000',
// Semantic Colors // Semantic Colors
primary: '#51258f', primary: '#51258f',

View File

@@ -18,7 +18,7 @@ const ShiftPlanCreate: React.FC = () => {
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const { showNotification } = useNotification(); const { showNotification } = useNotification();
const { executeWithValidation, isSubmitting } = useBackendValidation(); const { executeWithValidation, isSubmitting } = useBackendValidation();
const [planName, setPlanName] = useState(''); const [planName, setPlanName] = useState('');
const [startDate, setStartDate] = useState(''); const [startDate, setStartDate] = useState('');
const [endDate, setEndDate] = useState(''); const [endDate, setEndDate] = useState('');
@@ -35,9 +35,9 @@ const ShiftPlanCreate: React.FC = () => {
console.log('🔄 Lade verfügbare Vorlagen-Presets...'); console.log('🔄 Lade verfügbare Vorlagen-Presets...');
const data = await shiftPlanService.getTemplatePresets(); const data = await shiftPlanService.getTemplatePresets();
console.log('✅ Presets geladen:', data); console.log('✅ Presets geladen:', data);
setPresets(data); setPresets(data);
// Setze das erste Preset als Standard, falls vorhanden // Setze das erste Preset als Standard, falls vorhanden
if (data.length > 0) { if (data.length > 0) {
setSelectedPreset(data[0].name); setSelectedPreset(data[0].name);
@@ -75,7 +75,7 @@ const ShiftPlanCreate: React.FC = () => {
if (!endDate) { if (!endDate) {
showNotification({ showNotification({
type: 'error', type: 'error',
title: 'Fehlende Angaben', title: 'Fehlende Angaben',
message: 'Bitte wählen Sie ein Enddatum' message: 'Bitte wählen Sie ein Enddatum'
}); });
return; return;
@@ -115,14 +115,14 @@ const ShiftPlanCreate: React.FC = () => {
}); });
console.log('✅ Plan erstellt:', createdPlan); console.log('✅ Plan erstellt:', createdPlan);
// Erfolgsmeldung und Weiterleitung // Erfolgsmeldung und Weiterleitung
showNotification({ showNotification({
type: 'success', type: 'success',
title: 'Erfolg', title: 'Erfolg',
message: 'Schichtplan erfolgreich erstellt!' message: 'Schichtplan erfolgreich erstellt!'
}); });
setTimeout(() => { setTimeout(() => {
navigate(`/shift-plans/${createdPlan.id}`); navigate(`/shift-plans/${createdPlan.id}`);
}, 1500); }, 1500);
@@ -146,20 +146,20 @@ const ShiftPlanCreate: React.FC = () => {
<div className={styles.container}> <div className={styles.container}>
<div className={styles.header}> <div className={styles.header}>
<h1>Neuen Schichtplan erstellen</h1> <h1>Neuen Schichtplan erstellen</h1>
<button <button
onClick={() => navigate(-1)} onClick={() => navigate(-1)}
className={styles.backButton} className={styles.backButton}
disabled={isSubmitting} disabled={isSubmitting}
> >
Zurück Zurück
</button> </button>
</div> </div>
<div className={styles.form}> <div className={styles.form}>
<div className={styles.formGroup}> <div className={styles.formGroup}>
<label>Plan Name:</label> <label>Plan Name:</label>
<input <input
type="text" type="text"
value={planName} value={planName}
onChange={(e) => setPlanName(e.target.value)} onChange={(e) => setPlanName(e.target.value)}
placeholder="z.B. KW 42 2025" placeholder="z.B. KW 42 2025"
@@ -171,8 +171,8 @@ const ShiftPlanCreate: React.FC = () => {
<div className={styles.dateGroup}> <div className={styles.dateGroup}>
<div className={styles.formGroup}> <div className={styles.formGroup}>
<label>Von:</label> <label>Von:</label>
<input <input
type="date" type="date"
value={startDate} value={startDate}
onChange={(e) => setStartDate(e.target.value)} onChange={(e) => setStartDate(e.target.value)}
className={styles.input} className={styles.input}
@@ -182,8 +182,8 @@ const ShiftPlanCreate: React.FC = () => {
<div className={styles.formGroup}> <div className={styles.formGroup}>
<label>Bis:</label> <label>Bis:</label>
<input <input
type="date" type="date"
value={endDate} value={endDate}
onChange={(e) => setEndDate(e.target.value)} onChange={(e) => setEndDate(e.target.value)}
className={styles.input} className={styles.input}
@@ -194,8 +194,8 @@ const ShiftPlanCreate: React.FC = () => {
<div className={styles.formGroup}> <div className={styles.formGroup}>
<label>Vorlage verwenden:</label> <label>Vorlage verwenden:</label>
<select <select
value={selectedPreset} value={selectedPreset}
onChange={(e) => setSelectedPreset(e.target.value)} onChange={(e) => setSelectedPreset(e.target.value)}
className={`${styles.select} ${presets.length === 0 ? styles.empty : ''}`} className={`${styles.select} ${presets.length === 0 ? styles.empty : ''}`}
disabled={isSubmitting} disabled={isSubmitting}
@@ -207,7 +207,7 @@ const ShiftPlanCreate: React.FC = () => {
</option> </option>
))} ))}
</select> </select>
{selectedPreset && ( {selectedPreset && (
<div className={styles.presetDescription}> <div className={styles.presetDescription}>
{getSelectedPresetDescription()} {getSelectedPresetDescription()}
@@ -222,9 +222,9 @@ const ShiftPlanCreate: React.FC = () => {
</div> </div>
<div className={styles.actions}> <div className={styles.actions}>
<button <button
onClick={handleCreate} onClick={handleCreate}
className={styles.createButton} className={styles.createButton}
disabled={isSubmitting || !selectedPreset || !planName.trim() || !startDate || !endDate} disabled={isSubmitting || !selectedPreset || !planName.trim() || !startDate || !endDate}
> >
{isSubmitting ? 'Wird erstellt...' : 'Schichtplan erstellen'} {isSubmitting ? 'Wird erstellt...' : 'Schichtplan erstellen'}

View File

@@ -1,5 +1,5 @@
// frontend/src/pages/ShiftPlans/ShiftPlanView.tsx // frontend/src/pages/ShiftPlans/ShiftPlanView.tsx
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { useParams, useNavigate } from 'react-router-dom'; import { useParams, useNavigate } from 'react-router-dom';
import { useAuth } from '../../contexts/AuthContext'; import { useAuth } from '../../contexts/AuthContext';
import { shiftPlanService } from '../../services/shiftPlanService'; import { shiftPlanService } from '../../services/shiftPlanService';
@@ -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 {
@@ -44,7 +45,7 @@ const ShiftPlanView: React.FC = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { hasRole, user } = useAuth(); const { hasRole, user } = useAuth();
const { showNotification } = useNotification(); const { showNotification } = useNotification();
const [shiftPlan, setShiftPlan] = useState<ShiftPlan | null>(null); const [shiftPlan, setShiftPlan] = useState<ShiftPlan | null>(null);
const [employees, setEmployees] = useState<Employee[]>([]); const [employees, setEmployees] = useState<Employee[]>([]);
const [availabilities, setAvailabilities] = useState<EmployeeAvailability[]>([]); const [availabilities, setAvailabilities] = useState<EmployeeAvailability[]>([]);
@@ -54,19 +55,23 @@ 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 [exportType, setExportType] = useState<'pdf' | 'excel' | null>(null);
const [dropdownWidth, setDropdownWidth] = useState(0);
const dropdownRef = useRef<HTMLDivElement>(null);
useEffect(() => { useEffect(() => {
loadShiftPlanData(); loadShiftPlanData();
// Event Listener für Verfügbarkeits-Änderungen // Event Listener für Verfügbarkeits-Änderungen
const handleAvailabilityChange = () => { const handleAvailabilityChange = () => {
console.log('📢 Verfügbarkeiten wurden geändert - lade Daten neu...'); console.log('📢 Verfügbarkeiten wurden geändert - lade Daten neu...');
reloadAvailabilities(); reloadAvailabilities();
}; };
// Globales Event für Verfügbarkeits-Änderungen // Globales Event für Verfügbarkeits-Änderungen
window.addEventListener('availabilitiesChanged', handleAvailabilityChange); window.addEventListener('availabilitiesChanged', handleAvailabilityChange);
return () => { return () => {
window.removeEventListener('availabilitiesChanged', handleAvailabilityChange); window.removeEventListener('availabilitiesChanged', handleAvailabilityChange);
}; };
@@ -82,7 +87,7 @@ const ShiftPlanView: React.FC = () => {
}; };
document.addEventListener('visibilitychange', handleVisibilityChange); document.addEventListener('visibilitychange', handleVisibilityChange);
return () => { return () => {
document.removeEventListener('visibilitychange', handleVisibilityChange); document.removeEventListener('visibilitychange', handleVisibilityChange);
}; };
@@ -97,17 +102,17 @@ const ShiftPlanView: React.FC = () => {
const debugAvailabilityShiftIds = () => { const debugAvailabilityShiftIds = () => {
if (!availabilities.length) return; if (!availabilities.length) return;
console.log('🔍 AVAILABILITY SHIFT ID ANALYSIS:'); console.log('🔍 AVAILABILITY SHIFT ID ANALYSIS:');
const uniqueShiftIds = [...new Set(availabilities.map(a => a.shiftId))]; const uniqueShiftIds = [...new Set(availabilities.map(a => a.shiftId))];
console.log(`Unique shift IDs in availabilities: ${uniqueShiftIds.length}`); console.log(`Unique shift IDs in availabilities: ${uniqueShiftIds.length}`);
uniqueShiftIds.forEach(shiftId => { uniqueShiftIds.forEach(shiftId => {
const count = availabilities.filter(a => a.shiftId === shiftId).length; const count = availabilities.filter(a => a.shiftId === shiftId).length;
const pref1 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 1).length; const pref1 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 1).length;
const pref2 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 2).length; const pref2 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 2).length;
const pref3 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 3).length; const pref3 = availabilities.filter(a => a.shiftId === shiftId && a.preferenceLevel === 3).length;
console.log(` ${shiftId}: ${count} total (✅${pref1} 🔶${pref2}${pref3})`); console.log(` ${shiftId}: ${count} total (✅${pref1} 🔶${pref2}${pref3})`);
}); });
}; };
@@ -119,6 +124,12 @@ const ShiftPlanView: React.FC = () => {
} }
}, [availabilities]); }, [availabilities]);
useEffect(() => {
if (dropdownRef.current) {
setDropdownWidth(dropdownRef.current.offsetWidth);
}
}, [exportType]);
// Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER // Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER
const getTimetableData = () => { const getTimetableData = () => {
if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) { if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) {
@@ -133,7 +144,7 @@ const ShiftPlanView: React.FC = () => {
if (!acc[shift.dayOfWeek]) { if (!acc[shift.dayOfWeek]) {
acc[shift.dayOfWeek] = []; acc[shift.dayOfWeek] = [];
} }
const timeSlot = timeSlotMap.get(shift.timeSlotId); const timeSlot = timeSlotMap.get(shift.timeSlotId);
const enhancedShift: ExtendedShift = { const enhancedShift: ExtendedShift = {
...shift, ...shift,
@@ -142,7 +153,7 @@ const ShiftPlanView: React.FC = () => {
endTime: timeSlot?.endTime, endTime: timeSlot?.endTime,
displayName: timeSlot ? `${timeSlot.name} (${formatTime(timeSlot.startTime)}-${formatTime(timeSlot.endTime)})` : shift.id displayName: timeSlot ? `${timeSlot.name} (${formatTime(timeSlot.startTime)}-${formatTime(timeSlot.endTime)})` : shift.id
}; };
acc[shift.dayOfWeek].push(enhancedShift); acc[shift.dayOfWeek].push(enhancedShift);
return acc; return acc;
}, {} as Record<number, ExtendedShift[]>); }, {} as Record<number, ExtendedShift[]>);
@@ -202,11 +213,11 @@ const ShiftPlanView: React.FC = () => {
} }
const validationErrors: string[] = []; const validationErrors: string[] = [];
// Check for missing time slots - SAME VALIDATION AS AVAILABILITYMANAGER // Check for missing time slots - SAME VALIDATION AS AVAILABILITYMANAGER
const usedTimeSlotIds = new Set(shiftPlan.shifts.map(s => s.timeSlotId)); const usedTimeSlotIds = new Set(shiftPlan.shifts.map(s => s.timeSlotId));
const availableTimeSlotIds = new Set(shiftPlan.timeSlots.map(ts => ts.id)); const availableTimeSlotIds = new Set(shiftPlan.timeSlots.map(ts => ts.id));
usedTimeSlotIds.forEach(timeSlotId => { usedTimeSlotIds.forEach(timeSlotId => {
if (!availableTimeSlotIds.has(timeSlotId)) { if (!availableTimeSlotIds.has(timeSlotId)) {
validationErrors.push(`Zeitslot ${timeSlotId} wird verwendet, existiert aber nicht in timeSlots`); validationErrors.push(`Zeitslot ${timeSlotId} wird verwendet, existiert aber nicht in timeSlots`);
@@ -240,12 +251,45 @@ const ShiftPlanView: React.FC = () => {
}; };
}; };
const handleExport = async () => {
if (!shiftPlan || !exportType) return;
try {
setExporting(true);
let blob: Blob;
if (exportType === 'excel') {
blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`);
} else {
blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
}
showNotification({
type: 'success',
title: 'Export erfolgreich',
message: `Der Schichtplan wurde als ${exportType === 'excel' ? 'Excel' : 'PDF'} exportiert.`
});
} catch (error) {
console.error(`Error exporting to ${exportType}:`, error);
showNotification({
type: 'error',
title: 'Export fehlgeschlagen',
message: `Der ${exportType === 'excel' ? 'Excel' : 'PDF'}-Export konnte nicht durchgeführt werden.`
});
} finally {
setExporting(false);
}
};
const loadShiftPlanData = async () => { const loadShiftPlanData = async () => {
if (!id) return; if (!id) return;
try { try {
setLoading(true); setLoading(true);
// Load plan and employees first // Load plan and employees first
const [plan, employeesData] = await Promise.all([ const [plan, employeesData] = await Promise.all([
shiftPlanService.getShiftPlan(id), shiftPlanService.getShiftPlan(id),
@@ -258,7 +302,7 @@ const ShiftPlanView: React.FC = () => {
// CRITICAL: Load scheduled shifts and verify they exist // CRITICAL: Load scheduled shifts and verify they exist
const shiftsData = await shiftAssignmentService.getScheduledShiftsForPlan(id); const shiftsData = await shiftAssignmentService.getScheduledShiftsForPlan(id);
console.log('📋 Loaded scheduled shifts:', shiftsData.length); console.log('📋 Loaded scheduled shifts:', shiftsData.length);
if (shiftsData.length === 0) { if (shiftsData.length === 0) {
console.warn('⚠️ No scheduled shifts found for plan:', id); console.warn('⚠️ No scheduled shifts found for plan:', id);
showNotification({ showNotification({
@@ -272,21 +316,21 @@ const ShiftPlanView: React.FC = () => {
// Load availabilities - USING THE SAME LOGIC AS AVAILABILITYMANAGER // Load availabilities - USING THE SAME LOGIC AS AVAILABILITYMANAGER
console.log('🔄 LADE VERFÜGBARKEITEN FÜR PLAN:', id); console.log('🔄 LADE VERFÜGBARKEITEN FÜR PLAN:', id);
const availabilityPromises = employeesData const availabilityPromises = employeesData
.filter(emp => emp.isActive) .filter(emp => emp.isActive)
.map(emp => employeeService.getAvailabilities(emp.id)); .map(emp => employeeService.getAvailabilities(emp.id));
const allAvailabilities = await Promise.all(availabilityPromises); const allAvailabilities = await Promise.all(availabilityPromises);
const flattenedAvailabilities = allAvailabilities.flat(); const flattenedAvailabilities = allAvailabilities.flat();
// Filter to only include availabilities for the current plan - SAME LOGIC AS AVAILABILITYMANAGER // Filter to only include availabilities for the current plan - SAME LOGIC AS AVAILABILITYMANAGER
const planAvailabilities = flattenedAvailabilities.filter( const planAvailabilities = flattenedAvailabilities.filter(
availability => availability.planId === id availability => availability.planId === id
); );
console.log('✅ VERFÜGBARKEITEN FÜR DIESEN PLAN:', planAvailabilities.length); console.log('✅ VERFÜGBARKEITEN FÜR DIESEN PLAN:', planAvailabilities.length);
setAvailabilities(planAvailabilities); setAvailabilities(planAvailabilities);
// Run validation // Run validation
@@ -312,7 +356,7 @@ const ShiftPlanView: React.FC = () => {
try { try {
setRecreating(true); setRecreating(true);
if (!window.confirm('Möchten Sie die aktuellen Zuweisungen wirklich zurücksetzen? Alle vorhandenen Zuweisungen werden gelöscht.')) { if (!window.confirm('Möchten Sie die aktuellen Zuweisungen wirklich zurücksetzen? Alle vorhandenen Zuweisungen werden gelöscht.')) {
return; return;
} }
@@ -343,7 +387,7 @@ const ShiftPlanView: React.FC = () => {
// STEP 4: CRITICAL - Force reload of scheduled shifts to get EMPTY assignments // STEP 4: CRITICAL - Force reload of scheduled shifts to get EMPTY assignments
const refreshedShifts = await shiftAssignmentService.getScheduledShiftsForPlan(shiftPlan.id); const refreshedShifts = await shiftAssignmentService.getScheduledShiftsForPlan(shiftPlan.id);
setScheduledShifts(refreshedShifts); // Update state with EMPTY assignments setScheduledShifts(refreshedShifts); // Update state with EMPTY assignments
// STEP 5: Clear any previous assignment results // STEP 5: Clear any previous assignment results
setAssignmentResult(null); setAssignmentResult(null);
setShowAssignmentPreview(false); setShowAssignmentPreview(false);
@@ -383,9 +427,9 @@ const ShiftPlanView: React.FC = () => {
setPublishing(true); setPublishing(true);
setAssignmentResult(null); // Reset previous results setAssignmentResult(null); // Reset previous results
setShowAssignmentPreview(false); // Reset preview setShowAssignmentPreview(false); // Reset preview
console.log('🔄 STARTING ASSIGNMENT PREVIEW...'); console.log('🔄 STARTING ASSIGNMENT PREVIEW...');
// FORCE COMPLETE REFRESH - don't rely on cached state // FORCE COMPLETE REFRESH - don't rely on cached state
const [refreshedEmployees, refreshedAvailabilities] = await Promise.all([ const [refreshedEmployees, refreshedAvailabilities] = await Promise.all([
employeeService.getEmployees().then(emps => emps.filter(emp => emp.isActive)), employeeService.getEmployees().then(emps => emps.filter(emp => emp.isActive)),
@@ -399,12 +443,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,
@@ -414,7 +458,7 @@ const ShiftPlanView: React.FC = () => {
}; };
console.log('🧠 Calling shift assignment service...'); console.log('🧠 Calling shift assignment service...');
// Use the freshly loaded data, not the state // Use the freshly loaded data, not the state
const result = await shiftAssignmentService.assignShifts( const result = await shiftAssignmentService.assignShifts(
shiftPlan, shiftPlan,
@@ -435,7 +479,7 @@ const ShiftPlanView: React.FC = () => {
console.log('🔍 ASSIGNMENTS BY SHIFT PATTERN:'); console.log('🔍 ASSIGNMENTS BY SHIFT PATTERN:');
Object.entries(result.assignments).forEach(([shiftId, empIds]) => { Object.entries(result.assignments).forEach(([shiftId, empIds]) => {
const shiftPattern = shiftPlan.shifts?.find(s => s.id === shiftId); const shiftPattern = shiftPlan.shifts?.find(s => s.id === shiftId);
if (shiftPattern) { if (shiftPattern) {
console.log(` ✅ Shift Pattern: ${shiftId}`); console.log(` ✅ Shift Pattern: ${shiftId}`);
console.log(` - Day: ${shiftPattern.dayOfWeek}, TimeSlot: ${shiftPattern.timeSlotId}`); console.log(` - Day: ${shiftPattern.dayOfWeek}, TimeSlot: ${shiftPattern.timeSlotId}`);
@@ -451,7 +495,7 @@ const ShiftPlanView: React.FC = () => {
console.log('🔄 Setting assignment result and showing preview...'); console.log('🔄 Setting assignment result and showing preview...');
setAssignmentResult(result); setAssignmentResult(result);
setShowAssignmentPreview(true); setShowAssignmentPreview(true);
console.log('✅ Assignment preview ready, modal should be visible'); console.log('✅ Assignment preview ready, modal should be visible');
} catch (error) { } catch (error) {
@@ -465,18 +509,18 @@ const ShiftPlanView: React.FC = () => {
setPublishing(false); setPublishing(false);
} }
}; };
const handlePublish = async () => { const handlePublish = async () => {
if (!shiftPlan || !assignmentResult) return; if (!shiftPlan || !assignmentResult) return;
try { try {
setPublishing(true); setPublishing(true);
console.log('🔄 Starting to publish assignments...'); console.log('🔄 Starting to publish assignments...');
// Get fresh scheduled shifts // Get fresh scheduled shifts
const updatedShifts = await shiftAssignmentService.getScheduledShiftsForPlan(shiftPlan.id); const updatedShifts = await shiftAssignmentService.getScheduledShiftsForPlan(shiftPlan.id);
if (!updatedShifts || updatedShifts.length === 0) { if (!updatedShifts || updatedShifts.length === 0) {
throw new Error('No scheduled shifts found in the plan'); throw new Error('No scheduled shifts found in the plan');
} }
@@ -486,19 +530,19 @@ const ShiftPlanView: React.FC = () => {
const updatePromises = updatedShifts.map(async (scheduledShift) => { const updatePromises = updatedShifts.map(async (scheduledShift) => {
const dayOfWeek = getDayOfWeek(scheduledShift.date); const dayOfWeek = getDayOfWeek(scheduledShift.date);
// Find the corresponding shift pattern for this day and time slot // Find the corresponding shift pattern for this day and time slot
const shiftPattern = shiftPlan?.shifts?.find(shift => const shiftPattern = shiftPlan?.shifts?.find(shift =>
shift.dayOfWeek === dayOfWeek && shift.dayOfWeek === dayOfWeek &&
shift.timeSlotId === scheduledShift.timeSlotId shift.timeSlotId === scheduledShift.timeSlotId
); );
let assignedEmployees: string[] = []; let assignedEmployees: string[] = [];
if (shiftPattern) { if (shiftPattern) {
assignedEmployees = assignmentResult.assignments[shiftPattern.id] || []; assignedEmployees = assignmentResult.assignments[shiftPattern.id] || [];
console.log(`📝 Updating scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId}) with`, assignedEmployees, 'employees'); console.log(`📝 Updating scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId}) with`, assignedEmployees, 'employees');
if (assignedEmployees.length === 0) { if (assignedEmployees.length === 0) {
console.warn(`⚠️ No assignments found for shift pattern ${shiftPattern.id}`); console.warn(`⚠️ No assignments found for shift pattern ${shiftPattern.id}`);
console.log('🔍 Available assignment keys:', Object.keys(assignmentResult.assignments)); console.log('🔍 Available assignment keys:', Object.keys(assignmentResult.assignments));
@@ -506,13 +550,13 @@ const ShiftPlanView: React.FC = () => {
} else { } else {
console.warn(`⚠️ No shift pattern found for scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId})`); console.warn(`⚠️ No shift pattern found for scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId})`);
} }
try { try {
// Update the scheduled shift with assigned employees // Update the scheduled shift with assigned employees
await shiftAssignmentService.updateScheduledShift(scheduledShift.id, { await shiftAssignmentService.updateScheduledShift(scheduledShift.id, {
assignedEmployees assignedEmployees
}); });
console.log(`✅ Successfully updated scheduled shift ${scheduledShift.id}`); console.log(`✅ Successfully updated scheduled shift ${scheduledShift.id}`);
} catch (error) { } catch (error) {
console.error(`❌ Failed to update shift ${scheduledShift.id}:`, error); console.error(`❌ Failed to update shift ${scheduledShift.id}:`, error);
@@ -550,12 +594,12 @@ const ShiftPlanView: React.FC = () => {
} catch (error) { } catch (error) {
console.error('❌ Error publishing shift plan:', error); console.error('❌ Error publishing shift plan:', error);
let message = 'Unbekannter Fehler'; let message = 'Unbekannter Fehler';
if (error instanceof Error) { if (error instanceof Error) {
message = error.message; message = error.message;
} }
showNotification({ showNotification({
type: 'error', type: 'error',
title: 'Fehler', title: 'Fehler',
@@ -569,7 +613,7 @@ const ShiftPlanView: React.FC = () => {
const refreshAllAvailabilities = async (): Promise<EmployeeAvailability[]> => { const refreshAllAvailabilities = async (): Promise<EmployeeAvailability[]> => {
try { try {
console.log('🔄 Force refreshing ALL availabilities with error handling...'); console.log('🔄 Force refreshing ALL availabilities with error handling...');
if (!id) { if (!id) {
console.error('❌ No plan ID available'); console.error('❌ No plan ID available');
return []; return [];
@@ -585,20 +629,20 @@ const ShiftPlanView: React.FC = () => {
return []; // Return empty array instead of failing entire operation return []; // Return empty array instead of failing entire operation
} }
}); });
const allAvailabilities = await Promise.all(availabilityPromises); const allAvailabilities = await Promise.all(availabilityPromises);
const flattenedAvailabilities = allAvailabilities.flat(); const flattenedAvailabilities = allAvailabilities.flat();
// More robust filtering // More robust filtering
const planAvailabilities = flattenedAvailabilities.filter( const planAvailabilities = flattenedAvailabilities.filter(
availability => availability && availability.planId === id availability => availability && availability.planId === id
); );
console.log(`✅ Successfully refreshed ${planAvailabilities.length} availabilities for plan ${id}`); console.log(`✅ Successfully refreshed ${planAvailabilities.length} availabilities for plan ${id}`);
// IMMEDIATELY update state // IMMEDIATELY update state
setAvailabilities(planAvailabilities); setAvailabilities(planAvailabilities);
return planAvailabilities; return planAvailabilities;
} catch (error) { } catch (error) {
console.error('❌ Critical error refreshing availabilities:', error); console.error('❌ Critical error refreshing availabilities:', error);
@@ -609,21 +653,21 @@ const ShiftPlanView: React.FC = () => {
const debugShiftMatching = () => { const debugShiftMatching = () => {
if (!shiftPlan || !scheduledShifts.length) return; if (!shiftPlan || !scheduledShifts.length) return;
console.log('🔍 DEBUG: Shift Pattern to Scheduled Shift Matching'); console.log('🔍 DEBUG: Shift Pattern to Scheduled Shift Matching');
console.log('=================================================='); console.log('==================================================');
shiftPlan.shifts?.forEach(shiftPattern => { shiftPlan.shifts?.forEach(shiftPattern => {
const matchingScheduledShifts = scheduledShifts.filter(scheduled => { const matchingScheduledShifts = scheduledShifts.filter(scheduled => {
const dayOfWeek = getDayOfWeek(scheduled.date); const dayOfWeek = getDayOfWeek(scheduled.date);
return dayOfWeek === shiftPattern.dayOfWeek && return dayOfWeek === shiftPattern.dayOfWeek &&
scheduled.timeSlotId === shiftPattern.timeSlotId; scheduled.timeSlotId === shiftPattern.timeSlotId;
}); });
console.log(`📅 Shift Pattern: ${shiftPattern.id}`); console.log(`📅 Shift Pattern: ${shiftPattern.id}`);
console.log(` - Day: ${shiftPattern.dayOfWeek}, TimeSlot: ${shiftPattern.timeSlotId}`); console.log(` - Day: ${shiftPattern.dayOfWeek}, TimeSlot: ${shiftPattern.timeSlotId}`);
console.log(` - Matching scheduled shifts: ${matchingScheduledShifts.length}`); console.log(` - Matching scheduled shifts: ${matchingScheduledShifts.length}`);
if (assignmentResult) { if (assignmentResult) {
const assignments = assignmentResult.assignments[shiftPattern.id] || []; const assignments = assignmentResult.assignments[shiftPattern.id] || [];
console.log(` - Assignments: ${assignments.length} employees`); console.log(` - Assignments: ${assignments.length} employees`);
@@ -640,7 +684,7 @@ const ShiftPlanView: React.FC = () => {
const canPublish = () => { const canPublish = () => {
if (!shiftPlan || shiftPlan.status === 'published') return false; if (!shiftPlan || shiftPlan.status === 'published') return false;
// Check if all active employees have set their availabilities // Check if all active employees have set their availabilities
const employeesWithoutAvailabilities = employees.filter(emp => { const employeesWithoutAvailabilities = employees.filter(emp => {
const empAvailabilities = availabilities.filter(avail => avail.employeeId === emp.id); const empAvailabilities = availabilities.filter(avail => avail.employeeId === emp.id);
@@ -650,6 +694,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(
@@ -666,23 +724,23 @@ const ShiftPlanView: React.FC = () => {
const reloadAvailabilities = async () => { const reloadAvailabilities = async () => {
try { try {
console.log('🔄 Lade Verfügbarkeiten neu...'); console.log('🔄 Lade Verfügbarkeiten neu...');
// Load availabilities for all employees // Load availabilities for all employees
const availabilityPromises = employees const availabilityPromises = employees
.filter(emp => emp.isActive) .filter(emp => emp.isActive)
.map(emp => employeeService.getAvailabilities(emp.id)); .map(emp => employeeService.getAvailabilities(emp.id));
const allAvailabilities = await Promise.all(availabilityPromises); const allAvailabilities = await Promise.all(availabilityPromises);
const flattenedAvailabilities = allAvailabilities.flat(); const flattenedAvailabilities = allAvailabilities.flat();
// Filter availabilities to only include those for the current shift plan // Filter availabilities to only include those for the current shift plan
const planAvailabilities = flattenedAvailabilities.filter( const planAvailabilities = flattenedAvailabilities.filter(
availability => availability.planId === id availability => availability.planId === id
); );
setAvailabilities(planAvailabilities); setAvailabilities(planAvailabilities);
console.log('✅ Verfügbarkeiten neu geladen:', planAvailabilities.length); console.log('✅ Verfügbarkeiten neu geladen:', planAvailabilities.length);
} catch (error) { } catch (error) {
console.error('❌ Fehler beim Neuladen der Verfügbarkeiten:', error); console.error('❌ Fehler beim Neuladen der Verfügbarkeiten:', error);
} }
@@ -690,26 +748,26 @@ const ShiftPlanView: React.FC = () => {
const getAssignmentsForScheduledShift = (scheduledShift: ScheduledShift): string[] => { const getAssignmentsForScheduledShift = (scheduledShift: ScheduledShift): string[] => {
if (!assignmentResult) return []; if (!assignmentResult) return [];
const dayOfWeek = getDayOfWeek(scheduledShift.date); const dayOfWeek = getDayOfWeek(scheduledShift.date);
// Find the corresponding shift pattern for this day and time slot // Find the corresponding shift pattern for this day and time slot
const shiftPattern = shiftPlan?.shifts?.find(shift => const shiftPattern = shiftPlan?.shifts?.find(shift =>
shift.dayOfWeek === dayOfWeek && shift.dayOfWeek === dayOfWeek &&
shift.timeSlotId === scheduledShift.timeSlotId shift.timeSlotId === scheduledShift.timeSlotId
); );
if (shiftPattern && assignmentResult.assignments[shiftPattern.id]) { if (shiftPattern && assignmentResult.assignments[shiftPattern.id]) {
console.log(`✅ Found assignments for shift pattern ${shiftPattern.id}:`, assignmentResult.assignments[shiftPattern.id]); console.log(`✅ Found assignments for shift pattern ${shiftPattern.id}:`, assignmentResult.assignments[shiftPattern.id]);
return assignmentResult.assignments[shiftPattern.id]; return assignmentResult.assignments[shiftPattern.id];
} }
// Fallback: Check if there's a direct match with scheduled shift ID (unlikely) // Fallback: Check if there's a direct match with scheduled shift ID (unlikely)
if (assignmentResult.assignments[scheduledShift.id]) { if (assignmentResult.assignments[scheduledShift.id]) {
console.log(`⚠️ Using direct scheduled shift assignment for ${scheduledShift.id}`); console.log(`⚠️ Using direct scheduled shift assignment for ${scheduledShift.id}`);
return assignmentResult.assignments[scheduledShift.id]; return assignmentResult.assignments[scheduledShift.id];
} }
console.warn(`❌ No assignments found for scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId})`); console.warn(`❌ No assignments found for scheduled shift ${scheduledShift.id} (Day ${dayOfWeek}, TimeSlot ${scheduledShift.timeSlotId})`);
return []; return [];
}; };
@@ -820,13 +878,10 @@ 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];
if (!shift) { if (!shift) {
return ( return (
<td key={weekday.id} style={{ <td key={weekday.id} style={{
@@ -844,65 +899,115 @@ const ShiftPlanView: React.FC = () => {
// Validation: Check if shift has correct timeSlotId and dayOfWeek - SAME AS AVAILABILITYMANAGER // Validation: Check if shift has correct timeSlotId and dayOfWeek - SAME AS AVAILABILITYMANAGER
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
const scheduledShift = scheduledShifts.find(scheduled => { const scheduledShift = scheduledShifts.find(scheduled => {
const scheduledDayOfWeek = getDayOfWeek(scheduled.date); const scheduledDayOfWeek = getDayOfWeek(scheduled.date);
return scheduledDayOfWeek === weekday.id && return scheduledDayOfWeek === weekday.id &&
scheduled.timeSlotId === timeSlot.id; scheduled.timeSlotId === timeSlot.id;
}); });
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
const scheduledShift = scheduledShifts.find(scheduled => { const scheduledShift = scheduledShifts.find(scheduled => {
const scheduledDayOfWeek = getDayOfWeek(scheduled.date); const scheduledDayOfWeek = getDayOfWeek(scheduled.date);
return scheduledDayOfWeek === weekday.id && return scheduledDayOfWeek === weekday.id &&
scheduled.timeSlotId === timeSlot.id; scheduled.timeSlotId === timeSlot.id;
}); });
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 (
@@ -931,24 +1036,22 @@ const ShiftPlanView: React.FC = () => {
alignItems: 'center', alignItems: 'center',
justifyContent: 'center' justifyContent: 'center'
}} }}
title={`Shift Validierung: timeSlotId=${shift.timeSlotId}, dayOfWeek=${shift.dayOfWeek}`} title={`Shift Validierung: timeSlotId=${shift.timeSlotId}, dayOfWeek=${shift.dayOfWeek}`}
> >
</div> </div>
)} )}
{displayText} {displayContent}
{/* Shift debug info - SAME AS AVAILABILITYMANAGER */} {/* Shift debug info - SAME AS AVAILABILITYMANAGER */}
<div style={{ <div style={{
fontSize: '10px', fontSize: '10px',
color: '#666', color: '#666',
marginTop: '4px', marginTop: '4px',
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
@@ -963,7 +1066,6 @@ const ShiftPlanView: React.FC = () => {
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
); );
}; };
@@ -978,20 +1080,20 @@ const ShiftPlanView: React.FC = () => {
return ( return (
<div style={{ padding: '20px' }}> <div style={{ padding: '20px' }}>
{/* Header with Plan Information and Actions */} {/* Header with Plan Information and Actions */}
<div style={{ <div style={{
display: 'flex', display: 'flex',
justifyContent: 'space-between', justifyContent: 'space-between',
alignItems: 'flex-start', alignItems: 'flex-start',
marginBottom: '20px' marginBottom: '20px'
}}> }}>
<div> <div>
<h1>{shiftPlan.name}</h1> <h1>{shiftPlan.name}</h1>
<p style={{ color: '#666', margin: 0 }}> <p style={{ color: '#666', margin: 0 }}>
{shiftPlan.startDate && shiftPlan.endDate && {shiftPlan.startDate && shiftPlan.endDate &&
`Zeitraum: ${formatDate(shiftPlan.startDate)} - ${formatDate(shiftPlan.endDate)}` `Zeitraum: ${formatDate(shiftPlan.startDate)} - ${formatDate(shiftPlan.endDate)}`
} }
</p> </p>
<div style={{ <div style={{
display: 'inline-block', display: 'inline-block',
padding: '4px 12px', padding: '4px 12px',
backgroundColor: shiftPlan.status === 'published' ? '#2ecc71' : '#f1c40f', backgroundColor: shiftPlan.status === 'published' ? '#2ecc71' : '#f1c40f',
@@ -1004,8 +1106,9 @@ const ShiftPlanView: React.FC = () => {
{shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'} {shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'}
</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']) && ( {/* "Zuweisungen neu berechnen" button */}
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<button <button
onClick={handleRecreateAssignments} onClick={handleRecreateAssignments}
disabled={recreating} disabled={recreating}
@@ -1022,7 +1125,7 @@ const ShiftPlanView: React.FC = () => {
{recreating ? 'Lösche Zuweisungen...' : 'Zuweisungen neu berechnen'} {recreating ? 'Lösche Zuweisungen...' : 'Zuweisungen neu berechnen'}
</button> </button>
)} )}
<button <button
onClick={() => navigate('/shift-plans')} onClick={() => navigate('/shift-plans')}
style={{ style={{
@@ -1057,15 +1160,15 @@ const ShiftPlanView: React.FC = () => {
<div style={{ fontSize: '18px', fontWeight: 'bold' }}> <div style={{ fontSize: '18px', fontWeight: 'bold' }}>
{availabilityStatus.completed} / {availabilityStatus.total} Mitarbeiter {availabilityStatus.completed} / {availabilityStatus.total} Mitarbeiter
</div> </div>
<div style={{ <div style={{
width: '200px', width: '200px',
height: '8px', height: '8px',
backgroundColor: '#e0e0e0', backgroundColor: '#e0e0e0',
borderRadius: '4px', borderRadius: '4px',
marginTop: '5px', marginTop: '5px',
overflow: 'hidden' overflow: 'hidden'
}}> }}>
<div <div
style={{ style={{
width: `${availabilityStatus.percentage}%`, width: `${availabilityStatus.percentage}%`,
height: '100%', height: '100%',
@@ -1075,7 +1178,7 @@ const ShiftPlanView: React.FC = () => {
/> />
</div> </div>
</div> </div>
{hasRole(['admin', 'maintenance']) && ( {hasRole(['admin', 'maintenance']) && (
<div> <div>
<button <button
@@ -1093,11 +1196,11 @@ const ShiftPlanView: React.FC = () => {
> >
{publishing ? 'Berechne...' : 'Automatisch zuweisen'} {publishing ? 'Berechne...' : 'Automatisch zuweisen'}
</button> </button>
{!canPublish() && ( {!canPublish() && (
<div style={{ fontSize: '12px', color: '#666', marginTop: '5px' }}> <div style={{ fontSize: '12px', color: '#666', marginTop: '5px' }}>
{availabilityStatus.percentage === 100 {availabilityStatus.percentage === 100
? 'Bereit zur Berechnung' ? 'Bereit zur Berechnung'
: `${availabilityStatus.total - availabilityStatus.completed} Mitarbeiter müssen noch Verfügbarkeit eintragen`} : `${availabilityStatus.total - availabilityStatus.completed} Mitarbeiter müssen noch Verfügbarkeit eintragen`}
</div> </div>
)} )}
@@ -1142,7 +1245,7 @@ const ShiftPlanView: React.FC = () => {
width: '90%' width: '90%'
}}> }}>
<h2>Wochenmuster-Zuordnung</h2> <h2>Wochenmuster-Zuordnung</h2>
{/* Detaillierter Reparatur-Bericht anzeigen */} {/* Detaillierter Reparatur-Bericht anzeigen */}
{assignmentResult?.resolutionReport && ( {assignmentResult?.resolutionReport && (
<div style={{ <div style={{
@@ -1158,15 +1261,15 @@ const ShiftPlanView: React.FC = () => {
<h4 style={{ color: '#2c3e50', marginTop: 0, display: 'flex', alignItems: 'center', gap: '10px' }}> <h4 style={{ color: '#2c3e50', marginTop: 0, display: 'flex', alignItems: 'center', gap: '10px' }}>
<span>📋</span> Detaillierter Reparatur-Bericht <span>📋</span> Detaillierter Reparatur-Bericht
</h4> </h4>
<div style={{ <div style={{
fontFamily: 'monospace', fontFamily: 'monospace',
fontSize: '12px', fontSize: '12px',
lineHeight: '1.4' lineHeight: '1.4'
}}> }}>
{assignmentResult.resolutionReport.map((line, index) => { {assignmentResult.resolutionReport.map((line, index) => {
let color = '#2c3e50'; let color = '#2c3e50';
let fontWeight = 'normal'; let fontWeight = 'normal';
if (line.includes('✅') || line.includes('ALLES KRITISCHEN PROBLEME BEHOBEN')) { if (line.includes('✅') || line.includes('ALLES KRITISCHEN PROBLEME BEHOBEN')) {
color = '#2ecc71'; color = '#2ecc71';
fontWeight = 'bold'; fontWeight = 'bold';
@@ -1181,9 +1284,9 @@ const ShiftPlanView: React.FC = () => {
} else if (line.startsWith(' •') || line.startsWith(' -')) { } else if (line.startsWith(' •') || line.startsWith(' -')) {
color = '#7f8c8d'; color = '#7f8c8d';
} }
return ( return (
<div key={index} style={{ <div key={index} style={{
color, color,
fontWeight, fontWeight,
marginBottom: line === '' ? '5px' : '2px', marginBottom: line === '' ? '5px' : '2px',
@@ -1196,16 +1299,14 @@ const ShiftPlanView: React.FC = () => {
</div> </div>
</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',
@@ -1243,7 +1344,7 @@ const ShiftPlanView: React.FC = () => {
</ul> </ul>
</div> </div>
)} )}
{/* Warnungen separat anzeigen - NUR wenn welche vorhanden sind */} {/* Warnungen separat anzeigen - NUR wenn welche vorhanden sind */}
{assignmentResult.violations.some(v => v.includes('WARNING:') || v.includes('⚠️')) && ( {assignmentResult.violations.some(v => v.includes('WARNING:') || v.includes('⚠️')) && (
<div style={{ <div style={{
@@ -1287,34 +1388,26 @@ 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:') ? 'Schichtplan veröffentlichen'
).length === 0
? 'Schichtplan veröffentlichen'
: 'Kritische Probleme müssen behoben werden' : 'Kritische Probleme müssen behoben werden'
) : 'Lade Zuordnungen...' ) : 'Lade Zuordnungen...'
)} )}
@@ -1322,7 +1415,7 @@ const ShiftPlanView: React.FC = () => {
</div> </div>
</div> </div>
</div> </div>
)} )}
{/* Timetable */} {/* Timetable */}
<div style={{ <div style={{
@@ -1332,13 +1425,72 @@ const ShiftPlanView: React.FC = () => {
boxShadow: '0 2px 4px rgba(0,0,0,0.1)' boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
}}> }}>
<h3> <h3>
Schichtplan Schichtplan
{shiftPlan.status === 'published' && ' (Aktuelle Zuweisungen)'} {shiftPlan.status === 'published' && ' (Aktuelle Zuweisungen)'}
{assignmentResult && shiftPlan.status === 'draft' && ' (Exemplarische Woche)'} {assignmentResult && shiftPlan.status === 'draft' && ' (Exemplarische Woche)'}
</h3> </h3>
{renderTimetable()} {renderTimetable()}
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<div style={{
display: 'flex',
alignItems: 'center',
position: 'relative',
marginLeft: '10px'
}}>
{/* Export Dropdown */}
<div
ref={dropdownRef}
style={{
transform: exportType ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
transition: 'transform 0.3s ease-in-out',
position: exportType ? 'absolute' : 'relative',
right: exportType ? `-${dropdownWidth}px` : '0'
}}
>
<select
value={exportType || ''}
onChange={(e) => setExportType(e.target.value as 'pdf' | 'excel' | null)}
style={{
padding: '10px 20px',
backgroundColor: 'white',
border: '1px solid #ddd',
borderRadius: '4px',
cursor: 'pointer',
minWidth: '120px'
}}
>
<option value="">Export</option>
<option value="pdf">PDF</option>
<option value="excel">Excel</option>
</select>
</div>
{/* Export Button */}
{exportType && (
<button
onClick={handleExport}
disabled={exporting}
style={{
padding: '10px 20px',
backgroundColor: '#51258f',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: exporting ? 'not-allowed' : 'pointer',
fontWeight: 'bold',
marginLeft: '10px',
opacity: exporting ? 0.7 : 1,
transition: 'opacity 0.2s ease'
}}
>
{exporting ? '🔄 Exportiert...' : 'EXPORT'}
</button>
)}
</div>
)}
{/* Summary */} {/* Summary */}
{days.length > 0 && ( {days.length > 0 && (
<div style={{ <div style={{
@@ -1350,11 +1502,11 @@ const ShiftPlanView: React.FC = () => {
fontSize: '14px' fontSize: '14px'
}}> }}>
<strong>Legende:</strong> { <strong>Legende:</strong> {
shiftPlan.status === 'published' shiftPlan.status === 'published'
? 'Angezeigt werden die aktuell zugewiesenen Mitarbeiter' ? 'Angezeigt werden die aktuell zugewiesenen Mitarbeiter'
: assignmentResult : assignmentResult
? 'Angezeigt werden die vorgeschlagenen Mitarbeiter für eine exemplarische Woche' ? 'Angezeigt werden die vorgeschlagenen Mitarbeiter für eine exemplarische Woche'
: 'Angezeigt wird "zugewiesene/benötigte Mitarbeiter" pro Schicht und Wochentag' : 'Angezeigt wird "zugewiesene/benötigte Mitarbeiter" pro Schicht und Wochentag'
} }
</div> </div>
)} )}

View File

@@ -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) {

View File

@@ -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

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@
"private": true, "private": true,
"workspaces": [ "workspaces": [
"frontend", "frontend",
"backend", "backend",
"premium" "premium"
], ],
"scripts": { "scripts": {
@@ -12,7 +12,7 @@
"build:all": "npm run build --workspace=backend && npm run build --workspace=frontend", "build:all": "npm run build --workspace=backend && npm run build --workspace=frontend",
"dev": "concurrently \"npm run dev:backend\" \"npm run dev:frontend\"", "dev": "concurrently \"npm run dev:backend\" \"npm run dev:frontend\"",
"dev:frontend": "cd frontend && npm run dev", "dev:frontend": "cd frontend && npm run dev",
"dev:backend": "cd backend && npm run dev:single" "dev:backend": "cd backend && npm run dev:all"
}, },
"devDependencies": { "devDependencies": {
"typescript": "^5.3.3", "typescript": "^5.3.3",