mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 06:55:45 +01:00
Compare commits
1 Commits
7c63bee1b3
...
v1.0.18
| Author | SHA1 | Date | |
|---|---|---|---|
| dab5164704 |
@@ -27,7 +27,10 @@
|
|||||||
"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",
|
||||||
|
|||||||
@@ -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 {
|
||||||
@@ -54,6 +55,7 @@ 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);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadShiftPlanData();
|
loadShiftPlanData();
|
||||||
@@ -240,6 +242,66 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleExportExcel = async () => {
|
||||||
|
if (!shiftPlan) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setExporting(true);
|
||||||
|
|
||||||
|
// Call the export service
|
||||||
|
const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
|
||||||
|
|
||||||
|
// Use file-saver to download the file
|
||||||
|
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.xlsx`);
|
||||||
|
|
||||||
|
showNotification({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Export erfolgreich',
|
||||||
|
message: 'Der Schichtplan wurde als Excel-Datei exportiert.'
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error exporting to Excel:', error);
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Export fehlgeschlagen',
|
||||||
|
message: 'Der Excel-Export konnte nicht durchgeführt werden.'
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setExporting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleExportPDF = async () => {
|
||||||
|
if (!shiftPlan) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
setExporting(true);
|
||||||
|
|
||||||
|
// Call the PDF export service
|
||||||
|
const blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
|
||||||
|
|
||||||
|
// Use file-saver to download the file
|
||||||
|
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.pdf`);
|
||||||
|
|
||||||
|
showNotification({
|
||||||
|
type: 'success',
|
||||||
|
title: 'Export erfolgreich',
|
||||||
|
message: 'Der Schichtplan wurde als PDF exportiert.'
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error exporting to PDF:', error);
|
||||||
|
showNotification({
|
||||||
|
type: 'error',
|
||||||
|
title: 'Export fehlgeschlagen',
|
||||||
|
message: 'Der PDF-Export konnte nicht durchgeführt werden.'
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setExporting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const loadShiftPlanData = async () => {
|
const loadShiftPlanData = async () => {
|
||||||
if (!id) return;
|
if (!id) return;
|
||||||
|
|
||||||
@@ -399,12 +461,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,
|
||||||
@@ -650,6 +712,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(
|
||||||
@@ -1005,7 +1081,50 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</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
|
||||||
|
onClick={handleExportExcel}
|
||||||
|
disabled={exporting}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#27ae60',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: exporting ? 'not-allowed' : 'pointer',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: '8px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{exporting ? '🔄' : '📊'} {exporting ? 'Exportiert...' : 'Excel Export'}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
onClick={handleExportPDF}
|
||||||
|
disabled={exporting}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#e74c3c',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: exporting ? 'not-allowed' : 'pointer',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: '8px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{exporting ? '🔄' : '📄'} {exporting ? 'Exportiert...' : 'PDF Export'}
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Your existing "Zuweisungen neu berechnen" button */}
|
||||||
|
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
||||||
<button
|
<button
|
||||||
onClick={handleRecreateAssignments}
|
onClick={handleRecreateAssignments}
|
||||||
disabled={recreating}
|
disabled={recreating}
|
||||||
@@ -1197,15 +1316,13 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</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',
|
||||||
@@ -1291,29 +1408,21 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
{/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
|
{/* KORRIGIERTER BUTTON MIT TYPESCRIPT-FIX */}
|
||||||
<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:')
|
|
||||||
).length === 0
|
|
||||||
? 'Schichtplan veröffentlichen'
|
? 'Schichtplan veröffentlichen'
|
||||||
: 'Kritische Probleme müssen behoben werden'
|
: 'Kritische Probleme müssen behoben werden'
|
||||||
) : 'Lade Zuordnungen...'
|
) : 'Lade Zuordnungen...'
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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');
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
Reference in New Issue
Block a user