mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 06:55:45 +01:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 822b170920 | |||
| c6dfa5b4c6 | |||
| d0be1b4a61 | |||
| b337fd0e0a | |||
| badccb4f55 | |||
| 9eb9afce1e | |||
| 17d68c2426 | |||
| cff2374f41 | |||
| 3a787875e6 | |||
| 0b46919e46 | |||
| 65cb3e72ba | |||
| dab5164704 |
@@ -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
@@ -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;
|
||||||
@@ -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",
|
||||||
|
|||||||
@@ -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',
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -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