sustitude flet by flask

app/main.py

@@ -11,6 +11,7 @@ import datetime
 from flask import Flask, render_template, request, jsonify, redirect, url_for, flash
 from flask_socketio import SocketIO, emit
 from flask_login import LoginManager, UserMixin, login_user, login_required, logout_user, current_user
+from werkzeug.security import generate_password_hash, check_password_hash
 import mysql.connector
 import gitlab
 import telebot
@@ -207,12 +208,11 @@ def login():
             return render_template('login.html')
             
         cursor = conn.cursor(dictionary=True)
-        # NOTA: En producción usar hashing (e.g. werkzeug.security)
-        cursor.execute("SELECT id, username FROM users WHERE username = %s AND password = %s", (username, password))
+        cursor.execute("SELECT id, username, password FROM users WHERE username = %s", (username,))
         user_data = cursor.fetchone()
         conn.close()
         
-        if user_data:
+        if user_data and check_password_hash(user_data['password'], password):
             user = User(str(user_data['id']), user_data['username'])
             login_user(user)
             flash(f"¡Bienvenido, {username}!", "green")
@@ -281,6 +281,39 @@ def api_prestamo():
     loan_mgr.add_loan(nuevo)
     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:
+        return jsonify({"status": "error", "message": "Préstamo no encontrado"}), 404
+        
+    if loan['status_loan'] != "ACCEPTED":
+        return jsonify({"status": "error", "message": "Solo se pueden entregar préstamos aceptados"}), 400
+
+    ahora = datetime.datetime.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 Exception as e:
+            print(f"Error Telegram Entregar: {e}")
+
+    socketio.emit('notification', {"text": f"Entrega confirmada para {loan['Solicitante']}", "color": "blue"})
+    return jsonify({"status": "success"})
+
 @app.route('/repos')
 @login_required
 def repos():

app/templates/prestamos.html

@@ -84,6 +84,8 @@
             <div style="text-align: right;">
                 {% if loan.status_loan == 'ACCEPTED' %}
                 <i class="fas fa-check-circle" style="color: #10b981; font-size: 1.5rem;"></i>
+                {% elif loan.status_loan == 'DELIVERED' %}
+                <i class="fas fa-box" style="color: #3b82f6; font-size: 1.5rem;"></i>
                 {% elif loan.status_loan == 'DECLINED' %}
                 <i class="fas fa-times-circle" style="color: #ef4444; font-size: 1.5rem;"></i>
                 {% else %}
@@ -183,12 +185,18 @@
         const modal = document.getElementById('modal-content');
         const overlay = document.getElementById('modal-overlay');
 
-        const statusColor = loan.status_loan === 'ACCEPTED' ? '#10b981' : (loan.status_loan === 'DECLINED' ? '#ef4444' : '#f59e0b');
+        const statusConfig = {
+            'ACCEPTED': { color: '#10b981', label: 'ACEPTADO', canDeliver: true },
+            'DELIVERED': { color: '#3b82f6', label: 'ENTREGADO', canDeliver: false },
+            'DECLINED': { color: '#ef4444', label: 'DECLINADO', canDeliver: false },
+            'PENDING': { color: '#f59e0b', label: 'PENDIENTE', canDeliver: false }
+        };
+        const config = statusConfig[loan.status_loan] || statusConfig['PENDING'];
 
         modal.innerHTML = `
             <h2 style="font-family:'Outfit'; text-align:center; margin-bottom:1.5rem;">RECIBO DE PRÉSTAMO</h2>
-            <div style="background:${statusColor}; color:white; padding:0.5rem; border-radius:8px; text-align:center; font-weight:bold; margin-bottom:1.5rem;">
-                ESTADO: ${loan.status_loan}
+            <div style="background:${config.color}; color:white; padding:0.5rem; border-radius:8px; text-align:center; font-weight:bold; margin-bottom:1.5rem;">
+                ESTADO: ${config.label}
             </div>
             <p><strong>SOLICITANTE:</strong> ${loan.Solicitante}</p>
             <p><strong>SALIDA:</strong> ${loan.hora}</p>
@@ -196,12 +204,34 @@
             <hr style="opacity:0.1; margin:1rem 0;">
             <p><strong>HERRAMIENTAS:</strong></p>
             <p style="white-space:pre-wrap; font-size:0.9rem;">${loan.item}</p>
-            <button class="btn btn-primary" style="width:100%; margin-top:1.5rem;" onclick="closeModal()">Cerrar</button>
+            
+            <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>
         `;
         modal.style.display = 'block';
         overlay.style.display = 'block';
     }
 
+    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');
+        }
+    }
+
     function closeModal() {
         document.getElementById('modal-content').style.display = 'none';
         document.getElementById('modal-overlay').style.display = 'none';