mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-12-01 15:05:45 +01:00
Compare commits
100 Commits
ac2eab14d7
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 478578308d | |||
| 93a52aa196 | |||
|
|
b11c55c1d9 | ||
| 16302f2105 | |||
| 57aff5c858 | |||
| b4abe459c2 | |||
| 06bc27a6ce | |||
| 0aad8f0a56 | |||
| b52e9d57c7 | |||
| 15f3183bc0 | |||
| ca3a5d1c0e | |||
| 6a1509d807 | |||
|
|
308ae74e37 | ||
| e876f5eb02 | |||
| dabd2dff3b | |||
| 84d7be052d | |||
| 9460f10278 | |||
| 6e1927fe2f | |||
| e5a6fc73fe | |||
| c773740634 | |||
| 23acd88ced | |||
| aa1a2d4d72 | |||
| cf3866ee21 | |||
| 7ab3e0a5fb | |||
| 41aa77e45d | |||
| 8e782a5290 | |||
| 3856f93484 | |||
| dae255e2c1 | |||
| 8f96368f5a | |||
| 636b892ece | |||
| 8be6a7b474 | |||
| a2b2b76665 | |||
| 6d00ab695c | |||
| 2608acc2d9 | |||
| 4dacf94077 | |||
| 5e7c5aabfb | |||
| 05fa87c638 | |||
| 875db3aeb7 | |||
| 809a838e27 | |||
| 8d020a0dac | |||
| 92840c2424 | |||
| ce1c6b08b1 | |||
| b9a88bce1c | |||
| b60e5ccdd2 | |||
| f5aa376e31 | |||
| e82e584f76 | |||
| e177c3d2a6 | |||
| de23ea00ee | |||
| d78ba474d8 | |||
| 5c7786bc19 | |||
| 15107cdc63 | |||
| 22266c765b | |||
| a66609a40c | |||
| 87dda38bc3 | |||
| 9de501c7eb | |||
| 5c6a50ddcf | |||
| 017f5fb2e0 | |||
| 527954befd | |||
| e7d30151b7 | |||
| 4a006a2e69 | |||
| 4b699b05d3 | |||
| dcac0307a2 | |||
| a0cc859935 | |||
| 49afd75ed3 | |||
| ebb9e3f4fe | |||
| 48f140f930 | |||
| b6b31659e3 | |||
| 42e343777a | |||
| aa7af272d8 | |||
| a0d96925c5 | |||
|
|
28283fa8bc | ||
|
|
fdff2853bd | ||
| 09e08ff615 | |||
| fb4a2f6f20 | |||
| faaab74f07 | |||
| 90e10b9cc2 | |||
| 0821ca7711 | |||
| 02c1253f4f | |||
| 26417aaf88 | |||
| eb8945ae97 | |||
| 980cfab637 | |||
| accdc70165 | |||
| 9ac0309917 | |||
| afe5e85add | |||
| 4689966783 | |||
| 45509b1dbd | |||
| 590cf2d10f | |||
| d43162aff6 | |||
| fd00c47b20 | |||
| 3ff51f64eb | |||
| f64fb08566 | |||
| 5e248c662f | |||
| b3a3a5680e | |||
| 364fb41f0e | |||
| fb0d0b6711 | |||
| eb33f47071 | |||
| 5809e6c44c | |||
| 2200ef6937 | |||
| d6e0b45f07 | |||
| a45647bd87 |
180
.github/workflows/docker.yml
vendored
Normal file
180
.github/workflows/docker.yml
vendored
Normal file
@@ -0,0 +1,180 @@
|
|||||||
|
name: CI/CD Pipeline
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branches: [ "development", "main", "staging" ]
|
||||||
|
tags: [ "v*.*.*" ]
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: ghcr.io
|
||||||
|
IMAGE_NAME: ${{ github.repository }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
set-tag:
|
||||||
|
name: Set Tag Name
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
tag_name: ${{ steps.set_tag.outputs.tag_name }}
|
||||||
|
is_main_branch: ${{ steps.branch_check.outputs.is_main }}
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Check if main branch
|
||||||
|
id: branch_check
|
||||||
|
run: |
|
||||||
|
if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/heads/master" ]]; then
|
||||||
|
echo "is_main=true" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "is_main=false" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Determine next semantic version tag
|
||||||
|
id: set_tag
|
||||||
|
run: |
|
||||||
|
git fetch --tags
|
||||||
|
|
||||||
|
# Find latest tag matching vX.Y.Z
|
||||||
|
latest_tag=$(git tag --list 'v*.*.*' --sort=-v:refname | head -n 1)
|
||||||
|
echo "Latest tag found: $latest_tag"
|
||||||
|
|
||||||
|
if [[ -z "$latest_tag" ]]; then
|
||||||
|
major=0
|
||||||
|
minor=0
|
||||||
|
patch=0
|
||||||
|
echo "No existing tags found, starting from v0.0.0"
|
||||||
|
else
|
||||||
|
version="${latest_tag#v}"
|
||||||
|
IFS='.' read -r major minor patch <<< "$version"
|
||||||
|
echo "Parsed version: major=$major, minor=$minor, patch=$patch"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/heads/master" ]]; then
|
||||||
|
major=$((major + 1))
|
||||||
|
minor=0
|
||||||
|
patch=0
|
||||||
|
echo "Main branch - major version bump"
|
||||||
|
elif [[ "${{ github.ref }}" == "refs/heads/development" ]]; then
|
||||||
|
minor=$((minor + 1))
|
||||||
|
patch=0
|
||||||
|
echo "Development branch - minor version bump"
|
||||||
|
else
|
||||||
|
patch=$((patch + 1))
|
||||||
|
echo "Other branch - patch version bump"
|
||||||
|
fi
|
||||||
|
|
||||||
|
new_tag="v${major}.${minor}.${patch}"
|
||||||
|
echo "tag_name=${new_tag}" >> $GITHUB_OUTPUT
|
||||||
|
echo "Next version tag: ${new_tag}"
|
||||||
|
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: set-tag
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: '20'
|
||||||
|
|
||||||
|
- name: Install backend dependencies
|
||||||
|
working-directory: ./backend
|
||||||
|
run: npm install
|
||||||
|
|
||||||
|
- name: Run TypeScript check
|
||||||
|
working-directory: ./backend
|
||||||
|
run: npx tsc --noEmit
|
||||||
|
|
||||||
|
- name: Run backend tests
|
||||||
|
working-directory: ./backend
|
||||||
|
run: |
|
||||||
|
if [ -f "node_modules/.bin/jest" ]; then
|
||||||
|
npm test
|
||||||
|
else
|
||||||
|
echo "⚠️ Jest not installed. Skipping tests."
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Setup Python
|
||||||
|
uses: actions/setup-python@v4
|
||||||
|
with:
|
||||||
|
python-version: '3.11'
|
||||||
|
|
||||||
|
- name: Install Python dependencies
|
||||||
|
run: pip install ortools
|
||||||
|
|
||||||
|
- name: Test Python integration
|
||||||
|
run: |
|
||||||
|
python -c "from ortools.sat.python import cp_model; print('OR-Tools available')"
|
||||||
|
|
||||||
|
- name: Display next version
|
||||||
|
run: |
|
||||||
|
echo "Next version will be: ${{ needs.set-tag.outputs.tag_name }}"
|
||||||
|
|
||||||
|
build-and-push:
|
||||||
|
needs: [set-tag, test]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event_name == 'push'
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
packages: write
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Log in to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract metadata
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||||
|
tags: |
|
||||||
|
type=raw,value=${{ needs.set-tag.outputs.tag_name }}
|
||||||
|
type=raw,value=latest,enable=${{ fromJSON(needs.set-tag.outputs.is_main_branch) }}
|
||||||
|
|
||||||
|
- name: Build and push Docker image
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./Dockerfile
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|
||||||
|
- name: Create Git Tag
|
||||||
|
if: success()
|
||||||
|
run: |
|
||||||
|
git config --local user.email "action@github.com"
|
||||||
|
git config --local user.name "GitHub Action"
|
||||||
|
git tag ${{ needs.set-tag.outputs.tag_name }}
|
||||||
|
git push origin ${{ needs.set-tag.outputs.tag_name }}
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Display pushed images
|
||||||
|
run: |
|
||||||
|
echo "Docker images pushed successfully!"
|
||||||
|
echo "- Image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
|
||||||
|
echo "- Tags: ${{ steps.meta.outputs.tags }}"
|
||||||
|
echo "- New version: ${{ needs.set-tag.outputs.tag_name }}"
|
||||||
|
echo "- Is main branch: ${{ needs.set-tag.outputs.is_main_branch }}"
|
||||||
138
.gitignore
vendored
Normal file
138
.gitignore
vendored
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
# Dependencies
|
||||||
|
backend/node_modules/
|
||||||
|
frontend/node_modules/
|
||||||
|
|
||||||
|
/.pnp
|
||||||
|
.pnp.js
|
||||||
|
|
||||||
|
# Testing
|
||||||
|
/coverage
|
||||||
|
|
||||||
|
# Production
|
||||||
|
/build
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
.DS_Store
|
||||||
|
.env.local
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
.env
|
||||||
|
|
||||||
|
# Logs
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
|
||||||
|
# IDEs
|
||||||
|
.vscode/
|
||||||
|
.idea/
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
|
||||||
|
# OS generated files
|
||||||
|
.DS_Store
|
||||||
|
.DS_Store?
|
||||||
|
._*
|
||||||
|
.Spotlight-V100
|
||||||
|
.Trashes
|
||||||
|
ehthumbs.db
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
.env
|
||||||
|
.env.local
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
|
||||||
|
|
||||||
|
----
|
||||||
|
# Dependencies
|
||||||
|
node_modules/
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
|
||||||
|
# Build outputs
|
||||||
|
dist/
|
||||||
|
build/
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
.env
|
||||||
|
.env.local
|
||||||
|
.env.development.local
|
||||||
|
.env.test.local
|
||||||
|
.env.production.local
|
||||||
|
|
||||||
|
# Database
|
||||||
|
database/*.db
|
||||||
|
database/*.db-journal
|
||||||
|
*.sqlite
|
||||||
|
*.db
|
||||||
|
|
||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# Privat
|
||||||
|
backend/src/python-scripts/progress_data/*.json
|
||||||
|
|
||||||
|
# Runtime data
|
||||||
|
pids
|
||||||
|
*.pid
|
||||||
|
*.seed
|
||||||
|
*.pid.lock
|
||||||
|
|
||||||
|
# Coverage directory used by tools like istanbul
|
||||||
|
coverage/
|
||||||
|
|
||||||
|
# nyc test coverage
|
||||||
|
.nyc_output
|
||||||
|
|
||||||
|
# IDEs
|
||||||
|
.vscode/
|
||||||
|
.idea/
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
|
||||||
|
# OS generated files
|
||||||
|
.DS_Store
|
||||||
|
.DS_Store?
|
||||||
|
._*
|
||||||
|
.Spotlight-V100
|
||||||
|
.Trashes
|
||||||
|
ehthumbs.db
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
# Optional npm cache directory
|
||||||
|
.npm
|
||||||
|
|
||||||
|
# Optional eslint cache
|
||||||
|
.eslintcache
|
||||||
|
|
||||||
|
# Ignore contents of premium folder in public repo
|
||||||
|
premium/*
|
||||||
|
!premium/README-PREMIUM.md
|
||||||
|
!premium/.gitkeep
|
||||||
|
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
node_modules
|
||||||
|
npm-debug.log
|
||||||
|
README.md
|
||||||
|
.env
|
||||||
|
.nyc_output
|
||||||
|
coverage
|
||||||
|
.cache
|
||||||
|
dist
|
||||||
|
build
|
||||||
|
logs
|
||||||
|
*.tsbuildinfo
|
||||||
|
|
||||||
|
# Frontend specific
|
||||||
|
frontend/dist
|
||||||
|
frontend/.vite
|
||||||
|
|
||||||
|
# Backend specific
|
||||||
|
backend/dist
|
||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "premium"]
|
||||||
|
path = premium
|
||||||
|
url = https://github.com/donpat1to/Schichtenplaner-Pro.git
|
||||||
70
Dockerfile
Normal file
70
Dockerfile
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
# Single stage build for workspaces
|
||||||
|
FROM node:20-bullseye AS builder
|
||||||
|
|
||||||
|
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 package*.json ./
|
||||||
|
COPY tsconfig.base.json ./
|
||||||
|
COPY ecosystem.config.cjs ./
|
||||||
|
|
||||||
|
# Install root dependencies
|
||||||
|
RUN npm install --only=production
|
||||||
|
|
||||||
|
# Copy workspace files
|
||||||
|
COPY backend/ ./backend/
|
||||||
|
COPY frontend/ ./frontend/
|
||||||
|
|
||||||
|
# Install workspace dependencies individually
|
||||||
|
RUN npm install --workspace=backend
|
||||||
|
RUN npm install --workspace=frontend
|
||||||
|
|
||||||
|
# Build backend first
|
||||||
|
RUN npm run build --only=production --workspace=backend
|
||||||
|
|
||||||
|
# Build 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 (same as above)
|
||||||
|
FROM node:20-bookworm
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
RUN npm install -g pm2
|
||||||
|
RUN mkdir -p /app/data
|
||||||
|
|
||||||
|
COPY --from=builder /app/backend/dist/ ./dist/
|
||||||
|
COPY --from=builder /app/backend/package*.json ./
|
||||||
|
|
||||||
|
COPY --from=builder /app/node_modules/ ./node_modules/
|
||||||
|
COPY --from=builder /app/frontend/dist/ ./frontend-build/
|
||||||
|
|
||||||
|
COPY --from=builder /app/ecosystem.config.cjs ./
|
||||||
|
|
||||||
|
COPY --from=builder /app/backend/src/database/ ./dist/database/
|
||||||
|
COPY --from=builder /app/backend/src/database/ ./database/
|
||||||
|
|
||||||
|
RUN groupadd -g 1001 nodejs && \
|
||||||
|
useradd -m -u 1001 -s /bin/bash -g nodejs schichtplan && \
|
||||||
|
chown -R schichtplan:nodejs /app && \
|
||||||
|
chmod 755 /app && \
|
||||||
|
chmod 775 /app/data
|
||||||
|
|
||||||
|
ENV PM2_HOME=/app/.pm2
|
||||||
|
USER schichtplan
|
||||||
|
EXPOSE 3002
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
|
||||||
|
CMD wget --no-verbose --tries=1 --spider http://localhost:3002/api/health || exit 1
|
||||||
|
|
||||||
|
CMD ["pm2-runtime", "ecosystem.config.cjs"]
|
||||||
21
LICENSE-COMMERCIAL
Normal file
21
LICENSE-COMMERCIAL
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
COMMERCIAL LICENSE AGREEMENT
|
||||||
|
Copyright (c) 2025 Patrick Mahnke-Hartmann
|
||||||
|
|
||||||
|
This software, "Schichtenplaner", is offered under a dual licensing model.
|
||||||
|
|
||||||
|
1. Open-Source License
|
||||||
|
You may use this software under the terms of the MIT License
|
||||||
|
(see LICENSE file) for non-commercial, personal, or educational use.
|
||||||
|
|
||||||
|
2. Commercial License
|
||||||
|
Commercial use of this software requires a separate paid license.
|
||||||
|
This includes, but is not limited to:
|
||||||
|
- Use in proprietary, for-profit, or internal business applications
|
||||||
|
- Use within paid services or SaaS offerings
|
||||||
|
- Integration into commercial software or distributions
|
||||||
|
|
||||||
|
To obtain a commercial license, please contact:
|
||||||
|
📧 dev.patrick@mahnke-hartmann.de
|
||||||
|
or open an inquiry via GitHub: https://github.com/donpat1to/Schichtenplaner
|
||||||
|
|
||||||
|
Without a valid commercial license, all commercial rights are reserved.
|
||||||
12
README.md
12
README.md
@@ -2,4 +2,14 @@
|
|||||||
Aufteilung der Schichten unter Mitarbeitern
|
Aufteilung der Schichten unter Mitarbeitern
|
||||||
|
|
||||||
|
|
||||||
du knlich
|
## 🧾 License
|
||||||
|
|
||||||
|
This project uses a **dual license model**:
|
||||||
|
|
||||||
|
- **Community Edition:** Licensed under [MIT](./LICENSE) for personal and non-commercial use.
|
||||||
|
- **Commercial Edition:** A [commercial license](./LICENSE-COMMERCIAL) is required for any for-profit or business use.
|
||||||
|
|
||||||
|
To obtain a commercial license, contact:
|
||||||
|
📧 patrick@mahnke-hartmann.dev
|
||||||
|
|
||||||
|
[](#license)
|
||||||
|
|||||||
59
backend/.gitignore
vendored
59
backend/.gitignore
vendored
@@ -1,59 +0,0 @@
|
|||||||
# Dependencies
|
|
||||||
node_modules/
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
|
|
||||||
# Build outputs
|
|
||||||
dist/
|
|
||||||
build/
|
|
||||||
|
|
||||||
# Environment variables
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.development.local
|
|
||||||
.env.test.local
|
|
||||||
.env.production.local
|
|
||||||
|
|
||||||
# Database
|
|
||||||
database/*.db
|
|
||||||
database/*.db-journal
|
|
||||||
*.sqlite
|
|
||||||
*.db
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
logs
|
|
||||||
*.log
|
|
||||||
|
|
||||||
# Runtime data
|
|
||||||
pids
|
|
||||||
*.pid
|
|
||||||
*.seed
|
|
||||||
*.pid.lock
|
|
||||||
|
|
||||||
# Coverage directory used by tools like istanbul
|
|
||||||
coverage/
|
|
||||||
|
|
||||||
# nyc test coverage
|
|
||||||
.nyc_output
|
|
||||||
|
|
||||||
# IDEs
|
|
||||||
.vscode/
|
|
||||||
.idea/
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
|
|
||||||
# OS generated files
|
|
||||||
.DS_Store
|
|
||||||
.DS_Store?
|
|
||||||
._*
|
|
||||||
.Spotlight-V100
|
|
||||||
.Trashes
|
|
||||||
ehthumbs.db
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Optional npm cache directory
|
|
||||||
.npm
|
|
||||||
|
|
||||||
# Optional eslint cache
|
|
||||||
.eslintcache
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# backend/Dockerfile
|
|
||||||
FROM node:18-alpine
|
|
||||||
WORKDIR /app
|
|
||||||
COPY package*.json ./
|
|
||||||
RUN npm ci --only=production
|
|
||||||
COPY . .
|
|
||||||
EXPOSE 3002
|
|
||||||
CMD ["node", "dist/server.js"]
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
# Multi-stage Dockerfile for Node.js + Python application
|
|
||||||
FROM node:20-alpine AS node-base
|
|
||||||
|
|
||||||
# Install Python and build dependencies in Node stage
|
|
||||||
RUN apk add --no-cache \
|
|
||||||
python3 \
|
|
||||||
py3-pip \
|
|
||||||
build-base \
|
|
||||||
python3-dev
|
|
||||||
|
|
||||||
# Install Python dependencies
|
|
||||||
COPY python-scripts/requirements.txt /tmp/requirements.txt
|
|
||||||
RUN pip3 install --no-cache-dir -r /tmp/requirements.txt
|
|
||||||
|
|
||||||
# Set working directory
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy package files
|
|
||||||
COPY package*.json ./
|
|
||||||
|
|
||||||
# Install Node.js dependencies
|
|
||||||
RUN npm ci --only=production
|
|
||||||
|
|
||||||
# Build stage
|
|
||||||
FROM node-base AS builder
|
|
||||||
|
|
||||||
# Install all dependencies (including dev dependencies)
|
|
||||||
RUN npm ci
|
|
||||||
|
|
||||||
# Copy source code
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
# Build the application
|
|
||||||
RUN npm run build
|
|
||||||
|
|
||||||
# Production stage
|
|
||||||
FROM node-base AS production
|
|
||||||
|
|
||||||
# Copy built application from builder stage
|
|
||||||
COPY --from=builder /app/dist ./dist
|
|
||||||
COPY --from=builder /app/package*.json ./
|
|
||||||
|
|
||||||
# Copy Python scripts
|
|
||||||
COPY --from=builder /app/python-scripts ./python-scripts
|
|
||||||
|
|
||||||
# Create non-root user
|
|
||||||
RUN addgroup -g 1001 -S nodejs && \
|
|
||||||
adduser -S nextjs -u 1001
|
|
||||||
|
|
||||||
# Change to non-root user
|
|
||||||
USER nextjs
|
|
||||||
|
|
||||||
# Expose port
|
|
||||||
EXPOSE 3000
|
|
||||||
|
|
||||||
# Health check
|
|
||||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
|
|
||||||
CMD node dist/health-check.js
|
|
||||||
|
|
||||||
# Start the application
|
|
||||||
CMD ["npm", "start"]
|
|
||||||
18
backend/jest.config.js
Normal file
18
backend/jest.config.js
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
||||||
|
module.exports = {
|
||||||
|
preset: 'ts-jest',
|
||||||
|
testEnvironment: 'node',
|
||||||
|
roots: ['<rootDir>/src'],
|
||||||
|
testMatch: [
|
||||||
|
'**/__tests__/**/*.+(ts|tsx|js)',
|
||||||
|
'**/?(*.)+(spec|test).+(ts|tsx|js)'
|
||||||
|
],
|
||||||
|
transform: {
|
||||||
|
'^.+\.(ts|tsx)$': 'ts-jest',
|
||||||
|
},
|
||||||
|
collectCoverageFrom: [
|
||||||
|
'src/**/*.{js,ts}',
|
||||||
|
'!src/server.ts',
|
||||||
|
'!src/**/*.d.ts'
|
||||||
|
],
|
||||||
|
};
|
||||||
2853
backend/package-lock.json
generated
2853
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,11 @@
|
|||||||
"dev": "npm run build && npx tsx src/server.ts",
|
"dev": "npm run build && npx tsx src/server.ts",
|
||||||
"build": "tsc",
|
"build": "tsc",
|
||||||
"start": "node dist/server.js",
|
"start": "node dist/server.js",
|
||||||
"prestart": "npm run build"
|
"prestart": "npm run build",
|
||||||
|
"test": "jest",
|
||||||
|
"test:python": "python -c \"from ortools.sat.python import cp_model; print('OR-Tools OK')\"",
|
||||||
|
"docker:build": "docker build -t schichtplan-backend .",
|
||||||
|
"docker:run": "docker run -p 3001:3001 schichtplan-backend"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/bcrypt": "^6.0.0",
|
"@types/bcrypt": "^6.0.0",
|
||||||
@@ -16,8 +20,7 @@
|
|||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"sqlite3": "^5.1.6",
|
"sqlite3": "^5.1.6",
|
||||||
"uuid": "^9.0.0",
|
"uuid": "^9.0.0"
|
||||||
"worker_threads": "native"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bcryptjs": "^2.4.2",
|
"@types/bcryptjs": "^2.4.2",
|
||||||
@@ -25,6 +28,7 @@
|
|||||||
"@types/express": "^4.17.17",
|
"@types/express": "^4.17.17",
|
||||||
"@types/jsonwebtoken": "^9.0.2",
|
"@types/jsonwebtoken": "^9.0.2",
|
||||||
"@types/uuid": "^9.0.2",
|
"@types/uuid": "^9.0.2",
|
||||||
|
"@types/jest": "^29.5.0",
|
||||||
"ts-node": "^10.9.0",
|
"ts-node": "^10.9.0",
|
||||||
"typescript": "^5.0.0",
|
"typescript": "^5.0.0",
|
||||||
"tsx": "^4.0.0"
|
"tsx": "^4.0.0"
|
||||||
|
|||||||
@@ -102,7 +102,6 @@ export const AVAILABILITY_PREFERENCES = {
|
|||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
// Default availability for new employees (all shifts unavailable as level 3)
|
// Default availability for new employees (all shifts unavailable as level 3)
|
||||||
// UPDATED: Now uses shiftId instead of timeSlotId + dayOfWeek
|
|
||||||
export function createDefaultAvailabilities(employeeId: string, planId: string, shiftIds: string[]): Omit<EmployeeAvailability, 'id'>[] {
|
export function createDefaultAvailabilities(employeeId: string, planId: string, shiftIds: string[]): Omit<EmployeeAvailability, 'id'>[] {
|
||||||
const availabilities: Omit<EmployeeAvailability, 'id'>[] = [];
|
const availabilities: Omit<EmployeeAvailability, 'id'>[] = [];
|
||||||
|
|
||||||
@@ -120,7 +119,6 @@ export function createDefaultAvailabilities(employeeId: string, planId: string,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create complete manager availability for all days (default: only Mon-Tue available)
|
// Create complete manager availability for all days (default: only Mon-Tue available)
|
||||||
// NOTE: This function might need revision based on new schema requirements
|
|
||||||
export function createManagerDefaultSchedule(managerId: string, planId: string, timeSlotIds: string[]): Omit<ManagerAvailability, 'id'>[] {
|
export function createManagerDefaultSchedule(managerId: string, planId: string, timeSlotIds: string[]): Omit<ManagerAvailability, 'id'>[] {
|
||||||
const assignments: Omit<ManagerAvailability, 'id'>[] = [];
|
const assignments: Omit<ManagerAvailability, 'id'>[] = [];
|
||||||
|
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T11:16:11.693081",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0218085,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.00886988639831543,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2100.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009304285049438477,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.0218085,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T11:16:16.813066",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0158702,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008541107177734375,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2000.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.00941777229309082,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009499549865722656,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.0158702,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:34:06.393151",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.046477700000000004,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.04335761070251465,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2100.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.04459857940673828,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1700.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.04603719711303711,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.046477700000000004,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:37:10.936471",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.022602300000000002,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008664369583129883,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.008890628814697266,
|
|
||||||
"objective": 1150.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009119987487792969,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 3
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009514808654785156,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 4
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.022602300000000002,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:38:04.517181",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.017061200000000002,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008075952529907227,
|
|
||||||
"objective": 1000.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.008380889892578125,
|
|
||||||
"objective": 1200.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.008938789367675781,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.017061200000000002,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:40:00.354343",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0013928,
|
|
||||||
"constraintsAdded": 248,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 248,
|
|
||||||
"solve_time": 0.0013928,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:43:01.616117",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0009529,
|
|
||||||
"constraintsAdded": 230,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 230,
|
|
||||||
"solve_time": 0.0009529,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T14:43:40.972769",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0009025000000000001,
|
|
||||||
"constraintsAdded": 230,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 230,
|
|
||||||
"solve_time": 0.0009025000000000001,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T15:15:30.967943",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0009660000000000001,
|
|
||||||
"constraintsAdded": 230,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 230,
|
|
||||||
"solve_time": 0.0009660000000000001,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T15:15:39.908329",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0009183,
|
|
||||||
"constraintsAdded": 230,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 230,
|
|
||||||
"solve_time": 0.0009183,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T15:17:28.688727",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0175048,
|
|
||||||
"constraintsAdded": 230,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.0076940059661865234,
|
|
||||||
"objective": 1150.0,
|
|
||||||
"bound": 2650.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.008573293685913086,
|
|
||||||
"objective": 1200.0,
|
|
||||||
"bound": 1400.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.00871133804321289,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1400.0,
|
|
||||||
"solution_count": 3
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.008805990219116211,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1400.0,
|
|
||||||
"solution_count": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.00890493392944336,
|
|
||||||
"objective": 1350.0,
|
|
||||||
"bound": 1400.0,
|
|
||||||
"solution_count": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009298324584960938,
|
|
||||||
"objective": 1400.0,
|
|
||||||
"bound": 1400.0,
|
|
||||||
"solution_count": 6
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 16,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 230,
|
|
||||||
"solve_time": 0.0175048,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T15:19:19.785803",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.014216000000000001,
|
|
||||||
"constraintsAdded": 228,
|
|
||||||
"variablesCreated": 99,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008774042129516602,
|
|
||||||
"objective": 1200.0,
|
|
||||||
"bound": 2850.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009451627731323242,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1450.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009568452835083008,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1450.0,
|
|
||||||
"solution_count": 3
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009636402130126953,
|
|
||||||
"objective": 1350.0,
|
|
||||||
"bound": 1450.0,
|
|
||||||
"solution_count": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009870052337646484,
|
|
||||||
"objective": 1400.0,
|
|
||||||
"bound": 1450.0,
|
|
||||||
"solution_count": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009946584701538086,
|
|
||||||
"objective": 1450.0,
|
|
||||||
"bound": 1450.0,
|
|
||||||
"solution_count": 6
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 17,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 99,
|
|
||||||
"constraints_count": 228,
|
|
||||||
"solve_time": 0.014216000000000001,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T16:58:13.438358",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.012495000000000001,
|
|
||||||
"constraintsAdded": 218,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008534908294677734,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2100.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009073495864868164,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 218,
|
|
||||||
"solve_time": 0.012495000000000001,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T16:58:37.184763",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.0245485,
|
|
||||||
"constraintsAdded": 218,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.009514808654785156,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2100.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.010115385055541992,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 2
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 218,
|
|
||||||
"solve_time": 0.0245485,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T10:54:26.093544",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0,
|
|
||||||
"constraintsAdded": 0,
|
|
||||||
"variablesCreated": 0,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 1,
|
|
||||||
"variables_count": 0,
|
|
||||||
"constraints_count": 0,
|
|
||||||
"solve_time": 0,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"full_result": {
|
|
||||||
"assignments": [],
|
|
||||||
"violations": [
|
|
||||||
"Error: 'SolutionCallback' object has no attribute 'HasObjective'"
|
|
||||||
],
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0,
|
|
||||||
"constraintsAdded": 0,
|
|
||||||
"variablesCreated": 0,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T10:59:36.646855",
|
|
||||||
"success": false,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0,
|
|
||||||
"constraintsAdded": 0,
|
|
||||||
"variablesCreated": 0,
|
|
||||||
"optimal": false
|
|
||||||
},
|
|
||||||
"progress": [],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 0,
|
|
||||||
"violations_count": 1,
|
|
||||||
"variables_count": 0,
|
|
||||||
"constraints_count": 0,
|
|
||||||
"solve_time": 0,
|
|
||||||
"optimal": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
{
|
|
||||||
"timestamp": "2025-10-21T11:03:36.697986",
|
|
||||||
"success": true,
|
|
||||||
"metadata": {
|
|
||||||
"solveTime": 0.025875500000000003,
|
|
||||||
"constraintsAdded": 217,
|
|
||||||
"variablesCreated": 90,
|
|
||||||
"optimal": true
|
|
||||||
},
|
|
||||||
"progress": [
|
|
||||||
{
|
|
||||||
"timestamp": 0.008769989013671875,
|
|
||||||
"objective": 1050.0,
|
|
||||||
"bound": 2000.0,
|
|
||||||
"solution_count": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.009685516357421875,
|
|
||||||
"objective": 1250.0,
|
|
||||||
"bound": 1700.0,
|
|
||||||
"solution_count": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"timestamp": 0.010709047317504883,
|
|
||||||
"objective": 1300.0,
|
|
||||||
"bound": 1300.0,
|
|
||||||
"solution_count": 3
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"solution_summary": {
|
|
||||||
"assignments_count": 15,
|
|
||||||
"violations_count": 0,
|
|
||||||
"variables_count": 90,
|
|
||||||
"constraints_count": 217,
|
|
||||||
"solve_time": 0.025875500000000003,
|
|
||||||
"optimal": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,9 +20,9 @@ router.use(authMiddleware);
|
|||||||
|
|
||||||
// Employee CRUD Routes
|
// Employee CRUD Routes
|
||||||
router.get('/', authMiddleware, getEmployees);
|
router.get('/', authMiddleware, getEmployees);
|
||||||
router.get('/:id', requireRole(['admin', 'instandhalter']), getEmployee);
|
router.get('/:id', requireRole(['admin', 'maintenance']), getEmployee);
|
||||||
router.post('/', requireRole(['admin']), createEmployee);
|
router.post('/', requireRole(['admin']), createEmployee);
|
||||||
router.put('/:id', requireRole(['admin']), updateEmployee);
|
router.put('/:id', requireRole(['admin', 'maintenance']), updateEmployee);
|
||||||
router.delete('/:id', requireRole(['admin']), deleteEmployee);
|
router.delete('/:id', requireRole(['admin']), deleteEmployee);
|
||||||
router.put('/:id/password', authMiddleware, changePassword);
|
router.put('/:id/password', authMiddleware, changePassword);
|
||||||
router.put('/:id/last-login', authMiddleware, updateLastLogin);
|
router.put('/:id/last-login', authMiddleware, updateLastLogin);
|
||||||
|
|||||||
@@ -14,9 +14,9 @@ const router = express.Router();
|
|||||||
router.use(authMiddleware);
|
router.use(authMiddleware);
|
||||||
|
|
||||||
|
|
||||||
router.post('/:id/generate-shifts', requireRole(['admin', 'instandhalter']), generateScheduledShiftsForPlan);
|
router.post('/:id/generate-shifts', requireRole(['admin', 'maintenance']), generateScheduledShiftsForPlan);
|
||||||
|
|
||||||
router.post('/:id/regenerate-shifts', requireRole(['admin', 'instandhalter']), regenerateScheduledShifts);
|
router.post('/:id/regenerate-shifts', requireRole(['admin', 'maintenance']), regenerateScheduledShifts);
|
||||||
|
|
||||||
// GET all scheduled shifts for a plan
|
// GET all scheduled shifts for a plan
|
||||||
router.get('/plan/:planId', authMiddleware, getScheduledShiftsFromPlan);
|
router.get('/plan/:planId', authMiddleware, getScheduledShiftsFromPlan);
|
||||||
|
|||||||
@@ -24,18 +24,18 @@ router.get('/' , authMiddleware, getShiftPlans);
|
|||||||
router.get('/:id', authMiddleware, getShiftPlan);
|
router.get('/:id', authMiddleware, getShiftPlan);
|
||||||
|
|
||||||
// POST create new shift plan
|
// POST create new shift plan
|
||||||
router.post('/', requireRole(['admin', 'instandhalter']), createShiftPlan);
|
router.post('/', requireRole(['admin', 'maintenance']), createShiftPlan);
|
||||||
|
|
||||||
// POST create new plan from preset
|
// POST create new plan from preset
|
||||||
router.post('/from-preset', requireRole(['admin', 'instandhalter']), createFromPreset);
|
router.post('/from-preset', requireRole(['admin', 'maintenance']), createFromPreset);
|
||||||
|
|
||||||
// PUT update shift plan or template
|
// PUT update shift plan or template
|
||||||
router.put('/:id', requireRole(['admin', 'instandhalter']), updateShiftPlan);
|
router.put('/:id', requireRole(['admin', 'maintenance']), updateShiftPlan);
|
||||||
|
|
||||||
// DELETE shift plan or template
|
// DELETE shift plan or template
|
||||||
router.delete('/:id', requireRole(['admin', 'instandhalter']), deleteShiftPlan);
|
router.delete('/:id', requireRole(['admin', 'maintenance']), deleteShiftPlan);
|
||||||
|
|
||||||
// POST clear assignments and reset to draft
|
// POST clear assignments and reset to draft
|
||||||
router.post('/:id/clear-assignments', requireRole(['admin', 'instandhalter']), clearAssignments);
|
router.post('/:id/clear-assignments', requireRole(['admin', 'maintenance']), clearAssignments);
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
@@ -8,7 +8,30 @@ const __filename = fileURLToPath(import.meta.url);
|
|||||||
const __dirname = path.dirname(__filename);
|
const __dirname = path.dirname(__filename);
|
||||||
|
|
||||||
export async function initializeDatabase(): Promise<void> {
|
export async function initializeDatabase(): Promise<void> {
|
||||||
const schemaPath = path.join(__dirname, '../database/schema.sql');
|
const possiblePaths = [
|
||||||
|
path.join(__dirname, '../database/schema.sql'),
|
||||||
|
path.join(__dirname, '../../database/schema.sql'),
|
||||||
|
path.join(process.cwd(), 'database/schema.sql'),
|
||||||
|
path.join(process.cwd(), 'src/database/schema.sql'),
|
||||||
|
path.join(process.cwd(), 'dist/database/schema.sql')
|
||||||
|
];
|
||||||
|
|
||||||
|
let schemaPath: string | null = null;
|
||||||
|
|
||||||
|
for (const p of possiblePaths) {
|
||||||
|
if (fs.existsSync(p)) {
|
||||||
|
schemaPath = p;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!schemaPath) {
|
||||||
|
throw new Error(
|
||||||
|
`❌ schema.sql not found in any of the tested paths:\n${possiblePaths.join('\n')}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`✅ Using schema at: ${schemaPath}`);
|
||||||
const schema = fs.readFileSync(schemaPath, 'utf8');
|
const schema = fs.readFileSync(schemaPath, 'utf8');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
27
backend/src/scripts/verify-python.js
Normal file
27
backend/src/scripts/verify-python.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import { spawn } from 'child_process';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
export function runPythonScript(scriptPath, args = []) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const pythonProcess = spawn('python', [scriptPath, ...args]);
|
||||||
|
|
||||||
|
let stdout = '';
|
||||||
|
let stderr = '';
|
||||||
|
|
||||||
|
pythonProcess.stdout.on('data', (data) => {
|
||||||
|
stdout += data.toString();
|
||||||
|
});
|
||||||
|
|
||||||
|
pythonProcess.stderr.on('data', (data) => {
|
||||||
|
stderr += data.toString();
|
||||||
|
});
|
||||||
|
|
||||||
|
pythonProcess.on('close', (code) => {
|
||||||
|
if (code === 0) {
|
||||||
|
resolve(stdout);
|
||||||
|
} else {
|
||||||
|
reject(new Error(`Python script exited with code ${code}: ${stderr}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
// backend/src/server.ts
|
// backend/src/server.ts
|
||||||
import express from 'express';
|
import express from 'express';
|
||||||
import cors from 'cors';
|
import path from 'path';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
import { initializeDatabase } from './scripts/initializeDatabase.js';
|
import { initializeDatabase } from './scripts/initializeDatabase.js';
|
||||||
|
import fs from 'fs';
|
||||||
|
|
||||||
// Route imports
|
// Route imports
|
||||||
import authRoutes from './routes/auth.js';
|
import authRoutes from './routes/auth.js';
|
||||||
@@ -11,11 +13,13 @@ import setupRoutes from './routes/setup.js';
|
|||||||
import scheduledShifts from './routes/scheduledShifts.js';
|
import scheduledShifts from './routes/scheduledShifts.js';
|
||||||
import schedulingRoutes from './routes/scheduling.js';
|
import schedulingRoutes from './routes/scheduling.js';
|
||||||
|
|
||||||
|
const __filename = fileURLToPath(import.meta.url);
|
||||||
|
const __dirname = path.dirname(__filename);
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
const PORT = 3002;
|
const PORT = 3002;
|
||||||
|
|
||||||
// CORS und Middleware
|
// Middleware
|
||||||
app.use(cors());
|
|
||||||
app.use(express.json());
|
app.use(express.json());
|
||||||
|
|
||||||
// API Routes
|
// API Routes
|
||||||
@@ -26,17 +30,6 @@ app.use('/api/shift-plans', shiftPlanRoutes);
|
|||||||
app.use('/api/scheduled-shifts', scheduledShifts);
|
app.use('/api/scheduled-shifts', scheduledShifts);
|
||||||
app.use('/api/scheduling', schedulingRoutes);
|
app.use('/api/scheduling', schedulingRoutes);
|
||||||
|
|
||||||
// Error handling middleware should come after routes
|
|
||||||
app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
|
|
||||||
console.error('Unhandled error:', err);
|
|
||||||
res.status(500).json({ error: 'Internal server error' });
|
|
||||||
});
|
|
||||||
|
|
||||||
// 404 handler for API routes
|
|
||||||
app.use('/api/*', (req, res) => {
|
|
||||||
res.status(404).json({ error: 'API endpoint not found' });
|
|
||||||
});
|
|
||||||
|
|
||||||
// Health route
|
// Health route
|
||||||
app.get('/api/health', (req: any, res: any) => {
|
app.get('/api/health', (req: any, res: any) => {
|
||||||
res.json({
|
res.json({
|
||||||
@@ -46,23 +39,97 @@ app.get('/api/health', (req: any, res: any) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Setup status route (additional endpoint for clarity)
|
// 🆕 FIXED STATIC FILE SERVING
|
||||||
app.get('/api/initial-setup', async (req: any, res: any) => {
|
// Use absolute path that matches Docker container structure
|
||||||
try {
|
const frontendBuildPathEnv = process.env.FRONTEND_BUILD_PATH;
|
||||||
const { db } = await import('./services/databaseService.js');
|
console.log('📁 Frontend build path from the env', frontendBuildPathEnv);
|
||||||
|
const frontendBuildPath = path.resolve('/app/frontend-build');
|
||||||
|
console.log('📁 Frontend build path:', frontendBuildPath);
|
||||||
|
console.log('📁 Current __dirname:', __dirname);
|
||||||
|
|
||||||
const adminExists = await db.get<{ 'COUNT(*)': number }>(
|
// Check multiple possible locations for frontend build
|
||||||
'SELECT COUNT(*) FROM employees WHERE role = ?',
|
const possiblePaths = [
|
||||||
['admin']
|
'/app/frontend-build', // Docker production path
|
||||||
);
|
path.join(__dirname, '../../frontend-build'), // Relative from dist
|
||||||
|
path.join(process.cwd(), 'frontend-build'), // From current working directory
|
||||||
|
];
|
||||||
|
|
||||||
res.json({
|
let actualFrontendPath = null;
|
||||||
needsInitialSetup: !adminExists || adminExists['COUNT(*)'] === 0
|
for (const testPath of possiblePaths) {
|
||||||
});
|
if (fs.existsSync(testPath)) {
|
||||||
} catch (error) {
|
actualFrontendPath = testPath;
|
||||||
console.error('Error checking initial setup:', error);
|
console.log('✅ Found frontend build at:', testPath);
|
||||||
res.status(500).json({ error: 'Internal server error' });
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (actualFrontendPath) {
|
||||||
|
// Serviere statische Dateien
|
||||||
|
app.use(express.static(actualFrontendPath));
|
||||||
|
|
||||||
|
// List files for debugging
|
||||||
|
try {
|
||||||
|
const files = fs.readdirSync(actualFrontendPath);
|
||||||
|
console.log('📄 Files in frontend-build:', files);
|
||||||
|
} catch (err) {
|
||||||
|
console.log('❌ Could not read frontend-build directory:', err);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('✅ Static file serving configured');
|
||||||
|
} else {
|
||||||
|
console.log('❌ Frontend build directory NOT FOUND in any location');
|
||||||
|
console.log('❌ Checked paths:', possiblePaths);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Root route
|
||||||
|
app.get('/', (req, res) => {
|
||||||
|
if (!actualFrontendPath) {
|
||||||
|
return res.status(500).send('Frontend build not found');
|
||||||
|
}
|
||||||
|
|
||||||
|
const indexPath = path.join(actualFrontendPath, 'index.html');
|
||||||
|
console.log('📄 Serving index.html from:', indexPath);
|
||||||
|
|
||||||
|
if (fs.existsSync(indexPath)) {
|
||||||
|
res.sendFile(indexPath);
|
||||||
|
} else {
|
||||||
|
console.error('❌ index.html not found at:', indexPath);
|
||||||
|
res.status(404).send('Frontend not found - index.html missing');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Client-side routing fallback
|
||||||
|
app.get('*', (req, res) => {
|
||||||
|
// Ignoriere API Routes
|
||||||
|
if (req.path.startsWith('/api/')) {
|
||||||
|
return res.status(404).json({ error: 'API endpoint not found' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!actualFrontendPath) {
|
||||||
|
return res.status(500).json({ error: 'Frontend application not available' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const indexPath = path.join(actualFrontendPath, 'index.html');
|
||||||
|
console.log('🔄 Client-side routing for:', req.path, '->', indexPath);
|
||||||
|
|
||||||
|
if (fs.existsSync(indexPath)) {
|
||||||
|
// Use absolute path with res.sendFile
|
||||||
|
res.sendFile(indexPath, (err) => {
|
||||||
|
if (err) {
|
||||||
|
console.error('Error sending index.html:', err);
|
||||||
|
res.status(500).send('Error loading application');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
console.error('❌ index.html not found for client-side routing at:', indexPath);
|
||||||
|
res.status(404).json({ error: 'Frontend application not found' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Error handling middleware
|
||||||
|
app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => {
|
||||||
|
console.error('Unhandled error:', err);
|
||||||
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initialize the application
|
// Initialize the application
|
||||||
@@ -70,25 +137,24 @@ const initializeApp = async () => {
|
|||||||
try {
|
try {
|
||||||
// Initialize database with base schema
|
// Initialize database with base schema
|
||||||
await initializeDatabase();
|
await initializeDatabase();
|
||||||
//console.log('✅ Database initialized successfully');
|
|
||||||
|
|
||||||
// Apply any pending migrations
|
// Apply any pending migrations
|
||||||
const { applyMigration } = await import('./scripts/applyMigration.js');
|
const { applyMigration } = await import('./scripts/applyMigration.js');
|
||||||
await applyMigration();
|
await applyMigration();
|
||||||
//console.log('✅ Database migrations applied');
|
|
||||||
|
|
||||||
// Start server only after successful initialization
|
// Start server only after successful initialization
|
||||||
app.listen(PORT, () => {
|
app.listen(PORT, () => {
|
||||||
console.log('🎉 BACKEND STARTED SUCCESSFULLY!');
|
console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
|
||||||
console.log(`📍 Port: ${PORT}`);
|
console.log(`📍 Port: ${PORT}`);
|
||||||
console.log(`📍 Health: http://localhost:${PORT}/api/health`);
|
console.log(`📍 Frontend: http://localhost:${PORT}`);
|
||||||
|
console.log(`📍 API: http://localhost:${PORT}/api`);
|
||||||
console.log('');
|
console.log('');
|
||||||
console.log(`🔧 Setup ready at: http://localhost:${PORT}/api/setup/status`);
|
console.log(`🔧 Setup: http://localhost:${PORT}/api/setup/status`);
|
||||||
console.log('📝 Create your admin account on first launch');
|
console.log('📝 Create your admin account on first launch');
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Error during initialization:', error);
|
console.error('❌ Error during initialization:', error);
|
||||||
process.exit(1); // Exit if initialization fails
|
process.exit(1);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,19 @@
|
|||||||
|
// backend/src/services/databaseService
|
||||||
import sqlite3 from 'sqlite3';
|
import sqlite3 from 'sqlite3';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { fileURLToPath } from 'url';
|
import { fileURLToPath } from 'url';
|
||||||
|
import fs from 'fs';
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url);
|
const __filename = fileURLToPath(import.meta.url);
|
||||||
const __dirname = path.dirname(__filename);
|
const __dirname = path.dirname(__filename);
|
||||||
const dbPath = path.join(__dirname, '../../database/schichtplan.db');
|
|
||||||
|
const dbPath = process.env.DB_PATH || '/app/data/schichtplan.db';
|
||||||
|
|
||||||
|
// Stelle sicher, dass das Verzeichnis existiert
|
||||||
|
const dbDir = path.dirname(dbPath);
|
||||||
|
if (!fs.existsSync(dbDir)) {
|
||||||
|
fs.mkdirSync(dbDir, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
class Database {
|
class Database {
|
||||||
private db: sqlite3.Database;
|
private db: sqlite3.Database;
|
||||||
|
|||||||
@@ -1,19 +1,22 @@
|
|||||||
// backend/tsconfig.json
|
|
||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2022",
|
"target": "ES2022",
|
||||||
"module": "NodeNext",
|
"module": "NodeNext",
|
||||||
"moduleResolution": "NodeNext",
|
"moduleResolution": "NodeNext",
|
||||||
"allowSyntheticDefaultImports": true,
|
|
||||||
"esModuleInterop": true,
|
|
||||||
"allowJs": true,
|
|
||||||
"outDir": "./dist",
|
"outDir": "./dist",
|
||||||
"rootDir": "./src",
|
"rootDir": "./src",
|
||||||
"strict": true,
|
"strict": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"forceConsistentCasingInFileNames": true,
|
"forceConsistentCasingInFileNames": true,
|
||||||
"resolveJsonModule": true
|
"resolveJsonModule": true,
|
||||||
|
"allowSyntheticDefaultImports": true
|
||||||
},
|
},
|
||||||
"include": ["src/**/*"],
|
"include": [
|
||||||
"exclude": ["node_modules", "dist"]
|
"src/**/*"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"node_modules",
|
||||||
|
"dist"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
@@ -1,18 +1,14 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
frontend:
|
schichtplaner:
|
||||||
build: ./frontend
|
container_name: schichtplaner
|
||||||
|
image: ghcr.io/donpat1to/schichtenplaner:v1.0.0
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "3002:3002"
|
||||||
depends_on:
|
volumes:
|
||||||
- backend
|
- app_data:/app/data
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
backend:
|
volumes:
|
||||||
build: ./backend
|
app_data:
|
||||||
ports:
|
|
||||||
- "3001:3001"
|
|
||||||
environment:
|
|
||||||
- DATABASE_URL=file:./dev.db
|
|
||||||
- JWT_SECRET=your-secret-key
|
|
||||||
|
|
||||||
# Später: Database service hinzufügen
|
|
||||||
17
ecosystem.config.cjs
Normal file
17
ecosystem.config.cjs
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
// ecosystem.config.cjs
|
||||||
|
module.exports = {
|
||||||
|
apps: [{
|
||||||
|
name: 'schichtplan-app',
|
||||||
|
script: './dist/server.js',
|
||||||
|
instances: 1,
|
||||||
|
env: {
|
||||||
|
NODE_ENV: 'production',
|
||||||
|
PORT: 3002,
|
||||||
|
FRONTEND_BUILD_PATH: './frontend-build'
|
||||||
|
},
|
||||||
|
error_file: './logs/err.log',
|
||||||
|
out_file: './logs/out.log',
|
||||||
|
log_file: './logs/combined.log',
|
||||||
|
time: true
|
||||||
|
}]
|
||||||
|
};
|
||||||
45
frontend/.gitignore
vendored
45
frontend/.gitignore
vendored
@@ -1,45 +0,0 @@
|
|||||||
# Dependencies
|
|
||||||
node_modules/
|
|
||||||
/.pnp
|
|
||||||
.pnp.js
|
|
||||||
|
|
||||||
# Testing
|
|
||||||
/coverage
|
|
||||||
|
|
||||||
# Production
|
|
||||||
/build
|
|
||||||
|
|
||||||
# Misc
|
|
||||||
.DS_Store
|
|
||||||
.env.local
|
|
||||||
.env.development.local
|
|
||||||
.env.test.local
|
|
||||||
.env.production.local
|
|
||||||
.env
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
|
|
||||||
# IDEs
|
|
||||||
.vscode/
|
|
||||||
.idea/
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
|
|
||||||
# OS generated files
|
|
||||||
.DS_Store
|
|
||||||
.DS_Store?
|
|
||||||
._*
|
|
||||||
.Spotlight-V100
|
|
||||||
.Trashes
|
|
||||||
ehthumbs.db
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Environment variables
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.development.local
|
|
||||||
.env.test.local
|
|
||||||
.env.production.local
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# backend/Dockerfile
|
|
||||||
FROM node:18-alpine
|
|
||||||
WORKDIR /app
|
|
||||||
COPY package*.json ./
|
|
||||||
RUN npm ci --only=production
|
|
||||||
COPY . .
|
|
||||||
EXPOSE 3001
|
|
||||||
CMD ["node", "dist/server.js"]
|
|
||||||
13
frontend/index.html
Normal file
13
frontend/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Shift Planning App</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
17666
frontend/package-lock.json
generated
17666
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -2,46 +2,25 @@
|
|||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
"type": "module",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@testing-library/dom": "^10.4.1",
|
"react": "^19.0.0",
|
||||||
"@testing-library/jest-dom": "^6.9.1",
|
"react-dom": "^19.0.0",
|
||||||
"@testing-library/react": "^16.3.0",
|
"react-router-dom": "^6.28.0"
|
||||||
"@testing-library/user-event": "^13.5.0",
|
},
|
||||||
"@types/jest": "^27.5.2",
|
"devDependencies": {
|
||||||
"@types/node": "^16.18.126",
|
"@types/node": "20.19.23",
|
||||||
"@types/react": "^19.2.2",
|
"@types/react": "^19.0.0",
|
||||||
"@types/react-dom": "^19.2.1",
|
"@types/react-dom": "^19.0.0",
|
||||||
"@types/react-router-dom": "^5.3.3",
|
"@types/react-router-dom": "^5.3.3",
|
||||||
"react": "^19.2.0",
|
"@vitejs/plugin-react": "^4.3.3",
|
||||||
"react-dom": "^19.2.0",
|
"typescript": "^5.7.3",
|
||||||
"react-router-dom": "^7.9.3",
|
"vite": "^6.0.7",
|
||||||
"react-scripts": "5.0.1",
|
"esbuild": "^0.21.0"
|
||||||
"typescript": "^4.9.5",
|
|
||||||
"web-vitals": "^2.1.4",
|
|
||||||
"worker_threads": "native"
|
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"dev": "vite",
|
||||||
"build": "react-scripts build",
|
"build": "tsc && vite build",
|
||||||
"test": "react-scripts test",
|
"preview": "vite preview"
|
||||||
"eject": "react-scripts eject"
|
|
||||||
},
|
|
||||||
"eslintConfig": {
|
|
||||||
"extends": [
|
|
||||||
"react-app",
|
|
||||||
"react-app/jest"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"browserslist": {
|
|
||||||
"production": [
|
|
||||||
">0.2%",
|
|
||||||
"not dead",
|
|
||||||
"not op_mini all"
|
|
||||||
],
|
|
||||||
"development": [
|
|
||||||
"last 1 chrome version",
|
|
||||||
"last 1 firefox version",
|
|
||||||
"last 1 safari version"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"short_name": "React App",
|
"short_name": "SP",
|
||||||
"name": "Create React App Sample",
|
"name": "schichtenplaner",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "favicon.ico",
|
"src": "favicon.ico",
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import App from './App';
|
|
||||||
|
|
||||||
test('renders learn react link', () => {
|
|
||||||
render(<App />);
|
|
||||||
const linkElement = screen.getByText(/learn react/i);
|
|
||||||
expect(linkElement).toBeInTheDocument();
|
|
||||||
});
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
// frontend/src/App.tsx - KORRIGIERT MIT LAYOUT
|
// src/App.tsx - UPDATED FOR VITE
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
|
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
|
||||||
import { AuthProvider, useAuth } from './contexts/AuthContext';
|
import { AuthProvider, useAuth } from './contexts/AuthContext';
|
||||||
@@ -16,10 +16,42 @@ import Settings from './pages/Settings/Settings';
|
|||||||
import Help from './pages/Help/Help';
|
import Help from './pages/Help/Help';
|
||||||
import Setup from './pages/Setup/Setup';
|
import Setup from './pages/Setup/Setup';
|
||||||
|
|
||||||
|
// Free Footer Link Pages (always available)
|
||||||
|
import FAQ from './components/Layout/FooterLinks/FAQ/FAQ';
|
||||||
|
import About from './components/Layout/FooterLinks/About/About';
|
||||||
|
import Features from './components/Layout/FooterLinks/Features/Features';
|
||||||
|
import { CommunityContact, CommunityLegalPage } from './components/Layout/FooterLinks/CommunityLinks/communityLinks';
|
||||||
|
|
||||||
|
// Vite environment variables (use import.meta.env instead of process.env)
|
||||||
|
const ENABLE_PRO = import.meta.env.ENABLE_PRO === 'true';
|
||||||
|
|
||||||
|
// Conditional Premium Components
|
||||||
|
let PremiumContact: React.FC = CommunityContact;
|
||||||
|
let PremiumPrivacy: React.FC = () => <CommunityLegalPage title="Datenschutz" />;
|
||||||
|
let PremiumImprint: React.FC = () => <CommunityLegalPage title="Impressum" />;
|
||||||
|
let PremiumTerms: React.FC = () => <CommunityLegalPage title="AGB" />;
|
||||||
|
|
||||||
|
// Load premium components only when ENABLE_PRO is true
|
||||||
|
if (ENABLE_PRO) {
|
||||||
|
try {
|
||||||
|
// Use require with type assertions to avoid dynamic import issues
|
||||||
|
const premiumModule = require('@premium-frontend/components/FooterLinks');
|
||||||
|
|
||||||
|
if (premiumModule.Contact) PremiumContact = premiumModule.Contact;
|
||||||
|
if (premiumModule.Privacy) PremiumPrivacy = premiumModule.Privacy;
|
||||||
|
if (premiumModule.Imprint) PremiumImprint = premiumModule.Imprint;
|
||||||
|
if (premiumModule.Terms) PremiumTerms = premiumModule.Terms;
|
||||||
|
|
||||||
|
console.log('✅ Premium components loaded successfully');
|
||||||
|
} catch (error) {
|
||||||
|
console.warn('⚠️ Premium components not available, using community fallbacks:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Protected Route Component
|
// Protected Route Component
|
||||||
const ProtectedRoute: React.FC<{ children: React.ReactNode; roles?: string[] }> = ({
|
const ProtectedRoute: React.FC<{ children: React.ReactNode; roles?: string[] }> = ({
|
||||||
children,
|
children,
|
||||||
roles = ['admin', 'instandhalter', 'user']
|
roles = ['admin', 'maintenance', 'user']
|
||||||
}) => {
|
}) => {
|
||||||
const { user, loading, hasRole } = useAuth();
|
const { user, loading, hasRole } = useAuth();
|
||||||
|
|
||||||
@@ -49,11 +81,27 @@ const ProtectedRoute: React.FC<{ children: React.ReactNode; roles?: string[] }>
|
|||||||
return <Layout>{children}</Layout>;
|
return <Layout>{children}</Layout>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Public Route Component (without Layout for footer pages)
|
||||||
|
const PublicRoute: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
||||||
|
const { user, loading } = useAuth();
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return (
|
||||||
|
<div style={{ textAlign: 'center', padding: '40px' }}>
|
||||||
|
<div>⏳ Lade Anwendung...</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return user ? <Layout>{children}</Layout> : <>{children}</>;
|
||||||
|
};
|
||||||
|
|
||||||
// Main App Content
|
// Main App Content
|
||||||
const AppContent: React.FC = () => {
|
const AppContent: React.FC = () => {
|
||||||
const { loading, needsSetup, user } = useAuth();
|
const { loading, needsSetup, user } = useAuth();
|
||||||
|
|
||||||
console.log('🏠 AppContent rendering - loading:', loading, 'needsSetup:', needsSetup, 'user:', user);
|
console.log('🏠 AppContent rendering - loading:', loading, 'needsSetup:', needsSetup, 'user:', user);
|
||||||
|
console.log('🎯 Premium features enabled:', ENABLE_PRO);
|
||||||
|
|
||||||
// Während des Ladens
|
// Während des Ladens
|
||||||
if (loading) {
|
if (loading) {
|
||||||
@@ -80,52 +128,32 @@ const AppContent: React.FC = () => {
|
|||||||
console.log('✅ Showing protected routes for user:', user.email);
|
console.log('✅ Showing protected routes for user:', user.email);
|
||||||
return (
|
return (
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={
|
{/* Protected Routes (require login) */}
|
||||||
<ProtectedRoute>
|
<Route path="/" element={<ProtectedRoute><Dashboard /></ProtectedRoute>} />
|
||||||
<Dashboard />
|
<Route path="/shift-plans" element={<ProtectedRoute><ShiftPlanList /></ProtectedRoute>} />
|
||||||
</ProtectedRoute>
|
<Route path="/shift-plans/new" element={<ProtectedRoute roles={['admin', 'maintenance']}><ShiftPlanCreate /></ProtectedRoute>} />
|
||||||
} />
|
<Route path="/shift-plans/:id/edit" element={<ProtectedRoute roles={['admin', 'maintenance']}><ShiftPlanEdit /></ProtectedRoute>} />
|
||||||
<Route path="/shift-plans" element={
|
<Route path="/shift-plans/:id" element={<ProtectedRoute><ShiftPlanView /></ProtectedRoute>} />
|
||||||
<ProtectedRoute>
|
<Route path="/employees" element={<ProtectedRoute roles={['admin', 'maintenance']}><EmployeeManagement /></ProtectedRoute>} />
|
||||||
<ShiftPlanList />
|
<Route path="/settings" element={<ProtectedRoute><Settings /></ProtectedRoute>} />
|
||||||
</ProtectedRoute>
|
<Route path="/help" element={<ProtectedRoute><Help /></ProtectedRoute>} />
|
||||||
} />
|
|
||||||
<Route path="/shift-plans/new" element={
|
{/* Public Footer Link Pages (always available) */}
|
||||||
<ProtectedRoute roles={['admin', 'instandhalter']}>
|
<Route path="/faq" element={<PublicRoute><FAQ /></PublicRoute>} />
|
||||||
<ShiftPlanCreate />
|
<Route path="/about" element={<PublicRoute><About /></PublicRoute>} />
|
||||||
</ProtectedRoute>
|
<Route path="/features" element={<PublicRoute><Features /></PublicRoute>} />
|
||||||
} />
|
|
||||||
<Route path="/shift-plans/:id/edit" element={
|
{/* PREMIUM Footer Link Pages (conditionally available) */}
|
||||||
<ProtectedRoute roles={['admin', 'instandhalter']}>
|
<Route path="/contact" element={<PublicRoute><PremiumContact /></PublicRoute>} />
|
||||||
<ShiftPlanEdit />
|
<Route path="/privacy" element={<PublicRoute><PremiumPrivacy /></PublicRoute>} />
|
||||||
</ProtectedRoute>
|
<Route path="/imprint" element={<PublicRoute><PremiumImprint /></PublicRoute>} />
|
||||||
} />
|
<Route path="/terms" element={<PublicRoute><PremiumTerms /></PublicRoute>} />
|
||||||
<Route path="/shift-plans/:id" element={
|
|
||||||
<ProtectedRoute>
|
{/* Auth Routes */}
|
||||||
<ShiftPlanView />
|
|
||||||
</ProtectedRoute>
|
|
||||||
} />
|
|
||||||
<Route path="/employees" element={
|
|
||||||
<ProtectedRoute roles={['admin', 'instandhalter']}>
|
|
||||||
<EmployeeManagement />
|
|
||||||
</ProtectedRoute>
|
|
||||||
} />
|
|
||||||
<Route path="/settings" element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<Settings />
|
|
||||||
</ProtectedRoute>
|
|
||||||
} />
|
|
||||||
<Route path="/help" element={
|
|
||||||
<ProtectedRoute>
|
|
||||||
<Help />
|
|
||||||
</ProtectedRoute>
|
|
||||||
} />
|
|
||||||
<Route path="/login" element={<Login />} />
|
<Route path="/login" element={<Login />} />
|
||||||
<Route path="*" element={
|
|
||||||
<ProtectedRoute>
|
{/* Catch-all Route */}
|
||||||
<Dashboard />
|
<Route path="*" element={<ProtectedRoute><Dashboard /></ProtectedRoute>} />
|
||||||
</ProtectedRoute>
|
|
||||||
} />
|
|
||||||
</Routes>
|
</Routes>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,12 +10,12 @@ const Footer: React.FC = () => {
|
|||||||
borderTop: '1px solid rgba(251, 250, 246, 0.1)',
|
borderTop: '1px solid rgba(251, 250, 246, 0.1)',
|
||||||
},
|
},
|
||||||
footerContent: {
|
footerContent: {
|
||||||
maxWidth: '1200px',
|
maxWidth: '1500px',
|
||||||
margin: '0 auto',
|
margin: '0 auto',
|
||||||
padding: '3rem 2rem 2rem',
|
padding: '3rem 2rem 2rem',
|
||||||
display: 'grid',
|
display: 'grid',
|
||||||
gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))',
|
gridTemplateColumns: 'repeat(auto-fit, minmax(100px, 1fr))',
|
||||||
gap: '3rem',
|
gap: '1rem',
|
||||||
},
|
},
|
||||||
footerSection: {
|
footerSection: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -182,20 +182,6 @@ const Footer: React.FC = () => {
|
|||||||
>
|
>
|
||||||
Funktionen
|
Funktionen
|
||||||
</a>
|
</a>
|
||||||
<a
|
|
||||||
href="/pricing"
|
|
||||||
style={styles.footerLink}
|
|
||||||
onMouseEnter={(e) => {
|
|
||||||
e.currentTarget.style.color = '#FBFAF6';
|
|
||||||
e.currentTarget.style.transform = 'translateX(4px)';
|
|
||||||
}}
|
|
||||||
onMouseLeave={(e) => {
|
|
||||||
e.currentTarget.style.color = 'rgba(251, 250, 246, 0.7)';
|
|
||||||
e.currentTarget.style.transform = 'translateX(0)';
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Preise
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
76
frontend/src/components/Layout/FooterLinks/About/About.tsx
Normal file
76
frontend/src/components/Layout/FooterLinks/About/About.tsx
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
// frontend/src/pages/About/About.tsx
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
const About: React.FC = () => {
|
||||||
|
return (
|
||||||
|
<div style={{ padding: '40px 20px', maxWidth: '800px', margin: '0 auto' }}>
|
||||||
|
<h1>👨💻 Über uns</h1>
|
||||||
|
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: 'white',
|
||||||
|
borderRadius: '12px',
|
||||||
|
padding: '30px',
|
||||||
|
marginTop: '20px',
|
||||||
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
|
border: '1px solid #e0e0e0',
|
||||||
|
lineHeight: 1.6
|
||||||
|
}}>
|
||||||
|
<h2 style={{ color: '#2c3e50' }}>Unser Team</h2>
|
||||||
|
|
||||||
|
<div style={{ display: 'flex', alignItems: 'center', marginTop: '20px', padding: '20px', backgroundColor: '#f8f9fa', borderRadius: '8px' }}>
|
||||||
|
<div style={{ marginRight: '20px' }}>
|
||||||
|
<div style={{
|
||||||
|
width: '80px',
|
||||||
|
height: '80px',
|
||||||
|
backgroundColor: '#3498db',
|
||||||
|
borderRadius: '50%',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
color: 'white',
|
||||||
|
fontSize: '2rem',
|
||||||
|
fontWeight: 'bold'
|
||||||
|
}}>
|
||||||
|
P
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 style={{ color: '#2c3e50', margin: '0 0 5px 0' }}>Patrick</h3>
|
||||||
|
<p style={{ color: '#6c757d', margin: '0 0 10px 0' }}>
|
||||||
|
Full-Stack Developer & Projektleiter
|
||||||
|
</p>
|
||||||
|
<p style={{ margin: 0, fontSize: '0.9rem' }}>
|
||||||
|
GitHub: <a href="https://github.com/donpat1to" style={{ color: '#3498db' }}>donpat1to</a><br/>
|
||||||
|
E-Mail: <a href="mailto:dev.patrick@inca-vikingo.de" style={{ color: '#3498db' }}>dev.patrick@inca-vikingo.de</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h3 style={{ color: '#3498db', marginTop: '30px' }}>🚀 Unsere Mission</h3>
|
||||||
|
<p>
|
||||||
|
Wir entwickeln intelligente Lösungen für die Personalplanung,
|
||||||
|
die Zeit sparen und faire Schichtverteilung gewährleisten.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h3 style={{ color: '#3498db', marginTop: '25px' }}>💻 Technologie</h3>
|
||||||
|
<p>
|
||||||
|
Unser Stack umfasst moderne Technologien:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>Frontend: React, TypeScript</li>
|
||||||
|
<li>Backend: Node.js, Express</li>
|
||||||
|
<li>Optimierung: Google OR-Tools CP-SAT</li>
|
||||||
|
<li>Datenbank: SQLite/PostgreSQL</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h3 style={{ color: '#3498db', marginTop: '25px' }}>📈 Entwicklung</h3>
|
||||||
|
<p>
|
||||||
|
Schichtenplaner wird kontinuierlich weiterentwickelt und
|
||||||
|
basiert auf Feedback unserer Nutzer.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default About;
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
export const CommunityContact: React.FC = () => (
|
||||||
|
<div style={{ padding: '40px 20px', maxWidth: '800px', margin: '0 auto' }}>
|
||||||
|
<h1>📞 Kontakt</h1>
|
||||||
|
<div style={{ backgroundColor: 'white', borderRadius: '12px', padding: '30px', marginTop: '20px' }}>
|
||||||
|
<h2 style={{ color: '#2c3e50' }}>Community Edition</h2>
|
||||||
|
<p>Kontaktfunktionen sind in der Premium Edition verfügbar.</p>
|
||||||
|
<p>
|
||||||
|
<a href="/features" style={{ color: '#3498db' }}>
|
||||||
|
➡️ Zu den Features
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
export const CommunityLegalPage: React.FC<{ title: string }> = ({ title }) => (
|
||||||
|
<div style={{ padding: '40px 20px', maxWidth: '800px', margin: '0 auto' }}>
|
||||||
|
<h1>📄 {title}</h1>
|
||||||
|
<div style={{ backgroundColor: 'white', borderRadius: '12px', padding: '30px', marginTop: '20px' }}>
|
||||||
|
<h2 style={{ color: '#2c3e50' }}>Community Edition</h2>
|
||||||
|
<p>Rechtliche Dokumentation ist in der Premium Edition verfügbar.</p>
|
||||||
|
<p>
|
||||||
|
<a href="/features" style={{ color: '#3498db' }}>
|
||||||
|
➡️ Erfahren Sie mehr über Premium
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
|
// Optional: Barrel export für einfachere Imports
|
||||||
|
export default {
|
||||||
|
CommunityContact,
|
||||||
|
CommunityLegalPage
|
||||||
|
};
|
||||||
103
frontend/src/components/Layout/FooterLinks/FAQ/FAQ.tsx
Normal file
103
frontend/src/components/Layout/FooterLinks/FAQ/FAQ.tsx
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
// frontend/src/pages/FAQ/FAQ.tsx
|
||||||
|
import React, { useState } from 'react';
|
||||||
|
|
||||||
|
const FAQ: React.FC = () => {
|
||||||
|
const [openItems, setOpenItems] = useState<number[]>([]);
|
||||||
|
|
||||||
|
const toggleItem = (index: number) => {
|
||||||
|
setOpenItems(prev =>
|
||||||
|
prev.includes(index)
|
||||||
|
? prev.filter(i => i !== index)
|
||||||
|
: [...prev, index]
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const faqItems = [
|
||||||
|
{
|
||||||
|
question: "Wie funktioniert der Scheduling-Algorithmus?",
|
||||||
|
answer: "Unser System verwendet Google's OR-Tools CP-SAT Solver, um optimale Schichtzuweisungen basierend auf Verfügbarkeiten, Vertragstypen und Geschäftsregeln zu berechnen."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
question: "Was bedeuten die Verfügbarkeits-Level 1, 2 und 3?",
|
||||||
|
answer: "Level 1: Bevorzugt (Mitarbeiter möchte diese Schicht), Level 2: Verfügbar (kann arbeiten), Level 3: Nicht verfügbar (kann nicht arbeiten)."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
question: "Wie werden Vertragstypen berücksichtigt?",
|
||||||
|
answer: "Kleine Verträge: 1 Schicht pro Woche, Große Verträge: 2 Schichten pro Woche. Das System weist genau diese Anzahl zu."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
question: "Kann ich manuelle Anpassungen vornehmen?",
|
||||||
|
answer: "Ja, nach dem automatischen Scheduling können Sie Zuordnungen manuell anpassen und optimieren."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
question: "Was passiert bei unterbesetzten Schichten?",
|
||||||
|
answer: "Das System zeigt eine Warnung an und versucht, alternative Lösungen zu finden. In kritischen Fällen müssen manuelle Anpassungen vorgenommen werden."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
question: "Wie lange dauert die Planungserstellung?",
|
||||||
|
answer: "Typischerweise maximal 105 Sekunden, abhängig von der Anzahl der Mitarbeiter und Schichten."
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{ padding: '40px 20px', maxWidth: '800px', margin: '0 auto' }}>
|
||||||
|
<h1>❓ Häufige Fragen (FAQ)</h1>
|
||||||
|
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: 'white',
|
||||||
|
borderRadius: '12px',
|
||||||
|
marginTop: '20px',
|
||||||
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
|
border: '1px solid #e0e0e0'
|
||||||
|
}}>
|
||||||
|
{faqItems.map((item, index) => (
|
||||||
|
<div key={index} style={{
|
||||||
|
borderBottom: index < faqItems.length - 1 ? '1px solid #e0e0e0' : 'none',
|
||||||
|
padding: '20px 30px'
|
||||||
|
}}>
|
||||||
|
<div
|
||||||
|
onClick={() => toggleItem(index)}
|
||||||
|
style={{
|
||||||
|
cursor: 'pointer',
|
||||||
|
display: 'flex',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
alignItems: 'center'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<h3 style={{
|
||||||
|
color: '#2c3e50',
|
||||||
|
margin: 0,
|
||||||
|
fontSize: '1.1rem'
|
||||||
|
}}>
|
||||||
|
{item.question}
|
||||||
|
</h3>
|
||||||
|
<span style={{
|
||||||
|
fontSize: '1.5rem',
|
||||||
|
color: '#3498db',
|
||||||
|
transform: openItems.includes(index) ? 'rotate(45deg)' : 'rotate(0)',
|
||||||
|
transition: 'transform 0.2s ease'
|
||||||
|
}}>
|
||||||
|
+
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{openItems.includes(index) && (
|
||||||
|
<div style={{
|
||||||
|
marginTop: '15px',
|
||||||
|
padding: '15px',
|
||||||
|
backgroundColor: '#f8f9fa',
|
||||||
|
borderRadius: '8px',
|
||||||
|
color: '#6c757d',
|
||||||
|
lineHeight: 1.6
|
||||||
|
}}>
|
||||||
|
{item.answer}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default FAQ;
|
||||||
111
frontend/src/components/Layout/FooterLinks/Features/Features.tsx
Normal file
111
frontend/src/components/Layout/FooterLinks/Features/Features.tsx
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
// frontend/src/pages/Features/Features.tsx
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
const Features: React.FC = () => {
|
||||||
|
const features = [
|
||||||
|
{
|
||||||
|
icon: "🤖",
|
||||||
|
title: "Automatisches Scheduling",
|
||||||
|
description: "Intelligenter Algorithmus erstellt optimale Schichtpläne basierend auf Verfügbarkeiten und Regeln"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: "⚡",
|
||||||
|
title: "Schnelle Berechnung",
|
||||||
|
description: "Google OR-Tools CP-SAT Solver findet Lösungen in maximal 105 Sekunden"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: "👥",
|
||||||
|
title: "Flexible Regelkonfiguration",
|
||||||
|
description: "Anpassbare Geschäftsregeln für Trainee-Betreuung, Alleinarbeit, Vertragstypen"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: "📊",
|
||||||
|
title: "Echtzeit-Validierung",
|
||||||
|
description: "Automatische Erkennung von Regelverletzungen und Konflikten"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: "🔒",
|
||||||
|
title: "Lokale Datenspeicherung",
|
||||||
|
description: "Alle Daten bleiben in Ihrer Infrastruktur - volle Kontrolle und Datenschutz"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
icon: "🎯",
|
||||||
|
title: "Präferenz-basiert",
|
||||||
|
description: "Berücksichtigt Mitarbeiterwünsche für höhere Zufriedenheit"
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={{ padding: '40px 20px', maxWidth: '1000px', margin: '0 auto' }}>
|
||||||
|
<h1>✨ Funktionen</h1>
|
||||||
|
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: 'white',
|
||||||
|
borderRadius: '12px',
|
||||||
|
padding: '30px',
|
||||||
|
marginTop: '20px',
|
||||||
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
|
border: '1px solid #e0e0e0'
|
||||||
|
}}>
|
||||||
|
<h2 style={{ color: '#2c3e50', textAlign: 'center', marginBottom: '40px' }}>
|
||||||
|
Alles, was Sie für die perfekte Schichtplanung benötigen
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<div style={{
|
||||||
|
display: 'grid',
|
||||||
|
gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))',
|
||||||
|
gap: '30px'
|
||||||
|
}}>
|
||||||
|
{features.map((feature, index) => (
|
||||||
|
<div key={index} style={{
|
||||||
|
padding: '25px',
|
||||||
|
backgroundColor: '#f8f9fa',
|
||||||
|
borderRadius: '12px',
|
||||||
|
border: '2px solid #e9ecef',
|
||||||
|
textAlign: 'center',
|
||||||
|
transition: 'transform 0.2s ease, box-shadow 0.2s ease'
|
||||||
|
}}>
|
||||||
|
<div style={{
|
||||||
|
fontSize: '3rem',
|
||||||
|
marginBottom: '15px'
|
||||||
|
}}>
|
||||||
|
{feature.icon}
|
||||||
|
</div>
|
||||||
|
<h3 style={{
|
||||||
|
color: '#2c3e50',
|
||||||
|
margin: '0 0 15px 0'
|
||||||
|
}}>
|
||||||
|
{feature.title}
|
||||||
|
</h3>
|
||||||
|
<p style={{
|
||||||
|
color: '#6c757d',
|
||||||
|
margin: 0,
|
||||||
|
lineHeight: 1.5
|
||||||
|
}}>
|
||||||
|
{feature.description}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style={{
|
||||||
|
marginTop: '40px',
|
||||||
|
padding: '25px',
|
||||||
|
backgroundColor: '#e8f4fd',
|
||||||
|
borderRadius: '12px',
|
||||||
|
border: '2px solid #b8d4f0',
|
||||||
|
textAlign: 'center'
|
||||||
|
}}>
|
||||||
|
<h3 style={{ color: '#2980b9', margin: '0 0 15px 0' }}>
|
||||||
|
🚀 Starter Sie durch
|
||||||
|
</h3>
|
||||||
|
<p style={{ color: '#2c3e50', margin: 0 }}>
|
||||||
|
Erstellen Sie Ihren ersten optimierten Schichtplan in wenigen Minuten.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Features;
|
||||||
@@ -151,7 +151,7 @@
|
|||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
padding: 2rem 20px;
|
padding: 2rem 20px;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
|
||||||
gap: 2rem;
|
gap: 2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,11 +30,11 @@ const Navigation: React.FC = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const navigationItems = [
|
const navigationItems = [
|
||||||
{ path: '/', label: 'Dashboard', roles: ['admin', 'instandhalter', 'user'] },
|
{ path: '/', label: 'Dashboard', roles: ['admin', 'maintenance', 'user'] },
|
||||||
{ path: '/shift-plans', label: 'Schichtpläne', roles: ['admin', 'instandhalter', 'user'] },
|
{ path: '/shift-plans', label: 'Schichtpläne', roles: ['admin', 'maintenance', 'user'] },
|
||||||
{ path: '/employees', label: 'Mitarbeiter', roles: ['admin', 'instandhalter'] },
|
{ path: '/employees', label: 'Mitarbeiter', roles: ['admin', 'maintenance'] },
|
||||||
{ path: '/help', label: 'Hilfe', roles: ['admin', 'instandhalter', 'user'] },
|
{ path: '/help', label: 'Hilfe', roles: ['admin', 'maintenance', 'user'] },
|
||||||
{ path: '/settings', label: 'Einstellungen', roles: ['admin', 'instandhalter', 'user'] },
|
{ path: '/settings', label: 'Einstellungen', roles: ['admin', 'maintenance', 'user'] },
|
||||||
];
|
];
|
||||||
|
|
||||||
const filteredNavigation = navigationItems.filter(item =>
|
const filteredNavigation = navigationItems.filter(item =>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ interface AuthContextType {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||||
|
const API_BASE_URL = process.env.REACT_APP_API_BASE_URL || '/api';
|
||||||
|
|
||||||
interface AuthProviderProps {
|
interface AuthProviderProps {
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
@@ -48,7 +49,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
const checkSetupStatus = async (): Promise<void> => {
|
const checkSetupStatus = async (): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
console.log('🔍 Checking setup status...');
|
console.log('🔍 Checking setup status...');
|
||||||
const response = await fetch('http://localhost:3002/api/setup/status');
|
const response = await fetch(`${API_BASE_URL}/setup/status`);
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Setup status check failed');
|
throw new Error('Setup status check failed');
|
||||||
}
|
}
|
||||||
@@ -72,7 +73,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await fetch('http://localhost:3002/api/auth/me', {
|
const response = await fetch(`${API_BASE_URL}/auth/me`, {
|
||||||
headers: {
|
headers: {
|
||||||
'Authorization': `Bearer ${token}`
|
'Authorization': `Bearer ${token}`
|
||||||
}
|
}
|
||||||
@@ -104,7 +105,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
try {
|
try {
|
||||||
console.log('🔐 Attempting login for:', credentials.email);
|
console.log('🔐 Attempting login for:', credentials.email);
|
||||||
|
|
||||||
const response = await fetch('http://localhost:3002/api/auth/login', {
|
const response = await fetch(`${API_BASE_URL}/auth/login`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
|
|||||||
@@ -1,3 +1,14 @@
|
|||||||
|
/* Reset and base styles */
|
||||||
|
* {
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#root {
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import ReactDOM from 'react-dom/client';
|
|
||||||
import './index.css';
|
|
||||||
import App from './App';
|
|
||||||
import reportWebVitals from './reportWebVitals';
|
|
||||||
|
|
||||||
const root = ReactDOM.createRoot(
|
|
||||||
document.getElementById('root') as HTMLElement
|
|
||||||
);
|
|
||||||
root.render(
|
|
||||||
<React.StrictMode>
|
|
||||||
<App />
|
|
||||||
</React.StrictMode>
|
|
||||||
);
|
|
||||||
|
|
||||||
// If you want to start measuring performance in your app, pass a function
|
|
||||||
// to log results (for example: reportWebVitals(console.log))
|
|
||||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
|
||||||
reportWebVitals();
|
|
||||||
10
frontend/src/main.tsx
Normal file
10
frontend/src/main.tsx
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import ReactDOM from 'react-dom/client'
|
||||||
|
import App from './App.tsx'
|
||||||
|
import './index.css'
|
||||||
|
|
||||||
|
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||||
|
<React.StrictMode>
|
||||||
|
<App />
|
||||||
|
</React.StrictMode>,
|
||||||
|
)
|
||||||
@@ -1,18 +1,21 @@
|
|||||||
// frontend/src/pages/Auth/Login.tsx - KORRIGIERT
|
// frontend/src/pages/Auth/Login.tsx - UPDATED PASSWORD SECTION
|
||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { useAuth } from '../../contexts/AuthContext';
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
import { useNotification } from '../../contexts/NotificationContext';
|
import { useNotification } from '../../contexts/NotificationContext';
|
||||||
import { employeeService } from '../../services/employeeService';
|
|
||||||
|
|
||||||
const Login: React.FC = () => {
|
const Login: React.FC = () => {
|
||||||
const [email, setEmail] = useState('');
|
const [email, setEmail] = useState('');
|
||||||
const [password, setPassword] = useState('');
|
const [password, setPassword] = useState('');
|
||||||
|
const [showPassword, setShowPassword] = useState(false);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const { login, user } = useAuth();
|
const { login, user } = useAuth();
|
||||||
const { showNotification } = useNotification();
|
const { showNotification } = useNotification();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
const holdTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
|
const passwordInputRef = useRef<HTMLInputElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (user) {
|
if (user) {
|
||||||
console.log('✅ User already logged in, redirecting to dashboard');
|
console.log('✅ User already logged in, redirecting to dashboard');
|
||||||
@@ -20,6 +23,47 @@ const Login: React.FC = () => {
|
|||||||
}
|
}
|
||||||
}, [user, navigate]);
|
}, [user, navigate]);
|
||||||
|
|
||||||
|
// Cleanup timeouts on unmount
|
||||||
|
useEffect(() => {
|
||||||
|
return () => {
|
||||||
|
if (holdTimeoutRef.current) {
|
||||||
|
clearTimeout(holdTimeoutRef.current);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleMouseDown = () => {
|
||||||
|
// Start timeout to show password after a brief delay (300ms)
|
||||||
|
holdTimeoutRef.current = setTimeout(() => {
|
||||||
|
setShowPassword(true);
|
||||||
|
}, 300);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleMouseUp = () => {
|
||||||
|
// Clear the timeout if user releases before delay completes
|
||||||
|
if (holdTimeoutRef.current) {
|
||||||
|
clearTimeout(holdTimeoutRef.current);
|
||||||
|
holdTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
// Always hide password on release
|
||||||
|
setShowPassword(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchStart = (e: React.TouchEvent) => {
|
||||||
|
e.preventDefault(); // Prevent context menu on mobile
|
||||||
|
handleMouseDown();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchEnd = (e: React.TouchEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
handleMouseUp();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Prevent context menu on long press
|
||||||
|
const handleContextMenu = (e: React.MouseEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
};
|
||||||
|
|
||||||
const handleSubmit = async (e: React.FormEvent) => {
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -35,7 +79,6 @@ const Login: React.FC = () => {
|
|||||||
message: `Willkommen zurück!`
|
message: `Willkommen zurück!`
|
||||||
});
|
});
|
||||||
|
|
||||||
// Navigiere zur Startseite
|
|
||||||
navigate('/');
|
navigate('/');
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
@@ -50,7 +93,6 @@ const Login: React.FC = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Wenn bereits eingeloggt, zeige Ladeanzeige
|
|
||||||
if (user) {
|
if (user) {
|
||||||
return (
|
return (
|
||||||
<div style={{ textAlign: 'center', padding: '40px' }}>
|
<div style={{ textAlign: 'center', padding: '40px' }}>
|
||||||
@@ -77,7 +119,7 @@ const Login: React.FC = () => {
|
|||||||
}}>
|
}}>
|
||||||
<h2 style={{ textAlign: 'center', marginBottom: '30px' }}>Anmeldung</h2>
|
<h2 style={{ textAlign: 'center', marginBottom: '30px' }}>Anmeldung</h2>
|
||||||
|
|
||||||
<div style={{ marginBottom: '20px' }}>
|
<div style={{ marginBottom: '20px', width: '100%' }}>
|
||||||
<label style={{ display: 'block', marginBottom: '8px', fontWeight: 'bold' }}>
|
<label style={{ display: 'block', marginBottom: '8px', fontWeight: 'bold' }}>
|
||||||
E-Mail
|
E-Mail
|
||||||
</label>
|
</label>
|
||||||
@@ -97,24 +139,57 @@ const Login: React.FC = () => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style={{ marginBottom: '30px' }}>
|
<div style={{ marginBottom: '30px', width: '100%' }}>
|
||||||
<label style={{ display: 'block', marginBottom: '8px', fontWeight: 'bold' }}>
|
<label style={{ display: 'block', marginBottom: '8px', fontWeight: 'bold' }}>
|
||||||
Passwort
|
Passwort
|
||||||
</label>
|
</label>
|
||||||
|
<div style={{ position: 'relative' }}>
|
||||||
<input
|
<input
|
||||||
type="password"
|
ref={passwordInputRef}
|
||||||
|
type={showPassword ? 'text' : 'password'}
|
||||||
value={password}
|
value={password}
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
required
|
required
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
padding: '10px',
|
padding: '10px',
|
||||||
|
paddingRight: '10px',
|
||||||
border: '1px solid #ddd',
|
border: '1px solid #ddd',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
fontSize: '16px'
|
fontSize: '16px'
|
||||||
}}
|
}}
|
||||||
placeholder="Ihr Passwort"
|
placeholder="Ihr Passwort"
|
||||||
/>
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onMouseDown={handleMouseDown}
|
||||||
|
onMouseUp={handleMouseUp}
|
||||||
|
onMouseLeave={handleMouseUp} // Handle mouse leaving while pressed
|
||||||
|
onTouchStart={handleTouchStart}
|
||||||
|
onTouchEnd={handleTouchEnd}
|
||||||
|
onTouchCancel={handleTouchEnd} // Handle touch cancellation
|
||||||
|
onContextMenu={handleContextMenu}
|
||||||
|
style={{
|
||||||
|
position: 'absolute',
|
||||||
|
right: '10px',
|
||||||
|
top: '50%',
|
||||||
|
transform: 'translateY(-50%)',
|
||||||
|
background: 'none',
|
||||||
|
border: 'none',
|
||||||
|
cursor: 'pointer',
|
||||||
|
padding: '1px',
|
||||||
|
borderRadius: '1px',
|
||||||
|
backgroundColor: showPassword ? '#e0e0e0' : 'transparent',
|
||||||
|
transition: 'background-color 0.2s',
|
||||||
|
userSelect: 'none',
|
||||||
|
WebkitUserSelect: 'none',
|
||||||
|
touchAction: 'manipulation'
|
||||||
|
}}
|
||||||
|
title="Gedrückt halten zum Anzeigen des Passworts"
|
||||||
|
>
|
||||||
|
{showPassword ? '👁' : '👁'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
@@ -123,7 +198,7 @@ const Login: React.FC = () => {
|
|||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
padding: '12px',
|
padding: '12px',
|
||||||
backgroundColor: loading ? '#ccc' : '#007bff',
|
backgroundColor: loading ? '#ccc' : '#51258f',
|
||||||
color: 'white',
|
color: 'white',
|
||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ const Dashboard: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Quick Actions - Nur für Admins/Instandhalter */}
|
{/* Quick Actions - Nur für Admins/Instandhalter */}
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<div style={{ marginBottom: '30px' }}>
|
<div style={{ marginBottom: '30px' }}>
|
||||||
<h2 style={{ marginBottom: '15px', color: '#2c3e50' }}>Schnellaktionen</h2>
|
<h2 style={{ marginBottom: '15px', color: '#2c3e50' }}>Schnellaktionen</h2>
|
||||||
<div style={{
|
<div style={{
|
||||||
@@ -535,7 +535,7 @@ const Dashboard: React.FC = () => {
|
|||||||
<div style={{ textAlign: 'center', padding: '20px', color: '#666' }}>
|
<div style={{ textAlign: 'center', padding: '20px', color: '#666' }}>
|
||||||
<div style={{ fontSize: '48px', marginBottom: '10px' }}>📅</div>
|
<div style={{ fontSize: '48px', marginBottom: '10px' }}>📅</div>
|
||||||
<div>Kein aktiver Schichtplan</div>
|
<div>Kein aktiver Schichtplan</div>
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<Link to="/shift-plans/new">
|
<Link to="/shift-plans/new">
|
||||||
<button style={{
|
<button style={{
|
||||||
marginTop: '10px',
|
marginTop: '10px',
|
||||||
@@ -643,7 +643,7 @@ const Dashboard: React.FC = () => {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Letzte Schichtpläne (für Admins/Instandhalter) */}
|
{/* Letzte Schichtpläne (für Admins/Instandhalter) */}
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<div style={{
|
<div style={{
|
||||||
backgroundColor: 'white',
|
backgroundColor: 'white',
|
||||||
padding: '20px',
|
padding: '20px',
|
||||||
|
|||||||
@@ -588,6 +588,31 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Contract type validation
|
||||||
|
const availableShifts = validAvailabilities.filter(avail =>
|
||||||
|
avail.preferenceLevel === 1 || avail.preferenceLevel === 2
|
||||||
|
).length;
|
||||||
|
|
||||||
|
let contractRequirement = 0;
|
||||||
|
let contractTypeName = '';
|
||||||
|
|
||||||
|
if (employee.contractType === 'small') {
|
||||||
|
contractRequirement = 2;
|
||||||
|
contractTypeName = 'Kleiner Vertrag';
|
||||||
|
} else if (employee.contractType === 'large') {
|
||||||
|
contractRequirement = 3;
|
||||||
|
contractTypeName = 'Großer Vertrag';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (contractRequirement > 0 && availableShifts < contractRequirement) {
|
||||||
|
setError(
|
||||||
|
`${contractTypeName} erfordert mindestens ${contractRequirement} verfügbare Shifts. ` +
|
||||||
|
`Aktuell sind nur ${availableShifts} Shifts mit Verfügbarkeit "Bevorzugt" oder "Möglich" ausgewählt.`
|
||||||
|
);
|
||||||
|
setSaving(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Convert to the format expected by the API - using shiftId directly
|
// Convert to the format expected by the API - using shiftId directly
|
||||||
const requestData = {
|
const requestData = {
|
||||||
planId: selectedPlanId,
|
planId: selectedPlanId,
|
||||||
@@ -633,6 +658,12 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
|
|||||||
// Get full name for display
|
// Get full name for display
|
||||||
const employeeFullName = `${employee.firstname} ${employee.lastname}`;
|
const employeeFullName = `${employee.firstname} ${employee.lastname}`;
|
||||||
|
|
||||||
|
// Mininmum amount of shifts per contract type
|
||||||
|
const availableShiftsCount = availabilities.filter(avail =>
|
||||||
|
avail.preferenceLevel === 1 || avail.preferenceLevel === 2
|
||||||
|
).length;
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{
|
<div style={{
|
||||||
maxWidth: '1900px',
|
maxWidth: '1900px',
|
||||||
@@ -660,6 +691,14 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
|
|||||||
<p style={{ margin: 0, color: '#7f8c8d' }}>
|
<p style={{ margin: 0, color: '#7f8c8d' }}>
|
||||||
<strong>Email:</strong> {employee.email}
|
<strong>Email:</strong> {employee.email}
|
||||||
</p>
|
</p>
|
||||||
|
{employee.contractType && (
|
||||||
|
<p style={{ margin: '5px 0 0 0', color: employee.contractType === 'small' ? '#f39c12' : '#27ae60' }}>
|
||||||
|
<strong>Vertrag:</strong>
|
||||||
|
{employee.contractType === 'small' ? ' Kleiner Vertrag (min. 2 verfügbare Shifts)' :
|
||||||
|
employee.contractType === 'large' ? ' Großer Vertrag (min. 3 verfügbare Shifts)' :
|
||||||
|
' Flexibler Vertrag'}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{error && (
|
{error && (
|
||||||
@@ -816,7 +855,7 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
|
|||||||
fontWeight: 'bold'
|
fontWeight: 'bold'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{saving ? '⏳ Wird gespeichert...' : 'Verfügbarkeiten speichern'}
|
{saving ? '⏳ Wird gespeichert...' : `Verfügbarkeiten speichern (${availableShiftsCount})`}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -99,21 +99,26 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
if (checked) {
|
if (checked) {
|
||||||
return {
|
return {
|
||||||
...prev,
|
...prev,
|
||||||
roles: [...prev.roles, role]
|
roles: [role]
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
|
const newRoles = prev.roles.filter(r => r !== role);
|
||||||
return{
|
return{
|
||||||
...prev,
|
...prev,
|
||||||
roles: prev.roles.filter(r => r !== role)
|
roles: newRoles.length > 0 ? newRoles : ['user']
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleEmployeeTypeChange = (employeeType: EmployeeType) => {
|
const handleEmployeeTypeChange = (employeeType: EmployeeType) => {
|
||||||
// Determine if contract type should be shown and set default
|
// Determine contract type based on employee type
|
||||||
const requiresContract = employeeType !== 'guest';
|
let contractType: ContractType | undefined;
|
||||||
const defaultContractType = requiresContract ? 'small' as ContractType : undefined;
|
if (employeeType === 'manager' || employeeType === 'apprentice') {
|
||||||
|
contractType = 'flexible';
|
||||||
|
} else if (employeeType !== 'guest') {
|
||||||
|
contractType = 'small';
|
||||||
|
}
|
||||||
|
|
||||||
// Determine if can work alone based on employee type
|
// Determine if can work alone based on employee type
|
||||||
const canWorkAlone = employeeType === 'manager' ||
|
const canWorkAlone = employeeType === 'manager' ||
|
||||||
@@ -125,7 +130,7 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
setFormData(prev => ({
|
setFormData(prev => ({
|
||||||
...prev,
|
...prev,
|
||||||
employeeType,
|
employeeType,
|
||||||
contractType: defaultContractType,
|
contractType,
|
||||||
canWorkAlone,
|
canWorkAlone,
|
||||||
isTrainee
|
isTrainee
|
||||||
}));
|
}));
|
||||||
@@ -273,7 +278,7 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
required
|
required
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '94%',
|
||||||
padding: '10px',
|
padding: '10px',
|
||||||
border: '1px solid #ddd',
|
border: '1px solid #ddd',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
@@ -294,7 +299,7 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
onChange={handleChange}
|
onChange={handleChange}
|
||||||
required
|
required
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '94%',
|
||||||
padding: '10px',
|
padding: '10px',
|
||||||
border: '1px solid #ddd',
|
border: '1px solid #ddd',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
@@ -311,7 +316,7 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
E-Mail Adresse (automatisch generiert)
|
E-Mail Adresse (automatisch generiert)
|
||||||
</label>
|
</label>
|
||||||
<div style={{
|
<div style={{
|
||||||
width: '100%',
|
width: '97%',
|
||||||
padding: '10px',
|
padding: '10px',
|
||||||
border: '1px solid #ddd',
|
border: '1px solid #ddd',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
@@ -340,7 +345,7 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
required
|
required
|
||||||
minLength={6}
|
minLength={6}
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '97%',
|
||||||
padding: '10px',
|
padding: '10px',
|
||||||
border: '1px solid #ddd',
|
border: '1px solid #ddd',
|
||||||
borderRadius: '4px',
|
borderRadius: '4px',
|
||||||
@@ -355,78 +360,6 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Vertragstyp (nur für Admins und interne Mitarbeiter) */}
|
|
||||||
{hasRole(['admin']) && showContractType && (
|
|
||||||
<div style={{
|
|
||||||
padding: '20px',
|
|
||||||
backgroundColor: '#e8f4fd',
|
|
||||||
borderRadius: '8px',
|
|
||||||
border: '1px solid #b6d7e8'
|
|
||||||
}}>
|
|
||||||
<h3 style={{ margin: '0 0 15px 0', color: '#0c5460' }}>📝 Vertragstyp</h3>
|
|
||||||
|
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '12px' }}>
|
|
||||||
{contractTypeOptions.map(contract => (
|
|
||||||
<div
|
|
||||||
key={contract.value}
|
|
||||||
style={{
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'flex-start',
|
|
||||||
padding: '15px',
|
|
||||||
border: `2px solid ${formData.contractType === contract.value ? '#3498db' : '#e0e0e0'}`,
|
|
||||||
borderRadius: '8px',
|
|
||||||
backgroundColor: formData.contractType === contract.value ? '#f0f8ff' : 'white',
|
|
||||||
cursor: 'pointer',
|
|
||||||
transition: 'all 0.2s'
|
|
||||||
}}
|
|
||||||
onClick={() => handleContractTypeChange(contract.value)}
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
type="radio"
|
|
||||||
name="contractType"
|
|
||||||
value={contract.value}
|
|
||||||
checked={formData.contractType === contract.value}
|
|
||||||
onChange={() => handleContractTypeChange(contract.value)}
|
|
||||||
style={{
|
|
||||||
marginRight: '12px',
|
|
||||||
marginTop: '2px',
|
|
||||||
width: '18px',
|
|
||||||
height: '18px'
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<div style={{ flex: 1 }}>
|
|
||||||
<div style={{
|
|
||||||
fontWeight: 'bold',
|
|
||||||
color: '#2c3e50',
|
|
||||||
marginBottom: '4px',
|
|
||||||
fontSize: '16px'
|
|
||||||
}}>
|
|
||||||
{contract.label}
|
|
||||||
</div>
|
|
||||||
<div style={{
|
|
||||||
fontSize: '14px',
|
|
||||||
color: '#7f8c8d',
|
|
||||||
lineHeight: '1.4'
|
|
||||||
}}>
|
|
||||||
{contract.description}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style={{
|
|
||||||
padding: '6px 12px',
|
|
||||||
backgroundColor: formData.contractType === contract.value ? '#3498db' : '#95a5a6',
|
|
||||||
color: 'white',
|
|
||||||
borderRadius: '15px',
|
|
||||||
fontSize: '12px',
|
|
||||||
fontWeight: 'bold'
|
|
||||||
}}>
|
|
||||||
{contract.value.toUpperCase()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Mitarbeiter Kategorie */}
|
{/* Mitarbeiter Kategorie */}
|
||||||
<div style={{
|
<div style={{
|
||||||
padding: '20px',
|
padding: '20px',
|
||||||
@@ -528,6 +461,107 @@ const EmployeeForm: React.FC<EmployeeFormProps> = ({
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Vertragstyp (nur für Admins und interne Mitarbeiter) */}
|
||||||
|
{hasRole(['admin']) && showContractType && (
|
||||||
|
<div style={{
|
||||||
|
padding: '20px',
|
||||||
|
backgroundColor: '#e8f4fd',
|
||||||
|
borderRadius: '8px',
|
||||||
|
border: '1px solid #b6d7e8'
|
||||||
|
}}>
|
||||||
|
<h3 style={{ margin: '0 0 15px 0', color: '#0c5460' }}>📝 Vertragstyp</h3>
|
||||||
|
|
||||||
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '12px' }}>
|
||||||
|
{contractTypeOptions.map(contract => {
|
||||||
|
const isFlexibleDisabled = contract.value === 'flexible' && formData.employeeType === 'personell';
|
||||||
|
const isSmallLargeDisabled = (contract.value === 'small' || contract.value === 'large') &&
|
||||||
|
(formData.employeeType === 'manager' || formData.employeeType === 'apprentice');
|
||||||
|
const isDisabled = isFlexibleDisabled || isSmallLargeDisabled;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={contract.value}
|
||||||
|
style={{
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'flex-start',
|
||||||
|
padding: '15px',
|
||||||
|
border: `2px solid ${formData.contractType === contract.value ? '#3498db' : '#e0e0e0'}`,
|
||||||
|
borderRadius: '8px',
|
||||||
|
backgroundColor: formData.contractType === contract.value ? '#f0f8ff' : 'white',
|
||||||
|
cursor: isDisabled ? 'not-allowed' : 'pointer',
|
||||||
|
transition: 'all 0.2s',
|
||||||
|
opacity: isDisabled ? 0.6 : 1
|
||||||
|
}}
|
||||||
|
onClick={isDisabled ? undefined : () => handleContractTypeChange(contract.value)}
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="contractType"
|
||||||
|
value={contract.value}
|
||||||
|
checked={formData.contractType === contract.value}
|
||||||
|
onChange={isDisabled ? undefined : () => handleContractTypeChange(contract.value)}
|
||||||
|
disabled={isDisabled}
|
||||||
|
style={{
|
||||||
|
marginRight: '12px',
|
||||||
|
marginTop: '2px',
|
||||||
|
width: '18px',
|
||||||
|
height: '18px'
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<div style={{ flex: 1 }}>
|
||||||
|
<div style={{
|
||||||
|
fontWeight: 'bold',
|
||||||
|
color: '#2c3e50',
|
||||||
|
marginBottom: '4px',
|
||||||
|
fontSize: '16px'
|
||||||
|
}}>
|
||||||
|
{contract.label}
|
||||||
|
{isFlexibleDisabled && (
|
||||||
|
<span style={{
|
||||||
|
fontSize: '12px',
|
||||||
|
color: '#e74c3c',
|
||||||
|
marginLeft: '8px',
|
||||||
|
fontWeight: 'normal'
|
||||||
|
}}>
|
||||||
|
(Nicht verfügbar für Personell)
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{isSmallLargeDisabled && (
|
||||||
|
<span style={{
|
||||||
|
fontSize: '12px',
|
||||||
|
color: '#e74c3c',
|
||||||
|
marginLeft: '8px',
|
||||||
|
fontWeight: 'normal'
|
||||||
|
}}>
|
||||||
|
(Nicht verfügbar für {formData.employeeType === 'manager' ? 'Manager' : 'Auszubildende'})
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div style={{
|
||||||
|
fontSize: '14px',
|
||||||
|
color: '#7f8c8d',
|
||||||
|
lineHeight: '1.4'
|
||||||
|
}}>
|
||||||
|
{contract.description}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style={{
|
||||||
|
padding: '6px 12px',
|
||||||
|
backgroundColor: isDisabled ? '#95a5a6' : (formData.contractType === contract.value ? '#3498db' : '#95a5a6'),
|
||||||
|
color: 'white',
|
||||||
|
borderRadius: '15px',
|
||||||
|
fontSize: '12px',
|
||||||
|
fontWeight: 'bold'
|
||||||
|
}}>
|
||||||
|
{contract.value.toUpperCase()}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Eigenständigkeit */}
|
{/* Eigenständigkeit */}
|
||||||
<div style={{
|
<div style={{
|
||||||
padding: '20px',
|
padding: '20px',
|
||||||
|
|||||||
@@ -48,6 +48,13 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Helper to get highest role for sorting
|
||||||
|
const getHighestRole = (roles: string[]): string => {
|
||||||
|
if (roles.includes('admin')) return 'admin';
|
||||||
|
if (roles.includes('maintenance')) return 'maintenance';
|
||||||
|
return 'user';
|
||||||
|
};
|
||||||
|
|
||||||
// Sort employees based on selected field and direction
|
// Sort employees based on selected field and direction
|
||||||
const sortedEmployees = [...filteredEmployees].sort((a, b) => {
|
const sortedEmployees = [...filteredEmployees].sort((a, b) => {
|
||||||
let aValue: any;
|
let aValue: any;
|
||||||
@@ -67,7 +74,6 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
|
|||||||
bValue = b.canWorkAlone;
|
bValue = b.canWorkAlone;
|
||||||
break;
|
break;
|
||||||
case 'role':
|
case 'role':
|
||||||
// Use the highest role for sorting
|
|
||||||
aValue = getHighestRole(a.roles || []);
|
aValue = getHighestRole(a.roles || []);
|
||||||
bValue = getHighestRole(b.roles || []);
|
bValue = getHighestRole(b.roles || []);
|
||||||
break;
|
break;
|
||||||
@@ -87,13 +93,6 @@ const EmployeeList: React.FC<EmployeeListProps> = ({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Helper to get highest role for sorting
|
|
||||||
const getHighestRole = (roles: string[]): string => {
|
|
||||||
if (roles.includes('admin')) return 'admin';
|
|
||||||
if (roles.includes('maintenance')) return 'maintenance';
|
|
||||||
return 'user';
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSort = (field: SortField) => {
|
const handleSort = (field: SortField) => {
|
||||||
if (sortField === field) {
|
if (sortField === field) {
|
||||||
// Toggle direction if same field
|
// Toggle direction if same field
|
||||||
|
|||||||
@@ -1,213 +1,50 @@
|
|||||||
// frontend/src/pages/Help/Help.tsx
|
// frontend/src/pages/Help/Help.tsx
|
||||||
import React, { useState, useEffect } from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
const Help: React.FC = () => {
|
const Help: React.FC = () => {
|
||||||
const [currentStage, setCurrentStage] = useState(0);
|
|
||||||
const [isAnimating, setIsAnimating] = useState(false);
|
|
||||||
|
|
||||||
const algorithmStages = [
|
|
||||||
{
|
|
||||||
title: "📊 Phase A: Reguläre Mitarbeiterplanung",
|
|
||||||
description: "Zuweisung aller Mitarbeiter außer Manager",
|
|
||||||
steps: [
|
|
||||||
"Grundabdeckung: Mindestens 1 Mitarbeiter pro Schicht",
|
|
||||||
"Erfahrene Mitarbeiter werden bevorzugt",
|
|
||||||
"Verhindere 'Neu allein' Situationen",
|
|
||||||
"Fülle Schichten bis zur Zielbesetzung"
|
|
||||||
],
|
|
||||||
color: "#3498db"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "👑 Phase B: Manager-Einfügung",
|
|
||||||
description: "Manager wird seinen bevorzugten Schichten zugewiesen",
|
|
||||||
steps: [
|
|
||||||
"Manager wird festen Schichten zugewiesen",
|
|
||||||
"Erfahrene Mitarbeiter werden zu Manager-Schichten hinzugefügt",
|
|
||||||
"Bei Problemen: Austausch oder Bewegung von Mitarbeitern",
|
|
||||||
"Fallback: Nicht-erfahrene als Backup"
|
|
||||||
],
|
|
||||||
color: "#e74c3c"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "🔧 Phase C: Reparatur & Validierung",
|
|
||||||
description: "Probleme erkennen und automatisch beheben",
|
|
||||||
steps: [
|
|
||||||
"Überbesetzte erfahrene Mitarbeiter identifizieren",
|
|
||||||
"Mitarbeiter-Pool für Neuverteilung erstellen",
|
|
||||||
"Priorisierte Zuweisung zu Problem-Schichten",
|
|
||||||
"Finale Validierung aller Geschäftsregeln"
|
|
||||||
],
|
|
||||||
color: "#2ecc71"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "✅ Finale Prüfung",
|
|
||||||
description: "Zusammenfassung und Freigabe",
|
|
||||||
steps: [
|
|
||||||
"Reparatur-Bericht generieren",
|
|
||||||
"Kritische vs. nicht-kritische Probleme klassifizieren",
|
|
||||||
"Veröffentlichungsstatus bestimmen",
|
|
||||||
"Benutzerfreundliche Zusammenfassung anzeigen"
|
|
||||||
],
|
|
||||||
color: "#f39c12"
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
const businessRules = [
|
const businessRules = [
|
||||||
{ rule: "Manager darf nicht allein arbeiten", critical: true },
|
{ rule: "Mitarbeiter werden nur Schichten zugewiesen, für die sie sich eingetragen haben", critical: true },
|
||||||
{ rule: "Erfahrene mit canWorkAlone: false dürfen nicht allein arbeiten", critical: true },
|
{ rule: "Maximal 1 Schicht pro Tag pro Mitarbeiter", critical: true },
|
||||||
{ rule: "Keine leeren Schichten", critical: true },
|
{ rule: "Schichten haben Mindest- und Maximalkapazitäten", critical: true },
|
||||||
{ rule: "Keine 'Neu allein' Situationen", critical: true },
|
{ rule: "Trainees benötigen erfahrene Begleitung in jeder Schicht", critical: true },
|
||||||
{ rule: "Manager sollte mit erfahrenem Mitarbeiter arbeiten", critical: false },
|
{ rule: "Mitarbeiter, die nicht alleine arbeiten können, müssen Begleitung haben", critical: true },
|
||||||
{ rule: "Vertragslimits einhalten", critical: true },
|
{ rule: "Vertragslimits: Klein=1 Schicht/Woche, Groß=2 Schichten/Woche", critical: true },
|
||||||
{ rule: "Nicht zu viele erfahrene Mitarbeiter in einer Schicht", critical: false }
|
{ rule: "Manager werden automatisch ihren bevorzugten Schichten zugewiesen", critical: false }
|
||||||
];
|
];
|
||||||
|
|
||||||
useEffect(() => {
|
const schedulingStages = [
|
||||||
const interval = setInterval(() => {
|
{
|
||||||
if (isAnimating) {
|
title: "1. Verfügbarkeitsprüfung",
|
||||||
setCurrentStage((prev) => (prev + 1) % algorithmStages.length);
|
description: "Nur Mitarbeiter, die sich für Schichten eingetragen haben (Verfügbarkeit 1 oder 2), werden berücksichtigt."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "2. Modellaufbau",
|
||||||
|
description: "Das System erstellt ein mathematisches Modell mit allen Variablen und Constraints."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "3. CP-SAT Optimierung",
|
||||||
|
description: "Google's Constraint Programming Solver findet die beste Zuordnung unter allen Regeln."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "4. Manager-Zuweisung",
|
||||||
|
description: "Manager werden automatisch ihren Wunschschichten (Verfügbarkeit 1) zugeordnet."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "5. Validierung",
|
||||||
|
description: "Die Lösung wird auf Regelverletzungen geprüft und ein Bericht generiert."
|
||||||
}
|
}
|
||||||
}, 3000);
|
];
|
||||||
|
|
||||||
return () => clearInterval(interval);
|
const preferenceLevels = [
|
||||||
}, [isAnimating]);
|
{ level: 1, label: "Bevorzugt", description: "Mitarbeiter möchte diese Schicht unbedingt arbeiten", color: "#27ae60" },
|
||||||
|
{ level: 2, label: "Verfügbar", description: "Mitarbeiter ist verfügbar für diese Schicht", color: "#f39c12" },
|
||||||
const toggleAnimation = () => {
|
{ level: 3, label: "Nicht verfügbar", description: "Mitarbeiter kann diese Schicht nicht arbeiten", color: "#e74c3c" }
|
||||||
setIsAnimating(!isAnimating);
|
];
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{ padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
|
<div style={{ padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
|
||||||
<h1>❓ Hilfe & Support - Scheduling Algorithmus</h1>
|
<h1>❓ Hilfe & Support - Scheduling Algorithmus</h1>
|
||||||
|
|
||||||
{/* Algorithm Visualization */}
|
|
||||||
<div style={{
|
|
||||||
backgroundColor: 'white',
|
|
||||||
borderRadius: '12px',
|
|
||||||
padding: '30px',
|
|
||||||
marginTop: '20px',
|
|
||||||
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
|
||||||
border: '1px solid #e0e0e0'
|
|
||||||
}}>
|
|
||||||
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '20px' }}>
|
|
||||||
<h2 style={{ margin: 0, color: '#2c3e50' }}>🧠 Algorithmus Visualisierung</h2>
|
|
||||||
<button
|
|
||||||
onClick={toggleAnimation}
|
|
||||||
style={{
|
|
||||||
padding: '8px 16px',
|
|
||||||
backgroundColor: isAnimating ? '#e74c3c' : '#2ecc71',
|
|
||||||
color: 'white',
|
|
||||||
border: 'none',
|
|
||||||
borderRadius: '20px',
|
|
||||||
cursor: 'pointer',
|
|
||||||
fontWeight: 'bold'
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{isAnimating ? '⏸️ Animation pausieren' : '▶️ Animation starten'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Stage Indicators */}
|
|
||||||
<div style={{
|
|
||||||
display: 'flex',
|
|
||||||
justifyContent: 'space-between',
|
|
||||||
marginBottom: '30px',
|
|
||||||
position: 'relative'
|
|
||||||
}}>
|
|
||||||
{algorithmStages.map((stage, index) => (
|
|
||||||
<React.Fragment key={index}>
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
alignItems: 'center',
|
|
||||||
flex: 1
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
width: '60px',
|
|
||||||
height: '60px',
|
|
||||||
borderRadius: '50%',
|
|
||||||
backgroundColor: currentStage === index ? stage.color : '#ecf0f1',
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
justifyContent: 'center',
|
|
||||||
color: currentStage === index ? 'white' : '#7f8c8d',
|
|
||||||
fontWeight: 'bold',
|
|
||||||
fontSize: '18px',
|
|
||||||
transition: 'all 0.5s ease',
|
|
||||||
boxShadow: currentStage === index ? `0 0 20px ${stage.color}80` : 'none',
|
|
||||||
border: `3px solid ${stage.color}`
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{index + 1}
|
|
||||||
</div>
|
|
||||||
<div style={{
|
|
||||||
textAlign: 'center',
|
|
||||||
marginTop: '10px',
|
|
||||||
fontWeight: currentStage === index ? 'bold' : 'normal',
|
|
||||||
color: currentStage === index ? stage.color : '#7f8c8d'
|
|
||||||
}}>
|
|
||||||
{stage.title.split(':')[0]}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{index < algorithmStages.length - 1 && (
|
|
||||||
<div style={{
|
|
||||||
flex: 1,
|
|
||||||
height: '3px',
|
|
||||||
backgroundColor: currentStage > index ? stage.color : '#ecf0f1',
|
|
||||||
alignSelf: 'center',
|
|
||||||
margin: '0 10px',
|
|
||||||
transition: 'all 0.5s ease'
|
|
||||||
}} />
|
|
||||||
)}
|
|
||||||
</React.Fragment>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Current Stage Details */}
|
|
||||||
<div style={{
|
|
||||||
backgroundColor: algorithmStages[currentStage].color + '15',
|
|
||||||
border: `2px solid ${algorithmStages[currentStage].color}30`,
|
|
||||||
borderRadius: '8px',
|
|
||||||
padding: '20px',
|
|
||||||
marginBottom: '20px',
|
|
||||||
transition: 'all 0.5s ease'
|
|
||||||
}}>
|
|
||||||
<h3 style={{ color: algorithmStages[currentStage].color, marginTop: 0 }}>
|
|
||||||
{algorithmStages[currentStage].title}
|
|
||||||
</h3>
|
|
||||||
<p style={{ color: '#2c3e50', fontSize: '16px', marginBottom: '15px' }}>
|
|
||||||
{algorithmStages[currentStage].description}
|
|
||||||
</p>
|
|
||||||
<div style={{ display: 'grid', gap: '8px' }}>
|
|
||||||
{algorithmStages[currentStage].steps.map((step, stepIndex) => (
|
|
||||||
<div
|
|
||||||
key={stepIndex}
|
|
||||||
style={{
|
|
||||||
padding: '10px 15px',
|
|
||||||
backgroundColor: 'white',
|
|
||||||
borderRadius: '6px',
|
|
||||||
borderLeft: `4px solid ${algorithmStages[currentStage].color}`,
|
|
||||||
display: 'flex',
|
|
||||||
alignItems: 'center',
|
|
||||||
animation: isAnimating ? 'pulse 2s infinite' : 'none'
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<span style={{
|
|
||||||
marginRight: '10px',
|
|
||||||
color: algorithmStages[currentStage].color,
|
|
||||||
fontWeight: 'bold'
|
|
||||||
}}>•</span>
|
|
||||||
{step}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Business Rules */}
|
{/* Business Rules */}
|
||||||
<div style={{
|
<div style={{
|
||||||
backgroundColor: 'white',
|
backgroundColor: 'white',
|
||||||
@@ -217,7 +54,7 @@ const Help: React.FC = () => {
|
|||||||
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
border: '1px solid #e0e0e0'
|
border: '1px solid #e0e0e0'
|
||||||
}}>
|
}}>
|
||||||
<h2 style={{ color: '#2c3e50', marginBottom: '20px' }}>📋 Validierungs Regeln</h2>
|
<h2 style={{ color: '#2c3e50', marginBottom: '20px' }}>📋 Geschäftsregeln</h2>
|
||||||
<div style={{ display: 'grid', gap: '10px' }}>
|
<div style={{ display: 'grid', gap: '10px' }}>
|
||||||
{businessRules.map((rule, index) => (
|
{businessRules.map((rule, index) => (
|
||||||
<div
|
<div
|
||||||
@@ -248,14 +85,14 @@ const Help: React.FC = () => {
|
|||||||
color: rule.critical ? '#e74c3c' : '#f39c12',
|
color: rule.critical ? '#e74c3c' : '#f39c12',
|
||||||
fontWeight: 'bold'
|
fontWeight: 'bold'
|
||||||
}}>
|
}}>
|
||||||
{rule.critical ? 'KRITISCH' : 'WARNUNG'}
|
{rule.critical ? 'HART' : 'WEICH'}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Algorithm Explanation */}
|
{/* Scheduling Process */}
|
||||||
<div style={{
|
<div style={{
|
||||||
backgroundColor: 'white',
|
backgroundColor: 'white',
|
||||||
borderRadius: '12px',
|
borderRadius: '12px',
|
||||||
@@ -264,62 +101,125 @@ const Help: React.FC = () => {
|
|||||||
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
border: '1px solid #e0e0e0'
|
border: '1px solid #e0e0e0'
|
||||||
}}>
|
}}>
|
||||||
<h2 style={{ color: '#2c3e50', marginBottom: '20px' }}>🎯 Wie der Algorithmus funktioniert</h2>
|
<h2 style={{ color: '#2c3e50', marginBottom: '20px' }}>⚙️ Scheduling-Prozess</h2>
|
||||||
|
|
||||||
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))', gap: '20px' }}>
|
<div style={{ display: 'grid', gap: '15px' }}>
|
||||||
|
{schedulingStages.map((stage, index) => (
|
||||||
|
<div key={index} style={{
|
||||||
|
padding: '20px',
|
||||||
|
backgroundColor: '#f8f9fa',
|
||||||
|
borderRadius: '8px',
|
||||||
|
border: '2px solid #e9ecef',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'flex-start'
|
||||||
|
}}>
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: '#3498db',
|
||||||
|
color: 'white',
|
||||||
|
borderRadius: '50%',
|
||||||
|
width: '30px',
|
||||||
|
height: '30px',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'center',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
marginRight: '15px',
|
||||||
|
flexShrink: 0
|
||||||
|
}}>
|
||||||
|
{index + 1}
|
||||||
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h4 style={{ color: '#3498db' }}>🏗️ Phasen-basierter Ansatz</h4>
|
<h4 style={{ color: '#2c3e50', margin: '0 0 8px 0' }}>{stage.title}</h4>
|
||||||
<p>Der Algorithmus arbeitet in klar definierten Phasen, um komplexe Probleme schrittweise zu lösen und Stabilität zu gewährleisten.</p>
|
<p style={{ color: '#6c757d', margin: 0 }}>{stage.description}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Preference Levels */}
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: 'white',
|
||||||
|
borderRadius: '12px',
|
||||||
|
padding: '30px',
|
||||||
|
marginTop: '20px',
|
||||||
|
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||||
|
border: '1px solid #e0e0e0'
|
||||||
|
}}>
|
||||||
|
<h2 style={{ color: '#2c3e50', marginBottom: '20px' }}>🎯 Verfügbarkeits-Level</h2>
|
||||||
|
|
||||||
|
<div style={{ display: 'grid', gap: '12px' }}>
|
||||||
|
{preferenceLevels.map((pref) => (
|
||||||
|
<div key={pref.level} style={{
|
||||||
|
padding: '15px',
|
||||||
|
backgroundColor: `${pref.color}15`,
|
||||||
|
border: `2px solid ${pref.color}`,
|
||||||
|
borderRadius: '8px',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center'
|
||||||
|
}}>
|
||||||
|
<div style={{
|
||||||
|
backgroundColor: pref.color,
|
||||||
|
color: 'white',
|
||||||
|
borderRadius: '6px',
|
||||||
|
padding: '8px 12px',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
marginRight: '15px',
|
||||||
|
minWidth: '120px',
|
||||||
|
textAlign: 'center'
|
||||||
|
}}>
|
||||||
|
Level {pref.level}: {pref.label}
|
||||||
|
</div>
|
||||||
|
<span style={{ color: '#2c3e50' }}>{pref.description}</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Tips */}
|
||||||
|
<div style={{
|
||||||
|
marginTop: '25px',
|
||||||
|
padding: '25px',
|
||||||
|
backgroundColor: '#e8f4fd',
|
||||||
|
borderRadius: '12px',
|
||||||
|
border: '2px solid #b8d4f0'
|
||||||
|
}}>
|
||||||
|
<h3 style={{ color: '#2980b9', marginTop: 0 }}>💡 Best Practices für erfolgreiches Scheduling</h3>
|
||||||
|
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))', gap: '15px', marginTop: '15px' }}>
|
||||||
<div>
|
<div>
|
||||||
<h4 style={{ color: '#e74c3c' }}>⚖️ Wert-basierte Entscheidungen</h4>
|
<h4 style={{ color: '#2980b9' }}>Vor dem Scheduling</h4>
|
||||||
<p>Jede Zuweisung wird anhand eines Wertesystems bewertet, das Verfügbarkeit, Erfahrung und aktuelle Auslastung berücksichtigt.</p>
|
<ul style={{ margin: 0, paddingLeft: '20px', color: '#2c3e50' }}>
|
||||||
|
<li>Stellen Sie sicher, dass alle Mitarbeiter ihre Verfügbarkeit eingetragen haben</li>
|
||||||
|
<li>Überprüfen Sie die Mitarbeiterprofile (Trainee/Erfahren, Alleinarbeit möglich)</li>
|
||||||
|
<li>Bestätigen Sie die Vertragstypen und Schichtanforderungen</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h4 style={{ color: '#2ecc71' }}>🔧 Automatische Reparatur</h4>
|
<h4 style={{ color: '#2980b9' }}>Nach dem Scheduling</h4>
|
||||||
<p>Probleme werden automatisch erkannt und durch intelligente Tausch- und Bewegungsoperationen behoben.</p>
|
<ul style={{ margin: 0, paddingLeft: '20px', color: '#2c3e50' }}>
|
||||||
|
<li>Prüfen Sie den Lösungsbericht auf Verletzungen</li>
|
||||||
|
<li>Kontrollieren Sie unterbesetzte Schichten</li>
|
||||||
|
<li>Validieren Sie Trainee-Betreuung und Alleinarbeits-Regeln</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
|
||||||
<h4 style={{ color: '#f39c12' }}>📊 Transparente Berichterstattung</h4>
|
|
||||||
<p>Detaillierte Berichte zeigen genau, welche Probleme behoben wurden und welche verbleiben.</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Technical Info */}
|
||||||
</div>
|
|
||||||
|
|
||||||
<div style={{
|
<div style={{
|
||||||
marginTop: '25px',
|
marginTop: '25px',
|
||||||
padding: '20px',
|
padding: '20px',
|
||||||
backgroundColor: '#e8f4fd',
|
backgroundColor: '#fff3cd',
|
||||||
borderRadius: '8px',
|
borderRadius: '8px',
|
||||||
border: '1px solid #b8d4f0'
|
border: '1px solid #ffeaa7'
|
||||||
}}>
|
}}>
|
||||||
<h4 style={{ color: '#2980b9', marginTop: 0 }}>💡 Tipps für beste Ergebnisse</h4>
|
<h4 style={{ color: '#856404', marginTop: 0 }}>🔧 Technische Informationen</h4>
|
||||||
<ul style={{ margin: 0, paddingLeft: '20px' }}>
|
<p style={{ color: '#856404', margin: 0 }}>
|
||||||
<li>Stellen Sie sicher, dass alle Mitarbeiter ihre Verfügbarkeit eingetragen haben</li>
|
<strong>Lösungsalgorithmus:</strong> Google OR-Tools CP-SAT Solver •
|
||||||
<li>Überprüfen Sie die Vertragstypen (klein = 1 Schicht/Woche, groß = 2 Schichten/Woche)</li>
|
<strong> Fallback:</strong> TypeScript-basierter Solver •
|
||||||
<li>Markieren Sie erfahrene Mitarbeiter, die alleine arbeiten können</li>
|
<strong> Maximale Laufzeit:</strong> 105 Sekunden
|
||||||
<li>Planen Sie Manager-Verfügbarkeit im Voraus</li>
|
</p>
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>{`
|
|
||||||
@keyframes pulse {
|
|
||||||
0% { transform: scale(1); }
|
|
||||||
50% { transform: scale(1.02); }
|
|
||||||
100% { transform: scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes glow {
|
|
||||||
0% { box-shadow: 0 0 5px rgba(52, 152, 219, 0.5); }
|
|
||||||
50% { box-shadow: 0 0 20px rgba(52, 152, 219, 0.8); }
|
|
||||||
100% { box-shadow: 0 0 5px rgba(52, 152, 219, 0.5); }
|
|
||||||
}
|
|
||||||
`}</style>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// frontend/src/pages/Settings/Settings.tsx
|
// frontend/src/pages/Settings/Settings.tsx - UPDATED WITH NEW STYLES
|
||||||
import React, { useState, useEffect } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import { useAuth } from '../../contexts/AuthContext';
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
import { employeeService } from '../../services/employeeService';
|
import { employeeService } from '../../services/employeeService';
|
||||||
import { useNotification } from '../../contexts/NotificationContext';
|
import { useNotification } from '../../contexts/NotificationContext';
|
||||||
@@ -27,6 +27,16 @@ const Settings: React.FC = () => {
|
|||||||
confirmPassword: ''
|
confirmPassword: ''
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Password visibility states
|
||||||
|
const [showCurrentPassword, setShowCurrentPassword] = useState(false);
|
||||||
|
const [showNewPassword, setShowNewPassword] = useState(false);
|
||||||
|
const [showConfirmPassword, setShowConfirmPassword] = useState(false);
|
||||||
|
|
||||||
|
// Refs for timeout management
|
||||||
|
const currentPasswordTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
|
const newPasswordTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
|
const confirmPasswordTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (currentUser) {
|
if (currentUser) {
|
||||||
setProfileForm({
|
setProfileForm({
|
||||||
@@ -36,6 +46,17 @@ const Settings: React.FC = () => {
|
|||||||
}
|
}
|
||||||
}, [currentUser]);
|
}, [currentUser]);
|
||||||
|
|
||||||
|
// Cleanup timeouts on unmount
|
||||||
|
useEffect(() => {
|
||||||
|
return () => {
|
||||||
|
[currentPasswordTimeoutRef, newPasswordTimeoutRef, confirmPasswordTimeoutRef].forEach(ref => {
|
||||||
|
if (ref.current) {
|
||||||
|
clearTimeout(ref.current);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleProfileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
const handleProfileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
const { name, value } = e.target;
|
const { name, value } = e.target;
|
||||||
setProfileForm(prev => ({
|
setProfileForm(prev => ({
|
||||||
@@ -52,6 +73,67 @@ const Settings: React.FC = () => {
|
|||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Password visibility handlers for current password
|
||||||
|
const handleCurrentPasswordMouseDown = () => {
|
||||||
|
currentPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
|
setShowCurrentPassword(true);
|
||||||
|
}, 300);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCurrentPasswordMouseUp = () => {
|
||||||
|
if (currentPasswordTimeoutRef.current) {
|
||||||
|
clearTimeout(currentPasswordTimeoutRef.current);
|
||||||
|
currentPasswordTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
setShowCurrentPassword(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Password visibility handlers for new password
|
||||||
|
const handleNewPasswordMouseDown = () => {
|
||||||
|
newPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
|
setShowNewPassword(true);
|
||||||
|
}, 300);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleNewPasswordMouseUp = () => {
|
||||||
|
if (newPasswordTimeoutRef.current) {
|
||||||
|
clearTimeout(newPasswordTimeoutRef.current);
|
||||||
|
newPasswordTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
setShowNewPassword(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Password visibility handlers for confirm password
|
||||||
|
const handleConfirmPasswordMouseDown = () => {
|
||||||
|
confirmPasswordTimeoutRef.current = setTimeout(() => {
|
||||||
|
setShowConfirmPassword(true);
|
||||||
|
}, 300);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleConfirmPasswordMouseUp = () => {
|
||||||
|
if (confirmPasswordTimeoutRef.current) {
|
||||||
|
clearTimeout(confirmPasswordTimeoutRef.current);
|
||||||
|
confirmPasswordTimeoutRef.current = null;
|
||||||
|
}
|
||||||
|
setShowConfirmPassword(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Touch event handlers
|
||||||
|
const handleTouchStart = (setter: () => void) => (e: React.TouchEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setter();
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchEnd = (cleanup: () => void) => (e: React.TouchEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
cleanup();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Prevent context menu
|
||||||
|
const handleContextMenu = (e: React.MouseEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
};
|
||||||
|
|
||||||
const handleProfileUpdate = async (e: React.FormEvent) => {
|
const handleProfileUpdate = async (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (!currentUser) return;
|
if (!currentUser) return;
|
||||||
@@ -180,11 +262,6 @@ const Settings: React.FC = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get full name for display
|
|
||||||
const getFullName = () => {
|
|
||||||
return `${currentUser.firstname || ''} ${currentUser.lastname || ''}`.trim();
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={styles.container}>
|
<div style={styles.container}>
|
||||||
{/* Left Sidebar with Tabs */}
|
{/* Left Sidebar with Tabs */}
|
||||||
@@ -443,17 +520,19 @@ const Settings: React.FC = () => {
|
|||||||
|
|
||||||
<form onSubmit={handlePasswordUpdate} style={{ marginTop: '2rem' }}>
|
<form onSubmit={handlePasswordUpdate} style={{ marginTop: '2rem' }}>
|
||||||
<div style={styles.formGridCompact}>
|
<div style={styles.formGridCompact}>
|
||||||
|
{/* Current Password Field */}
|
||||||
<div style={styles.field}>
|
<div style={styles.field}>
|
||||||
<label style={styles.fieldLabel}>
|
<label style={styles.fieldLabel}>
|
||||||
Aktuelles Passwort *
|
Aktuelles Passwort *
|
||||||
</label>
|
</label>
|
||||||
|
<div style={styles.fieldInputContainer}>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type={showCurrentPassword ? 'text' : 'password'}
|
||||||
name="currentPassword"
|
name="currentPassword"
|
||||||
value={passwordForm.currentPassword}
|
value={passwordForm.currentPassword}
|
||||||
onChange={handlePasswordChange}
|
onChange={handlePasswordChange}
|
||||||
required
|
required
|
||||||
style={styles.fieldInput}
|
style={styles.fieldInputWithIcon}
|
||||||
placeholder="Aktuelles Passwort"
|
placeholder="Aktuelles Passwort"
|
||||||
onFocus={(e) => {
|
onFocus={(e) => {
|
||||||
e.target.style.borderColor = '#1a1325';
|
e.target.style.borderColor = '#1a1325';
|
||||||
@@ -464,20 +543,40 @@ const Settings: React.FC = () => {
|
|||||||
e.target.style.boxShadow = 'none';
|
e.target.style.boxShadow = 'none';
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onMouseDown={handleCurrentPasswordMouseDown}
|
||||||
|
onMouseUp={handleCurrentPasswordMouseUp}
|
||||||
|
onMouseLeave={handleCurrentPasswordMouseUp}
|
||||||
|
onTouchStart={handleTouchStart(handleCurrentPasswordMouseDown)}
|
||||||
|
onTouchEnd={handleTouchEnd(handleCurrentPasswordMouseUp)}
|
||||||
|
onTouchCancel={handleTouchEnd(handleCurrentPasswordMouseUp)}
|
||||||
|
onContextMenu={handleContextMenu}
|
||||||
|
style={{
|
||||||
|
...styles.passwordToggleButton,
|
||||||
|
backgroundColor: showCurrentPassword ? 'rgba(26, 19, 37, 0.1)' : 'transparent'
|
||||||
|
}}
|
||||||
|
title="Gedrückt halten zum Anzeigen des Passworts"
|
||||||
|
>
|
||||||
|
{showCurrentPassword ? '👁' : '👁'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* New Password Field */}
|
||||||
<div style={styles.field}>
|
<div style={styles.field}>
|
||||||
<label style={styles.fieldLabel}>
|
<label style={styles.fieldLabel}>
|
||||||
Neues Passwort *
|
Neues Passwort *
|
||||||
</label>
|
</label>
|
||||||
|
<div style={styles.fieldInputContainer}>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type={showNewPassword ? 'text' : 'password'}
|
||||||
name="newPassword"
|
name="newPassword"
|
||||||
value={passwordForm.newPassword}
|
value={passwordForm.newPassword}
|
||||||
onChange={handlePasswordChange}
|
onChange={handlePasswordChange}
|
||||||
required
|
required
|
||||||
minLength={6}
|
minLength={6}
|
||||||
style={styles.fieldInput}
|
style={styles.fieldInputWithIcon}
|
||||||
placeholder="Mindestens 6 Zeichen"
|
placeholder="Mindestens 6 Zeichen"
|
||||||
onFocus={(e) => {
|
onFocus={(e) => {
|
||||||
e.target.style.borderColor = '#1a1325';
|
e.target.style.borderColor = '#1a1325';
|
||||||
@@ -488,22 +587,42 @@ const Settings: React.FC = () => {
|
|||||||
e.target.style.boxShadow = 'none';
|
e.target.style.boxShadow = 'none';
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onMouseDown={handleNewPasswordMouseDown}
|
||||||
|
onMouseUp={handleNewPasswordMouseUp}
|
||||||
|
onMouseLeave={handleNewPasswordMouseUp}
|
||||||
|
onTouchStart={handleTouchStart(handleNewPasswordMouseDown)}
|
||||||
|
onTouchEnd={handleTouchEnd(handleNewPasswordMouseUp)}
|
||||||
|
onTouchCancel={handleTouchEnd(handleNewPasswordMouseUp)}
|
||||||
|
onContextMenu={handleContextMenu}
|
||||||
|
style={{
|
||||||
|
...styles.passwordToggleButton,
|
||||||
|
backgroundColor: showNewPassword ? 'rgba(26, 19, 37, 0.1)' : 'transparent'
|
||||||
|
}}
|
||||||
|
title="Gedrückt halten zum Anzeigen des Passworts"
|
||||||
|
>
|
||||||
|
{showNewPassword ? '👁' : '👁'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div style={styles.fieldHint}>
|
<div style={styles.fieldHint}>
|
||||||
Das Passwort muss mindestens 6 Zeichen lang sein.
|
Das Passwort muss mindestens 6 Zeichen lang sein.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Confirm Password Field */}
|
||||||
<div style={styles.field}>
|
<div style={styles.field}>
|
||||||
<label style={styles.fieldLabel}>
|
<label style={styles.fieldLabel}>
|
||||||
Neues Passwort bestätigen *
|
Neues Passwort bestätigen *
|
||||||
</label>
|
</label>
|
||||||
|
<div style={styles.fieldInputContainer}>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type={showConfirmPassword ? 'text' : 'password'}
|
||||||
name="confirmPassword"
|
name="confirmPassword"
|
||||||
value={passwordForm.confirmPassword}
|
value={passwordForm.confirmPassword}
|
||||||
onChange={handlePasswordChange}
|
onChange={handlePasswordChange}
|
||||||
required
|
required
|
||||||
style={styles.fieldInput}
|
style={styles.fieldInputWithIcon}
|
||||||
placeholder="Passwort wiederholen"
|
placeholder="Passwort wiederholen"
|
||||||
onFocus={(e) => {
|
onFocus={(e) => {
|
||||||
e.target.style.borderColor = '#1a1325';
|
e.target.style.borderColor = '#1a1325';
|
||||||
@@ -514,6 +633,24 @@ const Settings: React.FC = () => {
|
|||||||
e.target.style.boxShadow = 'none';
|
e.target.style.boxShadow = 'none';
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onMouseDown={handleConfirmPasswordMouseDown}
|
||||||
|
onMouseUp={handleConfirmPasswordMouseUp}
|
||||||
|
onMouseLeave={handleConfirmPasswordMouseUp}
|
||||||
|
onTouchStart={handleTouchStart(handleConfirmPasswordMouseDown)}
|
||||||
|
onTouchEnd={handleTouchEnd(handleConfirmPasswordMouseUp)}
|
||||||
|
onTouchCancel={handleTouchEnd(handleConfirmPasswordMouseUp)}
|
||||||
|
onContextMenu={handleContextMenu}
|
||||||
|
style={{
|
||||||
|
...styles.passwordToggleButton,
|
||||||
|
backgroundColor: showConfirmPassword ? 'rgba(26, 19, 37, 0.1)' : 'transparent'
|
||||||
|
}}
|
||||||
|
title="Gedrückt halten zum Anzeigen des Passworts"
|
||||||
|
>
|
||||||
|
{showConfirmPassword ? '👁' : '👁'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// frontend/src/pages/Settings/type/SettingsType.tsx - CORRECTED
|
||||||
export const styles = {
|
export const styles = {
|
||||||
container: {
|
container: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -74,7 +75,7 @@
|
|||||||
border: '1px solid rgba(255, 255, 255, 0.8)',
|
border: '1px solid rgba(255, 255, 255, 0.8)',
|
||||||
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.06), 0 1px 4px rgba(0, 0, 0, 0.04)',
|
||||||
backdropFilter: 'blur(10px)',
|
backdropFilter: 'blur(10px)',
|
||||||
minHeight: '200px',
|
minHeight: '100px',
|
||||||
},
|
},
|
||||||
section: {
|
section: {
|
||||||
marginBottom: '2rem',
|
marginBottom: '2rem',
|
||||||
@@ -121,11 +122,17 @@
|
|||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column' as const,
|
flexDirection: 'column' as const,
|
||||||
gap: '0.5rem',
|
gap: '0.5rem',
|
||||||
|
width: '100%',
|
||||||
},
|
},
|
||||||
fieldLabel: {
|
fieldLabel: {
|
||||||
fontSize: '0.9rem',
|
fontSize: '0.9rem',
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
|
fieldInputContainer: {
|
||||||
|
position: 'relative' as const,
|
||||||
|
width: '100%',
|
||||||
},
|
},
|
||||||
fieldInput: {
|
fieldInput: {
|
||||||
padding: '0.875rem 1rem',
|
padding: '0.875rem 1rem',
|
||||||
@@ -135,6 +142,20 @@
|
|||||||
background: '#FBFAF6',
|
background: '#FBFAF6',
|
||||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
color: '#161718',
|
color: '#161718',
|
||||||
|
width: '100%',
|
||||||
|
boxSizing: 'border-box' as const,
|
||||||
|
},
|
||||||
|
fieldInputWithIcon: {
|
||||||
|
padding: '0.875rem 1rem',
|
||||||
|
border: '1.5px solid #e8e8e8',
|
||||||
|
borderRadius: '8px',
|
||||||
|
fontSize: '0.95rem',
|
||||||
|
background: '#FBFAF6',
|
||||||
|
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||||
|
color: '#161718',
|
||||||
|
width: '100%',
|
||||||
|
paddingRight: '40px',
|
||||||
|
boxSizing: 'border-box' as const,
|
||||||
},
|
},
|
||||||
fieldInputDisabled: {
|
fieldInputDisabled: {
|
||||||
padding: '0.875rem 1rem',
|
padding: '0.875rem 1rem',
|
||||||
@@ -144,11 +165,29 @@
|
|||||||
background: 'rgba(26, 19, 37, 0.05)',
|
background: 'rgba(26, 19, 37, 0.05)',
|
||||||
color: '#666',
|
color: '#666',
|
||||||
cursor: 'not-allowed',
|
cursor: 'not-allowed',
|
||||||
|
width: '100%',
|
||||||
|
boxSizing: 'border-box' as const,
|
||||||
},
|
},
|
||||||
fieldHint: {
|
fieldHint: {
|
||||||
fontSize: '0.8rem',
|
fontSize: '0.8rem',
|
||||||
color: '#888',
|
color: '#888',
|
||||||
marginTop: '0.25rem',
|
marginTop: '0.25rem',
|
||||||
|
width: '100%',
|
||||||
|
},
|
||||||
|
passwordToggleButton: {
|
||||||
|
position: 'absolute' as const,
|
||||||
|
right: '10px',
|
||||||
|
top: '50%',
|
||||||
|
transform: 'translateY(-50%)',
|
||||||
|
background: 'none',
|
||||||
|
border: 'none',
|
||||||
|
cursor: 'pointer',
|
||||||
|
padding: '5px',
|
||||||
|
borderRadius: '4px',
|
||||||
|
transition: 'background-color 0.2s',
|
||||||
|
userSelect: 'none' as const,
|
||||||
|
WebkitUserSelect: 'none' as const,
|
||||||
|
touchAction: 'manipulation' as const,
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { useAuth } from '../../contexts/AuthContext';
|
import { useAuth } from '../../contexts/AuthContext';
|
||||||
|
|
||||||
|
const API_BASE_URL = '/api';
|
||||||
|
|
||||||
const Setup: React.FC = () => {
|
const Setup: React.FC = () => {
|
||||||
const [step, setStep] = useState(1);
|
const [step, setStep] = useState(1);
|
||||||
const [formData, setFormData] = useState({
|
const [formData, setFormData] = useState({
|
||||||
@@ -73,7 +75,7 @@ const Setup: React.FC = () => {
|
|||||||
|
|
||||||
console.log('🚀 Sending setup request...', payload);
|
console.log('🚀 Sending setup request...', payload);
|
||||||
|
|
||||||
const response = await fetch('http://localhost:3002/api/setup/admin', {
|
const response = await fetch(`${API_BASE_URL}/setup/admin`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ const ShiftPlanList: React.FC = () => {
|
|||||||
marginBottom: '30px'
|
marginBottom: '30px'
|
||||||
}}>
|
}}>
|
||||||
<h1>📅 Schichtpläne</h1>
|
<h1>📅 Schichtpläne</h1>
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<Link to="/shift-plans/new">
|
<Link to="/shift-plans/new">
|
||||||
<button style={{
|
<button style={{
|
||||||
padding: '10px 20px',
|
padding: '10px 20px',
|
||||||
@@ -143,7 +143,7 @@ const ShiftPlanList: React.FC = () => {
|
|||||||
>
|
>
|
||||||
Anzeigen
|
Anzeigen
|
||||||
</button>
|
</button>
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<>
|
<>
|
||||||
<button
|
<button
|
||||||
onClick={() => navigate(`/shift-plans/${plan.id}/edit`)}
|
onClick={() => navigate(`/shift-plans/${plan.id}/edit`)}
|
||||||
|
|||||||
@@ -1005,7 +1005,7 @@ 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', 'instandhalter']) && (
|
{shiftPlan.status === 'published' && hasRole(['admin', 'maintenance']) && (
|
||||||
<button
|
<button
|
||||||
onClick={handleRecreateAssignments}
|
onClick={handleRecreateAssignments}
|
||||||
disabled={recreating}
|
disabled={recreating}
|
||||||
@@ -1076,7 +1076,7 @@ const ShiftPlanView: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{hasRole(['admin', 'instandhalter']) && (
|
{hasRole(['admin', 'maintenance']) && (
|
||||||
<div>
|
<div>
|
||||||
<button
|
<button
|
||||||
onClick={handlePreviewAssignment}
|
onClick={handlePreviewAssignment}
|
||||||
|
|||||||
1
frontend/src/react-app-env.d.ts
vendored
1
frontend/src/react-app-env.d.ts
vendored
@@ -1 +0,0 @@
|
|||||||
/// <reference types="react-scripts" />
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import { ReportHandler } from 'web-vitals';
|
|
||||||
|
|
||||||
const reportWebVitals = (onPerfEntry?: ReportHandler) => {
|
|
||||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
|
||||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
|
||||||
getCLS(onPerfEntry);
|
|
||||||
getFID(onPerfEntry);
|
|
||||||
getFCP(onPerfEntry);
|
|
||||||
getLCP(onPerfEntry);
|
|
||||||
getTTFB(onPerfEntry);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export default reportWebVitals;
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
// frontend/src/services/authService.ts
|
// frontend/src/services/authService.ts
|
||||||
import { Employee } from '../models/Employee';
|
import { Employee } from '../models/Employee';
|
||||||
const API_BASE = 'http://localhost:3002/api';
|
const API_BASE = process.env.REACT_APP_API_BASE_URL || '/api';
|
||||||
|
|
||||||
export interface LoginRequest {
|
export interface LoginRequest {
|
||||||
email: string;
|
email: string;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// frontend/src/services/employeeService.ts
|
// frontend/src/services/employeeService.ts
|
||||||
import { Employee, CreateEmployeeRequest, UpdateEmployeeRequest, EmployeeAvailability } from '../models/Employee';
|
import { Employee, CreateEmployeeRequest, UpdateEmployeeRequest, EmployeeAvailability } from '../models/Employee';
|
||||||
|
|
||||||
const API_BASE_URL = 'http://localhost:3002/api';
|
const API_BASE_URL = '/api';
|
||||||
|
|
||||||
const getAuthHeaders = () => {
|
const getAuthHeaders = () => {
|
||||||
const token = localStorage.getItem('token');
|
const token = localStorage.getItem('token');
|
||||||
|
|||||||
@@ -4,9 +4,7 @@ import { Employee, EmployeeAvailability } from '../models/Employee';
|
|||||||
import { authService } from './authService';
|
import { authService } from './authService';
|
||||||
import { AssignmentResult, ScheduleRequest } from '../models/scheduling';
|
import { AssignmentResult, ScheduleRequest } from '../models/scheduling';
|
||||||
|
|
||||||
const API_BASE_URL = 'http://localhost:3002/api';
|
const API_BASE_URL = '/api';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Helper function to get auth headers
|
// Helper function to get auth headers
|
||||||
const getAuthHeaders = () => {
|
const getAuthHeaders = () => {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { authService } from './authService';
|
|||||||
import { ShiftPlan, CreateShiftPlanRequest, ScheduledShift, CreateShiftFromTemplateRequest } from '../models/ShiftPlan';
|
import { ShiftPlan, CreateShiftPlanRequest, ScheduledShift, CreateShiftFromTemplateRequest } from '../models/ShiftPlan';
|
||||||
import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults';
|
import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults';
|
||||||
|
|
||||||
const API_BASE = 'http://localhost:3002/api/shift-plans';
|
const API_BASE_URL = '/api/shift-plans';
|
||||||
|
|
||||||
// Helper function to get auth headers
|
// Helper function to get auth headers
|
||||||
const getAuthHeaders = () => {
|
const getAuthHeaders = () => {
|
||||||
@@ -25,7 +25,7 @@ const handleResponse = async (response: Response) => {
|
|||||||
|
|
||||||
export const shiftPlanService = {
|
export const shiftPlanService = {
|
||||||
async getShiftPlans(): Promise<ShiftPlan[]> {
|
async getShiftPlans(): Promise<ShiftPlan[]> {
|
||||||
const response = await fetch(API_BASE, {
|
const response = await fetch(API_BASE_URL, {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
...authService.getAuthHeaders()
|
...authService.getAuthHeaders()
|
||||||
@@ -50,7 +50,7 @@ export const shiftPlanService = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async getShiftPlan(id: string): Promise<ShiftPlan> {
|
async getShiftPlan(id: string): Promise<ShiftPlan> {
|
||||||
const response = await fetch(`${API_BASE}/${id}`, {
|
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
...authService.getAuthHeaders()
|
...authService.getAuthHeaders()
|
||||||
@@ -69,7 +69,7 @@ export const shiftPlanService = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async createShiftPlan(plan: CreateShiftPlanRequest): Promise<ShiftPlan> {
|
async createShiftPlan(plan: CreateShiftPlanRequest): Promise<ShiftPlan> {
|
||||||
const response = await fetch(API_BASE, {
|
const response = await fetch(API_BASE_URL, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -90,7 +90,7 @@ export const shiftPlanService = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async updateShiftPlan(id: string, plan: Partial<ShiftPlan>): Promise<ShiftPlan> {
|
async updateShiftPlan(id: string, plan: Partial<ShiftPlan>): Promise<ShiftPlan> {
|
||||||
const response = await fetch(`${API_BASE}/${id}`, {
|
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||||
method: 'PUT',
|
method: 'PUT',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -111,7 +111,7 @@ export const shiftPlanService = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async deleteShiftPlan(id: string): Promise<void> {
|
async deleteShiftPlan(id: string): Promise<void> {
|
||||||
const response = await fetch(`${API_BASE}/${id}`, {
|
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -130,7 +130,7 @@ export const shiftPlanService = {
|
|||||||
|
|
||||||
// Get specific template or plan
|
// Get specific template or plan
|
||||||
getTemplate: async (id: string): Promise<ShiftPlan> => {
|
getTemplate: async (id: string): Promise<ShiftPlan> => {
|
||||||
const response = await fetch(`${API_BASE}/${id}`, {
|
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||||
headers: getAuthHeaders()
|
headers: getAuthHeaders()
|
||||||
});
|
});
|
||||||
return handleResponse(response);
|
return handleResponse(response);
|
||||||
@@ -142,7 +142,7 @@ export const shiftPlanService = {
|
|||||||
console.log('🔄 Attempting to regenerate scheduled shifts...');
|
console.log('🔄 Attempting to regenerate scheduled shifts...');
|
||||||
|
|
||||||
// You'll need to add this API endpoint to your backend
|
// You'll need to add this API endpoint to your backend
|
||||||
const response = await fetch(`${API_BASE}/${planId}/regenerate-shifts`, {
|
const response = await fetch(`${API_BASE_URL}/${planId}/regenerate-shifts`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -162,7 +162,7 @@ export const shiftPlanService = {
|
|||||||
|
|
||||||
// Create new plan
|
// Create new plan
|
||||||
createPlan: async (data: CreateShiftPlanRequest): Promise<ShiftPlan> => {
|
createPlan: async (data: CreateShiftPlanRequest): Promise<ShiftPlan> => {
|
||||||
const response = await fetch(`${API_BASE}`, {
|
const response = await fetch(`${API_BASE_URL}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: getAuthHeaders(),
|
headers: getAuthHeaders(),
|
||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
@@ -177,7 +177,7 @@ export const shiftPlanService = {
|
|||||||
endDate: string;
|
endDate: string;
|
||||||
isTemplate?: boolean;
|
isTemplate?: boolean;
|
||||||
}): Promise<ShiftPlan> => {
|
}): Promise<ShiftPlan> => {
|
||||||
const response = await fetch(`${API_BASE}/from-preset`, {
|
const response = await fetch(`${API_BASE_URL}/from-preset`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: getAuthHeaders(),
|
headers: getAuthHeaders(),
|
||||||
body: JSON.stringify(data),
|
body: JSON.stringify(data),
|
||||||
@@ -204,7 +204,7 @@ export const shiftPlanService = {
|
|||||||
try {
|
try {
|
||||||
console.log('🔄 Clearing assignments for plan:', planId);
|
console.log('🔄 Clearing assignments for plan:', planId);
|
||||||
|
|
||||||
const response = await fetch(`${API_BASE}/${planId}/clear-assignments`, {
|
const response = await fetch(`${API_BASE_URL}/${planId}/clear-assignments`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
|
||||||
// allows you to do things like:
|
|
||||||
// expect(element).toHaveTextContent(/react/i)
|
|
||||||
// learn more: https://github.com/testing-library/jest-dom
|
|
||||||
import '@testing-library/jest-dom';
|
|
||||||
12
frontend/src/vite-env.d.ts
vendored
Normal file
12
frontend/src/vite-env.d.ts
vendored
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
|
|
||||||
|
// Define types for environment variables
|
||||||
|
interface ImportMetaEnv {
|
||||||
|
readonly VITE_APP_TITLE: string
|
||||||
|
readonly ENABLE_PRO: string
|
||||||
|
// more env variables...
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ImportMeta {
|
||||||
|
readonly env: ImportMetaEnv
|
||||||
|
}
|
||||||
@@ -1,28 +1,38 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es5",
|
"target": "ES2020",
|
||||||
"lib": [
|
"useDefineForClassFields": true,
|
||||||
"dom",
|
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||||
"dom.iterable",
|
"module": "ESNext",
|
||||||
"esnext"
|
|
||||||
],
|
|
||||||
"allowJs": true,
|
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"esModuleInterop": true,
|
//"ignoreDeprecations": "6.0",
|
||||||
"allowSyntheticDefaultImports": true,
|
|
||||||
"strict": true,
|
/* Bundler mode */
|
||||||
"forceConsistentCasingInFileNames": true,
|
"moduleResolution": "bundler",
|
||||||
"noFallthroughCasesInSwitch": true,
|
"allowImportingTsExtensions": true,
|
||||||
"module": "esnext",
|
|
||||||
"moduleResolution": "node",
|
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
"ignoreDeprecations": "6.0",
|
|
||||||
"jsx": "react-jsx",
|
"jsx": "react-jsx",
|
||||||
"downlevelIteration": true
|
|
||||||
},
|
/* Linting */
|
||||||
"include": [
|
"strict": true,
|
||||||
"src"
|
"noUnusedLocals": false,
|
||||||
]
|
"noUnusedParameters": false,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
|
||||||
|
/* Path mapping (modern approach) */
|
||||||
|
"paths": {
|
||||||
|
"@/*": ["./src/*"],
|
||||||
|
"@/components/*": ["./src/components/*"],
|
||||||
|
"@/pages/*": ["./src/pages/*"],
|
||||||
|
"@/contexts/*": ["./src/contexts/*"],
|
||||||
|
"@/utils/*": ["./src/utils/*"],
|
||||||
|
"@/services/*": ["./src/services/*"],
|
||||||
|
"@/models/*": ["./src/models/*"],
|
||||||
|
"@/design/*": ["./src/design/*"]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"include": ["src"],
|
||||||
|
"references": [{ "path": "./tsconfig.node.json" }]
|
||||||
}
|
}
|
||||||
10
frontend/tsconfig.node.json
Normal file
10
frontend/tsconfig.node.json
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"composite": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowSyntheticDefaultImports": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
45
frontend/vite.config.ts
Normal file
45
frontend/vite.config.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import react from '@vitejs/plugin-react'
|
||||||
|
import { resolve } from 'path'
|
||||||
|
|
||||||
|
// https://vitejs.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [react()],
|
||||||
|
server: {
|
||||||
|
port: 3003,
|
||||||
|
host: true,
|
||||||
|
open: true,
|
||||||
|
proxy: {
|
||||||
|
'/api': {
|
||||||
|
target: 'http://localhost:3002',
|
||||||
|
changeOrigin: true,
|
||||||
|
secure: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
build: {
|
||||||
|
outDir: 'dist',
|
||||||
|
sourcemap: true,
|
||||||
|
rollupOptions: {
|
||||||
|
input: {
|
||||||
|
main: resolve(__dirname, 'index.html')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': resolve(__dirname, './src'),
|
||||||
|
'@/components': resolve(__dirname, './src/components'),
|
||||||
|
'@/pages': resolve(__dirname, './src/pages'),
|
||||||
|
'@/contexts': resolve(__dirname, './src/contexts'),
|
||||||
|
'@/models': resolve(__dirname, './src/models'),
|
||||||
|
'@/utils': resolve(__dirname, './src/utils'),
|
||||||
|
'@/services': resolve(__dirname, './src/services'),
|
||||||
|
'@/design': resolve(__dirname, './src/design')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// Define environment variables
|
||||||
|
define: {
|
||||||
|
'process.env': process.env
|
||||||
|
}
|
||||||
|
})
|
||||||
3856
package-lock.json
generated
Normal file
3856
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
17
package.json
Normal file
17
package.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"name": "schichtenplaner-monorepo",
|
||||||
|
"private": true,
|
||||||
|
"workspaces": [
|
||||||
|
"frontend",
|
||||||
|
"backend",
|
||||||
|
"premium"
|
||||||
|
],
|
||||||
|
"scripts": {
|
||||||
|
"docker:build": "docker build -t schichtplan-app .",
|
||||||
|
"docker:run": "docker run -p 3002:3002 schichtplan-app",
|
||||||
|
"build:all": "npm run build --workspace=backend && npm run build --workspace=frontend"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"typescript": "^5.3.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
1
premium
Submodule
1
premium
Submodule
Submodule premium added at c65016aaab
52
tsconfig.base.json
Normal file
52
tsconfig.base.json
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
/* LANGUAGE AND ENVIRONMENT */
|
||||||
|
"target": "ES2022",
|
||||||
|
"lib": ["ES2022"],
|
||||||
|
|
||||||
|
/* MODULES */
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowSyntheticDefaultImports": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
|
||||||
|
/* TYPE CHECKING */
|
||||||
|
"strict": true,
|
||||||
|
"noImplicitAny": true,
|
||||||
|
"noImplicitReturns": true,
|
||||||
|
"noImplicitThis": true,
|
||||||
|
"noUnusedLocals": false,
|
||||||
|
"noUnusedParameters": false,
|
||||||
|
"exactOptionalPropertyTypes": true,
|
||||||
|
"noUncheckedIndexedAccess": true,
|
||||||
|
"noImplicitOverride": true,
|
||||||
|
|
||||||
|
/* EMIT */
|
||||||
|
"declaration": true,
|
||||||
|
"declarationMap": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"removeComments": false,
|
||||||
|
|
||||||
|
/* INTEROP CONSTRAINTS */
|
||||||
|
"allowJs": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
|
||||||
|
/* COMPATIBILITY */
|
||||||
|
"isolatedModules": true,
|
||||||
|
|
||||||
|
"types": ["vite/client", "node"]
|
||||||
|
},
|
||||||
|
"include": [
|
||||||
|
"/premium/**/*"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"node_modules",
|
||||||
|
"dist",
|
||||||
|
"build",
|
||||||
|
"coverage",
|
||||||
|
"*.test.*",
|
||||||
|
"*.spec.*"
|
||||||
|
]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user