Filter- und Pagination-Funktionen
Dieser Commit ist enthalten in:
@@ -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
|
||||
|
||||
@@ -102,6 +102,45 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- Pagination -->
|
||||
{% if total_pages > 1 %}
|
||||
<nav aria-label="Seitennavigation" class="mt-3">
|
||||
<ul class="pagination justify-content-center">
|
||||
<!-- Erste Seite -->
|
||||
<li class="page-item {% if page == 1 %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('customers', page=1, search=search) }}">Erste</a>
|
||||
</li>
|
||||
|
||||
<!-- Vorherige Seite -->
|
||||
<li class="page-item {% if page == 1 %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('customers', page=page-1, search=search) }}">←</a>
|
||||
</li>
|
||||
|
||||
<!-- Seitenzahlen -->
|
||||
{% for p in range(1, total_pages + 1) %}
|
||||
{% if p >= page - 2 and p <= page + 2 %}
|
||||
<li class="page-item {% if p == page %}active{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('customers', page=p, search=search) }}">{{ p }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
<!-- Nächste Seite -->
|
||||
<li class="page-item {% if page == total_pages %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('customers', page=page+1, search=search) }}">→</a>
|
||||
</li>
|
||||
|
||||
<!-- Letzte Seite -->
|
||||
<li class="page-item {% if page == total_pages %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('customers', page=total_pages, search=search) }}">Letzte</a>
|
||||
</li>
|
||||
</ul>
|
||||
<p class="text-center text-muted">
|
||||
Seite {{ page }} von {{ total_pages }} | Gesamt: {{ total }} Kunden
|
||||
</p>
|
||||
</nav>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -31,24 +31,49 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Suchformular -->
|
||||
<!-- Such- und Filterformular -->
|
||||
<div class="card mb-3">
|
||||
<div class="card-body">
|
||||
<form method="get" action="/licenses" class="row g-3 align-items-end">
|
||||
<div class="col-md-10">
|
||||
<label for="search" class="form-label">🔍 Suchen</label>
|
||||
<input type="text" class="form-control" id="search" name="search"
|
||||
placeholder="Lizenzschlüssel, Kundenname oder E-Mail..."
|
||||
value="{{ search }}" autofocus>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<button type="submit" class="btn btn-primary w-100">Suchen</button>
|
||||
<form method="get" action="/licenses" id="filterForm">
|
||||
<div class="row g-3 align-items-end">
|
||||
<div class="col-md-4">
|
||||
<label for="search" class="form-label">🔍 Suchen</label>
|
||||
<input type="text" class="form-control" id="search" name="search"
|
||||
placeholder="Lizenzschlüssel, Kunde, E-Mail..."
|
||||
value="{{ search }}">
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label for="type" class="form-label">Typ</label>
|
||||
<select class="form-select" id="type" name="type">
|
||||
<option value="">Alle Typen</option>
|
||||
<option value="full" {% if filter_type == 'full' %}selected{% endif %}>Vollversion</option>
|
||||
<option value="test" {% if filter_type == 'test' %}selected{% endif %}>Testversion</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="status" class="form-label">Status</label>
|
||||
<select class="form-select" id="status" name="status">
|
||||
<option value="">Alle Status</option>
|
||||
<option value="active" {% if filter_status == 'active' %}selected{% endif %}>✅ Aktiv</option>
|
||||
<option value="expiring" {% if filter_status == 'expiring' %}selected{% endif %}>⏰ Läuft bald ab</option>
|
||||
<option value="expired" {% if filter_status == 'expired' %}selected{% endif %}>⚠️ Abgelaufen</option>
|
||||
<option value="inactive" {% if filter_status == 'inactive' %}selected{% endif %}>❌ Deaktiviert</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<button type="submit" class="btn btn-primary">Filter anwenden</button>
|
||||
<a href="/licenses" class="btn btn-outline-secondary">Zurücksetzen</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% if search %}
|
||||
{% if search or filter_type or filter_status %}
|
||||
<div class="mt-2">
|
||||
<small class="text-muted">Suchergebnisse für: <strong>{{ search }}</strong></small>
|
||||
<a href="/licenses" class="btn btn-sm btn-outline-secondary ms-2">✖ Suche zurücksetzen</a>
|
||||
<small class="text-muted">
|
||||
Gefiltert: {{ total }} Ergebnisse
|
||||
{% if search %} | Suche: <strong>{{ search }}</strong>{% endif %}
|
||||
{% if filter_type %} | Typ: <strong>{{ 'Vollversion' if filter_type == 'full' else 'Testversion' }}</strong>{% endif %}
|
||||
{% if filter_status %} | Status: <strong>{{ filter_status }}</strong>{% endif %}
|
||||
</small>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -129,6 +154,45 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<!-- Pagination -->
|
||||
{% if total_pages > 1 %}
|
||||
<nav aria-label="Seitennavigation" class="mt-3">
|
||||
<ul class="pagination justify-content-center">
|
||||
<!-- Erste Seite -->
|
||||
<li class="page-item {% if page == 1 %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('licenses', page=1, search=search, type=filter_type, status=filter_status) }}">Erste</a>
|
||||
</li>
|
||||
|
||||
<!-- Vorherige Seite -->
|
||||
<li class="page-item {% if page == 1 %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('licenses', page=page-1, search=search, type=filter_type, status=filter_status) }}">←</a>
|
||||
</li>
|
||||
|
||||
<!-- Seitenzahlen -->
|
||||
{% for p in range(1, total_pages + 1) %}
|
||||
{% if p >= page - 2 and p <= page + 2 %}
|
||||
<li class="page-item {% if p == page %}active{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('licenses', page=p, search=search, type=filter_type, status=filter_status) }}">{{ p }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
<!-- Nächste Seite -->
|
||||
<li class="page-item {% if page == total_pages %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('licenses', page=page+1, search=search, type=filter_type, status=filter_status) }}">→</a>
|
||||
</li>
|
||||
|
||||
<!-- Letzte Seite -->
|
||||
<li class="page-item {% if page == total_pages %}disabled{% endif %}">
|
||||
<a class="page-link" href="{{ url_for('licenses', page=total_pages, search=search, type=filter_type, status=filter_status) }}">Letzte</a>
|
||||
</li>
|
||||
</ul>
|
||||
<p class="text-center text-muted">
|
||||
Seite {{ page }} von {{ total_pages }} | Gesamt: {{ total }} Lizenzen
|
||||
</p>
|
||||
</nav>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
In neuem Issue referenzieren
Einen Benutzer sperren