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:
@@ -12,7 +12,7 @@ import '../../l10n/i18n.dart';
|
||||
import '../../models/enums.dart';
|
||||
import '../../models/report.dart';
|
||||
import '../../services/location_service.dart';
|
||||
import '../../services/storage.dart';
|
||||
import '../../services/api_service.dart';
|
||||
import '../../widgets/severity_badge.dart';
|
||||
import '../../widgets/status_badge.dart';
|
||||
import '../my_reports/my_reports_screen.dart';
|
||||
@@ -59,7 +59,7 @@ class _MapScreenState extends State<MapScreen> {
|
||||
|
||||
Future<void> _refresh() async {
|
||||
setState(() => _loading = true);
|
||||
final reports = await StorageService.getReports();
|
||||
final reports = await ApiService.fetchTickets();
|
||||
setState(() {
|
||||
_allReports = reports;
|
||||
_loading = false;
|
||||
@@ -325,6 +325,17 @@ class _MapScreenState extends State<MapScreen> {
|
||||
child: Icon(Icons.photo, color: Colors.grey.shade600),
|
||||
);
|
||||
|
||||
// Prefer backend-provided image URL when available
|
||||
if (r.imageUrl != null && r.imageUrl!.isNotEmpty) {
|
||||
return Image.network(
|
||||
r.imageUrl!,
|
||||
width: 120,
|
||||
height: 90,
|
||||
fit: BoxFit.cover,
|
||||
errorBuilder: (_, __, ___) => placeholder,
|
||||
);
|
||||
}
|
||||
|
||||
if (kIsWeb) {
|
||||
if (r.base64Photo != null && r.base64Photo!.isNotEmpty) {
|
||||
try {
|
||||
@@ -776,7 +787,17 @@ class MapReportDetails extends StatelessWidget {
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
if (kIsWeb && report.base64Photo != null)
|
||||
if (report.imageUrl != null)
|
||||
Image.network(
|
||||
report.imageUrl!,
|
||||
errorBuilder: (_, __, ___) => Container(
|
||||
height: 180,
|
||||
color: Colors.grey.shade200,
|
||||
alignment: Alignment.center,
|
||||
child: const Icon(Icons.photo, size: 64),
|
||||
),
|
||||
)
|
||||
else if (kIsWeb && report.base64Photo != null)
|
||||
Image.memory(base64Decode(report.base64Photo!))
|
||||
else if (!kIsWeb && report.photoPath != null)
|
||||
Image.file(File(report.photoPath!))
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -54,25 +54,35 @@ class _CaptureScreenState extends State<CaptureScreen> {
|
||||
|
||||
Future<void> _processImage(XFile image, ImageSource source) async {
|
||||
try {
|
||||
// Get current position (Geolocator.Position)
|
||||
// Get current position (optional - app can work without location)
|
||||
final position = await LocationService.getCurrentPosition();
|
||||
|
||||
if (position == null) {
|
||||
// Create location data even if position is null (with default values)
|
||||
LocationData? locationData;
|
||||
if (position != null) {
|
||||
locationData = LocationService.positionToLocationData(position);
|
||||
print('Location acquired: ${locationData.lat}, ${locationData.lng}');
|
||||
} else {
|
||||
// Create a fallback location with zero coordinates
|
||||
// This allows the app to continue working without location
|
||||
locationData = LocationData(lat: 0.0, lng: 0.0, accuracy: null);
|
||||
print(
|
||||
'Using fallback location (0.0, 0.0) - location services unavailable',
|
||||
);
|
||||
|
||||
// Show a non-blocking warning to the user
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: const Text(
|
||||
'Unable to get location. Please try again.',
|
||||
const SnackBar(
|
||||
content: Text(
|
||||
'Location unavailable. Report will be created without GPS coordinates.',
|
||||
), // TODO: Move to i18n
|
||||
duration: Duration(seconds: 3),
|
||||
),
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Convert Position -> LocationData (app model)
|
||||
final locationData = LocationService.positionToLocationData(position);
|
||||
|
||||
// Generate AI suggestion (seeded deterministic)
|
||||
final aiSuggestion = MockAIService.generateSuggestion(
|
||||
id: DateTime.now().millisecondsSinceEpoch.toString(),
|
||||
@@ -113,10 +123,12 @@ class _CaptureScreenState extends State<CaptureScreen> {
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
print('Critical error in image processing: $e');
|
||||
if (mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(I18n.t('error.imageProcessing', {'0': e.toString()})),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user