Dieser Commit ist enthalten in:
2025-06-07 14:11:14 +02:00
Ursprung 68d6cc346b
Commit 0ede462d11
5 geänderte Dateien mit 281 neuen und 12 gelöschten Zeilen

Datei anzeigen

@@ -198,8 +198,11 @@ def licenses():
conn = get_connection()
cur = conn.cursor()
# Alle Lizenzen mit Kundeninformationen abrufen
cur.execute("""
# Suchparameter
search = request.args.get('search', '').strip()
# SQL Query mit optionaler Suche
query = """
SELECT l.id, l.license_key, c.name, c.email, l.license_type,
l.valid_from, l.valid_until, l.is_active,
CASE
@@ -209,14 +212,25 @@ def licenses():
END as status
FROM licenses l
JOIN customers c ON l.customer_id = c.id
ORDER BY l.valid_until DESC
""")
"""
if search:
query += """
WHERE LOWER(l.license_key) LIKE LOWER(%s)
OR LOWER(c.name) 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")
licenses = cur.fetchall()
cur.close()
conn.close()
return render_template("licenses.html", licenses=licenses, username=session.get('username'))
return render_template("licenses.html", licenses=licenses, search=search, username=session.get('username'))
@app.route("/license/edit/<int:license_id>", methods=["GET", "POST"])
@login_required
@@ -283,22 +297,41 @@ def customers():
conn = get_connection()
cur = conn.cursor()
# Alle Kunden mit Anzahl der Lizenzen abrufen
cur.execute("""
# Suchparameter
search = request.args.get('search', '').strip()
# SQL Query mit optionaler Suche
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
FROM customers c
LEFT JOIN licenses l ON c.id = l.customer_id
"""
if search:
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)
customers = cur.fetchall()
cur.close()
conn.close()
return render_template("customers.html", customers=customers, username=session.get('username'))
return render_template("customers.html", customers=customers, search=search, username=session.get('username'))
@app.route("/customer/edit/<int:customer_id>", methods=["GET", "POST"])
@login_required