From 2a2e9b38ac3cda3397ab739298c5ad24039aa89e Mon Sep 17 00:00:00 2001
From: marsalva <info@marsalva.es>
Date: Sun, 15 Feb 2026 22:27:42 +0000
Subject: [PATCH] Actualizar server.js

---
 server.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/server.js b/server.js
index 12a1072..e2cbcae 100644
--- a/server.js
+++ b/server.js
@@ -592,15 +592,19 @@ app.get("/services/active", authMiddleware, async (req, res) => {
         const q = await pool.query(`
             SELECT 
                 s.*, 
-                st.name as status_name, 
-                st.color as status_color, 
                 u.full_name as assigned_name,
-                g.name as guild_name
+                g.name as guild_name,
+                -- Determinamos el estado operativo
+                CASE 
+                    WHEN (s.raw_data->>'scheduled_date') IS NULL OR (s.raw_data->>'scheduled_date') = '' THEN 'asignado_operario'
+                    ELSE 'citado'
+                END as estado_operativo
             FROM scraped_services s
-            LEFT JOIN service_statuses st ON (s.raw_data->>'status_id')::int = st.id
             LEFT JOIN users u ON (s.raw_data->>'assigned_to')::int = u.id
             LEFT JOIN guilds g ON (s.raw_data->>'guild_id')::int = g.id
-            WHERE s.owner_id = $1 AND s.status = 'imported'
+            WHERE s.owner_id = $1 
+            AND (s.automation_status = 'completed' OR s.status = 'imported')
+            AND s.status != 'archived'
             ORDER BY s.created_at DESC
         `, [req.user.accountId]);
         res.json({ ok: true, services: q.rows });