Skip to content

M
MBetterd
Commit ccb5153f authored by Stefy Lanza (nextime / spora )'s avatar Stefy Lanza (nextime / spora )
Browse files
Options

Fix error

parent 2e96f7c5
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 9 deletions
app/main/routes.py
View file @ ccb5153f
......@@ -1817,7 +1817,26 @@ def reports():
except Exception as e:
logger.error(f"Reports page error: {str(e)}")
flash('Error loading reports', 'error')
return render_template('main/reports.html', reports=[], pagination=None, client_ids=[])
return render_template('main/reports.html',
clients=[],
pagination=None,
client_data=[],
totals={
'total_payin': 0.0,
'total_payout': 0.0,
'total_balance': 0.0,
'cap_balance': 0.0
},
filters={
'client_id': '',
'date_range': 'today',
'start_date': '',
'end_date': '',
'start_time': '',
'end_time': '',
'sort_by': 'sync_timestamp',
'sort_order': 'desc'
})
@csrf.exempt
@bp.route('/reports/<int:sync_id>')
......@@ -2527,5 +2546,11 @@ def client_report_detail(client_id):
except Exception as e:
logger.error(f"Client report detail error: {str(e)}")
flash('Error loading client report details', 'error')
return redirect(url_for('main.reports'))
return redirect(url_for('main.reports',
client_id=client_id_filter if 'client_id_filter' in locals() else '',
date_range=date_range_filter if 'date_range_filter' in locals() else 'today',
start_date=start_date_filter if 'start_date_filter' in locals() else '',
end_date=end_date_filter if 'end_date_filter' in locals() else '',
start_time=start_time_filter if 'start_time_filter' in locals() else '',
end_time=end_time_filter if 'end_time_filter' in locals() else ''))
return redirect(url_for('main.sync_logs'))
\ No newline at end of file
app/templates/main/reports.html
View file @ ccb5153f
......@@ -13,9 +13,9 @@
<i class="fas fa-download"></i> Export
</button>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='csv', **filters) }}">Export as CSV</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='xlsx', **filters) }}">Export as Excel</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='pdf', **filters) }}">Export as PDF</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='csv', client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">Export as CSV</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='xlsx', client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">Export as Excel</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.reports', export='pdf', client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">Export as PDF</a></li>
</ul>
</div>
</div>
......@@ -165,7 +165,7 @@
{{ "{:,.2f}".format(client.cap_balance) }}
</td>
<td>
<a href="{{ url_for('main.client_report_detail', client_id=client.client_id, **filters) }}" class="btn btn-sm btn-info">
<a href="{{ url_for('main.client_report_detail', client_id=client.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time) }}" class="btn btn-sm btn-info">
<i class="fas fa-eye"></i> Details
</a>
</td>
......@@ -181,7 +181,7 @@
<ul class="pagination justify-content-center">
{% if pagination.has_prev %}
<li class="page-item">
<a class="page-link" href="{{ url_for('main.reports', page=pagination.prev_num, **filters) }}">Previous</a>
<a class="page-link" href="{{ url_for('main.reports', page=pagination.prev_num, client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">Previous</a>
</li>
{% endif %}
......@@ -191,7 +191,7 @@
<li class="page-item active"><span class="page-link">{{ page_num }}</span></li>
{% else %}
<li class="page-item">
<a class="page-link" href="{{ url_for('main.reports', page=page_num, **filters) }}">{{ page_num }}</a>
<a class="page-link" href="{{ url_for('main.reports', page=page_num, client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">{{ page_num }}</a>
</li>
{% endif %}
{% else %}
......@@ -201,7 +201,7 @@
{% if pagination.has_next %}
<li class="page-item">
<a class="page-link" href="{{ url_for('main.reports', page=pagination.next_num, **filters) }}">Next</a>
<a class="page-link" href="{{ url_for('main.reports', page=pagination.next_num, client_id=filters.client_id, date_range=filters.date_range, start_date=filters.start_date, end_date=filters.end_date, start_time=filters.start_time, end_time=filters.end_time, sort_by=filters.sort_by, sort_order=filters.sort_order) }}">Next</a>
</li>
{% endif %}
</ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment