From 80b9c96238c82d9af263a016f0ad6f54666172b1 Mon Sep 17 00:00:00 2001 From: donpat1to Date: Sun, 12 Oct 2025 18:07:16 +0200 Subject: [PATCH] removed templateshiftrouter useless --- backend/src/routes/shiftPlans.ts | 30 +++++++++++++++++++++++++--- backend/src/routes/shiftTemplates.ts | 23 --------------------- backend/src/server.ts | 2 -- 3 files changed, 27 insertions(+), 28 deletions(-) delete mode 100644 backend/src/routes/shiftTemplates.ts diff --git a/backend/src/routes/shiftPlans.ts b/backend/src/routes/shiftPlans.ts index 7b317e2..eb5a8a1 100644 --- a/backend/src/routes/shiftPlans.ts +++ b/backend/src/routes/shiftPlans.ts @@ -6,16 +6,40 @@ import { getShiftPlan, createShiftPlan, updateShiftPlan, - deleteShiftPlan + deleteShiftPlan, + getTemplates, + createFromTemplate, + createFromPreset } from '../controllers/shiftPlanController.js'; const router = express.Router(); router.use(authMiddleware); + +// Combined routes for both shift plans and templates + +// GET all shift plans (including templates) router.get('/', getShiftPlans); + +// GET templates only +router.get('/templates', getTemplates); + +// GET specific shift plan or template router.get('/:id', getShiftPlan); + +// POST create new shift plan router.post('/', requireRole(['admin', 'instandhalter']), createShiftPlan); -router.put('/:id', updateShiftPlan); -router.delete('/:id', deleteShiftPlan); + +// POST create new plan from template +router.post('/from-template', requireRole(['admin', 'instandhalter']), createFromTemplate); + +// POST create new plan from preset +router.post('/from-preset', requireRole(['admin', 'instandhalter']), createFromPreset); + +// PUT update shift plan or template +router.put('/:id', requireRole(['admin', 'instandhalter']), updateShiftPlan); + +// DELETE shift plan or template +router.delete('/:id', requireRole(['admin', 'instandhalter']), deleteShiftPlan); export default router; \ No newline at end of file diff --git a/backend/src/routes/shiftTemplates.ts b/backend/src/routes/shiftTemplates.ts deleted file mode 100644 index bdc0581..0000000 --- a/backend/src/routes/shiftTemplates.ts +++ /dev/null @@ -1,23 +0,0 @@ -// backend/src/routes/shiftTemplates.ts -import express from 'express'; -import { authMiddleware } from '../middleware/auth.js'; -import { - getTemplates, - getShiftPlans, - getShiftPlan, - createFromTemplate, - updateShiftPlan, - deleteShiftPlan -} from '../controllers/shiftPlanController.js'; - - -const router = express.Router(); - -router.use(authMiddleware); -router.get('/', getTemplates); -router.get('/:id', getShiftPlan); -router.post('/', requireRole(['admin', 'instandhalter']), createFromTemplate); -router.put('/:id', requireRole(['admin', 'instandhalter']), updateShiftPlan); -router.delete('/:id', requireRole(['admin', 'instandhalter']), deleteShiftPlan); - -export default router; \ No newline at end of file diff --git a/backend/src/server.ts b/backend/src/server.ts index 0c2427a..838021b 100644 --- a/backend/src/server.ts +++ b/backend/src/server.ts @@ -8,7 +8,6 @@ import { initializeDatabase } from './scripts/initializeDatabase.js'; import authRoutes from './routes/auth.js'; import employeeRoutes from './routes/employees.js'; import shiftPlanRoutes from './routes/shiftPlans.js'; -import shiftTemplateRoutes from './routes/shiftTemplates.js'; import setupRoutes from './routes/setup.js'; const app = express(); @@ -23,7 +22,6 @@ app.use('/api/setup', setupRoutes); app.use('/api/auth', authRoutes); app.use('/api/employees', employeeRoutes); app.use('/api/shift-plans', shiftPlanRoutes); -app.use('/api/shift-templates', shiftTemplateRoutes); // Health route app.get('/api/health', (req: any, res: any) => {