add decline and acceptation buttons

app/main.py

@@ -4,7 +4,48 @@ import os
 import base64
 import requests
 import datetime
-import socket  # Importado para manejar errores de DNS
+import socket
+import json
+import threading
+import uuid
+import telebot
+from telebot import types
+
+# --- CLASE PARA PERSISTENCIA ---
+class LoanManager:
+    def __init__(self, filename="prestamos.json"):
+        self.filename = filename
+        self.loans = self._load()
+
+    def _load(self):
+        if os.path.exists(self.filename):
+            try:
+                with open(self.filename, "r") as f:
+                    return json.load(f)
+            except:
+                return []
+        return []
+
+    def save(self):
+        with open(self.filename, "w") as f:
+            json.dump(self.loans, f, indent=4)
+
+    def add_loan(self, loan):
+        self.loans.append(loan)
+        self.save()
+
+    def update_status(self, loan_id, status):
+        for loan in self.loans:
+            if loan["id"] == loan_id:
+                loan["status_loan"] = status
+                self.save()
+                return True
+        return False
+
+    def get_all(self):
+        return self.loans
+
+loan_mgr = LoanManager()
 
 def main(page: ft.Page):
     page.title = "MAKERSPACE DATABASE"
@@ -18,35 +59,87 @@ def main(page: ft.Page):
     GIT_TOKEN = os.getenv("GITLAB_TOKEN")
     GIT_GROUP = os.getenv("GITLAB_GROUP_ID")
 
-    historial_datos = []
-    
-    # Crear una sesión persistente para estabilizar la conexión en el contenedor
-    http_session = requests.Session()
+    # Inicializar bot
+    bot = telebot.TeleBot(TG_TOKEN) if TG_TOKEN else None
 
-    def enviar_telegram(mensaje):
-        # Reemplaza con la URL que copiaste de Google
-        GOOGLE_PROXY_URL = f"https://script.google.com/macros/s/AKfycbz7z1Jb0vsur42GmmqrL3PVXeRkN2WxSojFDIleEDoLOg6MnrmJjb_uuPcQ15CTwyzD/exec"
+    def mostrar_notificacion(texto, color="blue"):
+        snack = ft.SnackBar(ft.Text(texto), bgcolor=color)
+        page.overlay.append(snack)
+        snack.open = True
+        page.update()
 
+    def enviar_telegram_con_botones(loan_id, mensaje):
+        if not bot or not TG_CHAT_ID:
+            return "ERR_TOKEN"
+        
+        markup = types.InlineKeyboardMarkup()
+        btn_aceptar = types.InlineKeyboardButton("✅ Aceptar", callback_data=f"accept_{loan_id}")
+        btn_declinar = types.InlineKeyboardButton("❌ Declinar", callback_data=f"decline_{loan_id}")
+        markup.add(btn_aceptar, btn_declinar)
         
-        chat_id = str(os.getenv("TELEGRAM_CHAT_ID", "")).strip()
-        payload = {"chat_id": chat_id, "text": mensaje}
-
         try:
-            # Hugging Face sí permite hablar con Google
-            response = requests.post(GOOGLE_PROXY_URL, json=payload, timeout=15)
-            if "OK" in response.text:
-                return "OK"
-            return "ERR_PROXY"
-        except:
-            return "ERR_FINAL"
-     
+            bot.send_message(TG_CHAT_ID, mensaje, reply_markup=markup, parse_mode="Markdown")
+            return "OK"
+        except Exception as e:
+            print(f"Error Telegram: {e}")
+            return "ERR_TG"
 
+    # --- BOT CALLBACK HANDLER ---
+    @bot.callback_query_handler(func=lambda call: True)
+    def handle_query(call):
+        if call.data.startswith("accept_"):
+            loan_id = call.data.replace("accept_", "")
+            if loan_mgr.update_status(loan_id, "ACCEPTED"):
+                bot.answer_callback_query(call.id, "Préstamo Aceptado")
+                bot.edit_message_text(f"✅ *ACEPTADO*\n{call.message.text}", TG_CHAT_ID, call.message.message_id, parse_mode="Markdown")
+                mostrar_notificacion(f"Préstamo {loan_id[:8]} ACEPTADO", ft.Colors.GREEN)
+        elif call.data.startswith("decline_"):
+            loan_id = call.data.replace("decline_", "")
+            if loan_mgr.update_status(loan_id, "DECLINED"):
+                bot.answer_callback_query(call.id, "Préstamo Declinado")
+                bot.edit_message_text(f"❌ *DECLINADO*\n{call.message.text}", TG_CHAT_ID, call.message.message_id, parse_mode="Markdown")
+                mostrar_notificacion(f"Préstamo {loan_id[:8]} DECLINADO", ft.Colors.RED)
+        page.update()
+
+    # --- BOT COMMAND HANDLER ---
+    @bot.message_handler(commands=['aceptar', 'declinar', 'status'])
+    def handle_text_commands(message):
+        text = message.text.split()
+        if len(text) < 2:
+            bot.reply_to(message, "Uso: /aceptar <id> o /declinar <id>")
+            return
         
