mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Compare commits
9 Commits
v0.0.10
...
92840c2424
| Author | SHA1 | Date | |
|---|---|---|---|
| 92840c2424 | |||
| ce1c6b08b1 | |||
| b9a88bce1c | |||
| b60e5ccdd2 | |||
| f5aa376e31 | |||
| e82e584f76 | |||
| e177c3d2a6 | |||
| de23ea00ee | |||
| d78ba474d8 |
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:
|
||||
📧 patrick@mahnke-hartmann.dev
|
||||
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
|
||||
|
||||
|
||||
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)
|
||||
|
||||
@@ -3,6 +3,7 @@ import express from 'express';
|
||||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { initializeDatabase } from './scripts/initializeDatabase.js';
|
||||
import fs from 'fs';
|
||||
|
||||
// Route imports
|
||||
import authRoutes from './routes/auth.js';
|
||||
@@ -39,11 +40,50 @@ app.get('/api/health', (req: any, res: any) => {
|
||||
});
|
||||
|
||||
// 🆕 STATIC FILE SERVING FÜR FRONTEND
|
||||
app.use(express.static(path.join(__dirname, '../../frontend-build')));
|
||||
const frontendBuildPath = path.join(__dirname, '../frontend-build');
|
||||
console.log('📁 Frontend build path:', frontendBuildPath);
|
||||
|
||||
// Überprüfe ob das Verzeichnis existiert
|
||||
if (fs.existsSync(frontendBuildPath)) {
|
||||
console.log('✅ Frontend build directory exists');
|
||||
const files = fs.readdirSync(frontendBuildPath);
|
||||
console.log('📄 Files in frontend-build:', files);
|
||||
|
||||
// Serviere statische Dateien
|
||||
app.use(express.static(frontendBuildPath));
|
||||
|
||||
console.log('✅ Static file serving configured');
|
||||
} else {
|
||||
console.log('❌ Frontend build directory NOT FOUND:', frontendBuildPath);
|
||||
}
|
||||
|
||||
app.get('/', (req, res) => {
|
||||
const indexPath = path.join(frontendBuildPath, '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');
|
||||
}
|
||||
});
|
||||
|
||||
// 🆕 FALLBACK FÜR CLIENT-SIDE ROUTING
|
||||
app.get('*', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../../frontend-build/index.html'));
|
||||
// Ignoriere API Routes
|
||||
if (req.path.startsWith('/api/')) {
|
||||
return res.status(404).json({ error: 'API endpoint not found' });
|
||||
}
|
||||
|
||||
const indexPath = path.join(frontendBuildPath, 'index.html');
|
||||
console.log('🔄 Client-side routing for:', req.path, '-> index.html');
|
||||
|
||||
if (fs.existsSync(indexPath)) {
|
||||
res.sendFile(indexPath);
|
||||
} else {
|
||||
console.error('❌ index.html not found for client-side routing');
|
||||
res.status(404).json({ error: 'Frontend application not found' });
|
||||
}
|
||||
});
|
||||
|
||||
// Error handling middleware
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
// backend/src/services/databaseService
|
||||
import sqlite3 from 'sqlite3';
|
||||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
|
||||
4
frontend/.env.development
Normal file
4
frontend/.env.development
Normal file
@@ -0,0 +1,4 @@
|
||||
# frontend/.env.development
|
||||
BROWSER=none
|
||||
FAST_REFRESH=true
|
||||
DANGEROUSLY_DISABLE_HOST_CHECK=true
|
||||
1546
frontend/package-lock.json
generated
1546
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,7 @@
|
||||
"name": "frontend",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"proxy": "http://localhost:3002",
|
||||
"dependencies": {
|
||||
"@testing-library/dom": "^10.4.1",
|
||||
"@testing-library/jest-dom": "^6.9.1",
|
||||
@@ -15,7 +16,6 @@
|
||||
"react": "^19.2.0",
|
||||
"react-dom": "^19.2.0",
|
||||
"react-router-dom": "^7.9.3",
|
||||
"react-scripts": "5.0.1",
|
||||
"typescript": "^4.9.5",
|
||||
"web-vitals": "^2.1.4"
|
||||
},
|
||||
@@ -42,5 +42,9 @@
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"http-proxy-middleware": "^3.0.5",
|
||||
"react-scripts": "^5.0.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ interface AuthContextType {
|
||||
}
|
||||
|
||||
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||
const API_BASE_URL = process.env.REACT_APP_API_BASE_URL || 'http://localhost:3002/api';
|
||||
const API_BASE_URL = process.env.REACT_APP_API_BASE_URL || '/api';
|
||||
|
||||
interface AuthProviderProps {
|
||||
children: ReactNode;
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
// frontend/src/pages/Auth/Login.tsx - KORRIGIERT
|
||||
import React, { useState, useEffect } from 'react';
|
||||
// frontend/src/pages/Auth/Login.tsx - UPDATED PASSWORD SECTION
|
||||
import React, { useState, useEffect, useRef } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
import { useNotification } from '../../contexts/NotificationContext';
|
||||
import { employeeService } from '../../services/employeeService';
|
||||
|
||||
const Login: React.FC = () => {
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [showPassword, setShowPassword] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const { login, user } = useAuth();
|
||||
const { showNotification } = useNotification();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const holdTimeoutRef = useRef<NodeJS.Timeout | null>(null);
|
||||
const passwordInputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (user) {
|
||||
@@ -20,6 +23,47 @@ const Login: React.FC = () => {
|
||||
}
|
||||
}, [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) => {
|
||||
e.preventDefault();
|
||||
setLoading(true);
|
||||
@@ -35,7 +79,6 @@ const Login: React.FC = () => {
|
||||
message: `Willkommen zurück!`
|
||||
});
|
||||
|
||||
// Navigiere zur Startseite
|
||||
navigate('/');
|
||||
|
||||
} catch (error: any) {
|
||||
@@ -50,7 +93,6 @@ const Login: React.FC = () => {
|
||||
}
|
||||
};
|
||||
|
||||
// Wenn bereits eingeloggt, zeige Ladeanzeige
|
||||
if (user) {
|
||||
return (
|
||||
<div style={{ textAlign: 'center', padding: '40px' }}>
|
||||
@@ -77,7 +119,7 @@ const Login: React.FC = () => {
|
||||
}}>
|
||||
<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' }}>
|
||||
E-Mail
|
||||
</label>
|
||||
@@ -87,7 +129,7 @@ const Login: React.FC = () => {
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
required
|
||||
style={{
|
||||
width: '100%',
|
||||
width: '94.5%',
|
||||
padding: '10px',
|
||||
border: '1px solid #ddd',
|
||||
borderRadius: '4px',
|
||||
@@ -97,24 +139,57 @@ const Login: React.FC = () => {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div style={{ marginBottom: '30px' }}>
|
||||
<div style={{ marginBottom: '30px', width: '100%' }}>
|
||||
<label style={{ display: 'block', marginBottom: '8px', fontWeight: 'bold' }}>
|
||||
Passwort
|
||||
</label>
|
||||
<input
|
||||
type="password"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
style={{
|
||||
width: '100%',
|
||||
padding: '10px',
|
||||
border: '1px solid #ddd',
|
||||
borderRadius: '4px',
|
||||
fontSize: '16px'
|
||||
}}
|
||||
placeholder="Ihr Passwort"
|
||||
/>
|
||||
<div style={{ position: 'relative' }}>
|
||||
<input
|
||||
ref={passwordInputRef}
|
||||
type={showPassword ? 'text' : 'password'}
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
style={{
|
||||
width: '94.5%',
|
||||
padding: '10px',
|
||||
paddingRight: '10px',
|
||||
border: '1px solid #ddd',
|
||||
borderRadius: '4px',
|
||||
fontSize: '16px'
|
||||
}}
|
||||
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>
|
||||
|
||||
<button
|
||||
@@ -123,7 +198,7 @@ const Login: React.FC = () => {
|
||||
style={{
|
||||
width: '100%',
|
||||
padding: '12px',
|
||||
backgroundColor: loading ? '#ccc' : '#007bff',
|
||||
backgroundColor: loading ? '#ccc' : '#51258f',
|
||||
color: 'white',
|
||||
border: 'none',
|
||||
borderRadius: '4px',
|
||||
|
||||
@@ -1,81 +1,46 @@
|
||||
// frontend/src/pages/Help/Help.tsx
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import React from 'react';
|
||||
|
||||
const Help: React.FC = () => {
|
||||
const [currentStage, setCurrentStage] = useState(0);
|
||||
const [isAnimating, setIsAnimating] = useState(false);
|
||||
const businessRules = [
|
||||
{ rule: "Mitarbeiter werden nur Schichten zugewiesen, für die sie sich eingetragen haben", critical: true },
|
||||
{ rule: "Maximal 1 Schicht pro Tag pro Mitarbeiter", critical: true },
|
||||
{ rule: "Schichten haben Mindest- und Maximalkapazitäten", critical: true },
|
||||
{ rule: "Trainees benötigen erfahrene Begleitung in jeder Schicht", critical: true },
|
||||
{ rule: "Mitarbeiter, die nicht alleine arbeiten können, müssen Begleitung haben", critical: true },
|
||||
{ rule: "Vertragslimits: Klein=1 Schicht/Woche, Groß=2 Schichten/Woche", critical: true },
|
||||
{ rule: "Manager werden automatisch ihren bevorzugten Schichten zugewiesen", critical: false }
|
||||
];
|
||||
|
||||
const algorithmStages = [
|
||||
const schedulingStages = [
|
||||
{
|
||||
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: "1. Verfügbarkeitsprüfung",
|
||||
description: "Nur Mitarbeiter, die sich für Schichten eingetragen haben (Verfügbarkeit 1 oder 2), werden berücksichtigt."
|
||||
},
|
||||
{
|
||||
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: "2. Modellaufbau",
|
||||
description: "Das System erstellt ein mathematisches Modell mit allen Variablen und Constraints."
|
||||
},
|
||||
{
|
||||
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: "3. CP-SAT Optimierung",
|
||||
description: "Google's Constraint Programming Solver findet die beste Zuordnung unter allen Regeln."
|
||||
},
|
||||
{
|
||||
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"
|
||||
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."
|
||||
}
|
||||
];
|
||||
|
||||
const businessRules = [
|
||||
{ rule: "Manager darf nicht allein arbeiten", critical: true },
|
||||
{ rule: "Erfahrene mit canWorkAlone: false dürfen nicht allein arbeiten", critical: true },
|
||||
{ rule: "Keine leeren Schichten", critical: true },
|
||||
{ rule: "Keine 'Neu allein' Situationen", critical: true },
|
||||
{ rule: "Manager sollte mit erfahrenem Mitarbeiter arbeiten", critical: false },
|
||||
{ rule: "Vertragslimits einhalten", critical: true },
|
||||
{ rule: "Nicht zu viele erfahrene Mitarbeiter in einer Schicht", critical: false }
|
||||
const preferenceLevels = [
|
||||
{ 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" },
|
||||
{ level: 3, label: "Nicht verfügbar", description: "Mitarbeiter kann diese Schicht nicht arbeiten", color: "#e74c3c" }
|
||||
];
|
||||
|
||||
useEffect(() => {
|
||||
const interval = setInterval(() => {
|
||||
if (isAnimating) {
|
||||
setCurrentStage((prev) => (prev + 1) % algorithmStages.length);
|
||||
}
|
||||
}, 3000);
|
||||
|
||||
return () => clearInterval(interval);
|
||||
}, [isAnimating]);
|
||||
|
||||
const toggleAnimation = () => {
|
||||
setIsAnimating(!isAnimating);
|
||||
};
|
||||
|
||||
return (
|
||||
<div style={{ padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
|
||||
<h1>❓ Hilfe & Support - Scheduling Algorithmus</h1>
|
||||
@@ -89,7 +54,7 @@ const Help: React.FC = () => {
|
||||
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||
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' }}>
|
||||
{businessRules.map((rule, index) => (
|
||||
<div
|
||||
@@ -120,14 +85,14 @@ const Help: React.FC = () => {
|
||||
color: rule.critical ? '#e74c3c' : '#f39c12',
|
||||
fontWeight: 'bold'
|
||||
}}>
|
||||
{rule.critical ? 'KRITISCH' : 'WARNUNG'}
|
||||
{rule.critical ? 'HART' : 'WEICH'}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Algorithm Explanation */}
|
||||
{/* Scheduling Process */}
|
||||
<div style={{
|
||||
backgroundColor: 'white',
|
||||
borderRadius: '12px',
|
||||
@@ -136,45 +101,125 @@ const Help: React.FC = () => {
|
||||
boxShadow: '0 4px 6px rgba(0,0,0,0.1)',
|
||||
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>
|
||||
<h4 style={{ color: '#3498db' }}>🏗️ Phasen-basierter Ansatz</h4>
|
||||
<p>Der Algorithmus arbeitet in klar definierten Phasen, um komplexe Probleme schrittweise zu lösen und Stabilität zu gewährleisten.</p>
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
<h4 style={{ color: '#2c3e50', margin: '0 0 8px 0' }}>{stage.title}</h4>
|
||||
<p style={{ color: '#6c757d', margin: 0 }}>{stage.description}</p>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Preference Levels */}
|
||||
<div style={{
|
||||
marginTop: '25px',
|
||||
padding: '20px',
|
||||
backgroundColor: '#e8f4fd',
|
||||
borderRadius: '8px',
|
||||
border: '1px solid #b8d4f0'
|
||||
}}>
|
||||
<h4 style={{ color: '#2980b9', marginTop: 0 }}>💡 Tipps für beste Ergebnisse</h4>
|
||||
<ul style={{ margin: 0, paddingLeft: '20px' }}>
|
||||
<li>Stellen Sie sicher, dass alle Mitarbeiter ihre Verfügbarkeit eingetragen haben</li>
|
||||
<li>Überprüfen Sie die Vertragstypen (klein = 1 Schicht/Woche, groß = 2 Schichten/Woche)</li>
|
||||
<li>Markieren Sie erfahrene Mitarbeiter, die alleine arbeiten können</li>
|
||||
<li>Planen Sie Manager-Verfügbarkeit im Voraus</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<style>{`
|
||||
@keyframes pulse {
|
||||
0% { transform: scale(1); }
|
||||
50% { transform: scale(1.02); }
|
||||
100% { transform: scale(1); }
|
||||
}
|
||||
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>
|
||||
|
||||
@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 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>
|
||||
<h4 style={{ color: '#2980b9' }}>Vor dem Scheduling</h4>
|
||||
<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>
|
||||
<h4 style={{ color: '#2980b9' }}>Nach dem Scheduling</h4>
|
||||
<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>
|
||||
|
||||
{/* Technical Info */}
|
||||
<div style={{
|
||||
marginTop: '25px',
|
||||
padding: '20px',
|
||||
backgroundColor: '#fff3cd',
|
||||
borderRadius: '8px',
|
||||
border: '1px solid #ffeaa7'
|
||||
}}>
|
||||
<h4 style={{ color: '#856404', marginTop: 0 }}>🔧 Technische Informationen</h4>
|
||||
<p style={{ color: '#856404', margin: 0 }}>
|
||||
<strong>Lösungsalgorithmus:</strong> Google OR-Tools CP-SAT Solver •
|
||||
<strong> Fallback:</strong> TypeScript-basierter Solver •
|
||||
<strong> Maximale Laufzeit:</strong> 105 Sekunden
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// frontend/src/pages/Settings/Settings.tsx
|
||||
import React, { useState, useEffect } from 'react';
|
||||
// frontend/src/pages/Settings/Settings.tsx - UPDATED WITH NEW STYLES
|
||||
import React, { useState, useEffect, useRef } from 'react';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
import { employeeService } from '../../services/employeeService';
|
||||
import { useNotification } from '../../contexts/NotificationContext';
|
||||
@@ -27,6 +27,16 @@ const Settings: React.FC = () => {
|
||||
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(() => {
|
||||
if (currentUser) {
|
||||
setProfileForm({
|
||||
@@ -36,6 +46,17 @@ const Settings: React.FC = () => {
|
||||
}
|
||||
}, [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 { name, value } = e.target;
|
||||
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) => {
|
||||
e.preventDefault();
|
||||
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 (
|
||||
<div style={styles.container}>
|
||||
{/* Left Sidebar with Tabs */}
|
||||
@@ -443,77 +520,137 @@ const Settings: React.FC = () => {
|
||||
|
||||
<form onSubmit={handlePasswordUpdate} style={{ marginTop: '2rem' }}>
|
||||
<div style={styles.formGridCompact}>
|
||||
{/* Current Password Field */}
|
||||
<div style={styles.field}>
|
||||
<label style={styles.fieldLabel}>
|
||||
Aktuelles Passwort *
|
||||
</label>
|
||||
<input
|
||||
type="password"
|
||||
name="currentPassword"
|
||||
value={passwordForm.currentPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
style={styles.fieldInput}
|
||||
placeholder="Aktuelles Passwort"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
e.target.style.boxShadow = 'none';
|
||||
}}
|
||||
/>
|
||||
<div style={styles.fieldInputContainer}>
|
||||
<input
|
||||
type={showCurrentPassword ? 'text' : 'password'}
|
||||
name="currentPassword"
|
||||
value={passwordForm.currentPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
style={styles.fieldInputWithIcon}
|
||||
placeholder="Aktuelles Passwort"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
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>
|
||||
|
||||
{/* New Password Field */}
|
||||
<div style={styles.field}>
|
||||
<label style={styles.fieldLabel}>
|
||||
Neues Passwort *
|
||||
</label>
|
||||
<input
|
||||
type="password"
|
||||
name="newPassword"
|
||||
value={passwordForm.newPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
minLength={6}
|
||||
style={styles.fieldInput}
|
||||
placeholder="Mindestens 6 Zeichen"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
e.target.style.boxShadow = 'none';
|
||||
}}
|
||||
/>
|
||||
<div style={styles.fieldInputContainer}>
|
||||
<input
|
||||
type={showNewPassword ? 'text' : 'password'}
|
||||
name="newPassword"
|
||||
value={passwordForm.newPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
minLength={6}
|
||||
style={styles.fieldInputWithIcon}
|
||||
placeholder="Mindestens 6 Zeichen"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
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}>
|
||||
Das Passwort muss mindestens 6 Zeichen lang sein.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Confirm Password Field */}
|
||||
<div style={styles.field}>
|
||||
<label style={styles.fieldLabel}>
|
||||
Neues Passwort bestätigen *
|
||||
</label>
|
||||
<input
|
||||
type="password"
|
||||
name="confirmPassword"
|
||||
value={passwordForm.confirmPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
style={styles.fieldInput}
|
||||
placeholder="Passwort wiederholen"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
e.target.style.boxShadow = 'none';
|
||||
}}
|
||||
/>
|
||||
<div style={styles.fieldInputContainer}>
|
||||
<input
|
||||
type={showConfirmPassword ? 'text' : 'password'}
|
||||
name="confirmPassword"
|
||||
value={passwordForm.confirmPassword}
|
||||
onChange={handlePasswordChange}
|
||||
required
|
||||
style={styles.fieldInputWithIcon}
|
||||
placeholder="Passwort wiederholen"
|
||||
onFocus={(e) => {
|
||||
e.target.style.borderColor = '#1a1325';
|
||||
e.target.style.boxShadow = '0 0 0 3px rgba(26, 19, 37, 0.1)';
|
||||
}}
|
||||
onBlur={(e) => {
|
||||
e.target.style.borderColor = '#e8e8e8';
|
||||
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>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export const styles = {
|
||||
// frontend/src/pages/Settings/type/SettingsType.tsx - CORRECTED
|
||||
export const styles = {
|
||||
container: {
|
||||
display: 'flex',
|
||||
minHeight: 'calc(100vh - 120px)',
|
||||
@@ -121,11 +122,17 @@
|
||||
display: 'flex',
|
||||
flexDirection: 'column' as const,
|
||||
gap: '0.5rem',
|
||||
width: '100%',
|
||||
},
|
||||
fieldLabel: {
|
||||
fontSize: '0.9rem',
|
||||
fontWeight: 600,
|
||||
color: '#161718',
|
||||
width: '100%',
|
||||
},
|
||||
fieldInputContainer: {
|
||||
position: 'relative' as const,
|
||||
width: '100%',
|
||||
},
|
||||
fieldInput: {
|
||||
padding: '0.875rem 1rem',
|
||||
@@ -135,6 +142,20 @@
|
||||
background: '#FBFAF6',
|
||||
transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)',
|
||||
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: {
|
||||
padding: '0.875rem 1rem',
|
||||
@@ -144,11 +165,29 @@
|
||||
background: 'rgba(26, 19, 37, 0.05)',
|
||||
color: '#666',
|
||||
cursor: 'not-allowed',
|
||||
width: '100%',
|
||||
boxSizing: 'border-box' as const,
|
||||
},
|
||||
fieldHint: {
|
||||
fontSize: '0.8rem',
|
||||
color: '#888',
|
||||
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: {
|
||||
display: 'flex',
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useAuth } from '../../contexts/AuthContext';
|
||||
|
||||
const API_BASE_URL = '/api';
|
||||
|
||||
const Setup: React.FC = () => {
|
||||
const [step, setStep] = useState(1);
|
||||
const [formData, setFormData] = useState({
|
||||
@@ -73,7 +75,7 @@ const Setup: React.FC = () => {
|
||||
|
||||
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',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// frontend/src/services/authService.ts
|
||||
import { Employee } from '../models/Employee';
|
||||
const API_BASE = process.env.REACT_APP_API_BASE_URL || 'http://localhost:3002/api';
|
||||
const API_BASE = process.env.REACT_APP_API_BASE_URL || '/api';
|
||||
|
||||
export interface LoginRequest {
|
||||
email: string;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// frontend/src/services/employeeService.ts
|
||||
import { Employee, CreateEmployeeRequest, UpdateEmployeeRequest, EmployeeAvailability } from '../models/Employee';
|
||||
|
||||
const API_BASE_URL = 'http://localhost:3002/api';
|
||||
const API_BASE_URL = '/api';
|
||||
|
||||
const getAuthHeaders = () => {
|
||||
const token = localStorage.getItem('token');
|
||||
|
||||
@@ -4,9 +4,7 @@ import { Employee, EmployeeAvailability } from '../models/Employee';
|
||||
import { authService } from './authService';
|
||||
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
|
||||
const getAuthHeaders = () => {
|
||||
|
||||
@@ -3,7 +3,7 @@ import { authService } from './authService';
|
||||
import { ShiftPlan, CreateShiftPlanRequest, ScheduledShift, CreateShiftFromTemplateRequest } from '../models/ShiftPlan';
|
||||
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
|
||||
const getAuthHeaders = () => {
|
||||
@@ -25,7 +25,7 @@ const handleResponse = async (response: Response) => {
|
||||
|
||||
export const shiftPlanService = {
|
||||
async getShiftPlans(): Promise<ShiftPlan[]> {
|
||||
const response = await fetch(API_BASE, {
|
||||
const response = await fetch(API_BASE_URL, {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...authService.getAuthHeaders()
|
||||
@@ -50,7 +50,7 @@ export const shiftPlanService = {
|
||||
},
|
||||
|
||||
async getShiftPlan(id: string): Promise<ShiftPlan> {
|
||||
const response = await fetch(`${API_BASE}/${id}`, {
|
||||
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...authService.getAuthHeaders()
|
||||
@@ -69,7 +69,7 @@ export const shiftPlanService = {
|
||||
},
|
||||
|
||||
async createShiftPlan(plan: CreateShiftPlanRequest): Promise<ShiftPlan> {
|
||||
const response = await fetch(API_BASE, {
|
||||
const response = await fetch(API_BASE_URL, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -90,7 +90,7 @@ export const shiftPlanService = {
|
||||
},
|
||||
|
||||
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',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -111,7 +111,7 @@ export const shiftPlanService = {
|
||||
},
|
||||
|
||||
async deleteShiftPlan(id: string): Promise<void> {
|
||||
const response = await fetch(`${API_BASE}/${id}`, {
|
||||
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -130,7 +130,7 @@ export const shiftPlanService = {
|
||||
|
||||
// Get specific template or plan
|
||||
getTemplate: async (id: string): Promise<ShiftPlan> => {
|
||||
const response = await fetch(`${API_BASE}/${id}`, {
|
||||
const response = await fetch(`${API_BASE_URL}/${id}`, {
|
||||
headers: getAuthHeaders()
|
||||
});
|
||||
return handleResponse(response);
|
||||
@@ -142,7 +142,7 @@ export const shiftPlanService = {
|
||||
console.log('🔄 Attempting to regenerate scheduled shifts...');
|
||||
|
||||
// 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',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -162,7 +162,7 @@ export const shiftPlanService = {
|
||||
|
||||
// Create new plan
|
||||
createPlan: async (data: CreateShiftPlanRequest): Promise<ShiftPlan> => {
|
||||
const response = await fetch(`${API_BASE}`, {
|
||||
const response = await fetch(`${API_BASE_URL}`, {
|
||||
method: 'POST',
|
||||
headers: getAuthHeaders(),
|
||||
body: JSON.stringify(data),
|
||||
@@ -177,7 +177,7 @@ export const shiftPlanService = {
|
||||
endDate: string;
|
||||
isTemplate?: boolean;
|
||||
}): Promise<ShiftPlan> => {
|
||||
const response = await fetch(`${API_BASE}/from-preset`, {
|
||||
const response = await fetch(`${API_BASE_URL}/from-preset`, {
|
||||
method: 'POST',
|
||||
headers: getAuthHeaders(),
|
||||
body: JSON.stringify(data),
|
||||
@@ -204,7 +204,7 @@ export const shiftPlanService = {
|
||||
try {
|
||||
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',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
"esnext"
|
||||
],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
@@ -25,4 +24,4 @@
|
||||
"include": [
|
||||
"src"
|
||||
]
|
||||
}
|
||||
}
|
||||
6
package-lock.json
generated
6
package-lock.json
generated
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"name": "Schichtenplaner",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {}
|
||||
}
|
||||
Reference in New Issue
Block a user