Update adding project filter to export data

This commit is contained in:
Nguyen Ngo
2025-08-20 17:33:22 -04:00
parent f049bec15f
commit 206471dad5
2 changed files with 14 additions and 3 deletions
+2
View File
@@ -1050,6 +1050,8 @@ function exportAttendance() {
params.append("location", currentFilters.location); params.append("location", currentFilters.location);
if (currentFilters.employee) if (currentFilters.employee)
params.append("employee", currentFilters.employee); params.append("employee", currentFilters.employee);
if (currentFilters.project)
params.append("project", currentFilters.project);
// Navigate to export configuration page // Navigate to export configuration page
const configUrl = const configUrl =
+10 -1
View File
@@ -30,7 +30,7 @@
</div> </div>
<!-- Filter Information --> <!-- Filter Information -->
{% if filters.date_from or filters.date_to or filters.location_filter or filters.employee_filter %} {% if filters.date_from or filters.date_to or filters.location_filter or filters.employee_filter or filters.project_filter %}
<div class="applied-filters-section"> <div class="applied-filters-section">
<div class="filters-card"> <div class="filters-card">
<div class="filters-header"> <div class="filters-header">
@@ -64,6 +64,12 @@
Employee: {{ filters.employee_filter }} Employee: {{ filters.employee_filter }}
</span> </span>
{% endif %} {% endif %}
{% if filters.project_filter %}
<span class="filter-tag">
<i class="fas fa-project-diagram"></i>
Project: {{ filters.project_filter }}
</span>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -77,6 +83,7 @@
<input type="hidden" name="date_to" value="{{ filters.date_to }}"> <input type="hidden" name="date_to" value="{{ filters.date_to }}">
<input type="hidden" name="location_filter" value="{{ filters.location_filter }}"> <input type="hidden" name="location_filter" value="{{ filters.location_filter }}">
<input type="hidden" name="employee_filter" value="{{ filters.employee_filter }}"> <input type="hidden" name="employee_filter" value="{{ filters.employee_filter }}">
<input type="hidden" name="project_filter" value="{{ filters.project_filter }}">
<!-- Hidden field for column order --> <!-- Hidden field for column order -->
<input type="hidden" id="column_order" name="column_order" value=""> <input type="hidden" id="column_order" name="column_order" value="">
@@ -232,11 +239,13 @@ function goBackToReport() {
const dateTo = document.querySelector('input[name="date_to"]').value; const dateTo = document.querySelector('input[name="date_to"]').value;
const locationFilter = document.querySelector('input[name="location_filter"]').value; const locationFilter = document.querySelector('input[name="location_filter"]').value;
const employeeFilter = document.querySelector('input[name="employee_filter"]').value; const employeeFilter = document.querySelector('input[name="employee_filter"]').value;
const projectFilter = document.querySelector('input[name="project_filter"]').value;
if (dateFrom) params.append('date_from', dateFrom); if (dateFrom) params.append('date_from', dateFrom);
if (dateTo) params.append('date_to', dateTo); if (dateTo) params.append('date_to', dateTo);
if (locationFilter) params.append('location', locationFilter); if (locationFilter) params.append('location', locationFilter);
if (employeeFilter) params.append('employee', employeeFilter); if (employeeFilter) params.append('employee', employeeFilter);
if (projectFilter) params.append('project', projectFilter);
const url = "{{ url_for('attendance_report') }}" + (params.toString() ? '?' + params.toString() : ''); const url = "{{ url_for('attendance_report') }}" + (params.toString() ? '?' + params.toString() : '');
window.location.href = url; window.location.href = url;