changed from SolveWithSolutionCallback to Solver as of OR-Tools version change

README.md

@@ -1,6 +1,91 @@
 # Schichtenplaner
-Aufteilung der Schichten unter Mitarbeitern
 
+A web application for planning and distributing work shifts among employees. Manage your team's schedules, handle employee availability, and automatically generate optimized shift plans.
+
+## Features
+
+- Employee management with availability tracking
+- Shift plan creation and management
+- Automated scheduling optimization using constraint programming (OR-Tools CP-SAT)
+- Excel export functionality
+- User authentication with JWT
+- Responsive web interface
+
+---
+
+## For Developers
+
+### Tech Stack
+
+**Frontend:**
+- React 19 with TypeScript
+- Vite 6 (build tool & dev server)
+- React Router DOM (routing)
+- date-fns (date handling)
+- Framer Motion (animations)
+
+**Backend:**
+- Express.js with TypeScript
+- SQLite3 (database)
+- JWT authentication
+- Helmet (security headers)
+- express-rate-limit (rate limiting)
+- OR-Tools CP-SAT (Python - scheduling optimization)
+- ExcelJS (Excel exports)
+
+**Infrastructure:**
+- npm workspaces (monorepo)
+- Docker support
+
+### Prerequisites
+
+- Node.js (v18+)
+- Python 3 with OR-Tools (`pip install ortools`)
+- npm
+
+### Getting Started
+
+```bash
+# Install dependencies
+npm install
+
+# Run development server (frontend + backend)
+npm run dev
+
+# Build all packages
+npm run build:all
+```
+
+### Project Structure
+
+```
+schichtenplaner/
+├── frontend/     # React application
+├── backend/      # Express API server
+├── premium/      # Premium features (optional)
+└── package.json  # Root monorepo config
+```
+
+### Available Scripts
+
+| Command | Description |
+|---------|-------------|
+| `npm run dev` | Start both frontend and backend in development mode |
+| `npm run dev:frontend` | Start frontend only |
+| `npm run dev:backend` | Start backend only |
+| `npm run build:all` | Build frontend and backend |
+| `npm run docker:build` | Build Docker image |
+| `npm run docker:run` | Run Docker container |
+
+### Environment Variables
+
+The backend requires these environment variables in production:
+- `NODE_ENV` - Set to `production` or `development`
+- `JWT_SECRET` - Secret key for JWT token signing
+- `TRUST_PROXY_ENABLED` - Enable/disable proxy trust (default: true)
+- `TRUSTED_PROXY_IPS` - Comma-separated list of trusted proxy IPs
+
+---
 
 ## 🧾 License
 

backend/package.json

