Compare commits

..

20 Commits

Author SHA1 Message Date
822b170920 added dropdown menu for export 2025-11-05 11:32:40 +01:00
c6dfa5b4c6 fixed manager detection 2025-11-05 09:43:28 +01:00
d0be1b4a61 excel timetable with employee with each cell 2025-11-05 09:40:26 +01:00
b337fd0e0a using playwright for pdf export instead of pdfkit 2025-11-05 09:20:24 +01:00
badccb4f55 more fancy excel export 2025-11-05 08:31:39 +01:00
9eb9afce1e added timetable export to the export funciton 2025-11-04 23:25:26 +01:00
17d68c2426 Merge branch 'staging' of https://github.com/donpat1to/Schichtenplaner into staging 2025-11-04 22:31:23 +01:00
cff2374f41 fixed klammer usage 2025-11-04 22:28:39 +01:00
3a787875e6 implemented export with pdf and excel library 2025-11-04 15:33:51 +01:00
0b46919e46 fixed role handling in getshiftplanbyid 2025-11-03 23:16:53 +01:00
65cb3e72ba added backend for shiftplan export 2025-11-03 22:50:02 +01:00
dab5164704 added exporting files 2025-11-03 22:07:32 +01:00
7c63bee1b3 updated python installation to break system packages 2025-11-03 10:55:07 +01:00
4c275993e6 changing debian versions from bookworm to bullseye 2025-11-03 10:40:46 +01:00
5c925e3b54 copying python files seperate for scheduling mechanism 2025-11-03 10:33:07 +01:00
11b6ee7672 moved python installation from builder to image 2025-11-03 09:39:42 +01:00
19357d12c1 changed ci to create its own pakcage-lock 2025-11-02 21:14:34 +01:00
8ccd506b7d changed ci to create its own pakcage-lock 2025-11-02 21:13:32 +01:00
e09979aa77 put package-lock.json into the .gitignore 2025-11-02 21:09:25 +01:00
0eda1ac125 creating package lock package on every ci seperate 2025-11-02 20:59:35 +01:00
12 changed files with 1341 additions and 6914 deletions

View File

@@ -83,6 +83,10 @@ jobs:
with: with:
node-version: '20' node-version: '20'
- name: Create package-lock.json
working-directory: .
run: npm i --package-lock-only
- name: Install backend dependencies - name: Install backend dependencies
working-directory: ./backend working-directory: ./backend
run: npm ci run: npm ci

1
.gitignore vendored
View File

@@ -57,6 +57,7 @@ yarn-error.log*
# Build outputs # Build outputs
dist/ dist/
build/ build/
package-lock.json
# Environment variables # Environment variables
.env .env

View File

@@ -1,15 +1,8 @@
# Single stage build for workspaces # Single stage build for workspaces
FROM node:20-bullseye AS builder FROM node:20-bookworm AS builder
WORKDIR /app WORKDIR /app
# Install Python + OR-Tools
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
&& pip install --no-cache-dir ortools
# Create symlink so python3 is callable as python
RUN ln -sf /usr/bin/python3 /usr/bin/python
# Copy root package files first # Copy root package files first
COPY package*.json ./ COPY package*.json ./
COPY tsconfig.base.json ./ COPY tsconfig.base.json ./
@@ -34,9 +27,6 @@ RUN npm run build --only=production --workspace=backend
# Build frontend # Build frontend
RUN npm run build --only=production --workspace=frontend RUN npm run build --only=production --workspace=frontend
# Verify Python and OR-Tools installation
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
# Production stage # Production stage
FROM node:20-bookworm FROM node:20-bookworm
@@ -59,7 +49,20 @@ COPY --from=builder /app/frontend/dist/ ./frontend-build/
COPY --from=builder /app/ecosystem.config.cjs ./ COPY --from=builder /app/ecosystem.config.cjs ./
COPY --from=builder /app/backend/src/database/ ./dist/database/ COPY --from=builder /app/backend/src/database/ ./dist/database/
COPY --from=builder /app/backend/src/database/ ./database/ # should be obsolete with the line above
#COPY --from=builder /app/backend/src/database/ ./database/
COPY --from=builder /app/backend/src/python-scripts/ ./python-scripts/
# Install Python + OR-Tools
RUN apt-get update && apt-get install -y python3 python3-pip build-essential \
&& pip install --no-cache-dir --break-system-packages ortools
# Create symlink so python3 is callable as python
RUN ln -sf /usr/bin/python3 /usr/bin/python
# Verify Python and OR-Tools installation
RUN python -c "from ortools.sat.python import cp_model; print('OR-Tools installed successfully')"
# Copy init script and env template # Copy init script and env template
COPY docker-init.sh /usr/local/bin/ COPY docker-init.sh /usr/local/bin/

View File

@@ -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

View File

@@ -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;

View File

@@ -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",

View File

@@ -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

View File

@@ -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) {

View File

@@ -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');
}
},
}; };

6691
package-lock.json generated

File diff suppressed because it is too large Load Diff