Compare commits

..

14 Commits

9 changed files with 1314 additions and 227 deletions

View File

@@ -16,7 +16,7 @@
"dependencies": { "dependencies": {
"@types/bcrypt": "^6.0.0", "@types/bcrypt": "^6.0.0",
"@types/node": "24.9.2", "@types/node": "24.9.2",
"vite":"7.1.12", "vite": "7.1.12",
"bcrypt": "^6.0.0", "bcrypt": "^6.0.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"express": "^4.18.2", "express": "^4.18.2",
@@ -25,7 +25,9 @@
"uuid": "^9.0.0", "uuid": "^9.0.0",
"express-rate-limit": "8.1.0", "express-rate-limit": "8.1.0",
"helmet": "8.1.0", "helmet": "8.1.0",
"express-validator": "7.3.0" "express-validator": "7.3.0",
"exceljs": "4.4.0",
"playwright": "^1.37.0"
}, },
"devDependencies": { "devDependencies": {
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,9 @@ import {
updateShiftPlan, updateShiftPlan,
deleteShiftPlan, deleteShiftPlan,
createFromPreset, createFromPreset,
clearAssignments clearAssignments,
exportShiftPlanToExcel,
exportShiftPlanToPDF
} from '../controllers/shiftPlanController.js'; } from '../controllers/shiftPlanController.js';
import { import {
validateShiftPlan, validateShiftPlan,
@@ -30,4 +32,7 @@ router.put('/:id', validateId, validateShiftPlanUpdate, handleValidationErrors,
router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShiftPlan); router.delete('/:id', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), deleteShiftPlan);
router.post('/:id/clear-assignments', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), clearAssignments); router.post('/:id/clear-assignments', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), clearAssignments);
router.get('/:id/export/excel', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToExcel);
router.get('/:id/export/pdf', validateId, handleValidationErrors, requireRole(['admin', 'maintenance']), exportShiftPlanToPDF);
export default router; export default router;

View File

@@ -27,7 +27,9 @@
"esbuild": "^0.21.0", "esbuild": "^0.21.0",
"terser": "5.44.0", "terser": "5.44.0",
"babel-plugin-transform-remove-console": "6.9.4", "babel-plugin-transform-remove-console": "6.9.4",
"framer-motion": "12.23.24" "framer-motion": "12.23.24",
"file-saver": "2.0.5",
"@types/file-saver": "2.0.5"
}, },
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",

View File

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

View File

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

View File

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

View File

@@ -26,7 +26,7 @@ export class ApiClient {
return token ? { 'Authorization': `Bearer ${token}` } : {}; return token ? { 'Authorization': `Bearer ${token}` } : {};
} }
private async handleApiResponse<T>(response: Response): Promise<T> { private async handleApiResponse<T>(response: Response, responseType: 'json' | 'blob' = 'json'): Promise<T> {
if (!response.ok) { if (!response.ok) {
let errorData; let errorData;
@@ -61,7 +61,12 @@ export class ApiClient {
); );
} }
// For successful responses, try to parse as JSON // Handle blob responses (for file downloads)
if (responseType === 'blob') {
return response.blob() as Promise<T>;
}
// For successful JSON responses, try to parse as JSON
try { try {
const responseText = await response.text(); const responseText = await response.text();
return responseText ? JSON.parse(responseText) : {} as T; return responseText ? JSON.parse(responseText) : {} as T;
@@ -71,7 +76,7 @@ export class ApiClient {
} }
} }
async request<T>(endpoint: string, options: RequestInit = {}): Promise<T> { async request<T>(endpoint: string, options: RequestInit = {}, responseType: 'json' | 'blob' = 'json'): Promise<T> {
const url = `${this.baseURL}${endpoint}`; const url = `${this.baseURL}${endpoint}`;
const config: RequestInit = { const config: RequestInit = {
@@ -85,7 +90,7 @@ export class ApiClient {
try { try {
const response = await fetch(url, config); const response = await fetch(url, config);
return await this.handleApiResponse<T>(response); return await this.handleApiResponse<T>(response, responseType);
} catch (error) { } catch (error) {
// Re-throw the error to be caught by useBackendValidation // Re-throw the error to be caught by useBackendValidation
if (error instanceof ApiError) { if (error instanceof ApiError) {

View File

@@ -126,4 +126,60 @@ export const shiftPlanService = {
throw error; throw error;
} }
}, },
async exportShiftPlanToExcel(planId: string): Promise<Blob> {
try {
console.log('📊 Exporting shift plan to Excel:', planId);
// Use the apiClient with blob response handling
const blob = await apiClient.request<Blob>(`/shift-plans/${planId}/export/excel`, {
method: 'GET',
}, 'blob');
console.log('✅ Excel export successful');
return blob;
} catch (error: any) {
console.error('❌ Error exporting to Excel:', error);
if (error.statusCode === 401) {
localStorage.removeItem('token');
localStorage.removeItem('employee');
throw new Error('Nicht authorisiert - bitte erneut anmelden');
}
if (error.statusCode === 404) {
throw new Error('Schichtplan nicht gefunden');
}
throw new Error('Fehler beim Excel-Export des Schichtplans');
}
},
async exportShiftPlanToPDF(planId: string): Promise<Blob> {
try {
console.log('📄 Exporting shift plan to PDF:', planId);
// Use the apiClient with blob response handling
const blob = await apiClient.request<Blob>(`/shift-plans/${planId}/export/pdf`, {
method: 'GET',
}, 'blob');
console.log('✅ PDF export successful');
return blob;
} catch (error: any) {
console.error('❌ Error exporting to PDF:', error);
if (error.statusCode === 401) {
localStorage.removeItem('token');
localStorage.removeItem('employee');
throw new Error('Nicht authorisiert - bitte erneut anmelden');
}
if (error.statusCode === 404) {
throw new Error('Schichtplan nicht gefunden');
}
throw new Error('Fehler beim PDF-Export des Schichtplans');
}
},
}; };