Actualizar server.js
This commit is contained in:
17
server.js
17
server.js
@@ -1213,9 +1213,10 @@ app.get("/discovery/keys/:provider", authMiddleware, async (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
// AÑADIDO Y MEJORADO: Ruta para el Panel Operativo (Muestra TODOS los activos)
|
// AÑADIDO Y MEJORADO: Ruta para el Panel Operativo (Muestra TODOS los activos)
|
||||||
|
// AÑADIDO Y MEJORADO: Ruta para el Panel Operativo (Muestra TODOS los activos o filtra por operario)
|
||||||
app.get("/services/active", authMiddleware, async (req, res) => {
|
app.get("/services/active", authMiddleware, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const q = await pool.query(`
|
let query = `
|
||||||
SELECT
|
SELECT
|
||||||
s.*,
|
s.*,
|
||||||
u.full_name as assigned_name
|
u.full_name as assigned_name
|
||||||
@@ -1223,8 +1224,18 @@ app.get("/services/active", authMiddleware, async (req, res) => {
|
|||||||
LEFT JOIN users u ON s.assigned_to = u.id
|
LEFT JOIN users u ON s.assigned_to = u.id
|
||||||
WHERE s.owner_id = $1
|
WHERE s.owner_id = $1
|
||||||
AND s.status != 'archived'
|
AND s.status != 'archived'
|
||||||
ORDER BY s.created_at DESC
|
`;
|
||||||
`, [req.user.accountId]);
|
const params = [req.user.accountId];
|
||||||
|
|
||||||
|
// SI ES OPERARIO, SOLO VE LO SUYO
|
||||||
|
if (req.user.role === 'operario') {
|
||||||
|
query += ` AND s.assigned_to = $2`;
|
||||||
|
params.push(req.user.sub);
|
||||||
|
}
|
||||||
|
|
||||||
|
query += ` ORDER BY s.created_at DESC`;
|
||||||
|
|
||||||
|
const q = await pool.query(query, params);
|
||||||
res.json({ ok: true, services: q.rows });
|
res.json({ ok: true, services: q.rows });
|
||||||
} catch (e) { res.status(500).json({ ok: false }); }
|
} catch (e) { res.status(500).json({ ok: false }); }
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user