alim.aidrus/environment_monitoring_app
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

repair river api and telegram issue

Browse Source
This commit is contained in:
ALim Aidrus 2025-09-03 10:19:12 +08:00
parent 0d4d70cca6
commit adb3cb0754
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/services/river_in_situ_sampling_service.dart
View File

@ -170,13 +170,14 @@ class RiverInSituSamplingService {
if (dataResult['success'] != true) { if (dataResult['success'] != true) {
await _logAndSave(data: data, status: 'L1', message: dataResult['message']!, apiResults: [dataResult], ftpStatuses: [], serverName: serverName); await _logAndSave(data: data, status: 'L1', message: dataResult['message']!, apiResults: [dataResult], ftpStatuses: [], serverName: serverName);
return {'success': false, 'message': dataResult['message']}; // FIX: Also return the status code for the UI
return {'status': 'L1', 'success': false, 'message': dataResult['message']};
} }
final recordId = dataResult['data']?['r_man_id']?.toString(); final recordId = dataResult['data']?['r_man_id']?.toString();
if (recordId == null) { if (recordId == null) {
await _logAndSave(data: data, status: 'L1', message: 'API Error: Missing record ID.', apiResults: [dataResult], ftpStatuses: [], serverName: serverName); await _logAndSave(data: data, status: 'L1', message: 'API Error: Missing record ID.', apiResults: [dataResult], ftpStatuses: [], serverName: serverName);
return {'success': false, 'message': 'API Error: Missing record ID.'}; return {'status': 'L1', 'success': false, 'message': 'API Error: Missing record ID.'};
} }
data.reportId = recordId; data.reportId = recordId;
@ -252,7 +253,13 @@ class RiverInSituSamplingService {
_handleSuccessAlert(data, appSettings, isDataOnly: !apiSuccess); _handleSuccessAlert(data, appSettings, isDataOnly: !apiSuccess);
} }
return {'success': apiSuccess || ftpSuccess, 'message': finalMessage}; // FIX: Add the 'status' and 'reportId' keys to the return map for the UI.
return {
'status': finalStatus,
'success': apiSuccess || ftpSuccess,
'message': finalMessage,
'reportId': data.reportId
};
} }
Future<void> _logAndSave({ Future<void> _logAndSave({
@ -279,7 +286,6 @@ class RiverInSituSamplingService {
} }
Future<void> _handleSuccessAlert(RiverInSituSamplingData data, List<Map<String, dynamic>>? appSettings, {required bool isDataOnly}) async { Future<void> _handleSuccessAlert(RiverInSituSamplingData data, List<Map<String, dynamic>>? appSettings, {required bool isDataOnly}) async {
debugPrint("[DEBUG] appSettings passed to _handleSuccessAlert: ${jsonEncode(appSettings)}");
try { try {
final submissionType = isDataOnly ? "(Data Only)" : "(Data & Images)"; final submissionType = isDataOnly ? "(Data Only)" : "(Data & Images)";
final stationName = data.selectedStation?['sampling_river'] ?? 'N/A'; final stationName = data.selectedStation?['sampling_river'] ?? 'N/A';