mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 06:55:45 +01:00
Compare commits
5 Commits
9eb9afce1e
...
v1.0.25
| Author | SHA1 | Date | |
|---|---|---|---|
| 822b170920 | |||
| c6dfa5b4c6 | |||
| d0be1b4a61 | |||
| b337fd0e0a | |||
| badccb4f55 |
@@ -27,8 +27,7 @@
|
|||||||
"helmet": "8.1.0",
|
"helmet": "8.1.0",
|
||||||
"express-validator": "7.3.0",
|
"express-validator": "7.3.0",
|
||||||
"exceljs": "4.4.0",
|
"exceljs": "4.4.0",
|
||||||
"pdfkit": "0.12.3",
|
"playwright": "^1.37.0"
|
||||||
"@types/pdfkit": "^0.12.3"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bcryptjs": "^2.4.2",
|
"@types/bcryptjs": "^2.4.2",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -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';
|
||||||
@@ -56,6 +56,12 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
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 [exporting, setExporting] = useState(false);
|
||||||
|
const [exportDropdownOpen, setExportDropdownOpen] = useState(false);
|
||||||
|
const [selectedExportType, setSelectedExportType] = useState('');
|
||||||
|
const [showExportButton, setShowExportButton] = useState(false);
|
||||||
|
const [dropdownWidth, setDropdownWidth] = useState(0);
|
||||||
|
|
||||||
|
const dropdownRef = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
loadShiftPlanData();
|
loadShiftPlanData();
|
||||||
@@ -90,6 +96,13 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Measure dropdown width when it opens
|
||||||
|
useEffect(() => {
|
||||||
|
if (exportDropdownOpen && dropdownRef.current) {
|
||||||
|
setDropdownWidth(dropdownRef.current.offsetWidth);
|
||||||
|
}
|
||||||
|
}, [exportDropdownOpen]);
|
||||||
|
|
||||||
// Add this useEffect to debug state changes
|
// Add this useEffect to debug state changes
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('🔍 STATE DEBUG - showAssignmentPreview:', showAssignmentPreview);
|
console.log('🔍 STATE DEBUG - showAssignmentPreview:', showAssignmentPreview);
|
||||||
@@ -242,64 +255,51 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleExportExcel = async () => {
|
const handleExport = async () => {
|
||||||
if (!shiftPlan) return;
|
if (!shiftPlan || !selectedExportType) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setExporting(true);
|
setExporting(true);
|
||||||
|
|
||||||
// Call the export service
|
let blob: Blob;
|
||||||
const blob = await shiftPlanService.exportShiftPlanToExcel(shiftPlan.id);
|
if (selectedExportType === 'PDF') {
|
||||||
|
// Call the PDF export service
|
||||||
|
blob = await shiftPlanService.exportShiftPlanToPDF(shiftPlan.id);
|
||||||
|
} else {
|
||||||
|
// Call the Excel export service
|
||||||
|
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`);
|
const fileExtension = selectedExportType.toLowerCase();
|
||||||
|
saveAs(blob, `Schichtplan_${shiftPlan.name}_${new Date().toISOString().split('T')[0]}.${fileExtension}`);
|
||||||
|
|
||||||
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 ${selectedExportType}-Datei exportiert.`
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Reset export state
|
||||||
|
setSelectedExportType('');
|
||||||
|
setShowExportButton(false);
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error exporting to Excel:', error);
|
console.error(`Error exporting to ${selectedExportType}:`, error);
|
||||||
showNotification({
|
showNotification({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
title: 'Export fehlgeschlagen',
|
title: 'Export fehlgeschlagen',
|
||||||
message: 'Der Excel-Export konnte nicht durchgeführt werden.'
|
message: `Der ${selectedExportType}-Export konnte nicht durchgeführt werden.`
|
||||||
});
|
});
|
||||||
} finally {
|
} finally {
|
||||||
setExporting(false);
|
setExporting(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleExportPDF = async () => {
|
const handleExportTypeSelect = (type: string) => {
|
||||||
if (!shiftPlan) return;
|
setSelectedExportType(type);
|
||||||
|
setExportDropdownOpen(false);
|
||||||
try {
|
setShowExportButton(true);
|
||||||
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 () => {
|
||||||
@@ -460,14 +460,6 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
console.log('- Shift Patterns:', shiftPlan.shifts?.length || 0);
|
console.log('- Shift Patterns:', shiftPlan.shifts?.length || 0);
|
||||||
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
console.log('- Scheduled Shifts:', scheduledShifts.length);
|
||||||
|
|
||||||
// DEBUG: Show shift pattern IDs
|
|
||||||
/*if (shiftPlan.shifts) {
|
|
||||||
console.log('📋 SHIFT PATTERN IDs:');
|
|
||||||
shiftPlan.shifts.forEach((shift, index) => {
|
|
||||||
console.log(` ${index + 1}. ${shift.id} (Day ${shift.dayOfWeek}, TimeSlot ${shift.timeSlotId})`);
|
|
||||||
});
|
|
||||||
}*/
|
|
||||||
|
|
||||||
const constraints = {
|
const constraints = {
|
||||||
enforceNoTraineeAlone: true,
|
enforceNoTraineeAlone: true,
|
||||||
enforceExperiencedWithChef: true,
|
enforceExperiencedWithChef: true,
|
||||||
@@ -932,7 +924,7 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1084,6 +1076,78 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Export Dropdown - Only show when plan is published */}
|
||||||
|
{shiftPlan?.status === 'published' && (
|
||||||
|
<div style={{
|
||||||
|
padding: '15px 20px',
|
||||||
|
backgroundColor: '#f8f9fa',
|
||||||
|
borderTop: '1px solid #e0e0e0',
|
||||||
|
display: 'flex',
|
||||||
|
justifyContent: 'flex-end',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: '10px'
|
||||||
|
}}>
|
||||||
|
<div style={{ position: 'relative', display: 'inline-block' }}>
|
||||||
|
{/* Export Dropdown */}
|
||||||
|
<div
|
||||||
|
ref={dropdownRef}
|
||||||
|
style={{
|
||||||
|
position: 'relative',
|
||||||
|
transform: showExportButton ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
|
||||||
|
opacity: showExportButton ? 0 : 1,
|
||||||
|
transition: 'all 0.3s ease',
|
||||||
|
pointerEvents: showExportButton ? 'none' : 'auto'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
value=""
|
||||||
|
onChange={(e) => handleExportTypeSelect(e.target.value)}
|
||||||
|
onFocus={() => setExportDropdownOpen(true)}
|
||||||
|
onBlur={() => setTimeout(() => setExportDropdownOpen(false), 200)}
|
||||||
|
style={{
|
||||||
|
padding: '8px 16px',
|
||||||
|
border: '1px solid #ddd',
|
||||||
|
borderRadius: '4px',
|
||||||
|
backgroundColor: 'white',
|
||||||
|
cursor: 'pointer',
|
||||||
|
minWidth: '120px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<option value="">Export</option>
|
||||||
|
<option value="PDF">PDF</option>
|
||||||
|
<option value="Excel">Excel</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Export Button */}
|
||||||
|
{showExportButton && (
|
||||||
|
<button
|
||||||
|
onClick={handleExport}
|
||||||
|
disabled={exporting}
|
||||||
|
style={{
|
||||||
|
padding: '8px 16px',
|
||||||
|
backgroundColor: '#51258f',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: exporting ? 'not-allowed' : 'pointer',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
position: 'absolute',
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
opacity: showExportButton ? 1 : 0,
|
||||||
|
transform: showExportButton ? 'translateX(0)' : 'translateX(20px)',
|
||||||
|
transition: 'all 0.3s ease',
|
||||||
|
minWidth: '120px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{exporting ? 'Exportiert...' : 'EXPORT'}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -1125,48 +1189,6 @@ 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']) && (
|
|
||||||
<>
|
|
||||||
<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>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* "Zuweisungen neu berechnen" button */}
|
{/* "Zuweisungen neu berechnen" button */}
|
||||||
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
||||||
<button
|
<button
|
||||||
|
|||||||
Reference in New Issue
Block a user