donpat1to/Schichtenplaner
1
0
Fork 0
mirror of https://github.com/donpat1to/Schichtenplaner.git synced 2025-11-30 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed manager detection

Browse Source
This commit is contained in:
Patrick Mahnke-Hartmann
2025-11-05 09:43:28 +01:00
parent d0be1b4a61
commit c6dfa5b4c6
1 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
frontend/src/pages/ShiftPlans/ShiftPlanView.tsx
View File

@@ -45,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[]>([]);
@@ -59,16 +59,16 @@ const ShiftPlanView: React.FC = () => {
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);
}; };
@@ -84,7 +84,7 @@ const ShiftPlanView: React.FC = () => {
}; };
document.addEventListener('visibilitychange', handleVisibilityChange); document.addEventListener('visibilitychange', handleVisibilityChange);
return () => { return () => {
document.removeEventListener('visibilitychange', handleVisibilityChange); document.removeEventListener('visibilitychange', handleVisibilityChange);
}; };
@@ -99,17 +99,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})`);
}); });
}; };
@@ -135,7 +135,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,
@@ -144,7 +144,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[]>);
@@ -204,11 +204,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`);
@@ -247,19 +247,19 @@ const ShiftPlanView: React.FC = () => {
try { try {
setExporting(true); setExporting(true);
// Call the export service // Call the export service
const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id); const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
// Use file-saver to download the file // Use file-saver to download the file
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`); saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`);
showNotification({ showNotification({
type: 'success', type: 'success',
title: 'Export erfolgreich', title: 'Export erfolgreich',
message: 'Der Schichtplan wurde als Excel-Datei exportiert.' message: 'Der Schichtplan wurde als Excel-Datei exportiert.'
}); });
} catch (error) { } catch (error) {
console.error('Error exporting to Excel:', error); console.error('Error exporting to Excel:', error);
showNotification({ showNotification({
@@ -277,19 +277,19 @@ const ShiftPlanView: React.FC = () => {
try { try {
setExporting(true); setExporting(true);
// Call the PDF export service // Call the PDF export service
const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id); const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
// Use file-saver to download the file // Use file-saver to download the file
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`); saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
showNotification({ showNotification({
type: 'success', type: 'success',
title: 'Export erfolgreich', title: 'Export erfolgreich',
message: 'Der Schichtplan wurde als PDF exportiert.' message: 'Der Schichtplan wurde als PDF exportiert.'
}); });
} catch (error) { } catch (error) {
console.error('Error exporting to PDF:', error); console.error('Error exporting to PDF:', error);
showNotification({ showNotification({
@@ -304,10 +304,10 @@ const ShiftPlanView: React.FC = () => {
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),
@@ -320,7 +320,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({
@@ -334,21 +334,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
@@ -374,7 +374,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;
} }
@@ -405,7 +405,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);
@@ -445,9 +445,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)),
@@ -476,7 +476,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,
@@ -497,7 +497,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}`);
@@ -513,7 +513,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) {
@@ -527,18 +527,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');
} }
@@ -548,19 +548,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));
@@ -568,13 +568,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);
@@ -612,12 +612,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',
@@ -631,7 +631,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 [];
@@ -647,20 +647,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);
@@ -671,21 +671,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`);
@@ -702,7 +702,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);
@@ -714,15 +714,15 @@ const ShiftPlanView: React.FC = () => {
const canPublishAssignment = (): boolean => { const canPublishAssignment = (): boolean => {
if (!assignmentResult) return false; if (!assignmentResult) return false;
// Check if assignment was successful // Check if assignment was successful
if (assignmentResult.success === false) return false; if (assignmentResult.success === false) return false;
// Check if there are any critical violations // Check if there are any critical violations
const hasCriticalViolations = assignmentResult.violations.some(v => const hasCriticalViolations = assignmentResult.violations.some(v =>
v.includes('ERROR:') || v.includes('KRITISCH:') v.includes('ERROR:') || v.includes('KRITISCH:')
); );
return !hasCriticalViolations; return !hasCriticalViolations;
}; };
@@ -742,23 +742,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);
} }
@@ -766,26 +766,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 [];
}; };
@@ -899,7 +899,7 @@ const ShiftPlanView: React.FC = () => {
</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={{
@@ -917,7 +917,7 @@ 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 displayContent: React.ReactNode = null; let displayContent: React.ReactNode = null;
@@ -926,16 +926,16 @@ const ShiftPlanView: React.FC = () => {
return employeeIds.map(empId => { return employeeIds.map(empId => {
const employee = employees.find(emp => emp.id === empId); const employee = employees.find(emp => emp.id === empId);
if (!employee) return null; if (!employee) return null;
// Determine background color based on employee role // Determine background color based on employee role
let backgroundColor = '#642ab5'; // Default: non-trainee personnel (purple) let backgroundColor = '#642ab5'; // Default: non-trainee personnel (purple)
if (employee.isTrainee) { if (employee.isTrainee) {
backgroundColor = '#cda8f0'; // Trainee backgroundColor = '#cda8f0'; // Trainee
} else if (employee.roles?.includes('manager')) { } else if (employee.employeeType === 'manager') {
backgroundColor = '#CC0000'; // Manager backgroundColor = '#CC0000'; // Manager
} }
return ( return (
<div <div
key={empId} key={empId}
@@ -961,8 +961,8 @@ const ShiftPlanView: React.FC = () => {
// Helper function to get fallback content // Helper function to get fallback content
const getFallbackContent = () => { const getFallbackContent = () => {
const shiftsForSlot = shiftPlan?.shifts?.filter(s => const shiftsForSlot = shiftPlan?.shifts?.filter(s =>
s.dayOfWeek === weekday.id && s.dayOfWeek === weekday.id &&
s.timeSlotId === timeSlot.id s.timeSlotId === timeSlot.id
) || []; ) || [];
const totalRequired = shiftsForSlot.reduce((sum, s) => sum + s.requiredEmployees, 0); const totalRequired = shiftsForSlot.reduce((sum, s) => sum + s.requiredEmployees, 0);
@@ -973,18 +973,18 @@ const ShiftPlanView: React.FC = () => {
// 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 || [];
// 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);
} }
const employeeBoxes = createEmployeeBoxes(assignedEmployees); const employeeBoxes = createEmployeeBoxes(assignedEmployees);
displayContent = employeeBoxes.length > 0 ? ( displayContent = employeeBoxes.length > 0 ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}> <div style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
@@ -1000,10 +1000,10 @@ const ShiftPlanView: React.FC = () => {
// 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);
const employeeBoxes = createEmployeeBoxes(assignedEmployees); const employeeBoxes = createEmployeeBoxes(assignedEmployees);
@@ -1054,7 +1054,7 @@ 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>
@@ -1063,9 +1063,9 @@ const ShiftPlanView: React.FC = () => {
{displayContent} {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'
@@ -1098,20 +1098,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',
@@ -1124,7 +1124,7 @@ 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']) && ( {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<> <>
<button <button
@@ -1145,7 +1145,7 @@ const ShiftPlanView: React.FC = () => {
> >
{exporting ? '🔄' : '📊'} {exporting ? 'Exportiert...' : 'Excel Export'} {exporting ? '🔄' : '📊'} {exporting ? 'Exportiert...' : 'Excel Export'}
</button> </button>
<button <button
onClick={handleExportPDF} onClick={handleExportPDF}
disabled={exporting} disabled={exporting}
@@ -1166,7 +1166,7 @@ const ShiftPlanView: React.FC = () => {
</button> </button>
</> </>
)} )}
{/* "Zuweisungen neu berechnen" button */} {/* "Zuweisungen neu berechnen" button */}
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && ( {shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
<button <button
@@ -1185,7 +1185,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={{
@@ -1220,15 +1220,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%',
@@ -1238,7 +1238,7 @@ const ShiftPlanView: React.FC = () => {
/> />
</div> </div>
</div> </div>
{hasRole(['admin', 'maintenance']) && ( {hasRole(['admin', 'maintenance']) && (
<div> <div>
<button <button
@@ -1256,11 +1256,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>
)} )}
@@ -1305,7 +1305,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={{
@@ -1321,15 +1321,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';
@@ -1344,9 +1344,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',
@@ -1359,12 +1359,12 @@ const ShiftPlanView: React.FC = () => {
</div> </div>
</div> </div>
)} )}
{/* 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.length === 0) || assignmentResult.success == true ? ( {(assignmentResult.violations.length === 0) || assignmentResult.success == true ? (
<div style={{ <div style={{
@@ -1404,7 +1404,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={{
@@ -1448,7 +1448,7 @@ const ShiftPlanView: React.FC = () => {
> >
Abbrechen Abbrechen
</button> </button>
{/* BUTTON zum publishen */} {/* BUTTON zum publishen */}
<button <button
onClick={handlePublish} onClick={handlePublish}
@@ -1466,8 +1466,8 @@ const ShiftPlanView: React.FC = () => {
> >
{publishing ? 'Veröffentliche...' : ( {publishing ? 'Veröffentliche...' : (
assignmentResult ? ( assignmentResult ? (
canPublishAssignment() canPublishAssignment()
? 'Schichtplan veröffentlichen' ? 'Schichtplan veröffentlichen'
: 'Kritische Probleme müssen behoben werden' : 'Kritische Probleme müssen behoben werden'
) : 'Lade Zuordnungen...' ) : 'Lade Zuordnungen...'
)} )}
@@ -1475,7 +1475,7 @@ const ShiftPlanView: React.FC = () => {
</div> </div>
</div> </div>
</div> </div>
)} )}
{/* Timetable */} {/* Timetable */}
<div style={{ <div style={{
@@ -1485,11 +1485,11 @@ 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()}
{/* Summary */} {/* Summary */}
@@ -1503,11 +1503,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>
)} )}