added shiftplan generating logic

This commit is contained in:
2025-10-13 21:45:01 +02:00
parent e015a9a651
commit bd85895408
9 changed files with 1064 additions and 89 deletions

View File

@@ -28,7 +28,7 @@ const EmployeeManagement: React.FC = () => {
console.log('🔄 Loading employees...');
// Add cache-busting parameter to prevent browser caching
const data = await employeeService.getEmployees();
const data = await employeeService.getEmployees(true);
console.log('✅ Employees loaded:', data);
setEmployees(data);

View File

@@ -321,7 +321,7 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
flexWrap: 'wrap'
}}>
{/* Verfügbarkeit Button */}
{(employee.role === 'admin' || employee.role === 'maintenance') && (
{(employee.role === 'admin' || employee.role === 'maintenance' || employee.role === 'user') && (
<button
onClick={() => onManageAvailability(employee)}
style={{

View File

@@ -1,26 +1,16 @@
// frontend/src/pages/ShiftPlans/ShiftPlanView.tsx
// frontend/src/pages/ShiftPlans/ShiftPlanView.tsx (updated)
import React, { useState, useEffect } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { useAuth } from '../../contexts/AuthContext';
import { shiftPlanService } from '../../services/shiftPlanService';
import { getTimeSlotById } from '../../models/helpers/shiftPlanHelpers';
import { employeeService } from '../../services/employeeService';
import { ShiftAssignmentService, AssignmentResult } from '../../services/shiftAssignmentService';
import { ShiftPlan, TimeSlot } from '../../models/ShiftPlan';
import { Employee, EmployeeAvailability } from '../../models/Employee';
import { useNotification } from '../../contexts/NotificationContext';
import { formatDate, formatTime } from '../../utils/foramatters';
const ShiftPlanView: React.FC = () => {
const { id } = useParams<{ id: string }>();
const navigate = useNavigate();
const { hasRole } = useAuth();
const { showNotification } = useNotification();
const [shiftPlan, setShiftPlan] = useState<ShiftPlan | null>(null);
const [loading, setLoading] = useState(true);
useEffect(() => {
loadShiftPlan();
}, [id]);
const weekdays = [
const weekdays = [
{ id: 1, name: 'Mo' },
{ id: 2, name: 'Di' },
{ id: 3, name: 'Mi' },
@@ -30,24 +20,201 @@ const ShiftPlanView: React.FC = () => {
{ id: 7, name: 'So' }
];
const loadShiftPlan = async () => {
const ShiftPlanView: React.FC = () => {
const { id } = useParams<{ id: string }>();
const navigate = useNavigate();
const { hasRole, user } = useAuth();
const { showNotification } = useNotification();
const [shiftPlan, setShiftPlan] = useState<ShiftPlan | null>(null);
const [employees, setEmployees] = useState<Employee[]>([]);
const [availabilities, setAvailabilities] = useState<EmployeeAvailability[]>([]);
const [assignmentResult, setAssignmentResult] = useState<AssignmentResult | null>(null);
const [loading, setLoading] = useState(true);
const [publishing, setPublishing] = useState(false);
const [showAssignmentPreview, setShowAssignmentPreview] = useState(false);
useEffect(() => {
loadShiftPlanData();
}, [id]);
const loadShiftPlanData = async () => {
if (!id) return;
try {
const plan = await shiftPlanService.getShiftPlan(id);
setLoading(true);
const [plan, employeesData] = await Promise.all([
shiftPlanService.getShiftPlan(id),
employeeService.getEmployees()
]);
setShiftPlan(plan);
setEmployees(employeesData.filter(emp => emp.isActive));
// Load availabilities for all employees
const availabilityPromises = employeesData
.filter(emp => emp.isActive)
.map(emp => employeeService.getAvailabilities(emp.id));
const allAvailabilities = await Promise.all(availabilityPromises);
const flattenedAvailabilities = allAvailabilities.flat();
// Filter availabilities to only include those for the current shift plan
const planAvailabilities = flattenedAvailabilities.filter(
availability => availability.planId === id
);
setAvailabilities(planAvailabilities);
} catch (error) {
console.error('Error loading shift plan:', error);
console.error('Error loading shift plan data:', error);
showNotification({
type: 'error',
title: 'Fehler',
message: 'Der Schichtplan konnte nicht geladen werden.'
message: 'Daten konnten nicht geladen werden.'
});
navigate('/shift-plans');
} finally {
setLoading(false);
}
};
const handlePreviewAssignment = async () => {
if (!shiftPlan) return;
try {
setPublishing(true);
const result = await ShiftAssignmentService.assignShifts(
shiftPlan,
employees,
availabilities,
{
enforceExperiencedWithChef: true,
enforceNoTraineeAlone: true,
maxRepairAttempts: 50
}
);
setAssignmentResult(result);
setShowAssignmentPreview(true);
if (!result.success) {
showNotification({
type: 'warning',
title: 'Warnung',
message: `Automatische Zuordnung hat ${result.violations.length} Probleme gefunden.`
});
}
} catch (error) {
console.error('Error during assignment:', error);
showNotification({
type: 'error',
title: 'Fehler',
message: 'Automatische Zuordnung fehlgeschlagen.'
});
} finally {
setPublishing(false);
}
};
const handlePublish = async () => {
if (!shiftPlan || !assignmentResult) return;
try {
setPublishing(true);
console.log('🔄 Starting to publish assignments...');
// Debug: Check if scheduled shifts exist
if (!shiftPlan.scheduledShifts || shiftPlan.scheduledShifts.length === 0) {
throw new Error('No scheduled shifts found in the plan');
}
// Update scheduled shifts with assignments
const updatePromises = shiftPlan.scheduledShifts.map(async (scheduledShift) => {
const assignedEmployees = assignmentResult.assignments[scheduledShift.id] || [];
console.log(`📝 Updating shift ${scheduledShift.id} with`, assignedEmployees.length, 'employees');
try {
// First, verify the shift exists
await shiftPlanService.getScheduledShift(scheduledShift.id);
// Then update it
await shiftPlanService.updateScheduledShift(scheduledShift.id, {
assignedEmployees
});
console.log(`✅ Successfully updated shift ${scheduledShift.id}`);
} catch (error) {
console.error(`❌ Failed to update shift ${scheduledShift.id}:`, error);
throw error; // Re-throw to stop the process
}
});
await Promise.all(updatePromises);
// Update plan status to published
console.log('🔄 Updating plan status to published...');
await shiftPlanService.updateShiftPlan(shiftPlan.id, {
status: 'published'
});
showNotification({
type: 'success',
title: 'Erfolg',
message: 'Schichtplan wurde erfolgreich veröffentlicht!'
});
// Reload the plan to reflect changes
loadShiftPlanData();
setShowAssignmentPreview(false);
} catch (error) {
console.error('❌ Error publishing shift plan:', error);
let message = 'Unbekannter Fehler';
if (error instanceof Error) {
message = error.message;
} else if (typeof error === 'string') {
message = error;
}
showNotification({
type: 'error',
title: 'Fehler',
message: `Schichtplan konnte nicht veröffentlicht werden: ${message}`
});
} finally {
setPublishing(false);
}
};
const canPublish = () => {
if (!shiftPlan || shiftPlan.status === 'published') return false;
// Check if all active employees have set their availabilities
const employeesWithoutAvailabilities = employees.filter(emp => {
const empAvailabilities = availabilities.filter(avail => avail.employeeId === emp.id);
return empAvailabilities.length === 0;
});
return employeesWithoutAvailabilities.length === 0;
};
const getAvailabilityStatus = () => {
const totalEmployees = employees.length;
const employeesWithAvailabilities = new Set(
availabilities.map(avail => avail.employeeId)
).size;
return {
completed: employeesWithAvailabilities,
total: totalEmployees,
percentage: Math.round((employeesWithAvailabilities / totalEmployees) * 100)
};
};
// Simplified timetable data generation
const getTimetableData = () => {
if (!shiftPlan) return { shifts: [], weekdays: [] };
@@ -86,60 +253,232 @@ const ShiftPlanView: React.FC = () => {
if (!shiftPlan) return <div>Schichtplan nicht gefunden</div>;
const timetableData = getTimetableData();
const debugApiEndpoints = async () => {
if (!shiftPlan) return;
console.log('🔍 Testing API endpoints for plan:', shiftPlan.id);
try {
// Test the scheduled shifts endpoint
const shifts = await shiftPlanService.getScheduledShiftsForPlan(shiftPlan.id);
console.log('✅ GET /api/scheduled-shifts/plan/:planId works:', shifts.length, 'shifts found');
if (shifts.length > 0) {
const firstShift = shifts[0];
console.log('🔍 First shift:', firstShift);
// Test updating the first shift
try {
await shiftPlanService.updateScheduledShift(firstShift.id, {
assignedEmployees: ['test-employee']
});
console.log('✅ PUT /api/scheduled-shifts/:id works');
} catch (updateError) {
console.error('❌ PUT /api/scheduled-shifts/:id failed:', updateError);
}
}
} catch (error) {
console.error('❌ GET /api/scheduled-shifts/plan/:planId failed:', error);
}
};
return (
<div style={{ padding: '20px' }}>
<div style={{
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: '30px'
}}>
<div>
<h1>{shiftPlan.name}</h1>
<p style={{ color: '#666', marginTop: '5px' }}>
Zeitraum: {formatDate(shiftPlan.startDate)} - {formatDate(shiftPlan.endDate)}
</p>
<p style={{ color: '#666', marginTop: '5px' }}>
Status: <span style={{
color: shiftPlan.status === 'published' ? '#2ecc71' : '#f1c40f',
fontWeight: 'bold'
}}>
{shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'}
</span>
</p>
</div>
<div>
{hasRole(['admin', 'instandhalter']) && (
<button
onClick={() => navigate(`/shift-plans/${id}/edit`)}
style={{
padding: '8px 16px',
backgroundColor: '#f1c40f',
color: 'white',
border: 'none',
{/* Existing header code... */}
{/* Availability Status */}
{shiftPlan?.status === 'draft' && (
<div style={{
backgroundColor: 'white',
borderRadius: '8px',
padding: '20px',
marginBottom: '20px',
boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
}}>
<h3>Veröffentlichungsvoraussetzungen</h3>
<div style={{ display: 'flex', alignItems: 'center', gap: '20px', marginBottom: '15px' }}>
<div>
<div style={{ fontSize: '14px', color: '#666', marginBottom: '5px' }}>
Verfügbarkeitseinträge:
</div>
<div style={{ fontSize: '18px', fontWeight: 'bold' }}>
{getAvailabilityStatus().completed} / {getAvailabilityStatus().total} Mitarbeiter
</div>
<div style={{
width: '200px',
height: '8px',
backgroundColor: '#e0e0e0',
borderRadius: '4px',
cursor: 'pointer',
marginRight: '10px'
}}
>
Bearbeiten
</button>
)}
<button
onClick={() => navigate('/shift-plans')}
style={{
padding: '8px 16px',
backgroundColor: '#95a5a6',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer'
}}
>
Zurück
</button>
marginTop: '5px',
overflow: 'hidden'
}}>
<div
style={{
width: `${getAvailabilityStatus().percentage}%`,
height: '100%',
backgroundColor: getAvailabilityStatus().percentage === 100 ? '#2ecc71' : '#f1c40f',
transition: 'all 0.3s ease'
}}
/>
</div>
</div>
{hasRole(['admin', 'instandhalter']) && (
<div>
<button
onClick={handlePreviewAssignment}
disabled={!canPublish() || publishing}
style={{
padding: '10px 20px',
backgroundColor: canPublish() ? '#2ecc71' : '#95a5a6',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: canPublish() ? 'pointer' : 'not-allowed',
fontWeight: 'bold'
}}
>
{publishing ? 'Berechne...' : 'Automatisch zuweisen & Veröffentlichen'}
</button>
{!canPublish() && (
<div style={{ fontSize: '12px', color: '#666', marginTop: '5px' }}>
{getAvailabilityStatus().percentage === 100
? 'Bereit zur Veröffentlichung'
: `${getAvailabilityStatus().total - getAvailabilityStatus().completed} Mitarbeiter müssen noch Verfügbarkeit eintragen`}
</div>
)}
</div>
)}
</div>
</div>
</div>
)}
{/* Assignment Preview Modal */}
{showAssignmentPreview && assignmentResult && (
<div style={{
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: 'rgba(0,0,0,0.5)',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
zIndex: 1000
}}>
<div style={{
backgroundColor: 'white',
borderRadius: '8px',
padding: '30px',
maxWidth: '800px',
maxHeight: '80vh',
overflow: 'auto'
}}>
<h2>Wochenmuster-Zuordnung</h2>
{/* Show weekly pattern info */}
{assignmentResult.pattern && (
<div style={{
backgroundColor: '#e8f4fd',
border: '1px solid #b8d4f0',
borderRadius: '4px',
padding: '15px',
marginBottom: '20px'
}}>
<h4 style={{ color: '#2c3e50', marginTop: 0 }}>Wochenmuster erstellt</h4>
<p style={{ margin: 0, color: '#2c3e50' }}>
Der Algorithmus hat ein Muster für <strong>{assignmentResult.pattern.weekShifts.length} Schichten</strong> in der ersten Woche erstellt
und dieses für alle {Math.ceil(Object.keys(assignmentResult.assignments).length / assignmentResult.pattern.weekShifts.length)} Wochen im Plan wiederholt.
</p>
<div style={{ marginTop: '10px', fontSize: '14px' }}>
<strong>Wochenmuster-Statistik:</strong>
<div>- Schichten pro Woche: {assignmentResult.pattern.weekShifts.length}</div>
<div>- Zuweisungen pro Woche: {Object.values(assignmentResult.pattern.assignments).flat().length}</div>
<div>- Gesamtzuweisungen: {Object.values(assignmentResult.assignments).flat().length}</div>
</div>
</div>
)}
{assignmentResult.violations.length > 0 && (
<div style={{
backgroundColor: '#fff3cd',
border: '1px solid #ffeaa7',
borderRadius: '4px',
padding: '15px',
marginBottom: '20px'
}}>
<h4 style={{ color: '#856404', marginTop: 0 }}>Warnungen:</h4>
<ul style={{ margin: 0, paddingLeft: '20px' }}>
{assignmentResult.violations.map((violation, index) => (
<li key={index} style={{ color: '#856404', marginBottom: '5px' }}>
{violation}
</li>
))}
</ul>
</div>
)}
<div style={{ marginBottom: '20px' }}>
<h4>Zusammenfassung:</h4>
<p>
{assignmentResult.success
? '✅ Alle Schichten können zugeordnet werden!'
: '⚠️ Es gibt Probleme bei der Zuordnung die manuell behoben werden müssen.'}
</p>
</div>
<div style={{ display: 'flex', gap: '10px', justifyContent: 'flex-end' }}>
<button
onClick={() => setShowAssignmentPreview(false)}
style={{
padding: '8px 16px',
backgroundColor: '#95a5a6',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer'
}}
>
Abbrechen
</button>
<button
onClick={handlePublish}
disabled={publishing || !assignmentResult.success}
style={{
padding: '8px 16px',
backgroundColor: assignmentResult.success ? '#2ecc71' : '#95a5a6',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: assignmentResult.success ? 'pointer' : 'not-allowed'
}}
>
{publishing ? 'Veröffentliche...' : 'Veröffentlichen'}
</button>
<button
onClick={debugApiEndpoints}
style={{
padding: '8px 16px',
backgroundColor: '#f39c12',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer',
marginRight: '10px'
}}
>
Test API Endpoints
</button>
</div>
</div>
</div>
)}
<div style={{
backgroundColor: 'white',
@@ -147,16 +486,6 @@ const ShiftPlanView: React.FC = () => {
padding: '20px',
boxShadow: '0 2px 4px rgba(0,0,0,0.1)'
}}>
<div style={{ marginBottom: '20px' }}>
<div>Zeitraum: {formatDate(shiftPlan.startDate)} - {formatDate(shiftPlan.endDate)}</div>
<div>Status: <span style={{
color: shiftPlan.status === 'published' ? '#2ecc71' : '#f1c40f',
fontWeight: 'bold'
}}>
{shiftPlan.status === 'published' ? 'Veröffentlicht' : 'Entwurf'}
</span></div>
</div>
{/* Timetable */}
<div style={{ marginTop: '30px' }}>
<h3>Schichtplan</h3>