fix paging on events

This commit is contained in:
2025-05-31 12:18:52 +02:00
parent e0be56a7f4
commit 4bb776f801
5 changed files with 22 additions and 5 deletions

View File

@@ -448,6 +448,11 @@ def init_routes(main_bp):
# Get all users for filter dropdown # Get all users for filter dropdown
users = User.query.order_by(User.username).all() users = User.query.order_by(User.username).all()
else:
events = None
total_pages = 0
current_page = 1
users = []
# Create form for company settings # Create form for company settings
company_form = CompanySettingsForm() company_form = CompanySettingsForm()
@@ -706,7 +711,7 @@ def init_routes(main_bp):
date_range = request.args.get('date_range', '7d') date_range = request.args.get('date_range', '7d')
user_id = request.args.get('user_id') user_id = request.args.get('user_id')
page = request.args.get('page', 1, type=int) page = request.args.get('page', 1, type=int)
per_page = 50 per_page = 10
# Calculate date range # Calculate date range
end_date = datetime.utcnow() end_date = datetime.utcnow()

View File

@@ -73,7 +73,7 @@
<!-- Events Tab --> <!-- Events Tab -->
<div class="tab-pane fade {% if active_tab == 'events' %}show active{% endif %}" id="events" role="tabpanel" aria-labelledby="events-tab"> <div class="tab-pane fade {% if active_tab == 'events' %}show active{% endif %}" id="events" role="tabpanel" aria-labelledby="events-tab">
{{ events_tab(events, csrf_token, users) }} {{ events_tab(events, csrf_token, users, total_pages, current_page) }}
</div> </div>
<!-- Debugging Tab --> <!-- Debugging Tab -->

View File

@@ -1,4 +1,4 @@
{% macro events_tab(events, csrf_token, users) %} {% macro events_tab(events, csrf_token, users, total_pages=0, current_page=1) %}
<div class="card shadow-sm"> <div class="card shadow-sm">
<div class="card-body"> <div class="card-body">
<div class="d-flex justify-content-between align-items-center mb-4"> <div class="d-flex justify-content-between align-items-center mb-4">
@@ -156,9 +156,21 @@
<div class="d-flex justify-content-between align-items-center mt-3"> <div class="d-flex justify-content-between align-items-center mt-3">
<div> <div>
<button id="prevPage" class="btn btn-outline-primary btn-sm" {% if current_page == 1 %}disabled{% endif %}>Previous</button> <button id="prevPage" class="btn btn-outline-primary btn-sm"
style="border-color:var(--primary-color); color:var(--primary-color);"
onmouseover="this.style.backgroundColor='var(--primary-color)'; this.style.color='white'"
onmouseout="this.style.backgroundColor='transparent'; this.style.color='var(--primary-color)'"
{% if current_page == 1 %}disabled{% endif %}>
<i class="fas fa-chevron-left me-1"></i>Previous
</button>
<span class="mx-2">Page <span id="currentPage">{{ current_page }}</span> of <span id="totalPages">{{ total_pages }}</span></span> <span class="mx-2">Page <span id="currentPage">{{ current_page }}</span> of <span id="totalPages">{{ total_pages }}</span></span>
<button id="nextPage" class="btn btn-outline-primary btn-sm" {% if current_page == total_pages %}disabled{% endif %}>Next</button> <button id="nextPage" class="btn btn-outline-primary btn-sm"
style="border-color:var(--primary-color); color:var(--primary-color);"
onmouseover="this.style.backgroundColor='var(--primary-color)'; this.style.color='white'"
onmouseout="this.style.backgroundColor='transparent'; this.style.color='var(--primary-color)'"
{% if current_page == total_pages %}disabled{% endif %}>
Next<i class="fas fa-chevron-right ms-1"></i>
</button>
</div> </div>
</div> </div>
</div> </div>