@@ -4,7 +4,9 @@
   "type": "module",
   "scripts": {
     "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",
     "start": "node dist/server.js",
     "prestart": "npm run build",
@@ -16,7 +18,7 @@
   "dependencies": {
     "@types/bcrypt": "^6.0.0",
     "@types/node": "24.9.2",
-    "vite":"7.1.12",
+    "vite": "7.1.12",
     "bcrypt": "^6.0.0",
     "bcryptjs": "^2.4.3",
     "express": "^4.18.2",
@@ -25,7 +27,9 @@
     "uuid": "^9.0.0",
     "express-rate-limit": "8.1.0",
     "helmet": "8.1.0",
-    "express-validator": "7.3.0"
+    "express-validator": "7.3.0",
+    "exceljs": "4.4.0",
+    "playwright-chromium": "^1.37.0"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.2",

backend/src/middleware/rateLimit.ts

@@ -41,12 +41,35 @@ const getClientIP = (req: Request): string => {
   return remoteAddress;
 };
 
+// Helper to check if an IP is a loopback address (IPv4 or IPv6)
+const isLoopbackAddress = (ip: string): boolean => {
+  // IPv4 loopback: 127.0.0.0/8
+  if (ip.startsWith('127.') || ip === 'localhost') {
+    return true;
+  }
+
+  // IPv6 loopback: ::1
+  // Also handle IPv4-mapped IPv6 addresses like ::ffff:127.0.0.1
+  if (ip === '::1' || ip === '::ffff:127.0.0.1') {
+    return true;
+  }
+
+  // Handle full IPv6 loopback notation
+  if (ip.toLowerCase().startsWith('0000:0000:0000:0000:0000:0000:0000:0001') ||
+    ip.toLowerCase() === '0:0:0:0:0:0:0:1') {
+    return true;
+  }
+
+  return false;
+};
+
 // Helper to check if request should be limited
 const shouldSkipLimit = (req: Request): boolean => {
   const skipPaths = [
     '/api/health',
     '/api/setup/status',
-    '/api/auth/validate'
+    '/api/auth/validate',
+    '/api/auth/me',
   ];
 
   // Skip for successful GET requests (data fetching)
@@ -54,9 +77,16 @@ const shouldSkipLimit = (req: Request): boolean => {
     return true;
   }
 
+  const clientIP = getClientIP(req);
+
+  // Skip for loopback addresses (local development)
+  if (isLoopbackAddress(clientIP)) {
+    console.log(`✅ Loopback address skipped: ${clientIP}`);
+    return true;
+  }
+
   // Skip for whitelisted IPs from environment
   const whitelist = process.env.RATE_LIMIT_WHITELIST?.split(',') || [];
-  const clientIP = getClientIP(req);
   if (whitelist.includes(clientIP)) {
     console.log(`✅ IP whitelisted: ${clientIP}`);
     return true;
@@ -72,8 +102,8 @@ const getRateLimitConfig = () => {
   return {
     windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || '900000'), // 15 minutes default
     max: isProduction
-      ? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '1000')  // Stricter in production
+      ? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '50')  // Stricter in production
-      : parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '5000'), // More lenient in development
+      : parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '100'), // More lenient in development
 
     // Development-specific relaxations
     skip: (req: Request) => {
@@ -112,7 +142,7 @@ export const apiLimiter = rateLimit({
 // Strict limiter for auth endpoints
 export const authLimiter = rateLimit({
   windowMs: 15 * 60 * 1000,
-  max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '100'),
+  max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '50'),
   message: {
     error: 'Zu viele Login-Versuche, bitte versuchen Sie es später erneut'
   },
@@ -135,7 +165,7 @@ export const authLimiter = rateLimit({
 // Separate limiter for expensive endpoints
 export const expensiveEndpointLimiter = rateLimit({
   windowMs: 15 * 60 * 1000,
-  max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '100'),
+  max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '20'),
   message: {
     error: 'Zu viele Anfragen für diese Ressource'
   },

backend/src/middleware/validation.ts

@@ -388,6 +388,111 @@ export const validateCreateFromPreset = [
     .withMessage('isTemplate must be a boolean')
 ];
 
+// ===== TIME SLOT VALIDATION =====
+export const validateTimeSlot = [
+  body('name')
+    .isLength({ min: 1, max: 100 })
+    .withMessage('Time slot name must be between 1-100 characters')
+    .trim()
+    .escape(),
+
+  body('startTime')
+    .matches(/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/)
+    .withMessage('Start time must be in HH:MM format'),
+
+  body('endTime')
+    .matches(/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/)
+    .withMessage('End time must be in HH:MM format'),
+
+  body('description')
+    .optional()
+    .isLength({ max: 500 })
+    .withMessage('Description cannot exceed 500 characters')
+    .trim()
+    .escape()
+];
+
+export const validateTimeSlotUpdate = [
+  body('name')
+    .optional()
+    .isLength({ min: 1, max: 100 })
+    .withMessage('Time slot name must be between 1-100 characters')
+    .trim()
+    .escape(),
+
+  body('startTime')
+    .optional()
+    .matches(/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/)
+    .withMessage('Start time must be in HH:MM format'),
+
+  body('endTime')
+    .optional()
+    .matches(/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/)
+    .withMessage('End time must be in HH:MM format'),
+
+  body('description')
+    .optional()
+    .isLength({ max: 500 })
+    .withMessage('Description cannot exceed 500 characters')
+    .trim()
+    .escape()
+];
+
+export const validateSlotId = [
+  param('slotId')
+    .isUUID()
+    .withMessage('Slot ID must be a valid UUID')
+];
+
+// ===== SHIFT VALIDATION =====
+export const validateShiftCreate = [
+  body('timeSlotId')
+    .isUUID()
+    .withMessage('Time slot ID must be a valid UUID'),
+
+  body('dayOfWeek')
+    .isInt({ min: 1, max: 7 })
+    .withMessage('Day of week must be between 1-7 (Monday-Sunday)'),
+
+  body('requiredEmployees')
+    .optional()
+    .isInt({ min: 1, max: 10 })
+    .withMessage('Required employees must be between 1-10'),
+
+  body('color')
+    .optional()
+    .isHexColor()
+    .withMessage('Color must be a valid hex color')
+];
+
+export const validateShiftUpdate = [
+  body('timeSlotId')
+    .optional()
+    .isUUID()
+    .withMessage('Time slot ID must be a valid UUID'),
+
+  body('dayOfWeek')
+    .optional()
+    .isInt({ min: 1, max: 7 })
+    .withMessage('Day of week must be between 1-7 (Monday-Sunday)'),
+
+  body('requiredEmployees')
+    .optional()
+    .isInt({ min: 1, max: 10 })
+    .withMessage('Required employees must be between 1-10'),
+
+  body('color')
+    .optional()
+    .isHexColor()
+    .withMessage('Color must be a valid hex color')
+];
+
+export const validateShiftId = [
+  param('shiftId')
+    .isUUID()
+    .withMessage('Shift ID must be a valid UUID')
+];
+
 // ===== SCHEDULED SHIFTS VALIDATION =====
 export const validateScheduledShiftUpdate = [
   body('assignedEmployees')

backend/src/python-scripts/scheduling_solver.py

@@ -201,7 +201,7 @@ class UniversalSchedulingSolver:
             
             # Solve with callback
             callback = SimpleSolutionCallback()
-            status = self.solver.SolveWithSolutionCallback(self.model, callback)
+            status = self.solver.Solve(self.model, callback)
             
             result = self._format_solution(status, cp_vars, model_data)
             result['metadata']['constraintsAdded'] = constraints_added

backend/src/routes/shiftPlans.ts

@@ -9,14 +9,26 @@ import {
   createFromPreset,
   clearAssignments,
   exportShiftPlanToExcel,
-  exportShiftPlanToPDF
+  exportShiftPlanToPDF,
+  addTimeSlot,
+  updateTimeSlot,
+  deleteTimeSlot,
+  addShift,
+  updateShift,
+  deleteShift
 } from '../controllers/shiftPlanController.js';
 import {
   validateShiftPlan,
   validateShiftPlanUpdate,
   validateCreateFromPreset,
   handleValidationErrors,
-  validateId 
+  validateId,
+  validateTimeSlot,
+  validateTimeSlotUpdate,
+  validateShiftCreate,
+  validateShiftUpdate,
+  validateSlotId,
+  validateShiftId
 } from '../middleware/validation.js';
 
 const router = express.Router();
@@ -35,4 +47,14 @@ router.post('/:id/clear-assignments', validateId, handleValidationErrors, requir
 router.get('/:id/export/excel', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToExcel);
 router.get('/:id/export/pdf', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToPDF);
 
+// Time slot management
+router.post('/:id/time-slots', validateId, validateTimeSlot, handleValidationErrors, requireRole(['admin', 'maintenance']), addTimeSlot);
+router.put('/:id/time-slots/:slotId', validateId, validateSlotId, validateTimeSlotUpdate, handleValidationErrors, requireRole(['admin', 'maintenance']), updateTimeSlot);
+router.delete('/:id/time-slots/:slotId', validateId, validateSlotId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteTimeSlot);
+
+// Shift management
+router.post('/:id/shifts', validateId, validateShiftCreate, handleValidationErrors, requireRole(['admin', 'maintenance']), addShift);
+router.patch('/:id/shifts/:shiftId', validateId, validateShiftId, validateShiftUpdate, handleValidationErrors, requireRole(['admin', 'maintenance']), updateShift);
+router.delete('/:id/shifts/:shiftId', validateId, validateShiftId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShift);
+
 export default router;

backend/src/scripts/seedTestData.ts

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

backend/src/scripts/test.json

@@ -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"
+  }
+}

backend/src/server.ts

@@ -27,6 +27,15 @@ const __dirname = path.dirname(__filename);
 const app = express();
 const PORT = 3002;
 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);
 
@@ -311,6 +320,16 @@ const initializeApp = async () => {
     const { applyMigration } = await import('./scripts/applyMigration.js');
     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, () => {
       console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
       console.log(`📍 Port: ${PORT}`);

frontend/package.json

@@ -30,7 +30,6 @@
     "framer-motion": "12.23.24",
     "file-saver": "2.0.5",
     "@types/file-saver": "2.0.5"
-
   },
   "scripts": {
     "dev": "vite dev",

frontend/src/components/Modal/Modal.tsx

@@ -0,0 +1,122 @@
+import React, { useEffect } from 'react';
+import { BUTTON_COLORS } from '../../utils/buttonStyles';
+
+interface ModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  title: string;
+  children: React.ReactNode;
+  width?: string;
+}
+
+const Modal: React.FC<ModalProps> = ({
+  isOpen,
+  onClose,
+  title,
+  children,
+  width = '400px'
+}) => {
+  useEffect(() => {
+    const handleEscape = (e: KeyboardEvent) => {
+      if (e.key === 'Escape') {
+        onClose();
+      }
+    };
+
+    if (isOpen) {
+      document.addEventListener('keydown', handleEscape);
+      document.body.style.overflow = 'hidden';
+    }
+
+    return () => {
+      document.removeEventListener('keydown', handleEscape);
+      document.body.style.overflow = 'unset';
+    };
+  }, [isOpen, onClose]);
+
+  if (!isOpen) return null;
+
+  const overlayStyle: React.CSSProperties = {
+    position: 'fixed',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    zIndex: 9999,
+  };
+
+  const modalStyle: React.CSSProperties = {
+    backgroundColor: 'white',
+    borderRadius: '8px',
+    boxShadow: '0 4px 20px rgba(0, 0, 0, 0.2)',
+    width: width,
+    maxWidth: '90vw',
+    maxHeight: '90vh',
+    overflow: 'auto',
+  };
+
+  const headerStyle: React.CSSProperties = {
+    display: 'flex',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    padding: '16px 20px',
+    borderBottom: '1px solid #dee2e6',
+    backgroundColor: BUTTON_COLORS.primary,
+    color: 'white',
+    borderRadius: '8px 8px 0 0',
+  };
+
+  const titleStyle: React.CSSProperties = {
+    margin: 0,
+    fontSize: '18px',
+    fontWeight: 'bold',
+  };
+
+  const closeButtonStyle: React.CSSProperties = {
+    background: 'none',
+    border: 'none',
+    color: 'white',
+    fontSize: '24px',
+    cursor: 'pointer',
+    padding: '0',
+    lineHeight: 1,
+    opacity: 0.8,
+  };
+
+  const contentStyle: React.CSSProperties = {
+    padding: '20px',
+  };
+
+  const handleOverlayClick = (e: React.MouseEvent) => {
+    if (e.target === e.currentTarget) {
+      onClose();
+    }
+  };
+
+  return (
+    <div style={overlayStyle} onClick={handleOverlayClick}>
+      <div style={modalStyle} onClick={(e) => e.stopPropagation()}>
+        <div style={headerStyle}>
+          <h3 style={titleStyle}>{title}</h3>
+          <button
+            onClick={onClose}
+            style={closeButtonStyle}
+            onMouseEnter={(e) => { e.currentTarget.style.opacity = '1'; }}
+            onMouseLeave={(e) => { e.currentTarget.style.opacity = '0.8'; }}
+          >
+            &times;
+          </button>
+        </div>
+        <div style={contentStyle}>
+          {children}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Modal;

frontend/src/design/DesignSystem.txt

@@ -20,6 +20,8 @@ export const designTokens = {
       10: '#ebd7fa',
     },
 
+    manager: '#CC0000',
+    
     // Semantic Colors
     primary: '#51258f',
     secondary: '#642ab5',

frontend/src/pages/Employees/components/AvailabilityManager.tsx

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

frontend/src/pages/Employees/components/EmployeeList.tsx

@@ -4,6 +4,7 @@ import { ROLE_CONFIG, EMPLOYEE_TYPE_CONFIG } from '../../../models/defaults/empl
 import { Employee } from '../../../models/Employee';
 import { useAuth } from '../../../contexts/AuthContext';
 import { useNotification } from '../../../contexts/NotificationContext';
+import { ICONS, iconButtonStyle, BUTTON_COLORS } from '../../../utils/buttonStyles';
 
 interface EmployeeListProps {
   employees: Employee[];
@@ -455,40 +456,20 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
                 {/* Verfügbarkeit Button */}
                 <button
                   onClick={() => onManageAvailability(employee)}
-                  style={{
+                  style={iconButtonStyle(BUTTON_COLORS.info, false)}
-                    padding: '6px 8px',
-                    backgroundColor: '#3498db',
-                    color: 'white',
-                    border: 'none',
-                    borderRadius: '4px',
-                    cursor: 'pointer',
-                    fontSize: '12px',
-                    minWidth: '32px',
-                    height: '32px'
-                  }}
                   title="Verfügbarkeit verwalten"
                 >
-                  📅
+                  {ICONS.calendar}
                 </button>
 
                 {/* Bearbeiten Button */}
                 {canEdit && (
                   <button
                     onClick={() => onEdit(employee)}
-                    style={{
+                    style={iconButtonStyle(BUTTON_COLORS.edit, false)}
-                      padding: '6px 8px',
-                      backgroundColor: '#f39c12',
-                      color: 'white',
-                      border: 'none',
-                      borderRadius: '4px',
-                      cursor: 'pointer',
-                      fontSize: '12px',
-                      minWidth: '32px',
-                      height: '32px'
-                    }}
                     title="Mitarbeiter bearbeiten"
                   >
-                    ✏️
+                    {ICONS.edit}
                   </button>
                 )}
 
@@ -496,20 +477,10 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
                 {canDelete && (
                   <button
                     onClick={() => handleDeleteClick(employee)}
-                    style={{
+                    style={iconButtonStyle(BUTTON_COLORS.delete, false)}
-                      padding: '6px 8px',
-                      backgroundColor: '#e74c3c',
-                      color: 'white',
-                      border: 'none',
-                      borderRadius: '4px',
-                      cursor: 'pointer',
-                      fontSize: '12px',
-                      minWidth: '32px',
-                      height: '32px'
-                    }}
                     title="Mitarbeiter löschen"
                   >
-                    🗑️
+                    {ICONS.delete}
                   </button>
                 )}
 

frontend/src/pages/ShiftPlans/ShiftPlanEdit.tsx

@@ -1,10 +1,32 @@
 // frontend/src/pages/ShiftPlans/ShiftPlanEdit.tsx
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { shiftPlanService } from '../../services/shiftPlanService';
-import { ShiftPlan, Shift, ScheduledShift } from '../../models/ShiftPlan';
+import { ShiftPlan, Shift, TimeSlot } from '../../models/ShiftPlan';
 import { useNotification } from '../../contexts/NotificationContext';
 import { useBackendValidation } from '../../hooks/useBackendValidation';
+import { formatTime } from '../../utils/foramatters';
+import {
+  ICONS,
+  smallDeleteButton,
+  addTextButton,
+  cancelTextButton,
+  addOutlineButton,
+  BUTTON_COLORS,
+} from '../../utils/buttonStyles';
+import ShiftCell from './components/ShiftCell';
+import TimeSlotEditor from './components/TimeSlotEditor';
+import AddDayButton from './components/AddDayButton';
+
+const DAYS_OF_WEEK = [
+  { id: 1, name: 'Montag', shortName: 'Mo' },
+  { id: 2, name: 'Dienstag', shortName: 'Di' },
+  { id: 3, name: 'Mittwoch', shortName: 'Mi' },
+  { id: 4, name: 'Donnerstag', shortName: 'Do' },
+  { id: 5, name: 'Freitag', shortName: 'Fr' },
+  { id: 6, name: 'Samstag', shortName: 'Sa' },
+  { id: 7, name: 'Sonntag', shortName: 'So' },
+];
 
 const ShiftPlanEdit: React.FC = () => {
   const { id } = useParams<{ id: string }>();
@@ -14,17 +36,29 @@ const ShiftPlanEdit: React.FC = () => {
 
   const [shiftPlan, setShiftPlan] = useState<ShiftPlan | null>(null);
   const [loading, setLoading] = useState(true);
-  const [editingShift, setEditingShift] = useState<Shift | null>(null);
+  const [activeDays, setActiveDays] = useState<number[]>([]);
-  const [newShift, setNewShift] = useState<Partial<Shift>>({
+
-    timeSlotId: '',
+  // New time slot form state
-    dayOfWeek: 1,
+  const [showAddTimeSlot, setShowAddTimeSlot] = useState(false);
-    requiredEmployees: 1
+  const [newTimeSlot, setNewTimeSlot] = useState({
+    name: '',
+    startTime: '08:00',
+    endTime: '12:00',
+    description: '',
   });
 
   useEffect(() => {
     loadShiftPlan();
   }, [id]);
 
+  useEffect(() => {
+    if (shiftPlan) {
+      // Determine active days from existing shifts
+      const daysWithShifts = new Set(shiftPlan.shifts.map(s => s.dayOfWeek));
+      setActiveDays(Array.from(daysWithShifts).sort((a, b) => a - b));
+    }
+  }, [shiftPlan]);
+
   const loadShiftPlan = async () => {
     if (!id) return;
 
@@ -41,68 +75,223 @@ const ShiftPlanEdit: React.FC = () => {
     });
   };
 
-  const handleUpdateShift = async (shift: Shift) => {
+  // Get shift for a specific cell
+  const getShift = (timeSlotId: string, dayOfWeek: number): Shift | null => {
+    if (!shiftPlan) return null;
+    return shiftPlan.shifts.find(
+      s => s.timeSlotId === timeSlotId && s.dayOfWeek === dayOfWeek
+    ) || null;
+  };
+
+  // Count shifts for a time slot
+  const getShiftsCountForSlot = (slotId: string): number => {
+    if (!shiftPlan) return 0;
+    return shiftPlan.shifts.filter(s => s.timeSlotId === slotId).length;
+  };
+
+  // Sort time slots by start time (early to late)
+  const sortedTimeSlots = useMemo(() => {
+    if (!shiftPlan) return [];
+
+    const timeToMinutes = (timeStr: string): number => {
+      if (!timeStr) return 0;
+      const [hours, minutes] = timeStr.split(':').map(Number);
+      return hours * 60 + minutes;
+    };
+
+    return [...shiftPlan.timeSlots].sort((a, b) => {
+      const minutesA = timeToMinutes(a.startTime);
+      const minutesB = timeToMinutes(b.startTime);
+      return minutesA - minutesB;
+    });
+  }, [shiftPlan]);
+
+  // Add a new day column
+  const handleAddDay = (dayOfWeek: number) => {
+    if (!activeDays.includes(dayOfWeek)) {
+      setActiveDays([...activeDays, dayOfWeek].sort((a, b) => a - b));
+    }
+  };
+
+  // Remove a day column (delete all shifts for that day)
+  const handleRemoveDay = async (dayOfWeek: number) => {
     if (!shiftPlan || !id) return;
 
+    const shiftsForDay = shiftPlan.shifts.filter(s => s.dayOfWeek === dayOfWeek);
+
+    if (shiftsForDay.length > 0) {
+      const confirmed = await confirmDialog({
+        title: 'Tag entfernen',
+        message: `Dieser Tag enthält ${shiftsForDay.length} Schicht(en). Alle Schichten für diesen Tag werden gelöscht. Fortfahren?`,
+        confirmText: 'Löschen',
+        cancelText: 'Abbrechen',
+        type: 'warning'
+      });
+
+      if (!confirmed) return;
+
+      // Delete all shifts for this day
       await executeWithValidation(async () => {
-      // Update logic here - will be implemented when backend API is available
+        for (const shift of shiftsForDay) {
-      // For now, just simulate success
+          await shiftPlanService.deleteShift(id, shift.id);
-      console.log('Updating shift:', shift);
+        }
-      
+        await loadShiftPlan();
-      loadShiftPlan();
-      setEditingShift(null);
-      
         showNotification({
           type: 'success',
           title: 'Erfolg',
-        message: 'Schicht wurde erfolgreich aktualisiert.'
+          message: `Alle Schichten für diesen Tag wurden gelöscht.`
         });
       });
-  };
-
-  const handleAddShift = async () => {
-    if (!shiftPlan || !id) return;
-    
-    // Basic frontend validation only
-    if (!newShift.timeSlotId) {
-      showNotification({
-        type: 'error',
-        title: 'Fehlende Angaben',
-        message: 'Bitte wählen Sie einen Zeit-Slot aus.'
-      });
-      return;
     }
 
-    if (!newShift.requiredEmployees || newShift.requiredEmployees < 1) {
+    setActiveDays(activeDays.filter(d => d !== dayOfWeek));
+  };
+
+  // Add a new time slot
+  const handleAddTimeSlot = async () => {
+    if (!id || !newTimeSlot.name || !newTimeSlot.startTime || !newTimeSlot.endTime) {
       showNotification({
         type: 'error',
         title: 'Fehlende Angaben',
-        message: 'Bitte geben Sie die Anzahl der benötigten Mitarbeiter an.'
+        message: 'Bitte füllen Sie alle Pflichtfelder aus.'
       });
       return;
     }
 
     await executeWithValidation(async () => {
-      // Add shift logic here - will be implemented when backend API is available
+      await shiftPlanService.addTimeSlot(id, {
-      // For now, just simulate success
+        name: newTimeSlot.name,
-      console.log('Adding shift:', newShift);
+        startTime: newTimeSlot.startTime,
+        endTime: newTimeSlot.endTime,
+        description: newTimeSlot.description || undefined,
+      });
 
       showNotification({
         type: 'success',
         title: 'Erfolg',
-        message: 'Neue Schicht wurde hinzugefügt.'
+        message: 'Zeit-Slot wurde hinzugefügt.'
       });
 
-      setNewShift({
+      setNewTimeSlot({ name: '', startTime: '08:00', endTime: '12:00', description: '' });
-        timeSlotId: '',
+      setShowAddTimeSlot(false);
-        dayOfWeek: 1,
+      await loadShiftPlan();
-        requiredEmployees: 1
-      });
-      loadShiftPlan();
     });
   };
 
+  // Update a time slot
+  const handleUpdateTimeSlot = async (
+    slot: TimeSlot,
+    name: string,
+    startTime: string,
+    endTime: string,
+    description?: string
+  ) => {
+    if (!id) return;
+
+    await executeWithValidation(async () => {
+      await shiftPlanService.updateTimeSlot(id, slot.id, {
+        name,
+        startTime,
+        endTime,
+        description,
+      });
+
+      showNotification({
+        type: 'success',
+        title: 'Erfolg',
+        message: 'Zeit-Slot wurde aktualisiert.'
+      });
+
+      await loadShiftPlan();
+    });
+  };
+
+  // Delete a time slot
+  const handleDeleteTimeSlot = async (slotId: string) => {
+    if (!id || !shiftPlan) return;
+
+    const shiftsCount = getShiftsCountForSlot(slotId);
+
+    const confirmed = await confirmDialog({
+      title: 'Zeit-Slot löschen',
+      message: shiftsCount > 0
+        ? `Dieser Zeit-Slot enthält ${shiftsCount} Schicht(en). Alle zugehörigen Schichten werden ebenfalls gelöscht. Fortfahren?`
+        : 'Möchten Sie diesen Zeit-Slot wirklich löschen?',
+      confirmText: 'Löschen',
+      cancelText: 'Abbrechen',
+      type: 'warning'
+    });
+
+    if (!confirmed) return;
+
+    await executeWithValidation(async () => {
+      await shiftPlanService.deleteTimeSlot(id, slotId);
+
+      showNotification({
+        type: 'success',
+        title: 'Erfolg',
+        message: 'Zeit-Slot wurde gelöscht.'
+      });
+
+      await loadShiftPlan();
+    });
+  };
+
+  // Add a new shift
+  const handleAddShift = async (
+    dayOfWeek: number,
+    timeSlotId: string,
+    requiredEmployees: number,
+    color: string
+  ) => {
+    if (!id) return;
+
+    await executeWithValidation(async () => {
+      await shiftPlanService.addShift(id, {
+        dayOfWeek,
+        timeSlotId,
+        requiredEmployees,
+        color,
+      });
+
+      showNotification({
+        type: 'success',
+        title: 'Erfolg',
+        message: 'Schicht wurde hinzugefügt.'
+      });
+
+      await loadShiftPlan();
+    });
+  };
+
+  // Update a shift
+  const handleUpdateShift = async (
+    shift: Shift,
+    requiredEmployees: number,
+    color: string
+  ) => {
+    if (!id) return;
+
+    await executeWithValidation(async () => {
+      await shiftPlanService.updateShift(id, shift.id, {
+        requiredEmployees,
+        color,
+      });
+
+      showNotification({
+        type: 'success',
+        title: 'Erfolg',
+        message: 'Schicht wurde aktualisiert.'
+      });
+
+      await loadShiftPlan();
+    });
+  };
+
+  // Delete a shift
   const handleDeleteShift = async (shiftId: string) => {
+    if (!id) return;
+
     const confirmed = await confirmDialog({
       title: 'Schicht löschen',
       message: 'Möchten Sie diese Schicht wirklich löschen?',
@@ -114,20 +303,19 @@ const ShiftPlanEdit: React.FC = () => {
     if (!confirmed) return;
 
     await executeWithValidation(async () => {
-      // Delete logic here - will be implemented when backend API is available
+      await shiftPlanService.deleteShift(id, shiftId);
-      // For now, just simulate success
-      console.log('Deleting shift:', shiftId);
-      
-      loadShiftPlan();
 
       showNotification({
         type: 'success',
         title: 'Erfolg',
-        message: 'Schicht wurde erfolgreich gelöscht.'
+        message: 'Schicht wurde gelöscht.'
       });
+
+      await loadShiftPlan();
     });
   };
 
+  // Publish the shift plan
   const handlePublish = async () => {
     if (!shiftPlan || !id) return;
 
@@ -143,7 +331,7 @@ const ShiftPlanEdit: React.FC = () => {
         message: 'Schichtplan wurde veröffentlicht.'
       });
 
-      loadShiftPlan();
+      await loadShiftPlan();
     });
   };
 
@@ -173,34 +361,19 @@ const ShiftPlanEdit: React.FC = () => {
     );
   }
 
-  // Group shifts by dayOfWeek
+  const hasTimeSlots = shiftPlan.timeSlots.length > 0;
-  const shiftsByDay = shiftPlan.shifts.reduce((acc, shift) => {
+  const hasActiveDays = activeDays.length > 0;
-    if (!acc[shift.dayOfWeek]) {
-      acc[shift.dayOfWeek] = [];
-    }
-    acc[shift.dayOfWeek].push(shift);
-    return acc;
-  }, {} as Record<number, typeof shiftPlan.shifts>);
-
-  const daysOfWeek = [
-    { id: 1, name: 'Montag' },
-    { id: 2, name: 'Dienstag' },
-    { id: 3, name: 'Mittwoch' },
-    { id: 4, name: 'Donnerstag' },
-    { id: 5, name: 'Freitag' },
-    { id: 6, name: 'Samstag' },
-    { id: 7, name: 'Sonntag' }
-  ];
 
   return (
     <div style={{ padding: '20px' }}>
+      {/* Header */}
       <div style={{
         display: 'flex',
         justifyContent: 'space-between',
         alignItems: 'center',
         marginBottom: '30px'
       }}>
-        <h1>{shiftPlan.name} bearbeiten</h1>
+        <h1 style={{ margin: 0 }}>{shiftPlan.name} bearbeiten</h1>
         <div>
           {shiftPlan.status === 'draft' && (
             <button
@@ -238,211 +411,329 @@ const ShiftPlanEdit: React.FC = () => {
         </div>
       </div>
 
-      {/* Add new shift form */}
+      {/* Empty State */}
+      {!hasTimeSlots && !hasActiveDays && (
         <div style={{
           backgroundColor: 'white',
           borderRadius: '8px',
-        padding: '20px',
+          padding: '60px 40px',
+          textAlign: 'center',
+          boxShadow: '0 2px 4px rgba(0,0,0,0.1)',
           marginBottom: '20px',
-        boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
         }}>
-        <h3>Neue Schicht hinzufügen</h3>
+          <div style={{ fontSize: '48px', marginBottom: '16px', opacity: 0.5 }}>
-        <div style={{ display: 'grid', gap: '15px', gridTemplateColumns: 'repeat(auto-fit, minmax(200px, 1fr))' }}>
+            📋
-          <div>
-            <label>Wochentag</label>
-            <select
-              value={newShift.dayOfWeek}
-              onChange={(e) => setNewShift({ ...newShift, dayOfWeek: parseInt(e.target.value) })}
-              style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-              disabled={isSubmitting}
-            >
-              {daysOfWeek.map(day => (
-                <option key={day.id} value={day.id}>{day.name}</option>
-              ))}
-            </select>
-          </div>
-          <div>
-            <label>Zeit-Slot</label>
-            <select
-              value={newShift.timeSlotId}
-              onChange={(e) => setNewShift({ ...newShift, timeSlotId: e.target.value })}
-              style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-              disabled={isSubmitting}
-            >
-              <option value="">Bitte auswählen...</option>
-              {shiftPlan.timeSlots.map(slot => (
-                <option key={slot.id} value={slot.id}>
-                  {slot.name} ({slot.startTime}-{slot.endTime})
-                </option>
-              ))}
-            </select>
-          </div>
-          <div>
-            <label>Benötigte Mitarbeiter</label>
-            <input
-              type="number"
-              min="1"
-              value={newShift.requiredEmployees}
-              onChange={(e) => setNewShift({ ...newShift, requiredEmployees: parseInt(e.target.value) || 1 })}
-              style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-              disabled={isSubmitting}
-            />
-          </div>
           </div>
+          <h2 style={{ color: '#2c3e50', marginBottom: '8px' }}>
+            Keine Schichten vorhanden
+          </h2>
+          <p style={{ color: '#666', marginBottom: '24px' }}>
+            Fügen Sie zunächst einen Zeit-Slot hinzu und wählen Sie dann die Tage aus,
+            an denen Schichten stattfinden sollen.
+          </p>
           <button
-          onClick={handleAddShift}
+            onClick={() => setShowAddTimeSlot(true)}
-          disabled={isSubmitting || !newShift.timeSlotId || !newShift.requiredEmployees}
             style={{
-            marginTop: '15px',
+              ...addTextButton(false),
-            padding: '8px 16px',
+              padding: '12px 24px',
-            backgroundColor: isSubmitting ? '#bdc3c7' : '#3498db',
+              fontSize: '16px',
-            color: 'white',
-            border: 'none',
-            borderRadius: '4px',
-            cursor: isSubmitting ? 'not-allowed' : 'pointer',
-            opacity: (!newShift.timeSlotId || !newShift.requiredEmployees) ? 0.6 : 1
             }}
           >
-          {isSubmitting ? 'Wird hinzugefügt...' : 'Schicht hinzufügen'}
+            {ICONS.add} Zeit-Slot hinzufügen
           </button>
         </div>
+      )}
 
-      {/* Existing shifts */}
+      {/* Grid Editor */}
-      <div style={{ display: 'grid', gap: '20px' }}>
+      {(hasTimeSlots || hasActiveDays) && (
-        {daysOfWeek.map(day => {
+        <div style={{
-          const shifts = shiftsByDay[day.id] || [];
+          marginBottom: '30px',
-          if (shifts.length === 0) return null;
+          border: '1px solid #e0e0e0',
-          
-          return (
-            <div key={day.id} style={{
-              backgroundColor: 'white',
           borderRadius: '8px',
-              padding: '20px',
+          overflow: 'hidden'
-              boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
         }}>
-              <h3 style={{ marginTop: 0 }}>{day.name}</h3>
+          {/* Header bar matching ShiftPlanView */}
-              <div style={{ display: 'grid', gap: '15px' }}>
+          <div style={{
-                {shifts.map(shift => {
+            backgroundColor: '#2c3e50',
-                  const timeSlot = shiftPlan.timeSlots.find(ts => ts.id === shift.timeSlotId);
+            color: 'white',
-                  return (
+            padding: '15px 20px',
-                    <div key={shift.id} style={{
+            fontWeight: 'bold'
-                      backgroundColor: '#f8f9fa',
-                      padding: '15px',
-                      borderRadius: '6px',
-                      boxShadow: '0 1px 3px rgba(0,0,0,0.05)'
           }}>
-                      {editingShift?.id === shift.id ? (
+            Schichtplan bearbeiten
-                        <div style={{ display: 'grid', gap: '10px', gridTemplateColumns: 'repeat(auto-fit, minmax(200px, 1fr))' }}>
+            <div style={{ fontSize: '14px', fontWeight: 'normal', marginTop: '5px' }}>
-                          <div>
+              {sortedTimeSlots.length} Zeitslots • {activeDays.length} Tage
-                            <label>Zeit-Slot</label>
-                            <select
-                              value={editingShift.timeSlotId}
-                              onChange={(e) => setEditingShift({ ...editingShift, timeSlotId: e.target.value })}
-                              style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-                              disabled={isSubmitting}
-                            >
-                              {shiftPlan.timeSlots.map(slot => (
-                                <option key={slot.id} value={slot.id}>
-                                  {slot.name} ({slot.startTime}-{slot.endTime})
-                                </option>
-                              ))}
-                            </select>
             </div>
+          </div>
+
+          <div style={{ overflowX: 'auto' }}>
+            <table style={{
+              width: '100%',
+              borderCollapse: 'collapse',
+              backgroundColor: 'white'
+            }}>
+              <thead>
+                <tr style={{ backgroundColor: '#f8f9fa' }}>
+                  <th style={{
+                    padding: '12px 16px',
+                    textAlign: 'left',
+                    border: '1px solid #dee2e6',
+                    fontWeight: 'bold',
+                    minWidth: '180px'
+                  }}>
+                    Schicht (Zeit)
+                  </th>
+                  {activeDays.map(dayId => {
+                    const day = DAYS_OF_WEEK.find(d => d.id === dayId);
+                    return (
+                      <th key={dayId} style={{
+                        padding: '12px 16px',
+                        textAlign: 'center',
+                        border: '1px solid #dee2e6',
+                        fontWeight: 'bold',
+                        minWidth: '120px'
+                      }}>
+                        <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', gap: '8px' }}>
+                          <span>{day?.name}</span>
+                          <button
+                            onClick={() => handleRemoveDay(dayId)}
+                            disabled={isSubmitting}
+                            style={smallDeleteButton(isSubmitting)}
+                            title="Tag entfernen"
+                          >
+                            {ICONS.delete}
+                          </button>
+                        </div>
+                      </th>
+                    );
+                  })}
+                  <th style={{
+                    padding: '12px 16px',
+                    textAlign: 'center',
+                    border: '1px solid #dee2e6',
+                    minWidth: '70px',
+                    backgroundColor: '#f8f9fa',
+                  }}>
+                    <AddDayButton
+                      activeDays={activeDays}
+                      onAddDay={handleAddDay}
+                      disabled={isSubmitting}
+                    />
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                {sortedTimeSlots.map((slot, index) => (
+                  <tr key={slot.id} style={{
+                    backgroundColor: index % 2 === 0 ? 'white' : '#f8f9fa'
+                  }}>
+                    <td style={{
+                      padding: '12px 16px',
+                      border: '1px solid #dee2e6',
+                      fontWeight: '500',
+                      backgroundColor: '#f8f9fa',
+                      position: 'sticky',
+                      left: 0
+                    }}>
+                      <TimeSlotEditor
+                        slot={slot}
+                        onUpdate={handleUpdateTimeSlot}
+                        onDelete={handleDeleteTimeSlot}
+                        shiftsCount={getShiftsCountForSlot(slot.id)}
+                        disabled={isSubmitting}
+                      />
+                    </td>
+                    {activeDays.map(dayId => (
+                      <ShiftCell
+                        key={`${slot.id}-${dayId}`}
+                        shift={getShift(slot.id, dayId)}
+                        dayOfWeek={dayId}
+                        timeSlotId={slot.id}
+                        onAdd={handleAddShift}
+                        onEdit={handleUpdateShift}
+                        onDelete={handleDeleteShift}
+                        disabled={isSubmitting}
+                      />
+                    ))}
+                    <td style={{
+                      border: '1px solid #dee2e6',
+                      padding: '8px',
+                      textAlign: 'center',
+                    }}>
+                      <button
+                        onClick={() => handleDeleteTimeSlot(slot.id)}
+                        disabled={isSubmitting}
+                        style={smallDeleteButton(isSubmitting)}
+                        title="Zeit-Slot löschen"
+                      >
+                        {ICONS.delete}
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+
+                {/* Add Time Slot Row */}
+                <tr>
+                  <td colSpan={activeDays.length + 2} style={{
+                    padding: '16px',
+                    borderTop: '2px solid #dee2e6',
+                  }}>
+                    {showAddTimeSlot ? (
+                      <div style={{
+                        display: 'flex',
+                        gap: '12px',
+                        alignItems: 'flex-end',
+                        flexWrap: 'wrap',
+                      }}>
                         <div>
-                            <label>Benötigte Mitarbeiter</label>
+                          <label style={{ display: 'block', fontSize: '12px', marginBottom: '4px', color: '#666' }}>
+                            Name *
+                          </label>
                           <input
-                              type="number"
+                            type="text"
-                              min="1"
+                            value={newTimeSlot.name}
-                              value={editingShift.requiredEmployees}
+                            onChange={(e) => setNewTimeSlot({ ...newTimeSlot, name: e.target.value })}
-                              onChange={(e) => setEditingShift({ ...editingShift, requiredEmployees: parseInt(e.target.value) || 1 })}
+                            placeholder="z.B. Vormittag"
-                              style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
+                            style={{
+                              padding: '8px',
+                              borderRadius: '4px',
+                              border: '1px solid #ddd',
+                              width: '150px',
+                            }}
                             disabled={isSubmitting}
                           />
                         </div>
-                          <div style={{ display: 'flex', gap: '10px', alignItems: 'flex-end' }}>
+                        <div>
-                            <button
+                          <label style={{ display: 'block', fontSize: '12px', marginBottom: '4px', color: '#666' }}>
-                              onClick={() => handleUpdateShift(editingShift)}
+                            Startzeit *
-                              disabled={isSubmitting}
+                          </label>
+                          <input
+                            type="time"
+                            value={newTimeSlot.startTime}
+                            onChange={(e) => setNewTimeSlot({ ...newTimeSlot, startTime: e.target.value })}
                             style={{
-                                padding: '8px 16px',
+                              padding: '8px',
-                                backgroundColor: isSubmitting ? '#bdc3c7' : '#2ecc71',
-                                color: 'white',
-                                border: 'none',
                               borderRadius: '4px',
-                                cursor: isSubmitting ? 'not-allowed' : 'pointer'
+                              border: '1px solid #ddd',
                             }}
+                            disabled={isSubmitting}
+                          />
+                        </div>
+                        <div>
+                          <label style={{ display: 'block', fontSize: '12px', marginBottom: '4px', color: '#666' }}>
+                            Endzeit *
+                          </label>
+                          <input
+                            type="time"
+                            value={newTimeSlot.endTime}
+                            onChange={(e) => setNewTimeSlot({ ...newTimeSlot, endTime: e.target.value })}
+                            style={{
+                              padding: '8px',
+                              borderRadius: '4px',
+                              border: '1px solid #ddd',
+                            }}
+                            disabled={isSubmitting}
+                          />
+                        </div>
+                        <div>
+                          <label style={{ display: 'block', fontSize: '12px', marginBottom: '4px', color: '#666' }}>
+                            Beschreibung
+                          </label>
+                          <input
+                            type="text"
+                            value={newTimeSlot.description}
+                            onChange={(e) => setNewTimeSlot({ ...newTimeSlot, description: e.target.value })}
+                            placeholder="Optional"
+                            style={{
+                              padding: '8px',
+                              borderRadius: '4px',
+                              border: '1px solid #ddd',
+                              width: '150px',
+                            }}
+                            disabled={isSubmitting}
+                          />
+                        </div>
+                        <button
+                          onClick={handleAddTimeSlot}
+                          disabled={isSubmitting || !newTimeSlot.name}
+                          style={addTextButton(isSubmitting || !newTimeSlot.name)}
                         >
-                              {isSubmitting ? 'Speichern...' : 'Speichern'}
+                          {ICONS.add} Hinzufügen
                         </button>
                         <button
-                              onClick={() => setEditingShift(null)}
+                          onClick={() => {
-                              disabled={isSubmitting}
+                            setShowAddTimeSlot(false);
-                              style={{
+                            setNewTimeSlot({ name: '', startTime: '08:00', endTime: '12:00', description: '' });
-                                padding: '8px 16px',
-                                backgroundColor: '#95a5a6',
-                                color: 'white',
-                                border: 'none',
-                                borderRadius: '4px',
-                                cursor: isSubmitting ? 'not-allowed' : 'pointer',
-                                opacity: isSubmitting ? 0.6 : 1
                           }}
+                          disabled={isSubmitting}
+                          style={cancelTextButton(isSubmitting)}
                         >
                           Abbrechen
                         </button>
                       </div>
-                        </div>
                     ) : (
-                        <>
-                          <div style={{ fontWeight: 'bold', marginBottom: '5px' }}>
-                            {timeSlot?.name} ({timeSlot?.startTime?.substring(0, 5)} - {timeSlot?.endTime?.substring(0, 5)})
-                          </div>
-                          <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-                            <div style={{ fontSize: '14px', color: '#666' }}>
-                              <span>Benötigte Mitarbeiter: {shift.requiredEmployees}</span>
-                            </div>
-                            <div>
                       <button
-                                onClick={() => setEditingShift(shift)}
+                        onClick={() => setShowAddTimeSlot(true)}
                         disabled={isSubmitting}
-                                style={{
+                        style={addOutlineButton(isSubmitting)}
-                                  padding: '6px 12px',
+                        onMouseEnter={(e) => {
-                                  backgroundColor: isSubmitting ? '#bdc3c7' : '#f1c40f',
+                          if (!isSubmitting) {
-                                  color: 'white',
+                            e.currentTarget.style.backgroundColor = '#f0fff4';
-                                  border: 'none',
+                          }
-                                  borderRadius: '4px',
+                        }}
-                                  cursor: isSubmitting ? 'not-allowed' : 'pointer',
+                        onMouseLeave={(e) => {
-                                  marginRight: '8px',
+                          e.currentTarget.style.backgroundColor = 'transparent';
-                                  opacity: isSubmitting ? 0.6 : 1
                         }}
                       >
-                                Bearbeiten
+                        {ICONS.add} Neuer Zeit-Slot hinzufügen
                       </button>
-                              <button
-                                onClick={() => handleDeleteShift(shift.id)}
-                                disabled={isSubmitting}
-                                style={{
-                                  padding: '6px 12px',
-                                  backgroundColor: isSubmitting ? '#bdc3c7' : '#e74c3c',
-                                  color: 'white',
-                                  border: 'none',
-                                  borderRadius: '4px',
-                                  cursor: isSubmitting ? 'not-allowed' : 'pointer',
-                                  opacity: isSubmitting ? 0.6 : 1
-                                }}
-                              >
-                                Löschen
-                              </button>
-                            </div>
-                          </div>
-                        </>
                     )}
-                    </div>
+                  </td>
-                  );
+                </tr>
-                })}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      )}
+
+      {/* Legend */}
+      <div style={{
+        marginTop: '20px',
+        padding: '16px',
+        backgroundColor: 'white',
+        borderRadius: '8px',
+        boxShadow: '0 2px 4px rgba(0,0,0,0.1)',
+      }}>
+        <h4 style={{ margin: '0 0 12px 0', color: '#2c3e50' }}>Legende</h4>
+        <div style={{ display: 'flex', gap: '24px', flexWrap: 'wrap', fontSize: '13px' }}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+            <div style={{
+              width: '24px',
+              height: '24px',
+              backgroundColor: '#d5f4e6',
+              border: `2px solid ${BUTTON_COLORS.add}`,
+              borderRadius: '4px',
+            }} />
+            <span>Aktive Schicht (klicken zum Bearbeiten)</span>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+            <div style={{
+              width: '24px',
+              height: '24px',
+              backgroundColor: '#f8f9fa',
+              border: '2px dashed #dee2e6',
+              borderRadius: '4px',
+            }} />
+            <span>Leere Zelle (klicken zum Hinzufügen)</span>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+            <span style={{ color: BUTTON_COLORS.edit, fontSize: '16px' }}>{ICONS.edit}</span>
+            <span>Zeit-Slot bearbeiten</span>
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+            <span style={{ color: BUTTON_COLORS.delete, fontSize: '16px' }}>{ICONS.delete}</span>
+            <span>Löschen</span>
           </div>
         </div>
-          );
-        })}
       </div>
     </div>
   );

frontend/src/pages/ShiftPlans/ShiftPlanList.tsx

@@ -117,7 +117,7 @@ const ShiftPlanList: React.FC = () => {
               borderRadius: '4px',
               cursor: 'pointer'
             }}>
-              + Neuen Plan
+              + Neuer Plan
             </button>
           </Link>
         )}

frontend/src/pages/ShiftPlans/ShiftPlanView.tsx

@@ -1,5 +1,5 @@
 // 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 { useAuth } from '../../contexts/AuthContext';
 import { shiftPlanService } from '../../services/shiftPlanService';
@@ -56,6 +56,9 @@ const ShiftPlanView: React.FC = () => {
   const [showAssignmentPreview, setShowAssignmentPreview] = 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(() => {
     loadShiftPlanData();
@@ -121,6 +124,12 @@ const ShiftPlanView: React.FC = () => {
     }
   }, [availabilities]);
 
+  useEffect(() => {
+    if (dropdownRef.current) {
+      setDropdownWidth(dropdownRef.current.offsetWidth / 40);  // Adjust divisor for desired slide distance
+    }
+  }, [exportType]);
+
   // Create a data structure that maps days to their shifts with time slot info - SAME AS AVAILABILITYMANAGER
   const getTimetableData = () => {
     if (!shiftPlan || !shiftPlan.shifts || !shiftPlan.timeSlots) {
@@ -191,7 +200,17 @@ const ShiftPlanView: React.FC = () => {
 
     // Convert to array and sort by start time - SAME LOGIC AS AVAILABILITYMANAGER
     const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a, b) => {
-      return (a.startTime || '').localeCompare(b.startTime || '');
+      // Convert time strings to minutes for proper numeric comparison
+      const timeToMinutes = (timeStr: string) => {
+        if (!timeStr) return 0;
+        const [hours, minutes] = timeStr.split(':').map(Number);
+        return hours * 60 + minutes;
+      };
+
+      const minutesA = timeToMinutes(a.startTime);
+      const minutesB = timeToMinutes(b.startTime);
+      
+      return minutesA - minutesB; // Ascending order (earliest first)
     });
 
     return { days, shiftsByDay, allTimeSlots };
@@ -242,60 +261,33 @@ const ShiftPlanView: React.FC = () => {
     };
   };
 
-  const handleExportExcel = async () => {
+  const handleExport = async () => {
-    if (!shiftPlan) return;
+    if (!shiftPlan || !exportType) return;
 
     try {
       setExporting(true);
 
-      // Call the export service
+      let blob: Blob;
-      const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
+      if (exportType === 'excel') {
-      
+        blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
-      // Use file-saver to download the file
         saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`);
-      
+      } else {
-      showNotification({
+        blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
-        type: 'success',
-        title: 'Export erfolgreich',
-        message: 'Der Schichtplan wurde als Excel-Datei exportiert.'
-      });
-      
-    } catch (error) {
-      console.error('Error exporting to Excel:', error);
-      showNotification({
-        type: 'error',
-        title: 'Export fehlgeschlagen',
-        message: 'Der Excel-Export konnte nicht durchgeführt werden.'
-      });
-    } finally {
-      setExporting(false);
-    }
-  };
-
-  const handleExportPDF = async () => {
-    if (!shiftPlan) return;
-
-    try {
-      setExporting(true);
-      
-      // Call the PDF export service
-      const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
-      
-      // Use file-saver to download the file
         saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
+      }
 
       showNotification({
         type: 'success',
         title: 'Export erfolgreich',
-        message: 'Der Schichtplan wurde als PDF exportiert.'
+        message: `Der Schichtplan wurde als ${exportType === 'excel' ? 'Excel' : 'PDF'} exportiert.`
       });
 
     } catch (error) {
-      console.error('Error exporting to PDF:', error);
+      console.error(`Error exporting to ${exportType}:`, error);
       showNotification({
         type: 'error',
         title: 'Export fehlgeschlagen',
-        message: 'Der PDF-Export konnte nicht durchgeführt werden.'
+        message: `Der ${exportType === 'excel' ? 'Excel' : 'PDF'}-Export konnte nicht durchgeführt werden.`
       });
     } finally {
       setExporting(false);
@@ -896,9 +888,6 @@ const ShiftPlanView: React.FC = () => {
                     <div style={{ fontSize: '14px', color: '#666' }}>
                       {formatTime(timeSlot.startTime)} - {formatTime(timeSlot.endTime)}
                     </div>
-                    <div style={{ fontSize: '11px', color: '#999', marginTop: '4px' }}>
-                      ID: {timeSlot.id.substring(0, 8)}...
-                    </div>
                   </td>
                   {days.map(weekday => {
                     const shift = timeSlot.shiftsByDay[weekday.id];
@@ -922,7 +911,55 @@ const ShiftPlanView: React.FC = () => {
                     const isValidShift = shift.timeSlotId === timeSlot.id && shift.dayOfWeek === weekday.id;
 
                     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') {
                       // For published plans, use actual assignments from scheduled shifts
@@ -935,15 +972,21 @@ const ShiftPlanView: React.FC = () => {
                       if (scheduledShift) {
                         assignedEmployees = scheduledShift.assignedEmployees || [];
 
-                        // DEBUG: Log if we're still seeing old data
+                        // Log if we're still seeing old data
                         if (assignedEmployees.length > 0) {
                           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) {
                       // For draft with preview, use assignment result
@@ -955,30 +998,26 @@ const ShiftPlanView: React.FC = () => {
 
                       if (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 (
@@ -1013,7 +1052,7 @@ const ShiftPlanView: React.FC = () => {
                           </div>
                         )}
 
-                        {displayText}
+                        {displayContent}
 
                         {/* Shift debug info - SAME AS AVAILABILITYMANAGER */}
                         <div style={{
@@ -1023,8 +1062,6 @@ const ShiftPlanView: React.FC = () => {
                           textAlign: 'left',
                           fontFamily: 'monospace'
                         }}>
-                          <div>Shift: {shift.id.substring(0, 6)}...</div>
-                          <div>Day: {shift.dayOfWeek}</div>
                           {!isValidShift && (
                             <div style={{ color: '#e74c3c', fontWeight: 'bold' }}>
                               VALIDATION ERROR
@@ -1039,7 +1076,6 @@ const ShiftPlanView: React.FC = () => {
             </tbody>
           </table>
         </div>
-
       </div>
     );
   };
@@ -1081,49 +1117,7 @@ const ShiftPlanView: React.FC = () => {
           </div>
         </div>
         <div style={{ display: 'flex', gap: '10px', alignItems: 'center' }}>
-          {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
+          {/* "Zuweisungen neu berechnen" button */}
-            <>
-              <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
               onClick={handleRecreateAssignments}
@@ -1405,7 +1399,7 @@ const ShiftPlanView: React.FC = () => {
                 Abbrechen
               </button>
 
-              {/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
+              {/* BUTTON zum publishen */}
               <button
                 onClick={handlePublish}
                 disabled={publishing || !canPublishAssignment()}
@@ -1448,6 +1442,64 @@ const ShiftPlanView: React.FC = () => {
 
         {renderTimetable()}
 
+        {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
+          <div style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'flex-end',
+            marginTop: '20px',
+            gap: '10px'
+          }}>
+            {/* Export Dropdown Container */}
+            <div
+              ref={dropdownRef}
+              style={{
+                transform: exportType ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
+                transition: 'transform 0.3s ease-in-out',
+                position: 'relative' 
+              }}
+            >
+              <select
+                value={exportType || ''}
+                onChange={(e) => setExportType(e.target.value as 'pdf' | 'excel' | null)}
+                style={{
+                  padding: '10px 20px',
+                  backgroundColor: 'white',
+                  border: '1px solid #ddd',
+                  borderRadius: '4px',
+                  cursor: 'pointer',
+                  minWidth: '120px'
+                }}
+              >
+                <option value="">Export</option>
+                <option value="pdf">PDF</option>
+                <option value="excel">Excel</option>
+              </select>
+            </div>
+
+            {/* Export Button - erscheint nur wenn eine Option ausgewählt ist */}
+            {exportType && (
+              <button
+                onClick={handleExport}
+                disabled={exporting}
+                style={{
+                  padding: '10px 20px',
+                  backgroundColor: '#51258f',
+                  color: 'white',
+                  border: 'none',
+                  borderRadius: '4px',
+                  cursor: exporting ? 'not-allowed' : 'pointer',
+                  fontWeight: 'bold',
+                  opacity: exporting ? 0.7 : 1,
+                  transition: 'opacity 0.2s ease'
+                }}
+              >
+                {exporting ? '🔄 Exportiert...' : 'EXPORT'}
+              </button>
+            )}
+          </div>
+        )}
+
         {/* Summary */}
         {days.length > 0 && (
           <div style={{

frontend/src/pages/ShiftPlans/components/AddDayButton.tsx

@@ -0,0 +1,123 @@
+import React, { useState } from 'react';
+import { ICONS, addIconButton, addTextButton, cancelTextButton } from '../../../utils/buttonStyles';
+import Modal from '../../../components/Modal/Modal';
+
+interface DayOption {
+  id: number;
+  name: string;
+}
+
+interface AddDayButtonProps {
+  activeDays: number[];
+  onAddDay: (dayOfWeek: number) => void;
+  disabled?: boolean;
+}
+
+const ALL_DAYS: DayOption[] = [
+  { id: 1, name: 'Montag' },
+  { id: 2, name: 'Dienstag' },
+  { id: 3, name: 'Mittwoch' },
+  { id: 4, name: 'Donnerstag' },
+  { id: 5, name: 'Freitag' },
+  { id: 6, name: 'Samstag' },
+  { id: 7, name: 'Sonntag' },
+];
+
+const AddDayButton: React.FC<AddDayButtonProps> = ({
+  activeDays,
+  onAddDay,
+  disabled = false
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  const [selectedDay, setSelectedDay] = useState<number | null>(null);
+
+  const availableDays = ALL_DAYS.filter(day => !activeDays.includes(day.id));
+
+  const handleAddDay = () => {
+    if (selectedDay !== null) {
+      onAddDay(selectedDay);
+      setShowModal(false);
+      setSelectedDay(null);
+    }
+  };
+
+  const isDisabled = disabled || availableDays.length === 0;
+
+  if (availableDays.length === 0) {
+    return null;
+  }
+
+  return (
+    <>
+      <button
+        onClick={() => setShowModal(true)}
+        style={addIconButton(isDisabled)}
+        disabled={isDisabled}
+        title="Tag hinzufügen"
+      >
+        {ICONS.add}
+      </button>
+
+      <Modal
+        isOpen={showModal}
+        onClose={() => {
+          setShowModal(false);
+          setSelectedDay(null);
+        }}
+        title="Tag hinzufügen"
+        width="350px"
+      >
+        <div style={{ marginBottom: '16px' }}>
+          <label style={{
+            display: 'block',
+            marginBottom: '8px',
+            fontWeight: 'bold',
+            fontSize: '14px',
+            color: '#2c3e50'
+          }}>
+            Wählen Sie einen Tag:
+          </label>
+          <select
+            value={selectedDay ?? ''}
+            onChange={(e) => setSelectedDay(e.target.value ? Number(e.target.value) : null)}
+            style={{
+              width: '100%',
+              padding: '10px',
+              borderRadius: '4px',
+              border: '1px solid #ddd',
+              fontSize: '14px',
+            }}
+          >
+            <option value="">-- Tag auswählen --</option>
+            {availableDays.map(day => (
+              <option key={day.id} value={day.id}>
+                {day.name}
+              </option>
+            ))}
+          </select>
+        </div>
+
+        <div style={{ display: 'flex', gap: '8px', justifyContent: 'flex-end' }}>
+          <button
+            onClick={handleAddDay}
+            disabled={selectedDay === null}
+            style={addTextButton(selectedDay === null)}
+          >
+            {ICONS.add} Hinzufügen
+          </button>
+          <button
+            onClick={() => {
+              setShowModal(false);
+              setSelectedDay(null);
+            }}
+            style={cancelTextButton(false)}
+          >
+            Abbrechen
+          </button>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default AddDayButton;

frontend/src/pages/ShiftPlans/components/ShiftCell.tsx

@@ -0,0 +1,234 @@
+import React, { useState, useEffect } from 'react';
+import { Shift } from '../../../models/ShiftPlan';
+import {
+  ICONS,
+  addTextButton,
+  deleteTextButton,
+  cancelTextButton,
+  BUTTON_COLORS,
+} from '../../../utils/buttonStyles';
+import Modal from '../../../components/Modal/Modal';
+
+interface ShiftCellProps {
+  shift: Shift | null;
+  dayOfWeek: number;
+  timeSlotId: string;
+  onAdd: (dayOfWeek: number, timeSlotId: string, requiredEmployees: number, color: string) => void;
+  onEdit: (shift: Shift, requiredEmployees: number, color: string) => void;
+  onDelete: (shiftId: string) => void;
+  disabled?: boolean;
+}
+
+const COLORS = [
+  '#3498db', // Blue (default)
+  '#27ae60', // Green
+  '#e74c3c', // Red
+  '#f39c12', // Orange
+  '#9b59b6', // Purple
+  '#1abc9c', // Teal
+  '#e91e63', // Pink
+  '#795548', // Brown
+];
+
+const ShiftCell: React.FC<ShiftCellProps> = ({
+  shift,
+  dayOfWeek,
+  timeSlotId,
+  onAdd,
+  onEdit,
+  onDelete,
+  disabled = false
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  const [requiredEmployees, setRequiredEmployees] = useState(shift?.requiredEmployees || 2);
+  const [selectedColor, setSelectedColor] = useState(shift?.color || '#3498db');
+  const [isHovered, setIsHovered] = useState(false);
+
+  useEffect(() => {
+    if (shift) {
+      setRequiredEmployees(shift.requiredEmployees);
+      setSelectedColor(shift.color || '#3498db');
+    } else {
+      setRequiredEmployees(2);
+      setSelectedColor('#3498db');
+    }
+  }, [shift]);
+
+  const handleCellClick = () => {
+    if (disabled) return;
+    setShowModal(true);
+  };
+
+  const handleSave = () => {
+    if (shift) {
+      onEdit(shift, requiredEmployees, selectedColor);
+    } else {
+      onAdd(dayOfWeek, timeSlotId, requiredEmployees, selectedColor);
+    }
+    setShowModal(false);
+  };
+
+  const handleDelete = () => {
+    if (shift) {
+      onDelete(shift.id);
+    }
+    setShowModal(false);
+  };
+
+  const handleClose = () => {
+    if (shift) {
+      setRequiredEmployees(shift.requiredEmployees);
+      setSelectedColor(shift.color || '#3498db');
+    } else {
+      setRequiredEmployees(2);
+      setSelectedColor('#3498db');
+    }
+    setShowModal(false);
+  };
+
+  const cellStyle: React.CSSProperties = {
+    padding: '8px',
+    textAlign: 'center',
+    cursor: disabled ? 'not-allowed' : 'pointer',
+    minWidth: '80px',
+    height: '60px',
+    verticalAlign: 'middle',
+    transition: 'all 0.2s ease',
+    border: '1px solid #dee2e6',
+    ...(shift ? {
+      backgroundColor: shift.color ? `${shift.color}20` : '#d5f4e6',
+      borderColor: shift.color || '#27ae60',
+      borderWidth: '2px',
+    } : {
+      backgroundColor: isHovered ? '#f0fff4' : '#f8f9fa',
+      borderStyle: 'dashed',
+      borderColor: isHovered ? BUTTON_COLORS.add : '#dee2e6',
+    }),
+    opacity: disabled ? 0.6 : 1,
+  };
+
+  const inputStyle: React.CSSProperties = {
+    width: '100%',
+    padding: '10px',
+    borderRadius: '4px',
+    border: '1px solid #ddd',
+    fontSize: '14px',
+    boxSizing: 'border-box',
+  };
+
+  const labelStyle: React.CSSProperties = {
+    display: 'block',
+    marginBottom: '6px',
+    fontWeight: 'bold',
+    fontSize: '14px',
+    color: '#2c3e50',
+  };
+
+  return (
+    <>
+      <td
+        style={cellStyle}
+        onClick={handleCellClick}
+        onMouseEnter={() => setIsHovered(true)}
+        onMouseLeave={() => setIsHovered(false)}
+      >
+        {shift ? (
+          <div>
+            <div style={{
+              width: '28px',
+              height: '28px',
+              borderRadius: '50%',
+              backgroundColor: shift.color || '#27ae60',
+              margin: '0 auto 4px',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+            }}>
+              <span style={{ color: 'white', fontSize: '12px', fontWeight: 'bold' }}>
+                {shift.requiredEmployees}
+              </span>
+            </div>
+            <span style={{ fontSize: '11px', color: '#666' }}>
+              Mitarbeiter
+            </span>
+          </div>
+        ) : (
+          <div style={{
+            color: BUTTON_COLORS.add,
+            fontSize: '24px',
+            opacity: isHovered ? 1 : 0.4,
+            transition: 'opacity 0.2s ease',
+          }}>
+            {ICONS.add}
+          </div>
+        )}
+      </td>
+
+      <Modal
+        isOpen={showModal}
+        onClose={handleClose}
+        title={shift ? 'Schicht bearbeiten' : 'Schicht hinzufügen'}
+        width="380px"
+      >
+        <div style={{ marginBottom: '16px' }}>
+          <label style={labelStyle}>Benötigte Mitarbeiter *</label>
+          <input
+            type="number"
+            min="1"
+            max="99"
+            value={requiredEmployees}
+            onChange={(e) => setRequiredEmployees(parseInt(e.target.value) || 1)}
+            style={inputStyle}
+          />
+        </div>
+
+        <div style={{ marginBottom: '20px' }}>
+          <label style={labelStyle}>Farbe</label>
+          <div style={{ display: 'flex', gap: '8px', flexWrap: 'wrap' }}>
+            {COLORS.map((color) => (
+              <button
+                key={color}
+                onClick={() => setSelectedColor(color)}
+                style={{
+                  width: '36px',
+                  height: '36px',
+                  borderRadius: '6px',
+                  backgroundColor: color,
+                  border: selectedColor === color ? '3px solid #2c3e50' : '2px solid transparent',
+                  cursor: 'pointer',
+                  transition: 'transform 0.1s ease',
+                }}
+                title={color}
+              />
+            ))}
+          </div>
+        </div>
+
+        <div style={{ display: 'flex', gap: '8px', justifyContent: 'flex-end' }}>
+          <button
+            onClick={handleSave}
+            style={{ ...addTextButton(false), flex: 1 }}
+          >
+            {shift ? 'Speichern' : `${ICONS.add} Hinzufügen`}
+          </button>
+          {shift && (
+            <button
+              onClick={handleDelete}
+              style={deleteTextButton(false)}
+            >
+              {ICONS.delete} Löschen
+            </button>
+          )}
+          <button
+            onClick={handleClose}
+            style={cancelTextButton(false)}
+          >
+            Abbrechen
+          </button>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default ShiftCell;

frontend/src/pages/ShiftPlans/components/TimeSlotEditor.tsx

@@ -0,0 +1,199 @@
+import React, { useState, useEffect } from 'react';
+import { TimeSlot } from '../../../models/ShiftPlan';
+import {
+  ICONS,
+  addTextButton,
+  deleteTextButton,
+  cancelTextButton,
+  borderlessEditButton,
+} from '../../../utils/buttonStyles';
+import Modal from '../../../components/Modal/Modal';
+
+interface TimeSlotEditorProps {
+  slot: TimeSlot;
+  onUpdate: (slot: TimeSlot, name: string, startTime: string, endTime: string, description?: string) => void;
+  onDelete: (slotId: string) => void;
+  shiftsCount: number;
+  disabled?: boolean;
+}
+
+const TimeSlotEditor: React.FC<TimeSlotEditorProps> = ({
+  slot,
+  onUpdate,
+  onDelete,
+  shiftsCount,
+  disabled = false
+}) => {
+  const [showModal, setShowModal] = useState(false);
+  const [name, setName] = useState(slot.name);
+  const [startTime, setStartTime] = useState(slot.startTime);
+  const [endTime, setEndTime] = useState(slot.endTime);
+  const [description, setDescription] = useState(slot.description || '');
+
+  useEffect(() => {
+    setName(slot.name);
+    setStartTime(slot.startTime);
+    setEndTime(slot.endTime);
+    setDescription(slot.description || '');
+  }, [slot]);
+
+  const handleEditClick = () => {
+    if (disabled) return;
+    setShowModal(true);
+  };
+
+  const handleSave = () => {
+    onUpdate(slot, name, startTime, endTime, description || undefined);
+    setShowModal(false);
+  };
+
+  const handleDelete = () => {
+    onDelete(slot.id);
+    setShowModal(false);
+  };
+
+  const handleClose = () => {
+    setName(slot.name);
+    setStartTime(slot.startTime);
+    setEndTime(slot.endTime);
+    setDescription(slot.description || '');
+    setShowModal(false);
+  };
+
+  const formatTime = (time: string) => {
+    return time.substring(0, 5);
+  };
+
+  const inputStyle: React.CSSProperties = {
+    width: '100%',
+    padding: '10px',
+    borderRadius: '4px',
+    border: '1px solid #ddd',
+    fontSize: '14px',
+    boxSizing: 'border-box',
+  };
+
+  const labelStyle: React.CSSProperties = {
+    display: 'block',
+    marginBottom: '6px',
+    fontWeight: 'bold',
+    fontSize: '14px',
+    color: '#2c3e50',
+  };
+
+  return (
+    <>
+      <div style={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '8px',
+      }}>
+        <button
+          onClick={handleEditClick}
+          style={borderlessEditButton(disabled)}
+          title="Zeit-Slot bearbeiten"
+          disabled={disabled}
+        >
+          {ICONS.edit}
+        </button>
+        <div>
+          <div style={{ fontWeight: 'bold', fontSize: '14px', color: '#2c3e50' }}>
+            {slot.name}
+          </div>
+          <div style={{ fontSize: '12px', color: '#666' }}>
+            {formatTime(slot.startTime)} - {formatTime(slot.endTime)}
+          </div>
+        </div>
+      </div>
+
+      <Modal
+        isOpen={showModal}
+        onClose={handleClose}
+        title="Zeit-Slot bearbeiten"
+        width="400px"
+      >
+        <div style={{ marginBottom: '16px' }}>
+          <label style={labelStyle}>Name *</label>
+          <input
+            type="text"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            style={inputStyle}
+            placeholder="z.B. Vormittag"
+          />
+        </div>
+
+        <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '16px', marginBottom: '16px' }}>
+          <div>
+            <label style={labelStyle}>Startzeit *</label>
+            <input
+              type="time"
+              value={startTime}
+              onChange={(e) => setStartTime(e.target.value)}
+              style={inputStyle}
+            />
+          </div>
+          <div>
+            <label style={labelStyle}>Endzeit *</label>
+            <input
+              type="time"
+              value={endTime}
+              onChange={(e) => setEndTime(e.target.value)}
+              style={inputStyle}
+            />
+          </div>
+        </div>
+
+        <div style={{ marginBottom: '20px' }}>
+          <label style={labelStyle}>Beschreibung (optional)</label>
+          <input
+            type="text"
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            style={inputStyle}
+            placeholder="Optionale Beschreibung"
+          />
+        </div>
+
+        {shiftsCount > 0 && (
+          <div style={{
+            marginBottom: '16px',
+            padding: '12px',
+            backgroundColor: '#fff3cd',
+            borderRadius: '4px',
+            fontSize: '13px',
+            color: '#856404',
+            border: '1px solid #ffc107',
+          }}>
+            Dieser Zeit-Slot enthält {shiftsCount} Schicht(en). Beim Löschen werden alle zugehörigen Schichten entfernt.
+          </div>
+        )}
+
+        <div style={{ display: 'flex', gap: '8px', justifyContent: 'flex-end' }}>
+          <button
+            onClick={handleSave}
+            disabled={!name}
+            style={addTextButton(!name)}
+          >
+            Speichern
+          </button>
+          <button
+            onClick={handleDelete}
+            style={deleteTextButton(false)}
+            title={shiftsCount > 0 ? `Enthält ${shiftsCount} Schicht(en)` : undefined}
+          >
+            {ICONS.delete} Löschen
+          </button>
+          <button
+            onClick={handleClose}
+            style={cancelTextButton(false)}
+          >
+            Abbrechen
+          </button>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default TimeSlotEditor;

frontend/src/services/shiftPlanService.ts

@@ -1,7 +1,34 @@
-import { ShiftPlan, CreateShiftPlanRequest } from '../models/ShiftPlan';
+import { ShiftPlan, CreateShiftPlanRequest, TimeSlot, Shift } from '../models/ShiftPlan';
 import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults';
 import { apiClient } from './apiClient';
 
+// Request types for time slot and shift operations
+export interface CreateTimeSlotRequest {
+  name: string;
+  startTime: string;
+  endTime: string;
+  description?: string;
+}
+
+export interface UpdateTimeSlotRequest {
+  name?: string;
+  startTime?: string;
+  endTime?: string;
+  description?: string;
+}
+
+export interface CreateShiftRequest {
+  timeSlotId: string;
+  dayOfWeek: number;
+  requiredEmployees: number;
+  color?: string;
+}
+
+export interface UpdateShiftRequest {
+  requiredEmployees?: number;
+  color?: string;
+}
+
 export const shiftPlanService = {
   async getShiftPlans(): Promise<ShiftPlan[]> {
     try {
@@ -182,4 +209,84 @@ export const shiftPlanService = {
       throw new Error('Fehler beim PDF-Export des Schichtplans');
     }
   },
+
+  // Time Slot operations
+  async addTimeSlot(planId: string, timeSlot: CreateTimeSlotRequest): Promise<TimeSlot> {
+    try {
+      return await apiClient.post<TimeSlot>(`/shift-plans/${planId}/time-slots`, timeSlot);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Hinzufügen des Zeit-Slots');
+    }
+  },
+
+  async updateTimeSlot(planId: string, slotId: string, data: UpdateTimeSlotRequest): Promise<TimeSlot> {
+    try {
+      return await apiClient.put<TimeSlot>(`/shift-plans/${planId}/time-slots/${slotId}`, data);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Aktualisieren des Zeit-Slots');
+    }
+  },
+
+  async deleteTimeSlot(planId: string, slotId: string): Promise<void> {
+    try {
+      await apiClient.delete(`/shift-plans/${planId}/time-slots/${slotId}`);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Löschen des Zeit-Slots');
+    }
+  },
+
+  // Shift operations
+  async addShift(planId: string, shift: CreateShiftRequest): Promise<Shift> {
+    try {
+      return await apiClient.post<Shift>(`/shift-plans/${planId}/shifts`, shift);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Hinzufügen der Schicht');
+    }
+  },
+
+  async updateShift(planId: string, shiftId: string, data: UpdateShiftRequest): Promise<Shift> {
+    try {
+      return await apiClient.patch<Shift>(`/shift-plans/${planId}/shifts/${shiftId}`, data);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Aktualisieren der Schicht');
+    }
+  },
+
+  async deleteShift(planId: string, shiftId: string): Promise<void> {
+    try {
+      await apiClient.delete(`/shift-plans/${planId}/shifts/${shiftId}`);
+    } catch (error: any) {
+      if (error.statusCode === 401) {
+        localStorage.removeItem('token');
+        localStorage.removeItem('employee');
+        throw new Error('Nicht authorisiert - bitte erneut anmelden');
+      }
+      throw new Error('Fehler beim Löschen der Schicht');
+    }
+  },
 };

frontend/src/utils/buttonStyles.ts

@@ -0,0 +1,150 @@
+// Unified button styles for consistent UI across the application
+
+import React from 'react';
+
+// Color palette
+export const BUTTON_COLORS = {
+  delete: '#e74c3c',
+  add: '#27ae60',
+  edit: '#f39c12',
+  cancel: '#95a5a6',
+  info: '#3498db',
+  primary: '#2c3e50',
+};
+
+// Icon constants for uniform usage
+export const ICONS = {
+  delete: '-',
+  add: '+',
+  edit: '✎',
+  close: '✕',
+  calendar: '📅',
+};
+
+// Base button style
+const baseButtonStyle: React.CSSProperties = {
+  border: 'none',
+  borderRadius: '4px',
+  cursor: 'pointer',
+  fontWeight: 'bold',
+  transition: 'opacity 0.2s ease',
+};
+
+// Icon button (small, square) - for inline actions
+export const iconButtonStyle = (
+  color: string,
+  disabled = false
+): React.CSSProperties => ({
+  ...baseButtonStyle,
+  padding: '6px 8px',
+  backgroundColor: color,
+  color: 'white',
+  fontSize: '14px',
+  minWidth: '32px',
+  height: '32px',
+  display: 'inline-flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  cursor: disabled ? 'not-allowed' : 'pointer',
+  opacity: disabled ? 0.5 : 1,
+});
+
+// Small inline icon button (for table cells, headers)
+export const smallIconButtonStyle = (
+  color: string,
+  disabled = false
+): React.CSSProperties => ({
+  ...baseButtonStyle,
+  padding: '4px 8px',
+  backgroundColor: color,
+  color: 'white',
+  fontSize: '12px',
+  minWidth: '24px',
+  height: '24px',
+  display: 'inline-flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  cursor: disabled ? 'not-allowed' : 'pointer',
+  opacity: disabled ? 0.5 : 1,
+});
+
+// Text button with icon prefix
+export const textButtonStyle = (
+  color: string,
+  disabled = false
+): React.CSSProperties => ({
+  ...baseButtonStyle,
+  padding: '8px 16px',
+  backgroundColor: color,
+  color: 'white',
+  fontSize: '14px',
+  cursor: disabled ? 'not-allowed' : 'pointer',
+  opacity: disabled ? 0.6 : 1,
+});
+
+// Outline/dashed button for "add new" actions
+export const outlineButtonStyle = (
+  color: string,
+  disabled = false
+): React.CSSProperties => ({
+  ...baseButtonStyle,
+  padding: '10px 20px',
+  backgroundColor: 'transparent',
+  color: color,
+  border: `2px dashed ${color}`,
+  fontSize: '14px',
+  width: '100%',
+  cursor: disabled ? 'not-allowed' : 'pointer',
+  opacity: disabled ? 0.6 : 1,
+});
+
+// Borderless icon button (for minimal UI elements)
+export const borderlessIconButtonStyle = (
+  color: string,
+  disabled = false
+): React.CSSProperties => ({
+  background: 'none',
+  border: 'none',
+  color: color,
+  cursor: disabled ? 'not-allowed' : 'pointer',
+  fontSize: '16px',
+  padding: '4px 8px',
+  opacity: disabled ? 0.5 : 1,
+  display: 'inline-flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+});
+
+// Preset button styles for common actions
+export const deleteIconButton = (disabled = false) =>
+  iconButtonStyle(BUTTON_COLORS.delete, disabled);
+
+export const addIconButton = (disabled = false) =>
+  iconButtonStyle(BUTTON_COLORS.add, disabled);
+
+export const editIconButton = (disabled = false) =>
+  iconButtonStyle(BUTTON_COLORS.edit, disabled);
+
+export const deleteTextButton = (disabled = false) =>
+  textButtonStyle(BUTTON_COLORS.delete, disabled);
+
+export const addTextButton = (disabled = false) =>
+  textButtonStyle(BUTTON_COLORS.add, disabled);
+
+export const cancelTextButton = (disabled = false) =>
+  textButtonStyle(BUTTON_COLORS.cancel, disabled);
+
+export const addOutlineButton = (disabled = false) =>
+  outlineButtonStyle(BUTTON_COLORS.add, disabled);
+
+export const smallDeleteButton = (disabled = false) =>
+  smallIconButtonStyle(BUTTON_COLORS.delete, disabled);
+
+export const smallAddButton = (disabled = false) =>
+  smallIconButtonStyle(BUTTON_COLORS.add, disabled);
+
+export const borderlessDeleteButton = (disabled = false) =>
+  borderlessIconButtonStyle(BUTTON_COLORS.delete, disabled);
+
+export const borderlessEditButton = (disabled = false) =>
+  borderlessIconButtonStyle(BUTTON_COLORS.edit, disabled);

package.json

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