feat(api,ui,db): add address, guest users, image URLs; update API
- Backend:
- Add address column to tickets and migration script
- Create guest users when user_id is missing; accept user_name and address
- Normalize stored image paths and expose absolute image_url
- Introduce utils for path normalization and ticket serialization
- Add CORS configuration for dashboard/emulator origins
- Tickets API:
- Serialize via ticket_to_dict with consistent schema
- Change status update to PATCH /api/tickets/{id}/status with JSON body
- Add DELETE /api/tickets/{id} with safe file removal
- Dashboard:
- Fetch tickets from backend, show thumbnails, absolute image URLs
- Status select + PATCH updates, toasts for feedback
- Add i18n key btn.viewDetails
- Mobile app:
- Persist device user_id via SharedPreferences
- Fetch and merge API tickets; prefer network imageUrl
- Submit user_name and address; delete via API when available
- Make location acquisition robust with fallbacks and non-blocking UX
- Android/deps:
- Disable Geolocator NMEA listener to prevent crashes
- Downgrade geolocator to ^11.0.0 for stability
BREAKING CHANGE:
- Status endpoint changed from PATCH /api/tickets/{id}?new_status=... to
PATCH /api/tickets/{id}/status with JSON body: {"status":"in_progress"}.
- /api/tickets and /api/tickets/{id} responses now use "id" (replacing
"ticket_id"), include "image_url", and normalize fields for clients. Update
consumers to use the new schema.
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import '../../services/storage.dart';
|
||||
import '../../services/api_service.dart';
|
||||
import '../../models/report.dart';
|
||||
import '../../widgets/report_card.dart';
|
||||
import '../map/map_screen.dart';
|
||||
@@ -23,14 +24,46 @@ class _MyReportsScreenState extends State<MyReportsScreen> {
|
||||
}
|
||||
|
||||
Future<void> _loadReports() async {
|
||||
setState(() {
|
||||
_loading = true;
|
||||
});
|
||||
final reports = await StorageService.getReports();
|
||||
setState(() {
|
||||
_reports = reports.reversed.toList(); // newest first
|
||||
_loading = false;
|
||||
});
|
||||
setState(() => _loading = true);
|
||||
|
||||
try {
|
||||
// Try to fetch tickets from API and filter by this device's user id
|
||||
final userId = await ApiService.getUserId();
|
||||
final apiReports = await ApiService.fetchTickets();
|
||||
|
||||
// Keep only reports that belong to this device/user
|
||||
final myApiReports = apiReports.where((r) => r.deviceId == userId).toList();
|
||||
|
||||
// Also include any local reports stored that belong to this device
|
||||
final localReports = await StorageService.getReports();
|
||||
final myLocalReports = localReports.where((r) => r.deviceId == userId).toList();
|
||||
|
||||
// Merge by id, prefer API version when available
|
||||
final Map<String, Report> merged = {};
|
||||
for (final r in myApiReports) merged[r.id] = r;
|
||||
for (final r in myLocalReports) {
|
||||
if (!merged.containsKey(r.id)) merged[r.id] = r;
|
||||
}
|
||||
|
||||
final combined = merged.values.toList();
|
||||
|
||||
setState(() {
|
||||
if (combined.isNotEmpty) {
|
||||
_reports = combined.reversed.toList(); // newest first
|
||||
} else {
|
||||
// Fallback: show local reports if no API-backed reports found for this user
|
||||
_reports = localReports.reversed.toList();
|
||||
}
|
||||
_loading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
// Conservative fallback to local storage
|
||||
final reports = await StorageService.getReports();
|
||||
setState(() {
|
||||
_reports = reports.reversed.toList();
|
||||
_loading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _onViewReport(Report r) {
|
||||
|
||||
Reference in New Issue
Block a user