Filter- und Pagination-Funktionen

v2_adminpanel/app.py

@@ -198,10 +198,14 @@ def licenses():
     conn = get_connection()
     cur = conn.cursor()
     
-    # Suchparameter
+    # Parameter
     search = request.args.get('search', '').strip()
+    filter_type = request.args.get('type', '')
+    filter_status = request.args.get('status', '')
+    page = request.args.get('page', 1, type=int)
+    per_page = 20
     
-    # SQL Query mit optionaler Suche
+    # SQL Query mit optionaler Suche und Filtern
     query = """
         SELECT l.id, l.license_key, c.name, c.email, l.license_type, 
                l.valid_from, l.valid_until, l.is_active,
@@ -212,25 +216,64 @@ def licenses():
                END as status
         FROM licenses l
         JOIN customers c ON l.customer_id = c.id
+        WHERE 1=1
     """
     
+    params = []
+    
+    # Suchfilter
     if search:
         query += """
-        WHERE LOWER(l.license_key) LIKE LOWER(%s)
+        AND (LOWER(l.license_key) LIKE LOWER(%s)
            OR LOWER(c.name) LIKE LOWER(%s)
-           OR LOWER(c.email) LIKE LOWER(%s)
+           OR LOWER(c.email) LIKE LOWER(%s))
         """
         search_param = f'%{search}%'
-        cur.execute(query + " ORDER BY l.valid_until DESC", 
-                   (search_param, search_param, search_param))
-    else:
-        cur.execute(query + " ORDER BY l.valid_until DESC")
+        params.extend([search_param, search_param, search_param])
     
+    # Typ-Filter
+    if filter_type:
+        query += " AND l.license_type = %s"
+        params.append(filter_type)
+    
+    # Status-Filter
+    if filter_status == 'active':
+        query += " AND l.valid_until >= CURRENT_DATE AND l.is_active = TRUE"
+    elif filter_status == 'expiring':
+        query += " AND l.valid_until >= CURRENT_DATE AND l.valid_until < CURRENT_DATE + INTERVAL '30 days' AND l.is_active = TRUE"
+    elif filter_status == 'expired':
+        query += " AND l.valid_until < CURRENT_DATE"
+    elif filter_status == 'inactive':
+        query += " AND l.is_active = FALSE"
+    
+    # Gesamtanzahl für Pagination
+    count_query = "SELECT COUNT(*) FROM (" + query + ") as count_table"
+    cur.execute(count_query, params)
+    total = cur.fetchone()[0]
+    
+    # Pagination
+    offset = (page - 1) * per_page
+    query += " ORDER BY l.valid_until DESC LIMIT %s OFFSET %s"
+    params.extend([per_page, offset])
+    
+    cur.execute(query, params)
     licenses = cur.fetchall()
+    
+    # Pagination Info
+    total_pages = (total + per_page - 1) // per_page
+    
     cur.close()
     conn.close()
     
-    return render_template("licenses.html", licenses=licenses, search=search, username=session.get('username'))
+    return render_template("licenses.html", 
+                         licenses=licenses, 
+                         search=search,
+                         filter_type=filter_type,
+                         filter_status=filter_status,
+                         page=page,
+                         total_pages=total_pages,
+                         total=total,
+                         username=session.get('username'))
 
 @app.route("/license/edit/<int:license_id>", methods=["GET", "POST"])
 @login_required
@@ -297,11 +340,13 @@ def customers():
     conn = get_connection()
     cur = conn.cursor()
     
-    # Suchparameter
+    # Parameter
     search = request.args.get('search', '').strip()
+    page = request.args.get('page', 1, type=int)
+    per_page = 20
     
     # SQL Query mit optionaler Suche
-    query = """
+    base_query = """
         SELECT c.id, c.name, c.email, c.created_at,
                COUNT(l.id) as license_count,
                COUNT(CASE WHEN l.is_active = TRUE AND l.valid_until >= CURRENT_DATE THEN 1 END) as active_licenses
@@ -309,29 +354,54 @@ def customers():
         LEFT JOIN licenses l ON c.id = l.customer_id
     """
     
+    params = []
+    
     if search:
-        query += """
+        base_query += """
         WHERE LOWER(c.name) LIKE LOWER(%s)
            OR LOWER(c.email) LIKE LOWER(%s)
         """
         search_param = f'%{search}%'
-        query += """
-        GROUP BY c.id, c.name, c.email, c.created_at
-        ORDER BY c.created_at DESC
-        """
-        cur.execute(query, (search_param, search_param))
-    else:
-        query += """
-        GROUP BY c.id, c.name, c.email, c.created_at
-        ORDER BY c.created_at DESC
-        """
-        cur.execute(query)
+        params.extend([search_param, search_param])
     
+    # Gesamtanzahl für Pagination
+    count_query = f"""
+        SELECT COUNT(DISTINCT c.id)
+        FROM customers c
+        LEFT JOIN licenses l ON c.id = l.customer_id
+        {"WHERE LOWER(c.name) LIKE LOWER(%s) OR LOWER(c.email) LIKE LOWER(%s)" if search else ""}
+    """
+    if search:
+        cur.execute(count_query, params)
+    else:
+        cur.execute(count_query)
+    total = cur.fetchone()[0]
+    
+    # Pagination
+    offset = (page - 1) * per_page
+    query = base_query + """
+        GROUP BY c.id, c.name, c.email, c.created_at
+        ORDER BY c.created_at DESC
+        LIMIT %s OFFSET %s
+    """
+    params.extend([per_page, offset])
+    
+    cur.execute(query, params)
     customers = cur.fetchall()
+    
+    # Pagination Info
+    total_pages = (total + per_page - 1) // per_page
+    
     cur.close()
     conn.close()
     
-    return render_template("customers.html", customers=customers, search=search, username=session.get('username'))
+    return render_template("customers.html", 
+                         customers=customers, 
+                         search=search,
+                         page=page,
+                         total_pages=total_pages,
+                         total=total,
+                         username=session.get('username'))
 
 @app.route("/customer/edit/<int:customer_id>", methods=["GET", "POST"])
 @login_required