pc responsive issues

app/main.py

@@ -169,6 +169,25 @@ def escape_md(text):
         text = text.replace(char, f"\\{char}")
     return text
 
+def mark_as_delivered(loan_id):
+    """Lógica central para marcar un préstamo como entregado físicamente."""
+    loan = None
+    for l in loan_mgr.get_all():
+        if l['id'] == loan_id:
+            loan = l
+            break
+    
+    if loan and loan['status_loan'] == "ACCEPTED":
+        # Hora AST (Rep. Dom.)
+        utc_now = datetime.datetime.now(datetime.timezone.utc)
+        rd_now = utc_now - datetime.timedelta(hours=4)
+        ahora = rd_now.strftime("%H:%M")
+        
+        loan_mgr.update_status(loan_id, "DELIVERED")
+        socketio.emit('notification', {"text": f"{loan['Solicitante']} ha entregado", "color": "blue"})
+        return True, loan, ahora
+    return False, None, None
+
 if bot:
     @bot.callback_query_handler(func=lambda call: True)
     def handle_query(call):
@@ -177,9 +196,16 @@ if bot:
                 loan_id = call.data.replace("accept_", "")
                 if loan_mgr.update_status(loan_id, "ACCEPTED"):
                     bot.answer_callback_query(call.id, "Préstamo Aceptado")
+                    
+                    # Al aceptar, añadimos el botón de "ENTREGAR" en el mismo mensaje
+                    markup = types.InlineKeyboardMarkup()
+                    markup.add(types.InlineKeyboardButton("📦 MARCAR ENTREGADO", callback_data=f"deliver_{loan_id}"))
+                    
                     nuevo_texto = f"✅ *ACEPTADO*\n{escape_md(call.message.text)}"
-                    bot.edit_message_text(nuevo_texto, call.message.chat.id, call.message.message_id, parse_mode="Markdown")
+                    bot.edit_message_text(nuevo_texto, call.message.chat.id, call.message.message_id, 
+                                        reply_markup=markup, parse_mode="Markdown")
                     socketio.emit('notification', {"text": f"Préstamo {loan_id[:8]} ACEPTADO", "color": "green"})
+                    
             elif call.data.startswith("decline_"):
                 loan_id = call.data.replace("decline_", "")
                 if loan_mgr.update_status(loan_id, "DECLINED"):
@@ -187,22 +213,41 @@ if bot:
                     nuevo_texto = f"❌ *DECLINADO*\n{escape_md(call.message.text)}"
                     bot.edit_message_text(nuevo_texto, call.message.chat.id, call.message.message_id, parse_mode="Markdown")
                     socketio.emit('notification', {"text": f"Préstamo {loan_id[:8]} DECLINADO", "color": "red"})
+                    
+            elif call.data.startswith("deliver_"):
+                loan_id = call.data.replace("deliver_", "")
+                success, loan, ahora = mark_as_delivered(loan_id)
+                if success:
+                    bot.answer_callback_query(call.id, "Entrega Confirmada")
+                    nuevo_texto = f"📦 *ENTREGADO A LAS {ahora}*\n{escape_md(call.message.text)}"
+                    bot.edit_message_text(nuevo_texto, call.message.chat.id, call.message.message_id, parse_mode="Markdown")
+                else:
+                    bot.answer_callback_query(call.id, "Error: El préstamo no está aceptado o no existe", show_alert=True)
+                    
         except Exception as e:
             print(f"Callback Error: {e}")
 
-    @bot.message_handler(commands=['aceptar', 'declinar', 'status'])
+    @bot.message_handler(commands=['aceptar', 'declinar', 'entregado', 'status'])
     def handle_text_commands(message):
         try:
             text = message.text.split()
             if len(text) < 2:
-                bot.reply_to(message, "Uso: /aceptar <id> o /declinar <id>")
+                bot.reply_to(message, "Uso: /aceptar <id>, /declinar <id> o /entregado <id>")
                 return
             cmd = text[0][1:]; 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}")
-                socketio.emit('notification', {"text": f"Préstamo {loan_id[:8]} {status}", "color": "green" if status == "ACCEPTED" else "red"})
+            
+            if cmd == "entregado":
+                success, loan, ahora = mark_as_delivered(loan_id)
+                if success:
+                    bot.reply_to(message, f"📦 Entrega confirmada para {loan['Solicitante']} a las {ahora}")
+                else:
+                    bot.reply_to(message, "No se pudo marcar como entregado. Verifica el ID y el estado.")
+            else:
+                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}")
+                    socketio.emit('notification', {"text": f"Préstamo {loan_id[:8]} {status}", "color": "green" if status == "ACCEPTED" else "red"})
         except Exception as e:
             print(f"Command Error: {e}")
 
@@ -329,37 +374,7 @@ def api_prestamo():
     
     return jsonify({"status": "success", "id": loan_id})
 
-@app.route('/api/entregar/<loan_id>', methods=['POST'])
-def api_entregar(loan_id):
-    loan = None
-    for l in loan_mgr.get_all():
-        if l['id'] == loan_id:
-            loan = l
-            break
-            
-    if not loan or loan['status_loan'] != "ACCEPTED":
-        return jsonify({"status": "error", "message": "No se puede entregar"}), 400
-
-    # Hora AST (Rep. Dom.)
-    utc_now = datetime.datetime.now(datetime.timezone.utc)
-    rd_now = utc_now - datetime.timedelta(hours=4)
-    ahora = rd_now.strftime("%H:%M")
-    
-    loan_mgr.update_status(loan_id, "DELIVERED")
-    
-    mensaje_tg = (
-        "📦 *ENTREGA DE MATERIALES*\n"
-        f"👤 *Solicitante:* {escape_md(loan['Solicitante'])}\n"
-        f"⏰ *Hora de entrega:* {ahora}\n"
-        f"🛠 *Items:* {escape_md(loan['item'])}"
-    )
-    
-    if bot and TG_CHAT_ID:
-        try: bot.send_message(TG_CHAT_ID, mensaje_tg, parse_mode="Markdown")
-        except: pass
-
-    socketio.emit('notification', {"text": f"Entrega confirmada para {loan['Solicitante']}", "color": "blue"})
-    return jsonify({"status": "success"})
+    return jsonify({"status": "success", "id": loan_id})
 
 @app.route('/repos')
 @login_required

app/templates/prestamos.html

@@ -203,11 +203,6 @@
             <p style="white-space:pre-wrap; font-size:0.9rem;">${loan.item}</p>
             
             <div style="display:flex; gap:1rem; margin-top:1.5rem;">
-                ${config.canDeliver ? `
-                    <button class="btn" style="flex:1; background:#3b82f6; color:white;" onclick="entregarPrestamo('${loan.id}')">
-                        <i class="fas fa-box"></i> ENTREGAR
-                    </button>
-                ` : ''}
                 <button class="btn btn-primary" style="flex:1;" onclick="closeModal()">Cerrar</button>
             </div>
         `;
@@ -215,21 +210,6 @@
         overlay.style.display = 'block';
     }
 
-    // Acción para marcar como entregado físicamente (Handover)
-    async function entregarPrestamo(loanId) {
-        if (!confirm('¿Confirmar la entrega de materiales?')) return;
-
-        const response = await fetch(`/api/entregar/${loanId}`, {
-            method: 'POST'
-        });
-
-        if (response.ok) {
-            location.reload();
-        } else {
-            alert('Error al procesar la entrega');
-        }
-    }
-
     // Cerrar modal de recibo
     function closeModal() {
         document.getElementById('modal-content').style.display = 'none';