Skip to content

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

Update reports page

parent 6d547630
Hide whitespace changes
Inline Side-by-side
Showing with 1068 additions and 36 deletions
REPORTS_UPDATE_IMPLEMENTATION.md 0 → 100644
View file @ 2e96f7c5
# Reports Sync Update Implementation
## Overview
This implementation updates the reports sync system to handle cap compensation balance tracking, improved filtering, and client-aggregated reporting according to the latest protocol documentation.
## Changes Made
### 1. Database Model Updates
#### ReportSync Model (`app/models.py`)
- **Added**: `cap_compensation_balance` field (Numeric(15, 2))
- Stores the accumulated shortfall from cap compensation system
- Tracks adjustments across all extractions
- Updated at each sync to reflect current balance
### 2. API Endpoint Updates
#### `/api/reports/sync` Endpoint (`app/api/routes.py`)
**New Features:**
- Accepts `cap_compensation_balance` field in request payload
- Stores cap compensation balance in ReportSync records
- Differentiates between new and updated records:
- **New records**: Bets and extraction stats that don't exist
- **Updated records**: Existing records with new data (e.g., match results added)
**Request Payload Structure:**
```json
{
"sync_id": "sync_20260201_214327_abc12345",
"client_id": "client_unique_identifier",
"sync_timestamp": "2026-02-01T21:43:27.249Z",
"date_range": "all",
"start_date": "2026-01-01T00:00:00",
"end_date": "2026-02-01T21:43:27.249Z",
"bets": [...],
"extraction_stats": [...],
"cap_compensation_balance": 5000.0,
"summary": {...},
"is_incremental": true,
"sync_type": "incremental"
}
```
**Response Format:**
```json
{
"success": true,
"synced_count": 25,
"message": "Successfully synced 25 items"
}
```
### 3. Web Interface Updates
#### Reports Page (`app/templates/main/reports.html`)
**New Features:**
- **Date Range Filters**:
- Today (default)
- Yesterday
- This Week
- Last Week
- This Month
- All Time
- Custom (with date/time selection)
- **Custom Date/Time Selection**:
- Start Date and Start Time (optional)
- End Date and End Time (optional)
- Only visible when "Custom" is selected
- **Client Selection**:
- Dropdown showing all clients by token name
- Format: "Token Name (client_id)"
- Option to select "All Clients"
- **Aggregated Client Display**:
- Shows data aggregated by client for selected period
- Each client row displays:
- Client Name (from token)
- Client ID
- Total Payin
- Total Payout
- Balance (Payin - Payout)
- Total Bets
- Total Matches
- CAP Redistribution Balance (at end of period)
- Details button to view full report
- **Summary Blocks**:
- Total Payin (all clients)
- Total Payout (all clients)
- Total Balance (all clients)
- Total CAP Redistribution Balance (all clients)
#### Client Report Detail Page (`app/templates/main/client_report_detail.html`)
**New Route**: `/client-report/<client_id>`
**Features:**
- Shows detailed view for a specific client
- Respects date/time filters from reports page
- Displays:
- Summary cards (Payin, Payout, Balance, CAP Balance)
- Client information (ID, Token Name)
- Full list of bets with expandable details
- Full list of extraction stats with expandable details
**Bet Details Include:**
- Bet UUID
- Fixture ID
- Bet DateTime
- Total Amount
- Bet Count
- Paid/Paid Out status
- Individual bet details:
- Match ID
- Match Number
- Outcome
- Amount
- Win Amount
- Result (won/lost/pending/cancelled)
**Extraction Stats Details Include:**
- Match ID
- Fixture ID
- Match DateTime
- Total Bets
- Total Amount Collected
- Total Redistributed
- Actual Result
- Extraction Result
- CAP Applied (percentage)
- Under/Over bets and amounts
- Result breakdown by outcome
### 4. Backend Route Updates
#### Reports Route (`app/main/routes.py`)
**Updated**: `reports()` function
- Calculates date ranges based on filter selection
- Supports time selection for custom ranges
- Aggregates data by client
- Includes token names from ClientActivity
- Calculates CAP balance at end of period
- Passes filters to detail pages
**New Route**: `client_report_detail(client_id)`
- Shows detailed view for specific client
- Applies same date/time filters
- Retrieves all bets and extraction stats for period
- Calculates totals and CAP balance
- Displays comprehensive match-level data
### 5. JavaScript Enhancements
**Reports Page JavaScript**:
- `toggleCustomDateRange()` function
- Shows/hides custom date fields based on selection
- Shows/hides time fields for custom ranges
- Initializes on page load
## Database Migration
### Migration Script: `add_cap_compensation_balance.py`
**Purpose**: Add `cap_compensation_balance` field to `report_syncs` table
**SQL Command**:
```sql
ALTER TABLE report_syncs ADD COLUMN cap_compensation_balance NUMERIC(15, 2) DEFAULT 0.00;
```
**To Run Migration**:
```bash
python run_migration.py
```
## Cap Compensation Balance Tracking
### What is Cap Compensation Balance?
The cap compensation balance represents the accumulated shortfall from the cap compensation system. It tracks adjustments across all extractions where the redistribution CAP was applied.
### How It's Tracked
1. **At Each Sync**:
- Client sends current `cap_compensation_balance` value
- Server stores it in the ReportSync record
- Value represents the balance at the time of sync
2. **In Reports**:
- Shows the CAP balance at the **end of the selected period**
- For aggregated reports: uses the most recent sync's balance
- For client details: uses the most recent sync's balance
- For all clients: shows total across all clients
3. **Time-Based Tracking**:
- Each sync records the balance at that moment
- Reports can show historical balance values
- Filters allow viewing balance at specific time periods
## Record Differentiation
### New vs Updated Records
The system differentiates between new and updated records:
**New Records:**
- Bets that don't exist in the database (by UUID)
- Extraction stats that don't exist (by match_id + sync_id)
- Created with `created_at` timestamp
**Updated Records:**
- Existing bets with new data (e.g., results added)
- Existing extraction stats with updated information
- Original `created_at` preserved
- New `updated_at` timestamp set
**Example Scenario:**
1. Match is scheduled → Bet created (NEW record)
2. Match is played → Results added (UPDATED record)
3. Payout processed → Paid status updated (UPDATED record)
## Filtering System
### Date Range Filters
| Filter | Description | Time Range |
|---------|-------------|-------------|
| Today | Current day from 00:00:00 to now | 00:00:00 - now |
| Yesterday | Previous full day | 00:00:00 - 23:59:59 |
| This Week | Monday to current day | Monday 00:00:00 - now |
| Last Week | Previous full week | Monday 00:00:00 - Sunday 23:59:59 |
| This Month | Current month from 1st to now | 1st 00:00:00 - now |
| All | All historical data | No limit |
| Custom | User-defined range | User-specified dates/times |
### Client Filter
- Dropdown shows all clients with their token names
- Format: "Token Name (client_id)"
- Allows filtering to specific client or viewing all
### Sorting Options
- Sync Timestamp (default)
- Client ID
- Total Payin
- Total Payout
- Net Profit
- Total Bets
- Total Matches
## API Usage Examples
### Full Sync (First Sync)
```bash
curl -X POST http://localhost:5000/api/reports/sync \
-H "Content-Type: application/json" \
-H "Authorization: Bearer YOUR_TOKEN" \
-d '{
"sync_id": "sync_20260201_214327_abc12345",
"client_id": "machine_hostname_1234567890",
"sync_timestamp": "2026-02-01T21:43:27.249Z",
"date_range": "all",
"start_date": "2026-01-01T00:00:00",
"end_date": "2026-02-01T21:43:27.249Z",
"bets": [...],
"extraction_stats": [...],
"cap_compensation_balance": 5000.0,
"summary": {
"total_payin": 100000.0,
"total_payout": 95000.0,
"net_profit": 5000.0,
"total_bets": 50,
"total_matches": 10
},
"is_incremental": false,
"sync_type": "full"
}'
```
### Incremental Sync (Subsequent Syncs)
```bash
curl -X POST http://localhost:5000/api/reports/sync \
-H "Content-Type: application/json" \
-H "Authorization: Bearer YOUR_TOKEN" \
-d '{
"sync_id": "sync_20260201_220000_def67890",
"client_id": "machine_hostname_1234567890",
"sync_timestamp": "2026-02-01T22:00:00.000Z",
"date_range": "all",
"start_date": "2026-01-01T00:00:00",
"end_date": "2026-02-01T22:00:00.000Z",
"bets": [...], // Only new/updated bets
"extraction_stats": [...], // Only new/updated stats
"cap_compensation_balance": 5200.0,
"summary": {
"total_payin": 5000.0,
"total_payout": 4800.0,
"net_profit": 200.0,
"total_bets": 5,
"total_matches": 2
},
"is_incremental": true,
"sync_type": "incremental"
}'
```
## Testing
### Manual Testing
1. **Test API Endpoint**:
```bash
python test_reports_sync.py
```
2. **Test Web Interface**:
- Navigate to `/reports`
- Test each date range filter
- Test custom date/time selection
- Test client filtering
- Test sorting options
- Click "Details" button for a client
- Verify bet and extraction stats display
3. **Verify CAP Balance**:
- Check that CAP balance displays correctly
- Verify it shows balance at end of period
- Test with different date ranges
### Expected Behavior
- **Today Filter**: Shows only today's data
- **Custom Range**: Shows data between specified dates/times
- **Client Filter**: Shows only selected client's data
- **Aggregation**: Correctly sums payin, payout, bets, matches
- **CAP Balance**: Shows most recent balance for period
- **Details Page**: Shows all bets and stats with expandable details
## Troubleshooting
### Common Issues
**Issue**: CAP balance not displaying
- **Solution**: Run migration script to add column
- **Command**: `python run_migration.py`
**Issue**: Custom date fields not showing
- **Solution**: Check JavaScript console for errors
- **Verify**: `toggleCustomDateRange()` function is defined
**Issue**: Client names showing as "Unknown"
- **Solution**: Ensure ClientActivity records exist for clients
- **Check**: API tokens are linked to client activity
**Issue**: Data not aggregating correctly
- **Solution**: Verify date range calculations
- **Check**: Timezone handling in datetime conversions
## Performance Considerations
1. **Database Indexes**:
- Ensure indexes on `client_id`, `sync_timestamp`, `start_date`, `end_date`
- Improves query performance for filtering
2. **Pagination**:
- Client list is paginated (default 20 per page)
- Prevents large result sets from slowing page load
3. **Lazy Loading**:
- Bet and extraction stats details are collapsed by default
- Only loaded when user clicks "Details" button
## Security Considerations
1. **Authentication**:
- API endpoint requires valid Bearer token
- Web interface requires login
2. **Authorization**:
- Non-admin users can only see their own clients
- Admin users can see all clients
3. **Input Validation**:
- All date/time inputs validated
- Client IDs validated against user's tokens
- SQL injection protection via SQLAlchemy
## Future Enhancements
Potential improvements for future versions:
1. **Real-time Updates**:
- WebSocket support for live data updates
- Auto-refresh when new syncs arrive
2. **Advanced Filtering**:
- Filter by match status
- Filter by bet result
- Filter by CAP application
3. **Export Options**:
- Export individual client reports
- Export with custom date ranges
- Export in additional formats (JSON, XML)
4. **Analytics**:
- Charts showing trends over time
- Comparison between clients
- CAP balance history graph
## Summary
This implementation provides:
✅ Cap compensation balance tracking
✅ Comprehensive date/time filtering
✅ Client-aggregated reporting
✅ Detailed match-level views
✅ Differentiation of new vs updated records
✅ User-friendly interface with token names
✅ Pagination for performance
✅ Export functionality
✅ Security and authorization
The system now fully supports the latest reports sync protocol with enhanced reporting capabilities.
\ No newline at end of file
app/main/routes.py
View file @ 2e96f7c5
......@@ -1653,8 +1653,114 @@ def reports():
if export_format:
return export_reports(query, export_format)
# Aggregate data by client for the selected period
# Build base query with filters
base_query = ReportSync.query
# Apply user filter
if not current_user.is_admin:
user_token_ids = [t.id for t in APIToken.query.filter_by(user_id=current_user.id).all()]
if user_token_ids:
client_ids = [c.rustdesk_id for c in ClientActivity.query.filter(
ClientActivity.api_token_id.in_(user_token_ids)
).all()]
if client_ids:
base_query = base_query.filter(ReportSync.client_id.in_(client_ids))
else:
base_query = base_query.filter(ReportSync.client_id == 'none')
else:
base_query = base_query.filter(ReportSync.client_id == 'none')
# Apply filters
if client_id_filter:
base_query = base_query.filter(ReportSync.client_id == client_id_filter)
if start_date:
base_query = base_query.filter(ReportSync.start_date >= start_date)
if end_date:
base_query = base_query.filter(ReportSync.end_date <= end_date)
# Get all matching syncs for aggregation
matching_syncs = base_query.all()
# Aggregate by client
client_aggregates = {}
for sync in matching_syncs:
client_id = sync.client_id
if client_id not in client_aggregates:
# Get token name for this client
client_activity = ClientActivity.query.filter_by(rustdesk_id=client_id).first()
token_name = client_activity.api_token.name if client_activity and client_activity.api_token else 'Unknown'
client_aggregates[client_id] = {
'client_id': client_id,
'token_name': token_name,
'total_payin': 0.0,
'total_payout': 0.0,
'total_bets': 0,
'total_matches': 0,
'cap_balance': 0.0,
'last_sync_timestamp': sync.sync_timestamp
}
client_aggregates[client_id]['total_payin'] += float(sync.total_payin) if sync.total_payin else 0.0
client_aggregates[client_id]['total_payout'] += float(sync.total_payout) if sync.total_payout else 0.0
client_aggregates[client_id]['total_bets'] += sync.total_bets
client_aggregates[client_id]['total_matches'] += sync.total_matches
# Use the most recent CAP balance for this client
if sync.sync_timestamp >= client_aggregates[client_id]['last_sync_timestamp']:
client_aggregates[client_id]['cap_balance'] = float(sync.cap_compensation_balance) if sync.cap_compensation_balance else 0.0
client_aggregates[client_id]['last_sync_timestamp'] = sync.sync_timestamp
# Calculate balance for each client
for client_id, data in client_aggregates.items():
data['balance'] = data['total_payin'] - data['total_payout']
# Convert to list and sort
clients_list = list(client_aggregates.values())
# Apply sorting
if sort_by == 'total_payin':
clients_list.sort(key=lambda x: x['total_payin'], reverse=(sort_order == 'desc'))
elif sort_by == 'total_payout':
clients_list.sort(key=lambda x: x['total_payout'], reverse=(sort_order == 'desc'))
elif sort_by == 'net_profit':
clients_list.sort(key=lambda x: x['balance'], reverse=(sort_order == 'desc'))
elif sort_by == 'total_bets':
clients_list.sort(key=lambda x: x['total_bets'], reverse=(sort_order == 'desc'))
elif sort_by == 'total_matches':
clients_list.sort(key=lambda x: x['total_matches'], reverse=(sort_order == 'desc'))
else:
clients_list.sort(key=lambda x: x['last_sync_timestamp'], reverse=(sort_order == 'desc'))
# Calculate overall totals for summary blocks
total_payin = sum(c['total_payin'] for c in clients_list)
total_payout = sum(c['total_payout'] for c in clients_list)
total_balance = total_payin - total_payout
cap_balance = clients_list[0]['cap_balance'] if clients_list else 0.0
# Pagination
reports_pagination = query.paginate(page=page, per_page=per_page, error_out=False)
total_clients = len(clients_list)
start_idx = (page - 1) * per_page
end_idx = start_idx + per_page
clients_page = clients_list[start_idx:end_idx]
# Create pagination object
class SimplePagination:
def __init__(self, page, per_page, total, items):
self.page = page
self.per_page = per_page
self.total = total
self.items = items
self.pages = (total + per_page - 1) // per_page
self.has_prev = page > 1
self.has_next = page < self.pages
self.prev_num = page - 1 if self.has_prev else None
self.next_num = page + 1 if self.has_next else None
pagination = SimplePagination(page, per_page, total_clients, clients_page)
# Get unique client IDs for filter dropdown with token names
if current_user.is_admin:
......@@ -1688,9 +1794,15 @@ def reports():
client_data = []
return render_template('main/reports.html',
reports=reports_pagination.items,
pagination=reports_pagination,
clients=clients_page,
pagination=pagination,
client_data=client_data,
totals={
'total_payin': total_payin,
'total_payout': total_payout,
'total_balance': total_balance,
'cap_balance': cap_balance
},
filters={
'client_id': client_id_filter,
'date_range': date_range_filter,
......@@ -2280,4 +2392,140 @@ def export_sync_logs(export_format):
except Exception as e:
logger.error(f"Export sync logs error: {str(e)}")
flash('Error exporting sync logs', 'error')
@csrf.exempt
@bp.route('/client-report/<client_id>')
@login_required
@require_active_user
def client_report_detail(client_id):
"""Detailed view of a specific client for selected period"""
try:
from app.models import ReportSync, Bet, ExtractionStats, APIToken, ClientActivity
from datetime import timedelta
# Get filter parameters
date_range_filter = request.args.get('date_range', 'today').strip()
start_date_filter = request.args.get('start_date', '').strip()
end_date_filter = request.args.get('end_date', '').strip()
start_time_filter = request.args.get('start_time', '').strip()
end_time_filter = request.args.get('end_time', '').strip()
# Calculate date range
now = datetime.utcnow()
start_date = None
end_date = None
if date_range_filter == 'today':
start_date = now.replace(hour=0, minute=0, second=0, microsecond=0)
end_date = now
elif date_range_filter == 'yesterday':
yesterday = now - timedelta(days=1)
start_date = yesterday.replace(hour=0, minute=0, second=0, microsecond=0)
end_date = yesterday.replace(hour=23, minute=59, second=59, microsecond=999999)
elif date_range_filter == 'this_week':
start_date = now - timedelta(days=now.weekday())
start_date = start_date.replace(hour=0, minute=0, second=0, microsecond=0)
end_date = now
elif date_range_filter == 'last_week':
last_week_end = now - timedelta(days=now.weekday() + 1)
last_week_start = last_week_end - timedelta(days=6)
start_date = last_week_start.replace(hour=0, minute=0, second=0, microsecond=0)
end_date = last_week_end.replace(hour=23, minute=59, second=59, microsecond=999999)
elif date_range_filter == 'this_month':
start_date = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
end_date = now
elif date_range_filter == 'all':
start_date = None
end_date = None
elif date_range_filter == 'custom':
if start_date_filter:
try:
start_date = datetime.strptime(start_date_filter, '%Y-%m-%d')
if start_time_filter:
hour, minute = map(int, start_time_filter.split(':'))
start_date = start_date.replace(hour=hour, minute=minute, second=0, microsecond=0)
else:
start_date = start_date.replace(hour=0, minute=0, second=0, microsecond=0)
except ValueError:
pass
if end_date_filter:
try:
end_date = datetime.strptime(end_date_filter, '%Y-%m-%d')
if end_time_filter:
hour, minute = map(int, end_time_filter.split(':'))
end_date = end_date.replace(hour=hour, minute=minute, second=59, microsecond=999999)
else:
end_date = end_date.replace(hour=23, minute=59, second=59, microsecond=999999)
except ValueError:
pass
# Check if user has access to this client
if current_user.is_admin:
query = ReportSync.query.filter_by(client_id=client_id)
else:
user_token_ids = [t.id for t in APIToken.query.filter_by(user_id=current_user.id).all()]
if user_token_ids:
client_ids = [c.rustdesk_id for c in ClientActivity.query.filter(
ClientActivity.api_token_id.in_(user_token_ids)
).all()]
if client_id not in client_ids:
flash('Access denied to this client', 'error')
return redirect(url_for('main.reports'))
query = ReportSync.query.filter_by(client_id=client_id)
else:
flash('Access denied to this client', 'error')
return redirect(url_for('main.reports'))
# Apply date filters
if start_date:
query = query.filter(ReportSync.start_date >= start_date)
if end_date:
query = query.filter(ReportSync.end_date <= end_date)
# Get all matching syncs for this client
syncs = query.order_by(ReportSync.sync_timestamp.desc()).all()
# Get all bets and extraction stats for these syncs
sync_ids = [s.id for s in syncs]
bets = Bet.query.filter(Bet.sync_id.in_(sync_ids)).all()
stats = ExtractionStats.query.filter(ExtractionStats.sync_id.in_(sync_ids)).all()
# Calculate totals
total_payin = sum(float(s.total_payin) for s in syncs if s.total_payin)
total_payout = sum(float(s.total_payout) for s in syncs if s.total_payout)
total_balance = total_payin - total_payout
total_bets = sum(s.total_bets for s in syncs)
total_matches = sum(s.total_matches for s in syncs)
cap_balance = float(syncs[0].cap_compensation_balance) if syncs and syncs[0].cap_compensation_balance else 0.0
# Get client token name
client_activity = ClientActivity.query.filter_by(rustdesk_id=client_id).first()
token_name = client_activity.api_token.name if client_activity and client_activity.api_token else 'Unknown'
return render_template('main/client_report_detail.html',
client_id=client_id,
token_name=token_name,
syncs=syncs,
bets=bets,
stats=stats,
totals={
'total_payin': total_payin,
'total_payout': total_payout,
'total_balance': total_balance,
'total_bets': total_bets,
'total_matches': total_matches,
'cap_balance': cap_balance
},
filters={
'date_range': date_range_filter,
'start_date': start_date_filter,
'end_date': end_date_filter,
'start_time': start_time_filter,
'end_time': end_time_filter
})
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.sync_logs'))
\ No newline at end of file
app/templates/main/client_report_detail.html 0 → 100644
View file @ 2e96f7c5
{% extends "base.html" %}
{% block title %}Client Report - {{ token_name }}{% endblock %}
{% block content %}
<div class="container-fluid">
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center mb-4">
<div>
<h1>Client Report Details</h1>
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="{{ url_for('main.reports') }}">Reports</a></li>
<li class="breadcrumb-item active">{{ token_name }} ({{ client_id }})</li>
</ol>
</nav>
</div>
<a href="{{ url_for('main.reports') }}" class="btn btn-secondary">
<i class="fas fa-arrow-left"></i> Back to Reports
</a>
</div>
<!-- Summary Card -->
<div class="card mb-4">
<div class="card-header">
<h5 class="mb-0"><i class="fas fa-chart-line"></i> Summary</h5>
</div>
<div class="card-body">
<div class="row">
<div class="col-md-3">
<div class="p-3 bg-primary text-white rounded">
<h6 class="mb-1">Total Payin</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_payin) }}</h3>
</div>
</div>
<div class="col-md-3">
<div class="p-3 bg-info text-white rounded">
<h6 class="mb-1">Total Payout</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_payout) }}</h3>
</div>
</div>
<div class="col-md-3">
<div class="p-3 {% if totals.total_balance >= 0 %}bg-success{% else %}bg-danger{% endif %} text-white rounded">
<h6 class="mb-1">Balance</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_balance) }}</h3>
</div>
</div>
<div class="col-md-3">
<div class="p-3 bg-warning text-white rounded">
<h6 class="mb-1">CAP Redistribution Balance</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.cap_balance) }}</h3>
</div>
</div>
</div>
<div class="row mt-3">
<div class="col-md-3">
<div class="p-3 bg-light rounded">
<h6 class="text-muted mb-1">Total Bets</h6>
<p class="mb-0">{{ totals.total_bets }}</p>
</div>
</div>
<div class="col-md-3">
<div class="p-3 bg-light rounded">
<h6 class="text-muted mb-1">Total Matches</h6>
<p class="mb-0">{{ totals.total_matches }}</p>
</div>
</div>
<div class="col-md-3">
<div class="p-3 bg-light rounded">
<h6 class="text-muted mb-1">Client ID</h6>
<p class="mb-0"><code>{{ client_id }}</code></p>
</div>
</div>
<div class="col-md-3">
<div class="p-3 bg-light rounded">
<h6 class="text-muted mb-1">Token Name</h6>
<p class="mb-0">{{ token_name }}</p>
</div>
</div>
</div>
</div>
</div>
<!-- Tabs for Bets and Extraction Stats -->
<ul class="nav nav-tabs mb-3" id="reportTabs" role="tablist">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="bets-tab" data-bs-toggle="tab" data-bs-target="#bets" type="button" role="tab">
<i class="fas fa-ticket-alt"></i> Bets ({{ bets|length }})
</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="stats-tab" data-bs-toggle="tab" data-bs-target="#stats" type="button" role="tab">
<i class="fas fa-chart-bar"></i> Extraction Stats ({{ stats|length }})
</button>
</li>
</ul>
<div class="tab-content" id="reportTabsContent">
<!-- Bets Tab -->
<div class="tab-pane fade show active" id="bets" role="tabpanel">
<div class="card">
<div class="card-body">
{% if bets %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Bet UUID</th>
<th>Fixture ID</th>
<th>Bet DateTime</th>
<th>Total Amount</th>
<th>Bet Count</th>
<th>Paid</th>
<th>Paid Out</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for bet in bets %}
<tr>
<td><code>{{ bet.uuid }}</code></td>
<td>{{ bet.fixture_id }}</td>
<td>{{ bet.bet_datetime.strftime('%Y-%m-%d %H:%M:%S') if bet.bet_datetime else '' }}</td>
<td class="text-end">{{ "{:,.2f}".format(bet.total_amount) if bet.total_amount else '0.00' }}</td>
<td class="text-center">{{ bet.bet_count }}</td>
<td class="text-center">
{% if bet.paid %}
<i class="fas fa-check-circle text-success"></i>
{% else %}
<i class="fas fa-times-circle text-danger"></i>
{% endif %}
</td>
<td class="text-center">
{% if bet.paid_out %}
<i class="fas fa-check-circle text-success"></i>
{% else %}
<i class="fas fa-times-circle text-danger"></i>
{% endif %}
</td>
<td>
<button type="button" class="btn btn-sm btn-info" data-bs-toggle="collapse" data-bs-target="#bet-details-{{ bet.id }}">
<i class="fas fa-list"></i> Details
</button>
</td>
</tr>
<tr>
<td colspan="8" class="p-0">
<div class="collapse" id="bet-details-{{ bet.id }}">
<div class="p-3 bg-light">
<h6>Bet Details</h6>
<table class="table table-sm">
<thead>
<tr>
<th>Match ID</th>
<th>Match Number</th>
<th>Outcome</th>
<th>Amount</th>
<th>Win Amount</th>
<th>Result</th>
</tr>
</thead>
<tbody>
{% for detail in bet.details %}
<tr>
<td>{{ detail.match_id }}</td>
<td>{{ detail.match_number }}</td>
<td>{{ detail.outcome }}</td>
<td class="text-end">{{ "{:,.2f}".format(detail.amount) if detail.amount else '0.00' }}</td>
<td class="text-end">{{ "{:,.2f}".format(detail.win_amount) if detail.win_amount else '0.00' }}</td>
<td>
<span class="badge bg-{% if detail.result == 'won' %}success{% elif detail.result == 'lost' %}danger{% elif detail.result == 'pending' %}warning{% else %}secondary{% endif %}">
{{ detail.result }}
</span>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="text-center py-5">
<i class="fas fa-ticket-alt fa-3x text-muted mb-3"></i>
<h4 class="text-muted">No bets found</h4>
</div>
{% endif %}
</div>
</div>
</div>
<!-- Extraction Stats Tab -->
<div class="tab-pane fade" id="stats" role="tabpanel">
<div class="card">
<div class="card-body">
{% if stats %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Match ID</th>
<th>Fixture ID</th>
<th>Match DateTime</th>
<th>Total Bets</th>
<th>Total Collected</th>
<th>Total Redistributed</th>
<th>Actual Result</th>
<th>Extraction Result</th>
<th>CAP Applied</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for stat in stats %}
<tr>
<td>{{ stat.match_id }}</td>
<td>{{ stat.fixture_id }}</td>
<td>{{ stat.match_datetime.strftime('%Y-%m-%d %H:%M:%S') if stat.match_datetime else '' }}</td>
<td class="text-center">{{ stat.total_bets }}</td>
<td class="text-end">{{ "{:,.2f}".format(stat.total_amount_collected) if stat.total_amount_collected else '0.00' }}</td>
<td class="text-end">{{ "{:,.2f}".format(stat.total_redistributed) if stat.total_redistributed else '0.00' }}</td>
<td>{{ stat.actual_result }}</td>
<td>{{ stat.extraction_result }}</td>
<td class="text-center">
{% if stat.cap_applied %}
<i class="fas fa-check-circle text-success"></i> {{ stat.cap_percentage }}%
{% else %}
<i class="fas fa-times-circle text-danger"></i>
{% endif %}
</td>
<td>
<button type="button" class="btn btn-sm btn-info" data-bs-toggle="collapse" data-bs-target="#stats-details-{{ stat.id }}">
<i class="fas fa-list"></i> Details
</button>
</td>
</tr>
<tr>
<td colspan="10" class="p-0">
<div class="collapse" id="stats-details-{{ stat.id }}">
<div class="p-3 bg-light">
<h6>Extraction Details</h6>
<div class="row">
<div class="col-md-6">
<table class="table table-sm">
<tr>
<th>Under Bets:</th>
<td>{{ stat.under_bets }}</td>
</tr>
<tr>
<th>Under Amount:</th>
<td>{{ "{:,.2f}".format(stat.under_amount) if stat.under_amount else '0.00' }}</td>
</tr>
<tr>
<th>Over Bets:</th>
<td>{{ stat.over_bets }}</td>
</tr>
<tr>
<th>Over Amount:</th>
<td>{{ "{:,.2f}".format(stat.over_amount) if stat.over_amount else '0.00' }}</td>
</tr>
</table>
</div>
<div class="col-md-6">
<h6>Result Breakdown</h6>
{% if stat.result_breakdown %}
<table class="table table-sm">
<thead>
<tr>
<th>Outcome</th>
<th>Bets</th>
<th>Amount</th>
<th>Coefficient</th>
</tr>
</thead>
<tbody>
{% for outcome, data in stat.result_breakdown.items() %}
<tr>
<td>{{ outcome }}</td>
<td>{{ data.bets }}</td>
<td>{{ "{:,.2f}".format(data.amount) if data.amount else '0.00' }}</td>
<td>{{ data.coefficient }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p class="text-muted">No breakdown data available</p>
{% endif %}
</div>
</div>
</div>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<div class="text-center py-5">
<i class="fas fa-chart-bar fa-3x text-muted mb-3"></i>
<h4 class="text-muted">No extraction stats found</h4>
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
app/templates/main/reports.html
View file @ 2e96f7c5
......@@ -52,7 +52,7 @@
<label for="start_date" class="form-label">Start Date</label>
<input type="date" class="form-control" id="start_date" name="start_date" value="{{ filters.start_date }}">
</div>
<div class="col-md-1" id="custom-time-fields" style="display: none;">
<div class="col-md-1" id="time-fields">
<label for="start_time" class="form-label">Start Time</label>
<input type="time" class="form-control" id="start_time" name="start_time" value="{{ filters.start_time }}">
</div>
......@@ -60,7 +60,7 @@
<label for="end_date" class="form-label">End Date</label>
<input type="date" class="form-control" id="end_date" name="end_date" value="{{ filters.end_date }}">
</div>
<div class="col-md-1" id="custom-time-fields-end" style="display: none;">
<div class="col-md-1" id="time-fields-end">
<label for="end_time" class="form-label">End Time</label>
<input type="time" class="form-control" id="end_time" name="end_time" value="{{ filters.end_time }}">
</div>
......@@ -94,47 +94,79 @@
</div>
</div>
<!-- Reports Table -->
<!-- Summary Blocks -->
<div class="row mb-4">
<div class="col-md-3">
<div class="card bg-primary text-white">
<div class="card-body">
<h6 class="card-title mb-2">Total Payin</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_payin if totals.total_payin else 0.00) }}</h3>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card bg-info text-white">
<div class="card-body">
<h6 class="card-title mb-2">Total Payout</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_payout if totals.total_payout else 0.00) }}</h3>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card {% if totals.total_balance >= 0 %}bg-success{% else %}bg-danger{% endif %} text-white">
<div class="card-body">
<h6 class="card-title mb-2">Balance</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.total_balance if totals.total_balance else 0.00) }}</h3>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card bg-warning text-white">
<div class="card-body">
<h6 class="card-title mb-2">CAP Redistribution Balance</h6>
<h3 class="mb-0">{{ "{:,.2f}".format(totals.cap_balance if totals.cap_balance else 0.00) }}</h3>
</div>
</div>
</div>
</div>
<!-- Clients Table -->
<div class="card">
<div class="card-body">
{% if reports %}
{% if clients %}
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Sync ID</th>
<th>Client</th>
<th>Sync Timestamp</th>
<th>Date Range</th>
<th>Client Name</th>
<th>Client ID</th>
<th>Total Payin</th>
<th>Total Payout</th>
<th>Balance</th>
<th>CAP Balance</th>
<th>Total Bets</th>
<th>Total Matches</th>
<th>CAP Redistribution Balance</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for report in reports %}
{% for client in clients %}
<tr>
<td><code>{{ report.sync_id }}</code></td>
<td>{{ report.client_id }}</td>
<td>{{ report.sync_timestamp.strftime('%Y-%m-%d %H:%M:%S') if report.sync_timestamp else '' }}</td>
<td>{{ report.date_range }}</td>
<td class="text-end">{{ "{:,.2f}".format(report.total_payin) if report.total_payin else '0.00' }}</td>
<td class="text-end">{{ "{:,.2f}".format(report.total_payout) if report.total_payout else '0.00' }}</td>
<td class="text-end {% if (report.total_payin - report.total_payout) >= 0 %}text-success{% else %}text-danger{% endif %}">
{{ "{:,.2f}".format(report.total_payin - report.total_payout) if report.total_payin and report.total_payout else '0.00' }}
<td>{{ client.token_name }}</td>
<td><code>{{ client.client_id }}</code></td>
<td class="text-end">{{ "{:,.2f}".format(client.total_payin) }}</td>
<td class="text-end">{{ "{:,.2f}".format(client.total_payout) }}</td>
<td class="text-end {% if client.balance >= 0 %}text-success{% else %}text-danger{% endif %}">
{{ "{:,.2f}".format(client.balance) }}
</td>
<td class="text-center">{{ client.total_bets }}</td>
<td class="text-center">{{ client.total_matches }}</td>
<td class="text-end text-info">
{{ "{:,.2f}".format(report.cap_compensation_balance) if report.cap_compensation_balance else '0.00' }}
{{ "{:,.2f}".format(client.cap_balance) }}
</td>
<td class="text-center">{{ report.total_bets }}</td>
<td class="text-center">{{ report.total_matches }}</td>
<td>
<a href="{{ url_for('main.report_detail', sync_id=report.id) }}" class="btn btn-sm btn-info">
<i class="fas fa-eye"></i> View
<a href="{{ url_for('main.client_report_detail', client_id=client.client_id, **filters) }}" class="btn btn-sm btn-info">
<i class="fas fa-eye"></i> Details
</a>
</td>
</tr>
......@@ -175,15 +207,15 @@
</ul>
</nav>
<p class="text-center text-muted">
Showing {{ pagination.per_page * (pagination.page - 1) + 1 }} to
{{ min(pagination.per_page * pagination.page, pagination.total) }} of
{{ pagination.total }} reports
Showing {{ pagination.per_page * (pagination.page - 1) + 1 }} to
{{ min(pagination.per_page * pagination.page, pagination.total) }} of
{{ pagination.total }} clients
</p>
{% endif %}
{% else %}
<div class="text-center py-5">
<i class="fas fa-file-alt fa-3x text-muted mb-3"></i>
<h4 class="text-muted">No reports found</h4>
<h4 class="text-muted">No clients found</h4>
<p class="text-muted">Try adjusting your filters or wait for clients to sync reports.</p>
</div>
{% endif %}
......@@ -197,20 +229,20 @@
function toggleCustomDateRange() {
var dateRange = document.getElementById('date_range').value;
var customDateFields = document.getElementById('custom-date-fields');
var customTimeFields = document.getElementById('custom-time-fields');
var customDateFieldsEnd = document.getElementById('custom-date-fields-end');
var customTimeFieldsEnd = document.getElementById('custom-time-fields-end');
var timeFields = document.getElementById('time-fields');
var timeFieldsEnd = document.getElementById('time-fields-end');
if (dateRange === 'custom') {
customDateFields.style.display = 'block';
customTimeFields.style.display = 'block';
customDateFieldsEnd.style.display = 'block';
customTimeFieldsEnd.style.display = 'block';
timeFields.style.display = 'block';
timeFieldsEnd.style.display = 'block';
} else {
customDateFields.style.display = 'none';
customTimeFields.style.display = 'none';
customDateFieldsEnd.style.display = 'none';
customTimeFieldsEnd.style.display = 'none';
timeFields.style.display = 'none';
timeFieldsEnd.style.display = 'none';
}
}
......
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