mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Compare commits
7 Commits
v1.0.26
...
e5d836d037
| Author | SHA1 | Date | |
|---|---|---|---|
| e5d836d037 | |||
| 99d5105768 | |||
| a8dc11b024 | |||
| 0473a3b5bf | |||
| ec86290d72 | |||
| eec9ea92d0 | |||
| 80cfe71362 |
@@ -4,7 +4,9 @@
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "npm run build && npx tsx src/server.ts",
|
||||
"dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false npx tsx src/server.ts",
|
||||
"dev:single": "cross-env NODE_ENV=development TRUST_PROXY_ENABLED=false SEED_TEST_DATA=true npx tsx src/server.ts",
|
||||
"seed:test-data": "npx tsx src/scripts/seedTestData.ts",
|
||||
"dev:all": "npm run dev:single",
|
||||
"build": "tsc",
|
||||
"start": "node dist/server.js",
|
||||
"prestart": "npm run build",
|
||||
@@ -27,7 +29,7 @@
|
||||
"helmet": "8.1.0",
|
||||
"express-validator": "7.3.0",
|
||||
"exceljs": "4.4.0",
|
||||
"playwright": "^1.37.0"
|
||||
"playwright-chromium": "^1.37.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bcryptjs": "^2.4.2",
|
||||
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
import { AuthRequest } from '../middleware/auth.js';
|
||||
import { TEMPLATE_PRESETS } from '../models/defaults/shiftPlanDefaults.js';
|
||||
import ExcelJS from 'exceljs';
|
||||
import { chromium } from 'playwright';
|
||||
import { chromium } from 'playwright-chromium';
|
||||
|
||||
async function getPlanWithDetails(planId: string) {
|
||||
const plan = await db.get<any>(`
|
||||
@@ -989,6 +989,20 @@ interface ExportTimetableData {
|
||||
allTimeSlots: ExportTimeSlot[];
|
||||
}
|
||||
|
||||
function sortTimeSlotsByStartTime(timeSlots: any[]): any[] {
|
||||
const timeToMinutes = (timeStr: string) => {
|
||||
if (!timeStr) return 0;
|
||||
const [hours, minutes] = timeStr.split(':').map(Number);
|
||||
return hours * 60 + minutes;
|
||||
};
|
||||
|
||||
return [...timeSlots].sort((a, b) => {
|
||||
const minutesA = timeToMinutes(a.startTime);
|
||||
const minutesB = timeToMinutes(b.startTime);
|
||||
return minutesA - minutesB; // Ascending order (earliest first)
|
||||
});
|
||||
}
|
||||
|
||||
function getTimetableDataForExport(plan: any): ExportTimetableData {
|
||||
const weekdays = [
|
||||
{ id: 1, name: 'Montag' },
|
||||
@@ -1032,9 +1046,16 @@ function getTimetableDataForExport(plan: any): ExportTimetableData {
|
||||
Object.keys(shiftsByDay).forEach(day => {
|
||||
const dayNum = parseInt(day);
|
||||
shiftsByDay[dayNum].sort((a: any, b: any) => {
|
||||
const timeA = a.startTime || '';
|
||||
const timeB = b.startTime || '';
|
||||
return timeA.localeCompare(timeB);
|
||||
// Use numeric comparison for proper time sorting
|
||||
const timeToMinutes = (timeStr: string) => {
|
||||
if (!timeStr) return 0;
|
||||
const [hours, minutes] = timeStr.split(':').map(Number);
|
||||
return hours * 60 + minutes;
|
||||
};
|
||||
|
||||
const minutesA = timeToMinutes(a.startTime);
|
||||
const minutesB = timeToMinutes(b.startTime);
|
||||
return minutesA - minutesB;
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1073,15 +1094,12 @@ function getTimetableDataForExport(plan: any): ExportTimetableData {
|
||||
});
|
||||
});
|
||||
|
||||
// Convert to array and sort by start time
|
||||
const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a: ExportTimeSlot, b: ExportTimeSlot) => {
|
||||
return (a.startTime || '').localeCompare(b.startTime || '');
|
||||
});
|
||||
// Convert to array and sort by start time using numeric comparison
|
||||
const allTimeSlots = sortTimeSlotsByStartTime(Array.from(allTimeSlotsMap.values()));
|
||||
|
||||
return { days, allTimeSlots };
|
||||
}
|
||||
|
||||
// Export shift plan to Excel
|
||||
// Export shift plan to Excel
|
||||
export const exportShiftPlanToExcel = async (req: Request, res: Response): Promise<void> => {
|
||||
try {
|
||||
|
||||
@@ -41,12 +41,35 @@ const getClientIP = (req: Request): string => {
|
||||
return remoteAddress;
|
||||
};
|
||||
|
||||
// Helper to check if an IP is a loopback address (IPv4 or IPv6)
|
||||
const isLoopbackAddress = (ip: string): boolean => {
|
||||
// IPv4 loopback: 127.0.0.0/8
|
||||
if (ip.startsWith('127.') || ip === 'localhost') {
|
||||
return true;
|
||||
}
|
||||
|
||||
// IPv6 loopback: ::1
|
||||
// Also handle IPv4-mapped IPv6 addresses like ::ffff:127.0.0.1
|
||||
if (ip === '::1' || ip === '::ffff:127.0.0.1') {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Handle full IPv6 loopback notation
|
||||
if (ip.toLowerCase().startsWith('0000:0000:0000:0000:0000:0000:0000:0001') ||
|
||||
ip.toLowerCase() === '0:0:0:0:0:0:0:1') {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
// Helper to check if request should be limited
|
||||
const shouldSkipLimit = (req: Request): boolean => {
|
||||
const skipPaths = [
|
||||
'/api/health',
|
||||
'/api/setup/status',
|
||||
'/api/auth/validate'
|
||||
'/api/auth/validate',
|
||||
'/api/auth/me',
|
||||
];
|
||||
|
||||
// Skip for successful GET requests (data fetching)
|
||||
@@ -54,9 +77,16 @@ const shouldSkipLimit = (req: Request): boolean => {
|
||||
return true;
|
||||
}
|
||||
|
||||
const clientIP = getClientIP(req);
|
||||
|
||||
// Skip for loopback addresses (local development)
|
||||
if (isLoopbackAddress(clientIP)) {
|
||||
console.log(`✅ Loopback address skipped: ${clientIP}`);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Skip for whitelisted IPs from environment
|
||||
const whitelist = process.env.RATE_LIMIT_WHITELIST?.split(',') || [];
|
||||
const clientIP = getClientIP(req);
|
||||
if (whitelist.includes(clientIP)) {
|
||||
console.log(`✅ IP whitelisted: ${clientIP}`);
|
||||
return true;
|
||||
@@ -72,8 +102,8 @@ const getRateLimitConfig = () => {
|
||||
return {
|
||||
windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS || '900000'), // 15 minutes default
|
||||
max: isProduction
|
||||
? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '1000') // Stricter in production
|
||||
: parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '5000'), // More lenient in development
|
||||
? parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '50') // Stricter in production
|
||||
: parseInt(process.env.RATE_LIMIT_MAX_REQUESTS || '100'), // More lenient in development
|
||||
|
||||
// Development-specific relaxations
|
||||
skip: (req: Request) => {
|
||||
@@ -112,7 +142,7 @@ export const apiLimiter = rateLimit({
|
||||
// Strict limiter for auth endpoints
|
||||
export const authLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '100'),
|
||||
max: parseInt(process.env.AUTH_RATE_LIMIT_MAX_REQUESTS || '50'),
|
||||
message: {
|
||||
error: 'Zu viele Login-Versuche, bitte versuchen Sie es später erneut'
|
||||
},
|
||||
@@ -135,7 +165,7 @@ export const authLimiter = rateLimit({
|
||||
// Separate limiter for expensive endpoints
|
||||
export const expensiveEndpointLimiter = rateLimit({
|
||||
windowMs: 15 * 60 * 1000,
|
||||
max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '100'),
|
||||
max: parseInt(process.env.EXPENSIVE_ENDPOINT_LIMIT || '20'),
|
||||
message: {
|
||||
error: 'Zu viele Anfragen für diese Ressource'
|
||||
},
|
||||
|
||||
347
backend/src/scripts/seedTestData.ts
Normal file
347
backend/src/scripts/seedTestData.ts
Normal file
@@ -0,0 +1,347 @@
|
||||
// backend/src/scripts/seedTestData.ts
|
||||
import { db } from '../services/databaseService.js';
|
||||
import bcrypt from 'bcryptjs';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
|
||||
interface TestData {
|
||||
plan_name: string;
|
||||
description: string;
|
||||
period: string;
|
||||
status: string;
|
||||
created_by: string;
|
||||
shifts: {
|
||||
[day: string]: {
|
||||
[shiftType: string]: {
|
||||
time: string;
|
||||
assignments: { [employeeName: string]: number };
|
||||
};
|
||||
};
|
||||
};
|
||||
employee_info: {
|
||||
contract_sizes: { [name: string]: string };
|
||||
employee_types: { [name: string]: string };
|
||||
roles: { [name: string]: string };
|
||||
trainees: { [name: string]: boolean };
|
||||
can_work_alone: { [name: string]: boolean };
|
||||
};
|
||||
availability_scale: {
|
||||
[key: string]: string;
|
||||
};
|
||||
}
|
||||
|
||||
function generateEmail(firstname: string, lastname: string): string {
|
||||
const convertUmlauts = (str: string): string => {
|
||||
return str
|
||||
.toLowerCase()
|
||||
.replace(/ü/g, 'ue')
|
||||
.replace(/ö/g, 'oe')
|
||||
.replace(/ä/g, 'ae')
|
||||
.replace(/ß/g, 'ss');
|
||||
};
|
||||
|
||||
const cleanFirstname = convertUmlauts(firstname).replace(/[^a-z0-9]/g, '');
|
||||
const cleanLastname = convertUmlauts(lastname).replace(/[^a-z0-9]/g, '');
|
||||
|
||||
return `${cleanFirstname}.${cleanLastname}@sp.de`;
|
||||
}
|
||||
|
||||
function mapContractType(germanType: string): 'small' | 'large' | 'flexible' {
|
||||
switch (germanType) {
|
||||
case 'groß': return 'large';
|
||||
case 'klein': return 'small';
|
||||
case 'flexible': return 'flexible';
|
||||
default: return 'small';
|
||||
}
|
||||
}
|
||||
|
||||
function mapDayToNumber(day: string): number {
|
||||
const dayMap: { [key: string]: number } = {
|
||||
'monday': 1,
|
||||
'tuesday': 2,
|
||||
'wednesday': 3,
|
||||
'thursday': 4,
|
||||
'friday': 5,
|
||||
'saturday': 6,
|
||||
'sunday': 7
|
||||
};
|
||||
return dayMap[day.toLowerCase()] || 1;
|
||||
}
|
||||
|
||||
function parseTimeSlot(time: string): { startTime: string; endTime: string } {
|
||||
const [start, end] = time.split(' - ');
|
||||
return {
|
||||
startTime: start.trim(),
|
||||
endTime: end.trim()
|
||||
};
|
||||
}
|
||||
|
||||
export async function seedTestData(): Promise<void> {
|
||||
try {
|
||||
console.log('🌱 Starting test data seeding...');
|
||||
|
||||
// Read test.json file - adjust path to be relative to project root
|
||||
//const testDataPath = path.resolve(process.cwd(), './test.json');
|
||||
const testDataPath = path.resolve(__dirname, './test.json');
|
||||
|
||||
console.log('🔍 Looking for test.json at:', testDataPath);
|
||||
|
||||
if (!fs.existsSync(testDataPath)) {
|
||||
console.log('❌ test.json file not found at:', testDataPath);
|
||||
|
||||
// Try alternative paths
|
||||
const alternativePaths = [
|
||||
//path.resolve(__dirname, '../../../test.json'),
|
||||
//path.resolve(process.cwd(), '../test.json'),
|
||||
//path.resolve(__dirname, '../../test.json'),
|
||||
path.resolve(__dirname, './test.json')
|
||||
];
|
||||
|
||||
for (const altPath of alternativePaths) {
|
||||
console.log('🔍 Trying alternative path:', altPath);
|
||||
if (fs.existsSync(altPath)) {
|
||||
console.log('✅ Found test.json at:', altPath);
|
||||
// Continue with the found path
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
const testDataRaw = fs.readFileSync(testDataPath, 'utf-8');
|
||||
const testData: TestData = JSON.parse(testDataRaw);
|
||||
|
||||
console.log('📊 Loaded test data:', {
|
||||
planName: testData.plan_name,
|
||||
employeeCount: Object.keys(testData.employee_info.contract_sizes).length,
|
||||
days: Object.keys(testData.shifts).length
|
||||
});
|
||||
|
||||
// Start transaction
|
||||
await db.run('BEGIN TRANSACTION');
|
||||
|
||||
try {
|
||||
// 1. Create employees
|
||||
console.log('👥 Creating employees...');
|
||||
const employeeMap: { [name: string]: string } = {};
|
||||
const employeeNames = Object.keys(testData.employee_info.contract_sizes);
|
||||
|
||||
for (const name of employeeNames) {
|
||||
const employeeId = uuidv4();
|
||||
employeeMap[name] = employeeId;
|
||||
|
||||
const [firstname, lastname = ''] = name.split(' ');
|
||||
const email = generateEmail(firstname, lastname || 'Test');
|
||||
const passwordHash = await bcrypt.hash('ZebraAux123!', 10);
|
||||
|
||||
const contractType = mapContractType(testData.employee_info.contract_sizes[name]);
|
||||
const employeeType = testData.employee_info.employee_types[name];
|
||||
const role = testData.employee_info.roles[name];
|
||||
const isTrainee = testData.employee_info.trainees[name];
|
||||
const canWorkAlone = testData.employee_info.can_work_alone[name];
|
||||
|
||||
// Insert employee
|
||||
await db.run(
|
||||
`INSERT INTO employees (
|
||||
id, email, password, firstname, lastname,
|
||||
employee_type, contract_type, can_work_alone,
|
||||
is_trainee, is_active
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
[
|
||||
employeeId,
|
||||
email,
|
||||
passwordHash,
|
||||
firstname,
|
||||
lastname || 'Test',
|
||||
employeeType,
|
||||
contractType,
|
||||
canWorkAlone ? 1 : 0,
|
||||
isTrainee ? 1 : 0,
|
||||
1
|
||||
]
|
||||
);
|
||||
|
||||
// Insert role
|
||||
await db.run(
|
||||
`INSERT INTO employee_roles (employee_id, role) VALUES (?, ?)`,
|
||||
[employeeId, role]
|
||||
);
|
||||
|
||||
console.log(`✅ Created employee: ${name} (${email})`);
|
||||
}
|
||||
|
||||
// 2. Create shift plan
|
||||
console.log('📅 Creating shift plan...');
|
||||
const planId = uuidv4();
|
||||
const [startDate, endDate] = testData.period.split(' bis ');
|
||||
|
||||
// Use the first admin employee as creator
|
||||
const adminEmployee = Object.entries(testData.employee_info.roles)
|
||||
.find(([_, role]) => role === 'admin');
|
||||
const createdBy = adminEmployee ? employeeMap[adminEmployee[0]] : employeeMap[employeeNames[0]];
|
||||
|
||||
await db.run(
|
||||
`INSERT INTO shift_plans (
|
||||
id, name, description, start_date, end_date,
|
||||
is_template, status, created_by
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||
[
|
||||
planId,
|
||||
testData.plan_name,
|
||||
testData.description,
|
||||
startDate.trim(),
|
||||
endDate.trim(),
|
||||
0, // is_template = false
|
||||
'published',
|
||||
createdBy
|
||||
]
|
||||
);
|
||||
|
||||
// 3. Create time slots
|
||||
console.log('⏰ Creating time slots...');
|
||||
const timeSlotMap: { [key: string]: string } = {};
|
||||
|
||||
// Extract unique time slots from shifts
|
||||
const uniqueTimeSlots = new Set<string>();
|
||||
Object.values(testData.shifts).forEach(dayShifts => {
|
||||
Object.values(dayShifts).forEach(shift => {
|
||||
uniqueTimeSlots.add(shift.time);
|
||||
});
|
||||
});
|
||||
|
||||
let timeSlotIndex = 0;
|
||||
for (const time of uniqueTimeSlots) {
|
||||
const timeSlotId = uuidv4();
|
||||
const { startTime, endTime } = parseTimeSlot(time);
|
||||
const name = timeSlotIndex === 0 ? 'Vormittag' : 'Nachmittag';
|
||||
|
||||
await db.run(
|
||||
`INSERT INTO time_slots (id, plan_id, name, start_time, end_time, description)
|
||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||
[timeSlotId, planId, name, startTime, endTime, `Time slot: ${time}`]
|
||||
);
|
||||
|
||||
timeSlotMap[time] = timeSlotId;
|
||||
timeSlotIndex++;
|
||||
}
|
||||
|
||||
// 4. Create shifts
|
||||
console.log('🔄 Creating shifts...');
|
||||
const shiftMap: { [dayTime: string]: string } = {};
|
||||
|
||||
for (const [dayName, dayShifts] of Object.entries(testData.shifts)) {
|
||||
const dayOfWeek = mapDayToNumber(dayName);
|
||||
|
||||
for (const [shiftType, shiftData] of Object.entries(dayShifts)) {
|
||||
const shiftId = uuidv4();
|
||||
const timeSlotId = timeSlotMap[shiftData.time];
|
||||
|
||||
await db.run(
|
||||
`INSERT INTO shifts (id, plan_id, time_slot_id, day_of_week, required_employees, color)
|
||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||
[shiftId, planId, timeSlotId, dayOfWeek, 2, '#3498db']
|
||||
);
|
||||
|
||||
shiftMap[`${dayName}_${shiftType}`] = shiftId;
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Generate scheduled shifts for one week (for template demonstration)
|
||||
console.log('📋 Generating scheduled shifts...');
|
||||
const start = new Date(startDate.trim());
|
||||
|
||||
for (let dayOffset = 0; dayOffset < 7; dayOffset++) {
|
||||
const currentDate = new Date(start);
|
||||
currentDate.setDate(start.getDate() + dayOffset);
|
||||
|
||||
const dayOfWeek = currentDate.getDay() === 0 ? 7 : currentDate.getDay();
|
||||
const dayName = Object.keys(testData.shifts).find(day =>
|
||||
mapDayToNumber(day) === dayOfWeek
|
||||
);
|
||||
|
||||
if (dayName && testData.shifts[dayName]) {
|
||||
for (const [shiftType, shiftData] of Object.entries(testData.shifts[dayName])) {
|
||||
const scheduledShiftId = uuidv4();
|
||||
const timeSlotId = timeSlotMap[shiftData.time];
|
||||
|
||||
await db.run(
|
||||
`INSERT INTO scheduled_shifts (id, plan_id, date, time_slot_id, required_employees, assigned_employees)
|
||||
VALUES (?, ?, ?, ?, ?, ?)`,
|
||||
[
|
||||
scheduledShiftId,
|
||||
planId,
|
||||
currentDate.toISOString().split('T')[0],
|
||||
timeSlotId,
|
||||
2,
|
||||
JSON.stringify([])
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 6. Create employee availabilities
|
||||
console.log('📝 Creating employee availabilities...');
|
||||
|
||||
for (const [dayName, dayShifts] of Object.entries(testData.shifts)) {
|
||||
const dayOfWeek = mapDayToNumber(dayName);
|
||||
|
||||
for (const [shiftType, shiftData] of Object.entries(dayShifts)) {
|
||||
const shiftId = shiftMap[`${dayName}_${shiftType}`];
|
||||
|
||||
for (const [employeeName, preferenceLevel] of Object.entries(shiftData.assignments)) {
|
||||
const employeeId = employeeMap[employeeName];
|
||||
|
||||
if (employeeId) {
|
||||
const availabilityId = uuidv4();
|
||||
|
||||
await db.run(
|
||||
`INSERT INTO employee_availability (id, employee_id, plan_id, shift_id, preference_level)
|
||||
VALUES (?, ?, ?, ?, ?)`,
|
||||
[availabilityId, employeeId, planId, shiftId, preferenceLevel]
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await db.run('COMMIT');
|
||||
|
||||
console.log('🎉 Test data seeded successfully!');
|
||||
console.log('📊 Summary:');
|
||||
console.log(` - Employees: ${employeeNames.length}`);
|
||||
console.log(` - Shift Plan: ${testData.plan_name}`);
|
||||
console.log(` - Time Slots: ${Object.keys(timeSlotMap).length}`);
|
||||
console.log(` - Shifts: ${Object.keys(shiftMap).length}`);
|
||||
console.log(` - Period: ${testData.period}`);
|
||||
|
||||
} catch (error) {
|
||||
await db.run('ROLLBACK');
|
||||
console.error('❌ Error during test data seeding:', error);
|
||||
throw error;
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
console.error('❌ Failed to seed test data:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
// Run if called directly
|
||||
if (import.meta.url === `file://${process.argv[1]}`) {
|
||||
seedTestData()
|
||||
.then(() => {
|
||||
console.log('✅ Seed script completed');
|
||||
process.exit(0);
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('❌ Seed script failed:', error);
|
||||
process.exit(1);
|
||||
});
|
||||
}
|
||||
235
backend/src/scripts/test.json
Normal file
235
backend/src/scripts/test.json
Normal file
@@ -0,0 +1,235 @@
|
||||
{
|
||||
"plan_name": "test",
|
||||
"description": "Standard Vorlage für ZEBRA: Mo-Do Vormittag+Nachmittag, Fr nur Vormittag",
|
||||
"period": "2025-10-01 bis 2026-02-01",
|
||||
"status": "published",
|
||||
"created_by": "Max Mustermann",
|
||||
"shifts": {
|
||||
"monday": {
|
||||
"early": {
|
||||
"time": "8:00 - 12:00",
|
||||
"assignments": {
|
||||
"Jerome": 2,
|
||||
"Patrick": 2,
|
||||
"Andrey": 1,
|
||||
"Fabian": 2,
|
||||
"Lu": 3,
|
||||
"Basti": 1,
|
||||
"Kilian": 3,
|
||||
"Gerald": 1,
|
||||
"Uliana": 2,
|
||||
"Nico": 1,
|
||||
"Linuuuus": 1
|
||||
}
|
||||
},
|
||||
"late": {
|
||||
"time": "11:30 - 15:30",
|
||||
"assignments": {
|
||||
"Jerome": 1,
|
||||
"Patrick": 3,
|
||||
"Andrey": 1,
|
||||
"Fabian": 3,
|
||||
"Lu": 1,
|
||||
"Basti": 1,
|
||||
"Kilian": 3,
|
||||
"Gerald": 3,
|
||||
"Uliana": 3,
|
||||
"Nico": 1,
|
||||
"Linuuuus": 3
|
||||
}
|
||||
}
|
||||
},
|
||||
"tuesday": {
|
||||
"early": {
|
||||
"time": "8:00 - 12:00",
|
||||
"assignments": {
|
||||
"Jerome": 2,
|
||||
"Patrick": 2,
|
||||
"Andrey": 1,
|
||||
"Fabian": 2,
|
||||
"Lu": 3,
|
||||
"Basti": 1,
|
||||
"Kilian": 3,
|
||||
"Gerald": 2,
|
||||
"Uliana": 1,
|
||||
"Nico": 1,
|
||||
"Linuuuus": 2
|
||||
}
|
||||
},
|
||||
"late": {
|
||||
"time": "11:30 - 15:30",
|
||||
"assignments": {
|
||||
"Jerome": 1,
|
||||
"Patrick": 3,
|
||||
"Andrey": 1,
|
||||
"Fabian": 3,
|
||||
"Lu": 3,
|
||||
"Basti": 1,
|
||||
"Kilian": 3,
|
||||
"Gerald": 2,
|
||||
"Uliana": 2,
|
||||
"Nico": 3,
|
||||
"Linuuuus": 2
|
||||
}
|
||||
}
|
||||
},
|
||||
"wednesday": {
|
||||
"early": {
|
||||
"time": "8:00 - 12:00",
|
||||
"assignments": {
|
||||
"Jerome": 2,
|
||||
"Patrick": 2,
|
||||
"Andrey": 1,
|
||||
"Fabian": 2,
|
||||
"Lu": 3,
|
||||
"Basti": 3,
|
||||
"Kilian": 3,
|
||||
"Gerald": 3,
|
||||
"Uliana": 2,
|
||||
"Nico": 3,
|
||||
"Linuuuus": 2
|
||||
}
|
||||
},
|
||||
"late": {
|
||||
"time": "11:30 - 15:30",
|
||||
"assignments": {
|
||||
"Jerome": 2,
|
||||
"Patrick": 3,
|
||||
"Andrey": 1,
|
||||
"Fabian": 3,
|
||||
"Lu": 3,
|
||||
"Basti": 3,
|
||||
"Kilian": 3,
|
||||
"Gerald": 3,
|
||||
"Uliana": 3,
|
||||
"Nico": 1,
|
||||
"Linuuuus": 3
|
||||
}
|
||||
}
|
||||
},
|
||||
"thursday": {
|
||||
"early": {
|
||||
"time": "8:00 - 12:00",
|
||||
"assignments": {
|
||||
"Jerome": 3,
|
||||
"Patrick": 3,
|
||||
"Andrey": 1,
|
||||
"Fabian": 3,
|
||||
"Lu": 3,
|
||||
"Basti": 3,
|
||||
"Kilian": 3,
|
||||
"Gerald": 3,
|
||||
"Uliana": 3,
|
||||
"Nico": 2,
|
||||
"Linuuuus": 2
|
||||
}
|
||||
},
|
||||
"late": {
|
||||
"time": "11:30 - 15:30",
|
||||
"assignments": {
|
||||
"Jerome": 1,
|
||||
"Patrick": 1,
|
||||
"Andrey": 1,
|
||||
"Fabian": 1,
|
||||
"Lu": 3,
|
||||
"Basti": 3,
|
||||
"Kilian": 1,
|
||||
"Gerald": 2,
|
||||
"Uliana": 3,
|
||||
"Nico": 3,
|
||||
"Linuuuus": 3
|
||||
}
|
||||
}
|
||||
},
|
||||
"friday": {
|
||||
"early": {
|
||||
"time": "8:00 - 12:00",
|
||||
"assignments": {
|
||||
"Jerome": 1,
|
||||
"Patrick": 1,
|
||||
"Andrey": 1,
|
||||
"Fabian": 1,
|
||||
"Lu": 1,
|
||||
"Basti": 3,
|
||||
"Kilian": 1,
|
||||
"Gerald": 1,
|
||||
"Uliana": 1,
|
||||
"Nico": 3,
|
||||
"Linuuuus": 3
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"employee_info": {
|
||||
"contract_sizes": {
|
||||
"Jerome": "groß",
|
||||
"Patrick": "groß",
|
||||
"Andrey": "groß",
|
||||
"Fabian": "klein",
|
||||
"Lu": "klein",
|
||||
"Basti": "flexible",
|
||||
"Kilian": "klein",
|
||||
"Gerald": "groß",
|
||||
"Uliana": "groß",
|
||||
"Nico": "klein",
|
||||
"Linuuuus": "klein"
|
||||
},
|
||||
"employee_types": {
|
||||
"Jerome": "personell",
|
||||
"Patrick": "personell",
|
||||
"Andrey": "personell",
|
||||
"Fabian": "personell",
|
||||
"Lu": "personell",
|
||||
"Basti": "manager",
|
||||
"Kilian": "personell",
|
||||
"Gerald": "personell",
|
||||
"Uliana": "personell",
|
||||
"Nico": "personell",
|
||||
"Linuuuus": "personell"
|
||||
},
|
||||
"roles": {
|
||||
"Jerome": "user",
|
||||
"Patrick": "maintenance",
|
||||
"Andrey": "user",
|
||||
"Fabian": "user",
|
||||
"Lu": "user",
|
||||
"Basti": "admin",
|
||||
"Kilian": "user",
|
||||
"Gerald": "user",
|
||||
"Uliana": "user",
|
||||
"Nico": "user",
|
||||
"Linuuuus": "user"
|
||||
},
|
||||
"trainees": {
|
||||
"Jerome": false,
|
||||
"Patrick": false,
|
||||
"Andrey": false,
|
||||
"Fabian": false,
|
||||
"Lu": false,
|
||||
"Basti": false,
|
||||
"Kilian": true,
|
||||
"Gerald": true,
|
||||
"Uliana": true,
|
||||
"Nico": true,
|
||||
"Linuuuus": false
|
||||
},
|
||||
"can_work_alone": {
|
||||
"Jerome": true,
|
||||
"Patrick": true,
|
||||
"Andrey": false,
|
||||
"Fabian": true,
|
||||
"Lu": false,
|
||||
"Basti": false,
|
||||
"Kilian": false,
|
||||
"Gerald": false,
|
||||
"Uliana": false,
|
||||
"Nico": false,
|
||||
"Linuuuus": true
|
||||
}
|
||||
},
|
||||
"availability_scale": {
|
||||
"1": "available",
|
||||
"2": "limited",
|
||||
"3": "unavailable"
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,15 @@ const __dirname = path.dirname(__filename);
|
||||
const app = express();
|
||||
const PORT = 3002;
|
||||
const isDevelopment = process.env.NODE_ENV === 'development';
|
||||
if (isDevelopment) {
|
||||
console.log('🔧 Running in Development mode');
|
||||
} else if (process.env.NODE_ENV === 'production') {
|
||||
console.log('🚀 Running in Production mode');
|
||||
} else {
|
||||
console.log('⚠️ NODE_ENV not set, defaulting to Development mode');
|
||||
console.error('❌ Please set NODE_ENV to "production" or "development" for proper behavior.');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
app.use(authIpCheck);
|
||||
|
||||
@@ -311,6 +320,16 @@ const initializeApp = async () => {
|
||||
const { applyMigration } = await import('./scripts/applyMigration.js');
|
||||
await applyMigration();
|
||||
|
||||
if (isDevelopment && process.env.SEED_TEST_DATA === 'true') {
|
||||
try {
|
||||
const { seedTestData } = await import('./scripts/seedTestData.js');
|
||||
await seedTestData();
|
||||
console.log('✅ Test data seeded successfully');
|
||||
} catch (error) {
|
||||
console.log('⚠️ Test data seeding skipped or failed:', error);
|
||||
}
|
||||
}
|
||||
|
||||
app.listen(PORT, () => {
|
||||
console.log('🎉 APPLICATION STARTED SUCCESSFULLY!');
|
||||
console.log(`📍 Port: ${PORT}`);
|
||||
|
||||
@@ -317,7 +317,17 @@ const AvailabilityManager: React.FC<AvailabilityManagerProps> = ({
|
||||
|
||||
// Convert to array and sort by start time
|
||||
const sortedTimeSlots = Array.from(allTimeSlots.values()).sort((a, b) => {
|
||||
return (a.startTime || '').localeCompare(b.startTime || '');
|
||||
// Convert time strings to minutes for proper numeric comparison
|
||||
const timeToMinutes = (timeStr: string) => {
|
||||
if (!timeStr) return 0;
|
||||
const [hours, minutes] = timeStr.split(':').map(Number);
|
||||
return hours * 60 + minutes;
|
||||
};
|
||||
|
||||
const minutesA = timeToMinutes(a.startTime);
|
||||
const minutesB = timeToMinutes(b.startTime);
|
||||
|
||||
return minutesA - minutesB; // Ascending order (earliest first)
|
||||
});
|
||||
|
||||
return (
|
||||
|
||||
@@ -126,7 +126,7 @@ const ShiftPlanView: React.FC = () => {
|
||||
|
||||
useEffect(() => {
|
||||
if (dropdownRef.current) {
|
||||
setDropdownWidth(dropdownRef.current.offsetWidth);
|
||||
setDropdownWidth(dropdownRef.current.offsetWidth / 40); // Adjust divisor for desired slide distance
|
||||
}
|
||||
}, [exportType]);
|
||||
|
||||
@@ -200,7 +200,17 @@ const ShiftPlanView: React.FC = () => {
|
||||
|
||||
// Convert to array and sort by start time - SAME LOGIC AS AVAILABILITYMANAGER
|
||||
const allTimeSlots = Array.from(allTimeSlotsMap.values()).sort((a, b) => {
|
||||
return (a.startTime || '').localeCompare(b.startTime || '');
|
||||
// Convert time strings to minutes for proper numeric comparison
|
||||
const timeToMinutes = (timeStr: string) => {
|
||||
if (!timeStr) return 0;
|
||||
const [hours, minutes] = timeStr.split(':').map(Number);
|
||||
return hours * 60 + minutes;
|
||||
};
|
||||
|
||||
const minutesA = timeToMinutes(a.startTime);
|
||||
const minutesB = timeToMinutes(b.startTime);
|
||||
|
||||
return minutesA - minutesB; // Ascending order (earliest first)
|
||||
});
|
||||
|
||||
return { days, shiftsByDay, allTimeSlots };
|
||||
@@ -1436,17 +1446,17 @@ const ShiftPlanView: React.FC = () => {
|
||||
<div style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
position: 'relative',
|
||||
marginLeft: '10px'
|
||||
justifyContent: 'flex-end',
|
||||
marginTop: '20px',
|
||||
gap: '10px'
|
||||
}}>
|
||||
{/* Export Dropdown */}
|
||||
{/* Export Dropdown Container */}
|
||||
<div
|
||||
ref={dropdownRef}
|
||||
style={{
|
||||
transform: exportType ? `translateX(-${dropdownWidth}px)` : 'translateX(0)',
|
||||
transition: 'transform 0.3s ease-in-out',
|
||||
position: exportType ? 'absolute' : 'relative',
|
||||
right: exportType ? `-${dropdownWidth}px` : '0'
|
||||
position: 'relative'
|
||||
}}
|
||||
>
|
||||
<select
|
||||
@@ -1467,7 +1477,7 @@ const ShiftPlanView: React.FC = () => {
|
||||
</select>
|
||||
</div>
|
||||
|
||||
{/* Export Button */}
|
||||
{/* Export Button - erscheint nur wenn eine Option ausgewählt ist */}
|
||||
{exportType && (
|
||||
<button
|
||||
onClick={handleExport}
|
||||
@@ -1480,7 +1490,6 @@ const ShiftPlanView: React.FC = () => {
|
||||
borderRadius: '4px',
|
||||
cursor: exporting ? 'not-allowed' : 'pointer',
|
||||
fontWeight: 'bold',
|
||||
marginLeft: '10px',
|
||||
opacity: exporting ? 0.7 : 1,
|
||||
transition: 'opacity 0.2s ease'
|
||||
}}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"build:all": "npm run build --workspace=backend && npm run build --workspace=frontend",
|
||||
"dev": "concurrently \"npm run dev:backend\" \"npm run dev:frontend\"",
|
||||
"dev:frontend": "cd frontend && npm run dev",
|
||||
"dev:backend": "cd backend && npm run dev:single"
|
||||
"dev:backend": "cd backend && npm run dev:all"
|
||||
},
|
||||
"devDependencies": {
|
||||
"typescript": "^5.3.3",
|
||||
|
||||
Reference in New Issue
Block a user