Actualizar server.js
This commit is contained in:
10
server.js
10
server.js
@@ -625,25 +625,19 @@ app.get("/services/active", authMiddleware, async (req, res) => {
|
|||||||
SELECT
|
SELECT
|
||||||
s.*,
|
s.*,
|
||||||
u.full_name as assigned_name,
|
u.full_name as assigned_name,
|
||||||
-- Lógica para determinar si va a la izquierda o derecha en el panel
|
|
||||||
CASE
|
CASE
|
||||||
WHEN (s.raw_data->>'scheduled_date') IS NULL OR (s.raw_data->>'scheduled_date') = '' THEN 'asignado_operario'
|
WHEN (s.raw_data->>'scheduled_date') IS NULL OR (s.raw_data->>'scheduled_date') = '' THEN 'asignado_operario'
|
||||||
ELSE 'citado'
|
ELSE 'citado'
|
||||||
END as estado_operativo
|
END as estado_operativo
|
||||||
FROM scraped_services s
|
FROM scraped_services s
|
||||||
LEFT JOIN users u ON (s.raw_data->>'assigned_to')::int = u.id
|
LEFT JOIN users u ON s.assigned_to = u.id
|
||||||
WHERE s.owner_id = $1
|
WHERE s.owner_id = $1
|
||||||
-- Aseguramos que salgan los que ya tienen operario
|
|
||||||
AND (s.automation_status = 'completed' OR s.status = 'imported')
|
AND (s.automation_status = 'completed' OR s.status = 'imported')
|
||||||
AND s.status != 'archived'
|
AND s.status != 'archived'
|
||||||
ORDER BY s.created_at DESC
|
ORDER BY s.created_at DESC
|
||||||
`, [req.user.accountId]);
|
`, [req.user.accountId]);
|
||||||
|
|
||||||
res.json({ ok: true, services: q.rows });
|
res.json({ ok: true, services: q.rows });
|
||||||
} catch (e) {
|
} catch (e) { res.status(500).json({ ok: false }); }
|
||||||
console.error("Error ruta active:", e.message);
|
|
||||||
res.status(500).json({ ok: false });
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Ruta para fijar la cita (Mueve el servicio de la izquierda a la derecha)
|
// Ruta para fijar la cita (Mueve el servicio de la izquierda a la derecha)
|
||||||
|
|||||||
Reference in New Issue
Block a user