diff --git a/app.py b/app.py index 74e8fbd..89f6267 100644 --- a/app.py +++ b/app.py @@ -25,15 +25,15 @@ def obtener_turnos(mon_id): print(f"Error al conectar: {e}") return None -def obtener_pie(mon_id): +def obtener_pie(mon_id1, mon_id2): conn = get_connection() if not conn: return [] try: cursor = conn.cursor() - cursor.execute("SELECT MENSAJE FROM CSMK_MONITOR_PIE WHERE MONITOR_ID = :monitor AND INACTIVO = 0 ORDER BY MONITOR_PIE_ID ASC",{'monitor':mon_id}) + cursor.execute("SELECT MENSAJE FROM CSMK_MONITOR_PIE WHERE MONITOR_ID IN (:monitor, :monitor2) AND INACTIVO = 0 ORDER BY MONITOR_ID, MONITOR_PIE_ID ASC",{'monitor':mon_id1, 'monitor2':mon_id2}) mensajes = [fila[0] for fila in cursor.fetchall()] - mensaje_final = "          ".join(mensajes) + mensaje_final = "       ".join(mensajes) cursor.close() conn.close() return mensaje_final @@ -57,7 +57,7 @@ def api_datos2(): @app.route('/api/footer') def api_pie(): - mensaje = obtener_pie(1) + mensaje = obtener_pie(monitor1, monitor2) return Response(mensaje, mimetype='text/plain') if __name__ == '__main__': diff --git a/static/css/styles.css b/static/css/styles.css index 1a0484f..4c2b7a4 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -8,7 +8,7 @@ } .animate-scroll { - animation: scroll 45s linear infinite; + animation: scroll 69s linear infinite; } @keyframes blink { diff --git a/static/js/scripts.js b/static/js/scripts.js index fc9ee67..222fab9 100644 --- a/static/js/scripts.js +++ b/static/js/scripts.js @@ -79,6 +79,7 @@ function actualizarTablas(){ cargarTabla("/api/datos1","turnos1"); cargarTabla("/api/datos2","turnos2"); } + cargarFooter(); actualizarTablas(); setInterval(actualizarTablas, 30000); diff --git a/templates/index.html b/templates/index.html index 58eb8eb..7a99c41 100644 --- a/templates/index.html +++ b/templates/index.html @@ -44,17 +44,17 @@ - \ No newline at end of file