+        cmd = text[0][1:] # 'aceptar' o 'declinar'
+        loan_id = text[1]
+        
+        status = "ACCEPTED" if cmd == "aceptar" else "DECLINED"
+        if loan_mgr.update_status(loan_id, status):
+            emoji = "✅" if status == "ACCEPTED" else "❌"
+            bot.reply_to(message, f"{emoji} Préstamo {loan_id} actualizado a {status}")
+            mostrar_notificacion(f"Préstamo {loan_id[:8]} {status}", ft.Colors.GREEN if status == "ACCEPTED" else ft.Colors.RED)
+        else:
+            bot.reply_to(message, "ID de pr��stamo no encontrado.")
+        page.update()
+
+    def start_bot():
+        if bot:
+            bot.infinity_polling()
+
+    # Iniciar polling en hilo separado
+    if TG_TOKEN:
+        threading.Thread(target=start_bot, daemon=True).start()
+
     def mostrar_factura(i):
+        status_color = {
+            "PENDING": ft.Colors.ORANGE,
+            "ACCEPTED": ft.Colors.GREEN,
+            "DECLINED": ft.Colors.RED
+        }.get(i.get('status_loan', 'PENDING'), ft.Colors.GREY)
+
         dialog = ft.AlertDialog(
             title=ft.Text("RECIBO DE PRÉSTAMO", weight="bold"),
             content=ft.Column([
-                ft.Text(f"ESTADO: {'✅ ENVIADO' if i['status']=='OK' else '⚠️ LOCAL'}", color="green" if i['status']=='OK' else "orange", weight="bold"),
+                ft.Text(f"ESTADO: {i.get('status_loan', 'PENDING')}", color=status_color, weight="bold"),
                 ft.Divider(),
                 ft.Text(f"ALUMNO: {i['alumno']}", size=16),
                 ft.Text(f"ITEM: {i['item']}", weight="bold"),
@@ -54,6 +147,7 @@ def main(page: ft.Page):
                 ft.Divider(),
                 ft.Text(f"SALIDA: {i['hora']}"),
                 ft.Text(f"RETORNO EST.: {i['devolucion']}"),
+                ft.Text(f"ID: {i['id']}", size=10, color="grey"),
             ], tight=True, spacing=5),
             actions=[ft.TextButton("Cerrar", on_click=lambda _: page.close_dialog())]
         )
@@ -64,7 +158,6 @@ def main(page: ft.Page):
     def route_change(route):
         page.views.clear()
         
-        # --- MENÚ PRINCIPAL ---
         if page.route == "/":
             page.views.append(
                 ft.View("/", [
@@ -77,7 +170,6 @@ def main(page: ft.Page):
                 ])
             )
 
-        # --- SECCIÓN PRÉSTAMOS ---
         elif page.route == "/prestamos":
             ahora_rd = (datetime.datetime.utcnow() - datetime.timedelta(hours=4)).strftime('%H:%M')
             nombre = ft.TextField(label="Alumno", expand=True)
@@ -89,43 +181,72 @@ def main(page: ft.Page):
             lista_historial = ft.ListView(expand=True, spacing=10)
 
             def crear_card(d):
+                icon = ft.Icons.HOURGLASS_EMPTY
+                color = ft.Colors.ORANGE
+                if d.get('status_loan') == "ACCEPTED":
+                    icon = ft.Icons.CHECK_CIRCLE
+                    color = ft.Colors.GREEN
+                elif d.get('status_loan') == "DECLINED":
+                    icon = ft.Icons.CANCEL
+                    color = ft.Colors.RED
+
                 return ft.Container(
                     content=ft.ListTile(
                         title=ft.Text(d['alumno'], weight="bold"),
                         subtitle=ft.Text(f"{d['item']} (x{d['cantidad']})"),
-                        trailing=ft.Icon(ft.Icons.CHECK_CIRCLE, color="green") if d['status']=="OK" else ft.Icon(ft.Icons.REPORT_GMAILERRORRED, color="orange"),
+                        trailing=ft.Icon(icon, color=color),
                         on_click=lambda _: mostrar_factura(d)
                     ), bgcolor="#2d3238", border_radius=10
                 )
 
-            for d in reversed(historial_datos):
-                lista_historial.controls.append(crear_card(d))
+            def refactor_list():
+                lista_historial.controls.clear()
+                for d in reversed(loan_mgr.get_all()):
+                    lista_historial.controls.append(crear_card(d))
+                page.update()
+
+            refactor_list()
 
             def registrar(e):
                 if not nombre.value or not item.value:
                     st_txt.value = "⚠️ Completa los datos"; st_txt.color="red"; page.update(); return
-                res = enviar_telegram(f"🛠 *PRÉSTAMO*\n👤 {nombre.value}\n📦 {item.value}\n🔢 Cant: {cant.value}\n🕒 Hora: {h_ext.value}")
-                nuevo = {"alumno": nombre.value, "item": item.value, "cantidad": cant.value, "hora": h_ext.value, "devolucion": h_dev.value or "--:--", "status": res}
-                historial_datos.append(nuevo)
-                lista_historial.controls.insert(0, crear_card(nuevo))
-                st_txt.value = "✅ Registrado" if res == "OK" else f"❌ Error: {res}"
-                st_txt.color = "green" if res == "OK" else "orange"
+                
+                loan_id = str(uuid.uuid4())
+                mensaje_tg = f"🛠 *SOLICITUD DE PRÉSTAMO*\n👤 {nombre.value}\n📦 {item.value}\n🔢 Cant: {cant.value}\n🕒 Hora: {h_ext.value}"
+                
+                res_tg = enviar_telegram_con_botones(loan_id, mensaje_tg)
+                
+                nuevo = {
+                    "id": loan_id,
+                    "alumno": nombre.value,
+                    "item": item.value,
+                    "cantidad": cant.value,
+                    "hora": h_ext.value,
+                    "devolucion": h_dev.value or "--:--",
+                    "status_loan": "PENDING",
+                    "status_tg": res_tg
+                }
+                
+                loan_mgr.add_loan(nuevo)
+                refactor_list()
+                
+                st_txt.value = "✅ Solicitud Enviada" if res_tg == "OK" else f"⚠️ Error Telegram: {res_tg}"
+                st_txt.color = "green" if res_tg == "OK" else "orange"
                 nombre.value = ""; item.value = ""; page.update()
 
             page.views.append(
                 ft.View("/prestamos", [
                     ft.AppBar(title=ft.Text("Préstamos"), bgcolor="#1a1c1e"),
                     ft.Column([
-                        ft.Text("REGISTRO", size=18, weight="bold"),
+                        ft.Text("SOLICITAR HERRAMIENTA", size=18, weight="bold"),
                         nombre, ft.Row([cant, h_ext, h_dev], spacing=10), item,
-                        ft.ElevatedButton("CONFIRMAR", icon=ft.Icons.SEND, on_click=registrar, bgcolor=ft.Colors.GREEN_800, color="white", height=50, width=float("inf")),
-                        st_txt, ft.Divider(), ft.Text("HISTORIAL (Click p/ detalle)", size=18, weight="bold"),
+                        ft.ElevatedButton("ENVIAR SOLICITUD", icon=ft.Icons.SEND, on_click=registrar, bgcolor=ft.Colors.GREEN_800, color="white", height=50, width=float("inf")),
+                        st_txt, ft.Divider(), ft.Text("HISTORIAL DE SOLICITUDES", size=18, weight="bold"),
                         lista_historial, ft.TextButton("Volver", on_click=lambda _: page.go("/"))
                     ], scroll=ft.ScrollMode.ADAPTIVE, expand=True, spacing=10)
                 ])
             )
 
-        # --- SECCIÓN LISTA REPOS ---
         elif page.route == "/repos":
             repo_list = ft.ListView(expand=True, spacing=10)
             page.views.append(ft.View("/repos", [ft.AppBar(title=ft.Text("Proyectos")), repo_list, ft.TextButton("Volver", on_click=lambda _: page.go("/"))]))
@@ -136,7 +257,6 @@ def main(page: ft.Page):
                 page.update()
             except: pass
 
-        # --- VISTA DETALLE REPO (CON README) ---
         elif page.route.startswith("/ver/"):
             parts = page.route.split("/")
             pid, pname = parts[2], parts[3]
@@ -145,16 +265,13 @@ def main(page: ft.Page):
             try:
                 gl = gitlab.Gitlab(GITLAB_URL, private_token=GIT_TOKEN)
                 project = gl.projects.get(pid)
-                
-                # Intentar cargar README
-                readme_text = "README.md no encontrado en main/master."
+                readme_text = "README.md no encontrado."
                 for branch in ["main", "master"]:
                     try:
                         f = project.files.get(file_path='README.md', ref=branch)
                         readme_text = base64.b64decode(f.content).decode("utf-8")
                         break
                     except: continue
-                
                 c_area.controls.append(ft.Markdown(readme_text, selectable=True, extension_set=ft.MarkdownExtensionSet.GITHUB_WEB))
                 c_area.controls.append(ft.Divider())
                 c_area.controls.append(ft.Row([
@@ -163,7 +280,6 @@ def main(page: ft.Page):
                 ], alignment=ft.MainAxisAlignment.CENTER))
                 page.update()
             except: pass
-
         page.update()
 
     page.on_route_change = route_change

app/requirements.txt

@@ -1,3 +1,4 @@
 flet
 python-gitlab
 requests
+pyTelegramBotAPI