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

modfiy marine and river ftp submission module and retry module so that it only process once and not resubmit the success data multiple time

Browse Source
This commit is contained in:
ALim Aidrus 2025-11-22 21:21:48 +08:00
parent 6c4bc335b8
commit 05d29bc107
11 changed files with 1451 additions and 1132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
lib/models/river_inves_manual_sampling_data.dart
View File

@ -329,69 +329,71 @@ class RiverInvesManualSamplingData {
// Sampler & Time Info (Assuming same API keys as manual) // Sampler & Time Info (Assuming same API keys as manual)
add('first_sampler_user_id', firstSamplerUserId); add('first_sampler_user_id', firstSamplerUserId);
add('r_inv_second_sampler_id', secondSampler?['user_id']); // Prefixed inv? // *** FIX: Changed 'r_inv_' to 'r_inves_' to match API ***
add('r_inv_date', samplingDate); add('r_inves_second_sampler_id', secondSampler?['user_id']);
add('r_inv_time', samplingTime); add('r_inves_date', samplingDate);
add('r_inv_type', samplingType); // Should be 'Investigative' add('r_inves_time', samplingTime);
add('r_inv_sample_id_code', sampleIdCode); add('r_inves_type', samplingType);
add('r_inves_sample_id_code', sampleIdCode);
// Station Info (Conditional) // Station Info (Conditional)
add('r_inv_station_type', stationTypeSelection); add('r_inves_station_type', stationTypeSelection);
if (stationTypeSelection == 'Existing Manual Station') { if (stationTypeSelection == 'Existing Manual Station') {
add('station_id', selectedStation?['station_id']); // Assuming API wants the numeric ID add('station_id', selectedStation?['station_id']); // Assuming API wants the numeric ID
add('r_inv_station_code', selectedStation?['sampling_station_code']); // Add code for display/logging if needed add('r_inves_station_code', selectedStation?['sampling_station_code']); // Add code for display/logging if needed
} else if (stationTypeSelection == 'Existing Triennial Station') { } else if (stationTypeSelection == 'Existing Triennial Station') {
add('triennial_station_id', selectedTriennialStation?['station_id']); // Assuming a different key add('triennial_station_id', selectedTriennialStation?['station_id']); // Assuming a different key
add('r_inv_station_code', selectedTriennialStation?['triennial_station_code']); add('r_inves_station_code', selectedTriennialStation?['triennial_station_code']);
} else if (stationTypeSelection == 'New Location') { } else if (stationTypeSelection == 'New Location') {
add('r_inv_new_state_name', newStateName); add('r_inves_new_state_name', newStateName);
add('r_inv_new_basin_name', newBasinName); add('r_inves_new_basin_name', newBasinName);
add('r_inv_new_river_name', newRiverName); add('r_inves_new_river_name', newRiverName);
add('r_inv_new_station_name', newStationName); // Include newStationName add('r_inves_new_station_name', newStationName); // Include newStationName
add('r_inv_new_station_code', newStationCode); // Optional code add('r_inves_new_station_code', newStationCode); // Optional code
add('r_inv_station_latitude', stationLatitude); // Use the captured/entered lat/lon add('r_inves_station_latitude', stationLatitude); // Use the captured/entered lat/lon
add('r_inv_station_longitude', stationLongitude); add('r_inves_station_longitude', stationLongitude);
} }
// Location Verification (Assuming same keys) // Location Verification (Assuming same keys)
add('r_inv_current_latitude', currentLatitude); add('r_inves_current_latitude', currentLatitude);
add('r_inv_current_longitude', currentLongitude); add('r_inves_current_longitude', currentLongitude);
add('r_inv_distance_difference', distanceDifferenceInKm); add('r_inves_distance_difference', distanceDifferenceInKm);
add('r_inv_distance_difference_remarks', distanceDifferenceRemarks); add('r_inves_distance_difference_remarks', distanceDifferenceRemarks);
// Site Info (Assuming same keys) // Site Info (Assuming same keys)
add('r_inv_weather', weather); add('r_inves_weather', weather);
add('r_inv_event_remark', eventRemarks); add('r_inves_event_remark', eventRemarks);
add('r_inv_lab_remark', labRemarks); add('r_inves_lab_remark', labRemarks);
// Optional Remarks (Assuming same keys) // Optional Remarks (Assuming same keys)
add('r_inv_optional_photo_01_remarks', optionalRemark1); add('r_inves_optional_photo_01_remarks', optionalRemark1);
add('r_inv_optional_photo_02_remarks', optionalRemark2); add('r_inves_optional_photo_02_remarks', optionalRemark2);
add('r_inv_optional_photo_03_remarks', optionalRemark3); add('r_inves_optional_photo_03_remarks', optionalRemark3);
add('r_inv_optional_photo_04_remarks', optionalRemark4); add('r_inves_optional_photo_04_remarks', optionalRemark4);
// Parameters (Assuming same keys) // Parameters (Assuming same keys)
add('r_inv_sondeID', sondeId); add('r_inves_sondeID', sondeId);
add('data_capture_date', dataCaptureDate); // Reuse generic keys? // Note: data_capture_date/time might not be used by API if not in controller, but keeping generally safe
add('data_capture_time', dataCaptureTime); // Reuse generic keys? add('data_capture_date', dataCaptureDate);
add('r_inv_oxygen_conc', oxygenConcentration); add('data_capture_time', dataCaptureTime);
add('r_inv_oxygen_sat', oxygenSaturation); add('r_inves_oxygen_conc', oxygenConcentration);
add('r_inv_ph', ph); add('r_inves_oxygen_sat', oxygenSaturation);
add('r_inv_salinity', salinity); add('r_inves_ph', ph);
add('r_inv_conductivity', electricalConductivity); add('r_inves_salinity', salinity);
add('r_inv_temperature', temperature); add('r_inves_conductivity', electricalConductivity);
add('r_inv_tds', tds); add('r_inves_temperature', temperature);
add('r_inv_turbidity', turbidity); add('r_inves_tds', tds);
add('r_inv_ammonia', ammonia); add('r_inves_turbidity', turbidity);
add('r_inv_battery_volt', batteryVoltage); add('r_inves_ammonia', ammonia);
add('r_inves_battery_volt', batteryVoltage);
// Flowrate (Assuming same keys) // Flowrate (Assuming same keys)
add('r_inv_flowrate_method', flowrateMethod); add('r_inves_flowrate_method', flowrateMethod);
add('r_inv_flowrate_sd_height', flowrateSurfaceDrifterHeight); add('r_inves_flowrate_sd_height', flowrateSurfaceDrifterHeight);
add('r_inv_flowrate_sd_distance', flowrateSurfaceDrifterDistance); add('r_inves_flowrate_sd_distance', flowrateSurfaceDrifterDistance);
add('r_inv_flowrate_sd_time_first', flowrateSurfaceDrifterTimeFirst); add('r_inves_flowrate_sd_time_first', flowrateSurfaceDrifterTimeFirst);
add('r_inv_flowrate_sd_time_last', flowrateSurfaceDrifterTimeLast); add('r_inves_flowrate_sd_time_last', flowrateSurfaceDrifterTimeLast);
add('r_inv_flowrate_value', flowrateValue); add('r_inves_flowrate_value', flowrateValue);
// Additional data that might be useful for display or if API needs it redundantly // Additional data that might be useful for display or if API needs it redundantly
add('first_sampler_name', firstSamplerName); add('first_sampler_name', firstSamplerName);
@ -407,16 +409,16 @@ class RiverInvesManualSamplingData {
/// Converts the image properties into a Map<String, File?> for the multipart API request. /// Converts the image properties into a Map<String, File?> for the multipart API request.
/// Keys should match the expected API endpoint fields for Investigative images. /// Keys should match the expected API endpoint fields for Investigative images.
Map<String, File?> toApiImageFiles() { Map<String, File?> toApiImageFiles() {
// Assuming same keys as manual, but prefixed with r_inv_? // *** FIX: Updated keys to 'r_inves_' to match DB/Controller ***
return { return {
'r_inv_background_station': backgroundStationImage, 'r_inves_background_station': backgroundStationImage,
'r_inv_upstream_river': upstreamRiverImage, 'r_inves_upstream_river': upstreamRiverImage,
'r_inv_downstream_river': downstreamRiverImage, 'r_inves_downstream_river': downstreamRiverImage,
'r_inv_sample_turbidity': sampleTurbidityImage, 'r_inves_sample_turbidity': sampleTurbidityImage,
'r_inv_optional_photo_01': optionalImage1, 'r_inves_optional_photo_01': optionalImage1,
'r_inv_optional_photo_02': optionalImage2, 'r_inves_optional_photo_02': optionalImage2,
'r_inv_optional_photo_03': optionalImage3, 'r_inves_optional_photo_03': optionalImage3,
'r_inv_optional_photo_04': optionalImage4, 'r_inves_optional_photo_04': optionalImage4,
}; };
} }

132
lib/screens/river/investigative/manual_sampling/river_inves_in_situ_step_3_data_capture.dart
View File

@ -224,8 +224,9 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
if (value == 'NA') { if (value == 'NA') {
_flowrateValueController.text = 'NA'; _flowrateValueController.text = 'NA';
} else if (value == 'Flowmeter') { } else if (value == 'Flowmeter') {
// Keep existing value if user switches back, or clear if desired // --- MODIFICATION: Clear flowrate value for Flowmeter ---
// _flowrateValueController.clear(); _flowrateValueController.clear();
// --- END MODIFICATION ---
_sdHeightController.clear(); _sdHeightController.clear();
_sdDistanceController.clear(); _sdDistanceController.clear();
_sdTimeFirstController.clear(); _sdTimeFirstController.clear();
@ -466,10 +467,13 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
return; return;
} }
// --- START MODIFICATION: Disable Next if Connected ---
// --- MODIFICATION: Changed to allow proceeding if reading is STOPPED, even if connected ---
if (_isAutoReading) { if (_isAutoReading) {
_showStopReadingDialog(); _showStopReadingDialog();
return; return;
} }
// --- END MODIFICATION ---
if (!_formKey.currentState!.validate()) { if (!_formKey.currentState!.validate()) {
return; return;
@ -649,9 +653,10 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
} }
Map<String, dynamic>? _getActiveConnectionDetails() { Map<String, dynamic>? _getActiveConnectionDetails() {
// Logic copied from RiverInSituStep3DataCaptureState._getActiveConnectionDetails // --- START FIX: Use read() instead of watch() ---
// Uses the correct _samplingService instance via context.watch final service = context.read<RiverInvestigativeSamplingService>();
final service = context.watch<RiverInvestigativeSamplingService>(); // Watch Investigative service // --- END FIX ---
if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) { if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) {
return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName}; return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName};
} }
@ -675,6 +680,15 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
final activeConnection = _getActiveConnectionDetails(); final activeConnection = _getActiveConnectionDetails();
final String? activeType = activeConnection?['type'] as String?; final String? activeType = activeConnection?['type'] as String?;
// Check if ANY device is currently connected
final bool isDeviceConnected = activeConnection != null;
// --- START MODIFICATION: Logic for disabling inputs ---
// Disable interaction if auto-reading is active OR if locked out.
// If reading is stopped (even if connected), we allow interaction.
final bool shouldDisableInput = _isAutoReading || _isLockedOut;
// --- END MODIFICATION ---
return WillPopScope( return WillPopScope(
onWillPop: () async { onWillPop: () async {
if (_isLockedOut) { if (_isLockedOut) {
@ -719,14 +733,18 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
ValueListenableBuilder<String?>( ValueListenableBuilder<String?>(
valueListenable: service.sondeId, // Listen to the correct service instance valueListenable: service.sondeId, // Listen to the correct service instance
builder: (context, sondeId, child) { builder: (context, sondeId, child) {
final newSondeId = sondeId ?? ''; // --- START FIX: Only update if non-null to prevent clearing on disconnect ---
// Use addPostFrameCallback to avoid setting state during build if (sondeId != null && sondeId.isNotEmpty) {
WidgetsBinding.instance.addPostFrameCallback((_) { final newSondeId = sondeId;
if (mounted && _sondeIdController.text != newSondeId) { // Use addPostFrameCallback to avoid setting state during build
_sondeIdController.text = newSondeId; WidgetsBinding.instance.addPostFrameCallback((_) {
widget.data.sondeId = newSondeId; // Update model if (mounted && _sondeIdController.text != newSondeId) {
} _sondeIdController.text = newSondeId;
}); widget.data.sondeId = newSondeId; // Update model
}
});
}
// --- END FIX ---
return TextFormField( return TextFormField(
controller: _sondeIdController, controller: _sondeIdController,
decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'), decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'),
@ -768,14 +786,20 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
const Divider(height: 32), const Divider(height: 32),
// Flowrate Section // Flowrate Section
_buildFlowrateSection(), // --- MODIFIED: Pass connection state to Flowrate Section ---
_buildFlowrateSection(isInputDisabled: shouldDisableInput),
const SizedBox(height: 32), const SizedBox(height: 32),
// Next Button with Lockout Timer // Next Button with Lockout Timer
ElevatedButton( ElevatedButton(
onPressed: _isLockedOut ? null : _validateAndProceed, // Disable if Locked Out OR Auto Reading is active
onPressed: (_isLockedOut || _isAutoReading) ? null : _validateAndProceed,
style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)), style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)),
child: Text(_isLockedOut ? 'Next ($_lockoutSecondsRemaining\s)' : 'Next'), child: Text(
_isLockedOut
? 'Next ($_lockoutSecondsRemaining\s)'
: (_isAutoReading ? 'Stop Reading to Proceed' : 'Next') // Helper text
),
), ),
], ],
), ),
@ -1055,8 +1079,8 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
); );
} }
Widget _buildFlowrateSection() { // Updated to include disable logic
// Copied from RiverInSituStep3DataCaptureState._buildFlowrateSection, modified to use Wrap Widget _buildFlowrateSection({bool isInputDisabled = false}) {
return Card( return Card(
margin: const EdgeInsets.symmetric(vertical: 4.0), margin: const EdgeInsets.symmetric(vertical: 4.0),
child: Padding( child: Padding(
@ -1065,26 +1089,52 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Flowrate", style: Theme.of(context).textTheme.titleLarge), Text("Flowrate", style: Theme.of(context).textTheme.titleLarge),
if (isInputDisabled)
Padding(
padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
child: Row(
children: [
Icon(Icons.info_outline, color: Colors.orange, size: 20),
const SizedBox(width: 8),
Expanded(
child: Text(
"Please stop reading to enter flowrate.",
style: TextStyle(color: Colors.orange[800], fontSize: 12),
),
),
],
),
),
const SizedBox(height: 8), const SizedBox(height: 8),
// --- START FIX: Replaced Row with Wrap to fix horizontal overflow for radio buttons --- // Wrap content in AbsorbPointer and Opacity if connected
Wrap( AbsorbPointer(
alignment: WrapAlignment.spaceAround, absorbing: isInputDisabled,
spacing: 8.0, child: Opacity(
runSpacing: 4.0, opacity: isInputDisabled ? 0.5 : 1.0,
children: [ child: Column(
_buildFlowrateRadioButton("Surface Drifter"), children: [
_buildFlowrateRadioButton("Flowmeter"), // Replaced Row with Wrap to fix horizontal overflow for radio buttons
_buildFlowrateRadioButton("NA"), // Not Applicable Wrap(
], alignment: WrapAlignment.spaceAround,
spacing: 8.0,
runSpacing: 4.0,
children: [
_buildFlowrateRadioButton("Surface Drifter"),
_buildFlowrateRadioButton("Flowmeter"),
_buildFlowrateRadioButton("NA"), // Not Applicable
],
),
// Conditional fields based on selected method
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
],
),
),
), ),
// --- END FIX ---
// Conditional fields based on selected method
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
], ],
), ),
), ),
@ -1092,7 +1142,6 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
} }
Widget _buildFlowrateRadioButton(String title) { Widget _buildFlowrateRadioButton(String title) {
// Copied from RiverInSituStep3DataCaptureState._buildFlowrateRadioButton, added overflow handling
return Column( return Column(
children: [ children: [
Radio<String>( Radio<String>(
@ -1110,7 +1159,6 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
} }
Widget _buildSurfaceDrifterFields() { Widget _buildSurfaceDrifterFields() {
// Copied from RiverInSituStep3DataCaptureState._buildSurfaceDrifterFields
return Padding( return Padding(
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: Column( child: Column(
@ -1175,13 +1223,17 @@ class _RiverInvesStep3DataCaptureState extends State<RiverInvesStep3DataCapture>
} }
Widget _buildNAField() { Widget _buildNAField() {
// Copied from RiverInSituStep3DataCaptureState._buildNAField // Fix: Use controller to set value instead of initialValue to avoid conflict crash
if (_flowrateValueController.text != 'NA') {
_flowrateValueController.text = 'NA';
}
return Padding( return Padding(
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: TextFormField( child: TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Flowrate (m/s)'),
initialValue: 'NA', // Set initial value to NA // initialValue: 'NA', // Removed to fix AssertionError: initialValue == null || controller == null
readOnly: true, // Make it read-only readOnly: true, // Make it read-only
), ),
); );

207
lib/screens/river/manual/triennial/widgets/river_manual_triennial_step_3_data_capture.dart
View File

@ -211,12 +211,20 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
void _onFlowrateMethodChanged(String? value) { void _onFlowrateMethodChanged(String? value) {
setState(() { setState(() {
_selectedFlowrateMethod = value; _selectedFlowrateMethod = value;
widget.data.flowrateMethod = value; // Update model immediately
if (value == 'NA') { if (value == 'NA') {
_flowrateValueController.text = 'NA'; _flowrateValueController.text = 'NA';
} else if (value == 'Flowmeter') { } else if (value == 'Flowmeter') {
// --- MODIFICATION: Clear flowrate value for Flowmeter ---
_flowrateValueController.clear(); _flowrateValueController.clear();
} else { // --- END MODIFICATION ---
_flowrateValueController.clear(); _sdHeightController.clear();
_sdDistanceController.clear();
_sdTimeFirstController.clear();
_sdTimeLastController.clear();
} else { // Surface Drifter
_flowrateValueController.clear(); // Will be calculated
} }
}); });
} }
@ -233,9 +241,21 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
try { try {
final timeFormat = DateFormat("HH:mm:ss"); final timeFormat = DateFormat("HH:mm:ss");
// Use a common date (like today) to allow time difference calculation across midnight
final now = DateTime.now();
final timeFirst = timeFormat.parse(timeFirstStr); final timeFirst = timeFormat.parse(timeFirstStr);
final dateTimeFirst = DateTime(now.year, now.month, now.day, timeFirst.hour, timeFirst.minute, timeFirst.second);
final timeLast = timeFormat.parse(timeLastStr); final timeLast = timeFormat.parse(timeLastStr);
final differenceInSeconds = timeLast.difference(timeFirst).inSeconds; var dateTimeLast = DateTime(now.year, now.month, now.day, timeLast.hour, timeLast.minute, timeLast.second);
// Handle crossing midnight
if (dateTimeLast.isBefore(dateTimeFirst)) {
dateTimeLast = dateTimeLast.add(const Duration(days: 1));
}
final differenceInSeconds = dateTimeLast.difference(dateTimeFirst).inSeconds;
if (differenceInSeconds <= 0) { if (differenceInSeconds <= 0) {
_showSnackBar("Time Last Deploy must be after Time First Deploy.", isError: true); _showSnackBar("Time Last Deploy must be after Time First Deploy.", isError: true);
return; return;
@ -280,6 +300,13 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
if (mounted) { if (mounted) {
_updateTextFields(readings); _updateTextFields(readings);
} }
}, onError: (error) {
debugPrint("Error on data stream: $error");
if (mounted) _showSnackBar("Data stream error: $error", isError: true);
_disconnect(type); // Disconnect on stream error
}, onDone: () {
debugPrint("Data stream done.");
if (mounted) _disconnect(type); // Disconnect when stream closes
}); });
} }
} }
@ -291,7 +318,8 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
try { try {
if (type == 'bluetooth') { if (type == 'bluetooth') {
final devices = await service.getPairedBluetoothDevices(); final devices = await service.getPairedBluetoothDevices();
if (devices.isEmpty && mounted) { if (!mounted) return false; // Check mounted after async gap
if (devices.isEmpty) {
_showSnackBar('No paired Bluetooth devices found.', isError: true); _showSnackBar('No paired Bluetooth devices found.', isError: true);
return false; return false;
} }
@ -302,8 +330,9 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
} }
} else if (type == 'serial') { } else if (type == 'serial') {
final devices = await service.getAvailableSerialDevices(); final devices = await service.getAvailableSerialDevices();
if (devices.isEmpty && mounted) { if (!mounted) return false;
_showSnackBar('No USB Serial devices found.', isError: true); if (devices.isEmpty) {
_showSnackBar('No USB Serial devices found. Ensure device is plugged in.', isError: true);
return false; return false;
} }
final selectedDevice = await showSerialPortListDialog(context: context, devices: devices); final selectedDevice = await showSerialPortListDialog(context: context, devices: devices);
@ -357,6 +386,7 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
_startLockoutTimer(); // --- MODIFICATION: Start countdown _startLockoutTimer(); // --- MODIFICATION: Start countdown
} else { } else {
if (activeType == 'bluetooth') service.stopBluetoothAutoReading(); else service.stopSerialAutoReading(); if (activeType == 'bluetooth') service.stopBluetoothAutoReading(); else service.stopSerialAutoReading();
// NOTE: _lockoutTimer is intentionally NOT cancelled here so the lockout persists for the remaining duration
} }
}); });
} }
@ -419,6 +449,8 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
} }
// --- END MODIFICATION --- // --- END MODIFICATION ---
// --- START MODIFICATION: Disable Next if Connected and Auto Reading is active ---
// Similar to River In-Situ, allow manual stop to re-enable 'Next'
if (_isAutoReading) { if (_isAutoReading) {
_showStopReadingDialog(); _showStopReadingDialog();
return; return;
@ -519,8 +551,16 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
widget.data.flowrateSurfaceDrifterTimeLast = _sdTimeLastController.text; widget.data.flowrateSurfaceDrifterTimeLast = _sdTimeLastController.text;
widget.data.flowrateValue = double.tryParse(_flowrateValueController.text); widget.data.flowrateValue = double.tryParse(_flowrateValueController.text);
} else if (_selectedFlowrateMethod == 'Flowmeter') { } else if (_selectedFlowrateMethod == 'Flowmeter') {
widget.data.flowrateSurfaceDrifterHeight = null;
widget.data.flowrateSurfaceDrifterDistance = null;
widget.data.flowrateSurfaceDrifterTimeFirst = null;
widget.data.flowrateSurfaceDrifterTimeLast = null;
widget.data.flowrateValue = double.tryParse(_flowrateValueController.text); widget.data.flowrateValue = double.tryParse(_flowrateValueController.text);
} else { // NA } else { // NA
widget.data.flowrateSurfaceDrifterHeight = null;
widget.data.flowrateSurfaceDrifterDistance = null;
widget.data.flowrateSurfaceDrifterTimeFirst = null;
widget.data.flowrateSurfaceDrifterTimeLast = null;
widget.data.flowrateValue = null; widget.data.flowrateValue = null;
} }
@ -539,8 +579,6 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
widget.onNext(); widget.onNext();
} }
void _showSnackBar(String message, {bool isError = false}) { void _showSnackBar(String message, {bool isError = false}) {
if (mounted) { if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar( ScaffoldMessenger.of(context).showSnackBar(SnackBar(
@ -566,7 +604,10 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
} }
Map<String, dynamic>? _getActiveConnectionDetails() { Map<String, dynamic>? _getActiveConnectionDetails() {
final service = context.watch<RiverInSituSamplingService>(); // --- START FIX: Use read() instead of watch() ---
final service = context.read<RiverInSituSamplingService>();
// --- END FIX ---
if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) { if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) {
return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName}; return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName};
} }
@ -582,6 +623,15 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
final activeConnection = _getActiveConnectionDetails(); final activeConnection = _getActiveConnectionDetails();
final String? activeType = activeConnection?['type'] as String?; final String? activeType = activeConnection?['type'] as String?;
// Check if ANY device is currently connected
final bool isDeviceConnected = activeConnection != null;
// --- START MODIFICATION: Logic for disabling inputs ---
// Disable interaction if auto-reading is active OR if locked out.
// If reading is stopped (even if connected), we allow interaction.
final bool shouldDisableInput = _isAutoReading || _isLockedOut;
// --- END MODIFICATION ---
// --- START MODIFICATION: Add WillPopScope to block back navigation --- // --- START MODIFICATION: Add WillPopScope to block back navigation ---
return WillPopScope( return WillPopScope(
onWillPop: () async { onWillPop: () async {
@ -589,6 +639,7 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
_showSnackBar("Please wait for the initial reading period to complete.", isError: true); _showSnackBar("Please wait for the initial reading period to complete.", isError: true);
return false; // Prevent back navigation return false; // Prevent back navigation
} }
_disconnectFromAll();
return true; // Allow back navigation return true; // Allow back navigation
}, },
child: Form( child: Form(
@ -620,13 +671,17 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
ValueListenableBuilder<String?>( ValueListenableBuilder<String?>(
valueListenable: service.sondeId, valueListenable: service.sondeId,
builder: (context, sondeId, child) { builder: (context, sondeId, child) {
final newSondeId = sondeId ?? ''; // --- START FIX: Only update if non-null to prevent clearing on disconnect ---
WidgetsBinding.instance.addPostFrameCallback((_) { if (sondeId != null && sondeId.isNotEmpty) {
if (mounted && _sondeIdController.text != newSondeId) { final newSondeId = sondeId;
_sondeIdController.text = newSondeId; WidgetsBinding.instance.addPostFrameCallback((_) {
widget.data.sondeId = newSondeId; if (mounted && _sondeIdController.text != newSondeId) {
} _sondeIdController.text = newSondeId;
}); widget.data.sondeId = newSondeId;
}
});
}
// --- END FIX ---
return TextFormField( return TextFormField(
controller: _sondeIdController, controller: _sondeIdController,
decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'), decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'),
@ -661,13 +716,21 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
}).toList(), }).toList(),
), ),
const Divider(height: 32), const Divider(height: 32),
_buildFlowrateSection(),
// --- MODIFIED: Use 'shouldDisableInput' instead of 'isDeviceConnected' ---
_buildFlowrateSection(isInputDisabled: shouldDisableInput),
const SizedBox(height: 32), const SizedBox(height: 32),
// --- START MODIFICATION: Add countdown to Next button ---
// --- MODIFIED: Enable Next button if reading stopped (even if connected) ---
ElevatedButton( ElevatedButton(
onPressed: _isLockedOut ? null : _validateAndProceed, // Disable if locked out OR reading is active
onPressed: (_isLockedOut || _isAutoReading) ? null : _validateAndProceed,
style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)), style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)),
child: Text(_isLockedOut ? 'Next ($_lockoutSecondsRemaining\s)' : 'Next'), child: Text(
_isLockedOut
? 'Next ($_lockoutSecondsRemaining\s)'
: (_isAutoReading ? 'Stop Reading to Proceed' : 'Next')
),
), ),
// --- END MODIFICATION --- // --- END MODIFICATION ---
], ],
@ -679,7 +742,7 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
Widget _buildParameterListItem({ required IconData icon, required String label, required String unit, required TextEditingController controller, bool isOutOfBounds = false}) { Widget _buildParameterListItem({ required IconData icon, required String label, required String unit, required TextEditingController controller, bool isOutOfBounds = false}) {
final bool isMissing = controller.text.isEmpty || controller.text.contains('-999'); final bool isMissing = controller.text.isEmpty || controller.text.contains('-999');
final String displayValue = isMissing ? '-.--' : controller.text; final String displayValue = isMissing ? '-.--' : (double.tryParse(controller.text) ?? -999.0).toStringAsFixed(5);
final String displayLabel = unit.isEmpty ? label : '$label ($unit)'; final String displayLabel = unit.isEmpty ? label : '$label ($unit)';
final Color valueColor = isOutOfBounds final Color valueColor = isOutOfBounds
@ -804,6 +867,7 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
final controller = param['controller'] as TextEditingController; final controller = param['controller'] as TextEditingController;
final previousValue = previousReadings[key]; final previousValue = previousReadings[key];
final bool isCurrentValueOutOfBounds = _outOfBoundsKeys.contains(key); final bool isCurrentValueOutOfBounds = _outOfBoundsKeys.contains(key);
final currentValue = double.tryParse(controller.text) ?? -999.0;
return TableRow( return TableRow(
children: [ children: [
@ -818,7 +882,7 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(
controller.text.contains('-999') ? '-.--' : (double.tryParse(controller.text) ?? 0).toStringAsFixed(5), currentValue == -999.0 ? '-.--' : currentValue.toStringAsFixed(5),
style: TextStyle( style: TextStyle(
color: isCurrentValueOutOfBounds color: isCurrentValueOutOfBounds
? Colors.red ? Colors.red
@ -921,7 +985,8 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
); );
} }
Widget _buildFlowrateSection() { // Updated to include disable logic
Widget _buildFlowrateSection({bool isInputDisabled = false}) {
return Card( return Card(
margin: const EdgeInsets.symmetric(vertical: 4.0), margin: const EdgeInsets.symmetric(vertical: 4.0),
child: Padding( child: Padding(
@ -930,25 +995,52 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Flowrate", style: Theme.of(context).textTheme.titleLarge), Text("Flowrate", style: Theme.of(context).textTheme.titleLarge),
if (isInputDisabled)
Padding(
padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
child: Row(
children: [
Icon(Icons.info_outline, color: Colors.orange, size: 20),
const SizedBox(width: 8),
Expanded(
child: Text(
"Please stop reading to enter flowrate.",
style: TextStyle(color: Colors.orange[800], fontSize: 12),
),
),
],
),
),
const SizedBox(height: 8), const SizedBox(height: 8),
// --- START FIX: Wrap radio buttons in Expanded/Wrap widgets to prevent horizontal overflow --- // Wrap content in AbsorbPointer and Opacity if connected
Wrap( AbsorbPointer(
alignment: WrapAlignment.spaceAround, absorbing: isInputDisabled,
spacing: 8.0, child: Opacity(
runSpacing: 4.0, opacity: isInputDisabled ? 0.5 : 1.0,
children: [ child: Column(
_buildFlowrateRadioButton("Surface Drifter"), children: [
_buildFlowrateRadioButton("Flowmeter"), // Replaced Row with Wrap to fix horizontal overflow for radio buttons
_buildFlowrateRadioButton("NA"), Wrap(
], alignment: WrapAlignment.spaceAround,
spacing: 8.0,
runSpacing: 4.0,
children: [
_buildFlowrateRadioButton("Surface Drifter"),
_buildFlowrateRadioButton("Flowmeter"),
_buildFlowrateRadioButton("NA"), // Not Applicable
],
),
// Conditional fields based on selected method
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
],
),
),
), ),
// --- END FIX ---
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
], ],
), ),
), ),
@ -980,38 +1072,43 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
TextFormField( TextFormField(
controller: _sdHeightController, controller: _sdHeightController,
decoration: const InputDecoration(labelText: 'Height (m)'), decoration: const InputDecoration(labelText: 'Height (m)'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
// Add validation if needed
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdDistanceController, controller: _sdDistanceController,
decoration: const InputDecoration(labelText: 'Distance (m)'), decoration: const InputDecoration(labelText: 'Distance (m) *'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
validator: (v) => v == null || v.isEmpty ? 'Distance is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdTimeFirstController, controller: _sdTimeFirstController,
decoration: const InputDecoration(labelText: 'Time First Deploy (HH:mm:ss)', suffixIcon: Icon(Icons.timer)), decoration: const InputDecoration(labelText: 'Time First Deploy (HH:mm:ss) *', suffixIcon: Icon(Icons.timer)),
readOnly: true, readOnly: true,
onTap: () => _selectTime(context, _sdTimeFirstController), onTap: () => _selectTime(context, _sdTimeFirstController),
validator: (v) => v == null || v.isEmpty ? 'Start time is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdTimeLastController, controller: _sdTimeLastController,
decoration: const InputDecoration(labelText: 'Time Last Deploy (HH:mm:ss)', suffixIcon: Icon(Icons.timer)), decoration: const InputDecoration(labelText: 'Time Last Deploy (HH:mm:ss) *', suffixIcon: Icon(Icons.timer)),
readOnly: true, readOnly: true,
onTap: () => _selectTime(context, _sdTimeLastController), onTap: () => _selectTime(context, _sdTimeLastController),
validator: (v) => v == null || v.isEmpty ? 'End time is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
ElevatedButton( ElevatedButton(
onPressed: _calculateFlowrate, onPressed: _calculateFlowrate,
child: const Text('Get Flowrate'), child: const Text('Calculate Flowrate'),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Calculated Flowrate (m/s)'),
readOnly: true, readOnly: true,
// Add validator if calculation must be done?
), ),
], ],
), ),
@ -1023,20 +1120,28 @@ class _RiverManualTriennialStep3DataCaptureState extends State<RiverManualTrienn
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: TextFormField( child: TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Flowrate (m/s) *'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
validator: (v) => v == null || v.isEmpty ? 'Flowrate value is required' : null,
), ),
); );
} }
Widget _buildNAField() { Widget _buildNAField() {
// Fix: Use controller to set value instead of initialValue to avoid conflict crash
if (_flowrateValueController.text != 'NA') {
_flowrateValueController.text = 'NA';
}
return Padding( return Padding(
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: TextFormField( child: TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Flowrate (m/s)'),
readOnly: true, // initialValue: 'NA', // Removed to fix AssertionError: initialValue == null || controller == null
readOnly: true, // Make it read-only
), ),
); );
} }
}
} // End of State class

250
lib/screens/river/manual/widgets/river_in_situ_step_3_data_capture.dart
View File

@ -7,15 +7,15 @@ import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
import 'package:usb_serial/usb_serial.dart'; import 'package:usb_serial/usb_serial.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../../../../auth_provider.dart'; import '../../../../../auth_provider.dart';
import '../../../../models/river_in_situ_sampling_data.dart'; import '../../../../../models/river_in_situ_sampling_data.dart';
//import '../../../../services/api_service.dart'; // Import to access DatabaseHelper //import '../../../../../services/api_service.dart'; // Import to access DatabaseHelper
import 'package:environment_monitoring_app/services/database_helper.dart'; import 'package:environment_monitoring_app/services/database_helper.dart';
import '../../../../services/river_in_situ_sampling_service.dart'; import '../../../../../services/river_in_situ_sampling_service.dart';
import '../../../../bluetooth/bluetooth_manager.dart'; import '../../../../../bluetooth/bluetooth_manager.dart';
import '../../../../serial/serial_manager.dart'; import '../../../../../serial/serial_manager.dart';
import '../../../../bluetooth/widgets/bluetooth_device_list_dialog.dart'; import '../../../../../bluetooth/widgets/bluetooth_device_list_dialog.dart';
import '../../../../serial/widget/serial_port_list_dialog.dart'; import '../../../../../serial/widget/serial_port_list_dialog.dart';
class RiverInSituStep3DataCapture extends StatefulWidget { class RiverInSituStep3DataCapture extends StatefulWidget {
final RiverInSituSamplingData data; final RiverInSituSamplingData data;
@ -211,12 +211,20 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
void _onFlowrateMethodChanged(String? value) { void _onFlowrateMethodChanged(String? value) {
setState(() { setState(() {
_selectedFlowrateMethod = value; _selectedFlowrateMethod = value;
widget.data.flowrateMethod = value; // Update model immediately
if (value == 'NA') { if (value == 'NA') {
_flowrateValueController.text = 'NA'; _flowrateValueController.text = 'NA';
} else if (value == 'Flowmeter') { } else if (value == 'Flowmeter') {
// --- MODIFICATION: Clear flowrate value for Flowmeter ---
_flowrateValueController.clear(); _flowrateValueController.clear();
} else { // --- END MODIFICATION ---
_flowrateValueController.clear(); _sdHeightController.clear();
_sdDistanceController.clear();
_sdTimeFirstController.clear();
_sdTimeLastController.clear();
} else { // Surface Drifter
_flowrateValueController.clear(); // Will be calculated
} }
}); });
} }
@ -235,7 +243,18 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
final timeFormat = DateFormat("HH:mm:ss"); final timeFormat = DateFormat("HH:mm:ss");
final timeFirst = timeFormat.parse(timeFirstStr); final timeFirst = timeFormat.parse(timeFirstStr);
final timeLast = timeFormat.parse(timeLastStr); final timeLast = timeFormat.parse(timeLastStr);
final differenceInSeconds = timeLast.difference(timeFirst).inSeconds; // Use a common date (like today) to allow time difference calculation across midnight
final now = DateTime.now();
final dateTimeFirst = DateTime(now.year, now.month, now.day, timeFirst.hour, timeFirst.minute, timeFirst.second);
var dateTimeLast = DateTime(now.year, now.month, now.day, timeLast.hour, timeLast.minute, timeLast.second);
// Handle crossing midnight
if (dateTimeLast.isBefore(dateTimeFirst)) {
dateTimeLast = dateTimeLast.add(const Duration(days: 1));
}
final differenceInSeconds = dateTimeLast.difference(dateTimeFirst).inSeconds;
if (differenceInSeconds <= 0) { if (differenceInSeconds <= 0) {
_showSnackBar("Time Last Deploy must be after Time First Deploy.", isError: true); _showSnackBar("Time Last Deploy must be after Time First Deploy.", isError: true);
return; return;
@ -264,51 +283,61 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
} }
Future<void> _handleConnectionAttempt(String type) async { Future<void> _handleConnectionAttempt(String type) async {
final service = context.read<RiverInSituSamplingService>(); // Uses the correct _samplingService instance
final bool hasPermissions = await service.requestDevicePermissions(); final bool hasPermissions = await _samplingService.requestDevicePermissions();
if (!hasPermissions && mounted) { if (!hasPermissions && mounted) {
_showSnackBar("Bluetooth & Location permissions are required to connect.", isError: true); _showSnackBar("Bluetooth & Location permissions are required to connect.", isError: true);
return; return;
} }
_disconnectFromAll(); _disconnectFromAll();
await Future.delayed(const Duration(milliseconds: 250)); await Future.delayed(const Duration(milliseconds: 250)); // Short delay after disconnect
final bool connectionSuccess = await _connectToDevice(type); final bool connectionSuccess = await _connectToDevice(type);
if (connectionSuccess && mounted) { if (connectionSuccess && mounted) {
_dataSubscription?.cancel(); _dataSubscription?.cancel(); // Cancel previous subscription if any
final stream = type == 'bluetooth' ? service.bluetoothDataStream : service.serialDataStream; final stream = type == 'bluetooth' ? _samplingService.bluetoothDataStream : _samplingService.serialDataStream;
_dataSubscription = stream.listen((readings) { _dataSubscription = stream.listen((readings) {
if (mounted) { if (mounted) {
_updateTextFields(readings); _updateTextFields(readings);
} }
}, onError: (error) {
debugPrint("Error on data stream: $error");
if (mounted) _showSnackBar("Data stream error: $error", isError: true);
_disconnect(type); // Disconnect on stream error
}, onDone: () {
debugPrint("Data stream done.");
if (mounted) _disconnect(type); // Disconnect when stream closes
}); });
} }
} }
Future<bool> _connectToDevice(String type) async { Future<bool> _connectToDevice(String type) async {
// Uses the correct _samplingService instance
setState(() => _isLoading = true); setState(() => _isLoading = true);
final service = context.read<RiverInSituSamplingService>();
bool success = false; bool success = false;
try { try {
if (type == 'bluetooth') { if (type == 'bluetooth') {
final devices = await service.getPairedBluetoothDevices(); final devices = await _samplingService.getPairedBluetoothDevices();
if (devices.isEmpty && mounted) { if (!mounted) return false; // Check mounted after async gap
if (devices.isEmpty) {
_showSnackBar('No paired Bluetooth devices found.', isError: true); _showSnackBar('No paired Bluetooth devices found.', isError: true);
return false; return false;
} }
final selectedDevice = await showBluetoothDeviceListDialog(context: context, devices: devices); final selectedDevice = await showBluetoothDeviceListDialog(context: context, devices: devices);
if (selectedDevice != null) { if (selectedDevice != null) {
await service.connectToBluetoothDevice(selectedDevice); await _samplingService.connectToBluetoothDevice(selectedDevice);
success = true; success = true;
} }
} else if (type == 'serial') { } else if (type == 'serial') {
final devices = await service.getAvailableSerialDevices(); final devices = await _samplingService.getAvailableSerialDevices();
if (devices.isEmpty && mounted) { if (!mounted) return false;
_showSnackBar('No USB Serial devices found.', isError: true); if (devices.isEmpty) {
_showSnackBar('No USB Serial devices found. Ensure device is plugged in.', isError: true);
return false; return false;
} }
final selectedDevice = await showSerialPortListDialog(context: context, devices: devices); final selectedDevice = await showSerialPortListDialog(context: context, devices: devices);
if (selectedDevice != null) { if (selectedDevice != null) {
await service.connectToSerialDevice(selectedDevice); await _samplingService.connectToSerialDevice(selectedDevice);
success = true; success = true;
} }
} }
@ -357,6 +386,7 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
_startLockoutTimer(); // --- MODIFICATION: Start countdown _startLockoutTimer(); // --- MODIFICATION: Start countdown
} else { } else {
if (activeType == 'bluetooth') service.stopBluetoothAutoReading(); else service.stopSerialAutoReading(); if (activeType == 'bluetooth') service.stopBluetoothAutoReading(); else service.stopSerialAutoReading();
// NOTE: _lockoutTimer is intentionally NOT cancelled here so the lockout persists for the remaining duration
} }
}); });
} }
@ -419,10 +449,16 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
} }
// --- END MODIFICATION --- // --- END MODIFICATION ---
// --- START MODIFICATION: Disable Next if Connected and Auto Reading is active ---
// Check if reading is active or if device is connected but not reading (user must disconnect or stop reading first)
// Wait, request was: "either user click stop reading or disconnect button then the next button and flowrate can be used again"
// So if _isAutoReading is true, block. If device connected but _isAutoReading is false, ALLOW.
if (_isAutoReading) { if (_isAutoReading) {
_showStopReadingDialog(); _showStopReadingDialog(); // Still show dialog if reading is actively running
return; return;
} }
// Remove the forced disconnect check here because user can proceed if they stopped reading manually
if (!_formKey.currentState!.validate()) { if (!_formKey.currentState!.validate()) {
return; return;
@ -519,8 +555,16 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
widget.data.flowrateSurfaceDrifterTimeLast = _sdTimeLastController.text; widget.data.flowrateSurfaceDrifterTimeLast = _sdTimeLastController.text;
widget.data.flowrateValue = double.tryParse(_flowrateValueController.text); widget.data.flowrateValue = double.tryParse(_flowrateValueController.text);
} else if (_selectedFlowrateMethod == 'Flowmeter') { } else if (_selectedFlowrateMethod == 'Flowmeter') {
widget.data.flowrateSurfaceDrifterHeight = null;
widget.data.flowrateSurfaceDrifterDistance = null;
widget.data.flowrateSurfaceDrifterTimeFirst = null;
widget.data.flowrateSurfaceDrifterTimeLast = null;
widget.data.flowrateValue = double.tryParse(_flowrateValueController.text); widget.data.flowrateValue = double.tryParse(_flowrateValueController.text);
} else { // NA } else { // NA
widget.data.flowrateSurfaceDrifterHeight = null;
widget.data.flowrateSurfaceDrifterDistance = null;
widget.data.flowrateSurfaceDrifterTimeFirst = null;
widget.data.flowrateSurfaceDrifterTimeLast = null;
widget.data.flowrateValue = null; widget.data.flowrateValue = null;
} }
@ -564,7 +608,10 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
} }
Map<String, dynamic>? _getActiveConnectionDetails() { Map<String, dynamic>? _getActiveConnectionDetails() {
final service = context.watch<RiverInSituSamplingService>(); // --- START FIX: Use read() instead of watch() ---
final service = context.read<RiverInSituSamplingService>();
// --- END FIX ---
if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) { if (service.bluetoothConnectionState.value != BluetoothConnectionState.disconnected) {
return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName}; return {'type': 'bluetooth', 'state': service.bluetoothConnectionState.value, 'name': service.connectedBluetoothDeviceName};
} }
@ -580,13 +627,22 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
final activeConnection = _getActiveConnectionDetails(); final activeConnection = _getActiveConnectionDetails();
final String? activeType = activeConnection?['type'] as String?; final String? activeType = activeConnection?['type'] as String?;
// --- START MODIFICATION: Add WillPopScope to block back navigation --- // Check if ANY device is currently connected
final bool isDeviceConnected = activeConnection != null;
// --- START MODIFICATION: Logic for disabling inputs ---
// Disable interaction if auto-reading is active OR if locked out.
// If reading is stopped (even if connected), we allow interaction.
final bool shouldDisableInput = _isAutoReading || _isLockedOut;
// --- END MODIFICATION ---
return WillPopScope( return WillPopScope(
onWillPop: () async { onWillPop: () async {
if (_isLockedOut) { if (_isLockedOut) {
_showSnackBar("Please wait for the initial reading period to complete.", isError: true); _showSnackBar("Please wait for the initial reading period to complete.", isError: true);
return false; // Prevent back navigation return false; // Prevent back navigation
} }
_disconnectFromAll();
return true; // Allow back navigation return true; // Allow back navigation
}, },
child: Form( child: Form(
@ -618,13 +674,17 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
ValueListenableBuilder<String?>( ValueListenableBuilder<String?>(
valueListenable: service.sondeId, valueListenable: service.sondeId,
builder: (context, sondeId, child) { builder: (context, sondeId, child) {
final newSondeId = sondeId ?? ''; // --- START FIX: Only update if non-null to prevent clearing on disconnect ---
WidgetsBinding.instance.addPostFrameCallback((_) { if (sondeId != null && sondeId.isNotEmpty) {
if (mounted && _sondeIdController.text != newSondeId) { final newSondeId = sondeId;
_sondeIdController.text = newSondeId; WidgetsBinding.instance.addPostFrameCallback((_) {
widget.data.sondeId = newSondeId; if (mounted && _sondeIdController.text != newSondeId) {
} _sondeIdController.text = newSondeId;
}); widget.data.sondeId = newSondeId;
}
});
}
// --- END FIX ---
return TextFormField( return TextFormField(
controller: _sondeIdController, controller: _sondeIdController,
decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'), decoration: const InputDecoration(labelText: 'Sonde ID *', hintText: 'Connect device or enter manually'),
@ -659,25 +719,32 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
}).toList(), }).toList(),
), ),
const Divider(height: 32), const Divider(height: 32),
_buildFlowrateSection(),
// --- MODIFIED: Use 'shouldDisableInput' instead of 'isDeviceConnected' ---
_buildFlowrateSection(isInputDisabled: shouldDisableInput),
const SizedBox(height: 32), const SizedBox(height: 32),
// --- START MODIFICATION: Add countdown to Next button ---
// --- MODIFIED: Enable Next button if reading stopped (even if connected) ---
ElevatedButton( ElevatedButton(
onPressed: _isLockedOut ? null : _validateAndProceed, // Disable if locked out OR reading is active
onPressed: (_isLockedOut || _isAutoReading) ? null : _validateAndProceed,
style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)), style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16)),
child: Text(_isLockedOut ? 'Next ($_lockoutSecondsRemaining\s)' : 'Next'), child: Text(
_isLockedOut
? 'Next ($_lockoutSecondsRemaining\s)'
: (_isAutoReading ? 'Stop Reading to Proceed' : 'Next')
),
), ),
// --- END MODIFICATION --- // --- END MODIFICATION ---
], ],
), ),
), ),
); );
// --- END MODIFICATION ---
} }
Widget _buildParameterListItem({ required IconData icon, required String label, required String unit, required TextEditingController controller, bool isOutOfBounds = false}) { Widget _buildParameterListItem({ required IconData icon, required String label, required String unit, required TextEditingController controller, bool isOutOfBounds = false}) {
final bool isMissing = controller.text.isEmpty || controller.text.contains('-999'); final bool isMissing = controller.text.isEmpty || controller.text.contains('-999');
final String displayValue = isMissing ? '-.--' : controller.text; final String displayValue = isMissing ? '-.--' : (double.tryParse(controller.text) ?? -999.0).toStringAsFixed(5);
final String displayLabel = unit.isEmpty ? label : '$label ($unit)'; final String displayLabel = unit.isEmpty ? label : '$label ($unit)';
final Color valueColor = isOutOfBounds final Color valueColor = isOutOfBounds
@ -719,14 +786,14 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
if (isConnecting || _isLoading) if (isConnecting || _isLoading)
const CircularProgressIndicator() const CircularProgressIndicator()
else if (isConnected) else if (isConnected)
// --- START FIX: Replaced Row with Wrap to fix horizontal overflow with countdown timer --- // Replaced Row with Wrap to fix horizontal overflow with countdown timer
Wrap( Wrap(
alignment: WrapAlignment.spaceEvenly, alignment: WrapAlignment.spaceEvenly,
crossAxisAlignment: WrapCrossAlignment.center, crossAxisAlignment: WrapCrossAlignment.center,
spacing: 8.0, // Horizontal space between buttons spacing: 8.0, // Horizontal space between buttons
runSpacing: 4.0, // Vertical space if it wraps runSpacing: 4.0, // Vertical space if it wraps
children: [ children: [
// --- START MODIFICATION: Add countdown to Stop Reading button --- // Add countdown to Stop Reading button
ElevatedButton.icon( ElevatedButton.icon(
icon: Icon(_isAutoReading ? Icons.stop_circle_outlined : Icons.play_circle_outlined), icon: Icon(_isAutoReading ? Icons.stop_circle_outlined : Icons.play_circle_outlined),
label: Text(_isAutoReading label: Text(_isAutoReading
@ -740,7 +807,6 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
foregroundColor: Colors.white, foregroundColor: Colors.white,
), ),
), ),
// --- END MODIFICATION ---
TextButton.icon( TextButton.icon(
icon: const Icon(Icons.link_off), icon: const Icon(Icons.link_off),
label: const Text('Disconnect'), label: const Text('Disconnect'),
@ -749,7 +815,6 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
) )
], ],
) )
// --- END FIX ---
], ],
), ),
), ),
@ -802,6 +867,7 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
final controller = param['controller'] as TextEditingController; final controller = param['controller'] as TextEditingController;
final previousValue = previousReadings[key]; final previousValue = previousReadings[key];
final bool isCurrentValueOutOfBounds = _outOfBoundsKeys.contains(key); final bool isCurrentValueOutOfBounds = _outOfBoundsKeys.contains(key);
final currentValue = double.tryParse(controller.text) ?? -999.0;
return TableRow( return TableRow(
children: [ children: [
@ -816,7 +882,7 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(
controller.text.contains('-999') ? '-.--' : (double.tryParse(controller.text) ?? 0).toStringAsFixed(5), currentValue == -999.0 ? '-.--' : currentValue.toStringAsFixed(5),
style: TextStyle( style: TextStyle(
color: isCurrentValueOutOfBounds color: isCurrentValueOutOfBounds
? Colors.red ? Colors.red
@ -919,7 +985,8 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
); );
} }
Widget _buildFlowrateSection() { // Updated to include disable logic
Widget _buildFlowrateSection({bool isInputDisabled = false}) {
return Card( return Card(
margin: const EdgeInsets.symmetric(vertical: 4.0), margin: const EdgeInsets.symmetric(vertical: 4.0),
child: Padding( child: Padding(
@ -928,23 +995,52 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Flowrate", style: Theme.of(context).textTheme.titleLarge), Text("Flowrate", style: Theme.of(context).textTheme.titleLarge),
if (isInputDisabled)
Padding(
padding: const EdgeInsets.only(top: 8.0, bottom: 8.0),
child: Row(
children: [
Icon(Icons.info_outline, color: Colors.orange, size: 20),
const SizedBox(width: 8),
Expanded(
child: Text(
"Please stop reading to enter flowrate.",
style: TextStyle(color: Colors.orange[800], fontSize: 12),
),
),
],
),
),
const SizedBox(height: 8), const SizedBox(height: 8),
// --- START FIX: Wrap radio buttons in Expanded widgets to prevent horizontal overflow --- // Wrap content in AbsorbPointer and Opacity if connected
Row( AbsorbPointer(
mainAxisAlignment: MainAxisAlignment.spaceAround, absorbing: isInputDisabled,
children: [ child: Opacity(
Expanded(child: _buildFlowrateRadioButton("Surface Drifter")), opacity: isInputDisabled ? 0.5 : 1.0,
Expanded(child: _buildFlowrateRadioButton("Flowmeter")), child: Column(
Expanded(child: _buildFlowrateRadioButton("NA")), children: [
], // Replaced Row with Wrap to fix horizontal overflow for radio buttons
Wrap(
alignment: WrapAlignment.spaceAround,
spacing: 8.0,
runSpacing: 4.0,
children: [
_buildFlowrateRadioButton("Surface Drifter"),
_buildFlowrateRadioButton("Flowmeter"),
_buildFlowrateRadioButton("NA"), // Not Applicable
],
),
// Conditional fields based on selected method
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
],
),
),
), ),
// --- END FIX ---
if (_selectedFlowrateMethod == 'Surface Drifter')
_buildSurfaceDrifterFields(),
if (_selectedFlowrateMethod == 'Flowmeter')
_buildFlowmeterField(),
if (_selectedFlowrateMethod == 'NA')
_buildNAField(),
], ],
), ),
), ),
@ -976,38 +1072,43 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
TextFormField( TextFormField(
controller: _sdHeightController, controller: _sdHeightController,
decoration: const InputDecoration(labelText: 'Height (m)'), decoration: const InputDecoration(labelText: 'Height (m)'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
// Add validation if needed
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdDistanceController, controller: _sdDistanceController,
decoration: const InputDecoration(labelText: 'Distance (m)'), decoration: const InputDecoration(labelText: 'Distance (m) *'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
validator: (v) => v == null || v.isEmpty ? 'Distance is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdTimeFirstController, controller: _sdTimeFirstController,
decoration: const InputDecoration(labelText: 'Time First Deploy (HH:mm:ss)', suffixIcon: Icon(Icons.timer)), decoration: const InputDecoration(labelText: 'Time First Deploy (HH:mm:ss) *', suffixIcon: Icon(Icons.timer)),
readOnly: true, readOnly: true,
onTap: () => _selectTime(context, _sdTimeFirstController), onTap: () => _selectTime(context, _sdTimeFirstController),
validator: (v) => v == null || v.isEmpty ? 'Start time is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _sdTimeLastController, controller: _sdTimeLastController,
decoration: const InputDecoration(labelText: 'Time Last Deploy (HH:mm:ss)', suffixIcon: Icon(Icons.timer)), decoration: const InputDecoration(labelText: 'Time Last Deploy (HH:mm:ss) *', suffixIcon: Icon(Icons.timer)),
readOnly: true, readOnly: true,
onTap: () => _selectTime(context, _sdTimeLastController), onTap: () => _selectTime(context, _sdTimeLastController),
validator: (v) => v == null || v.isEmpty ? 'End time is required' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
ElevatedButton( ElevatedButton(
onPressed: _calculateFlowrate, onPressed: _calculateFlowrate,
child: const Text('Get Flowrate'), child: const Text('Calculate Flowrate'),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Calculated Flowrate (m/s)'),
readOnly: true, readOnly: true,
// Add validator if calculation must be done?
), ),
], ],
), ),
@ -1019,19 +1120,26 @@ class _RiverInSituStep3DataCaptureState extends State<RiverInSituStep3DataCaptur
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: TextFormField( child: TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Flowrate (m/s) *'),
keyboardType: TextInputType.number, keyboardType: const TextInputType.numberWithOptions(decimal: true),
validator: (v) => v == null || v.isEmpty ? 'Flowrate value is required' : null,
), ),
); );
} }
Widget _buildNAField() { Widget _buildNAField() {
// Fix: Use controller to set value instead of initialValue to avoid conflict crash
if (_flowrateValueController.text != 'NA') {
_flowrateValueController.text = 'NA';
}
return Padding( return Padding(
padding: const EdgeInsets.only(top: 16.0), padding: const EdgeInsets.only(top: 16.0),
child: TextFormField( child: TextFormField(
controller: _flowrateValueController, controller: _flowrateValueController,
decoration: const InputDecoration(labelText: 'Flowrate (m/s)'), decoration: const InputDecoration(labelText: 'Flowrate (m/s)'),
readOnly: true, // initialValue: 'NA', // Removed to fix AssertionError: initialValue == null || controller == null
readOnly: true, // Make it read-only
), ),
); );
} }

220
lib/services/marine_in_situ_sampling_service.dart
View File

@ -32,7 +32,7 @@ import 'submission_ftp_service.dart';
import 'telegram_service.dart'; import 'telegram_service.dart';
import 'retry_service.dart'; import 'retry_service.dart';
import 'base_api_service.dart'; // Import for SessionExpiredException import 'base_api_service.dart'; // Import for SessionExpiredException
import 'user_preferences_service.dart'; // ADDED
/// A dedicated service to handle all business logic for the Marine In-Situ Sampling feature. /// A dedicated service to handle all business logic for the Marine In-Situ Sampling feature.
/// This includes location, image processing, device communication, and data submission. /// This includes location, image processing, device communication, and data submission.
@ -51,6 +51,7 @@ class MarineInSituSamplingService {
final DatabaseHelper _dbHelper = DatabaseHelper(); final DatabaseHelper _dbHelper = DatabaseHelper();
final RetryService _retryService = RetryService(); final RetryService _retryService = RetryService();
final TelegramService _telegramService; final TelegramService _telegramService;
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
MarineInSituSamplingService(this._telegramService); MarineInSituSamplingService(this._telegramService);
@ -262,132 +263,159 @@ class MarineInSituSamplingService {
// data.reportId already contains the timestamp ID // data.reportId already contains the timestamp ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
try { // 1. Check module preferences for API
// 1. Submit Form Data final pref = await _userPreferencesService.getModulePreference(moduleName);
apiDataResult = await _submissionApiService.submitPost( bool isApiEnabled = pref?['is_api_enabled'] ?? true;
moduleName: moduleName, bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true;
endpoint: 'marine/manual/sample', // Correct endpoint for In-Situ data
body: data.toApiFormData(),
);
if (apiDataResult['success'] == true) { if (isApiEnabled) {
anyApiSuccess = true; try {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 1. Submit Form Data
// Store the server's database ID in a separate variable. apiDataResult = await _submissionApiService.submitPost(
apiRecordId = apiDataResult['data']?['man_id']?.toString(); // Correct ID key for In-Situ moduleName: moduleName,
// --- END: MODIFIED TO USE TIMESTAMP ID --- endpoint: 'marine/manual/sample', // Correct endpoint for In-Situ data
body: data.toApiFormData(),
);
if (apiRecordId != null) { if (apiDataResult['success'] == true) {
if (finalImageFiles.isNotEmpty) { anyApiSuccess = true;
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'marine/manual/images', // Correct endpoint for In-Situ images
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'man_id': apiRecordId}, // Correct field key for In-Situ
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.'; // Store the server's database ID in a separate variable.
apiRecordId = apiDataResult['data']?['man_id']?.toString(); // Correct ID key for In-Situ
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) { if (apiRecordId != null) {
debugPrint("Online submission failed due to session expiry that could not be refreshed."); if (finalImageFiles.isNotEmpty) {
isSessionKnownToBeExpired = true; // 2. Submit Images
anyApiSuccess = false; apiImageResult = await _submissionApiService.submitMultipart(
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'}; moduleName: moduleName,
// Manually queue API calls endpoint: 'marine/manual/images', // Correct endpoint for In-Situ images
await _retryService.addApiToQueue(endpoint: 'marine/manual/sample', method: 'POST', body: data.toApiFormData()); // --- START: MODIFIED TO USE TIMESTAMP ID ---
// --- START: MODIFIED TO USE TIMESTAMP ID --- fields: {'man_id': apiRecordId}, // Correct field key for In-Situ
if (finalImageFiles.isNotEmpty && apiRecordId != null) { // --- END: MODIFIED TO USE TIMESTAMP ID ---
// Also queue images if data call might have partially succeeded before expiry files: finalImageFiles,
await _retryService.addApiToQueue(endpoint: 'marine/manual/images', method: 'POST_MULTIPART', fields: {'man_id': apiRecordId}, files: finalImageFiles); );
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) {
debugPrint("Online submission failed due to session expiry that could not be refreshed.");
isSessionKnownToBeExpired = true;
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'marine/manual/sample', method: 'POST', body: data.toApiFormData());
// --- START: MODIFIED TO USE TIMESTAMP ID ---
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
await _retryService.addApiToQueue(endpoint: 'marine/manual/images', method: 'POST_MULTIPART', fields: {'man_id': apiRecordId}, files: finalImageFiles);
}
// --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
// --- END: MODIFIED TO USE TIMESTAMP ID --- } else {
debugPrint("API submission disabled for $moduleName by user preference.");
apiDataResult = {'success': true, 'message': 'API submission disabled by user.'};
anyApiSuccess = true; // Treated as success since it was intentional
} }
// 3. Submit FTP Files // 3. Submit FTP Files
Map<String, dynamic> ftpResults = {'statuses': []}; Map<String, dynamic> ftpResults = {'statuses': []};
bool anyFtpSuccess = false; bool anyFtpSuccess = false;
if (isSessionKnownToBeExpired) { // --- START FIX: Check if FTP is enabled AND if it was already successful ---
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks."); bool previousFtpSuccess = data.submissionStatus == 'L4' || data.submissionStatus == 'S4';
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper
// --- END: MODIFIED TO USE TIMESTAMP ID ---
// --- START FIX: Add ftpConfigId when queuing --- if (!isFtpEnabled) {
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; debugPrint("FTP submission disabled for $moduleName by user preference. Skipping FTP.");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'FTP disabled by user preference.', 'success': true}]};
anyFtpSuccess = true;
} else if (previousFtpSuccess) {
debugPrint("FTP submission skipped because it was already successful (Status: ${data.submissionStatus}).");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'Already successful in previous attempt.', 'success': true}]};
anyFtpSuccess = true;
} else {
// Proceed with FTP logic only if enabled AND not previously successful
if (isSessionKnownToBeExpired) {
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks.");
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper
// --- END: MODIFIED TO USE TIMESTAMP ID ---
// --- MODIFIED: Use new data model methods for multi-json zip --- // --- START FIX: Add ftpConfigId when queuing ---
final dataZip = await _zippingService.createDataZip( final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
jsonDataMap: {
'db.json': data.toDbJson(),
'marine_insitu_basic_form.json': data.toBasicFormJson(),
'marine_sampling_reading.json': data.toReadingJson(),
'marine_manual_info.json': data.toManualInfoJson(),
},
baseFileName: baseFileNameForQueue,
destinationDir: null, // Use temp dir
);
// --- END MODIFIED ---
if (dataZip != null) { // --- MODIFIED: Use new data model methods for multi-json zip ---
// Queue for each config separately final dataZip = await _zippingService.createDataZip(
for (final config in ftpConfigs) { jsonDataMap: {
final configId = config['ftp_config_id']; 'db.json': data.toDbJson(),
if (configId != null) { 'marine_insitu_basic_form.json': data.toBasicFormJson(),
await _retryService.addFtpToQueue( 'marine_sampling_reading.json': data.toReadingJson(),
localFilePath: dataZip.path, 'marine_manual_info.json': data.toManualInfoJson(),
remotePath: '/${p.basename(dataZip.path)}', },
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
if (finalImageFiles.isNotEmpty) {
final imageZip = await _zippingService.createImageZip(
imageFiles: finalImageFiles.values.toList(),
baseFileName: baseFileNameForQueue, baseFileName: baseFileNameForQueue,
destinationDir: null, // Use temp dir destinationDir: null, // Use temp dir
); );
if (imageZip != null) { // --- END MODIFIED ---
if (dataZip != null) {
// Queue for each config separately // Queue for each config separately
for (final config in ftpConfigs) { for (final config in ftpConfigs) {
final configId = config['ftp_config_id']; final configId = config['ftp_config_id'];
if (configId != null) { if (configId != null) {
await _retryService.addFtpToQueue( await _retryService.addFtpToQueue(
localFilePath: imageZip.path, localFilePath: dataZip.path,
remotePath: '/${p.basename(imageZip.path)}', remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID ftpConfigId: configId // Provide the specific config ID
); );
} }
} }
} }
}
// --- END FIX --- if (finalImageFiles.isNotEmpty) {
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]}; final imageZip = await _zippingService.createImageZip(
anyFtpSuccess = false; imageFiles: finalImageFiles.values.toList(),
} else { baseFileName: baseFileNameForQueue,
try { destinationDir: null, // Use temp dir
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName); );
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured'); if (imageZip != null) {
} catch (e) { // Queue for each config separately
debugPrint("Unexpected FTP submission error: $e"); for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: imageZip.path,
remotePath: '/${p.basename(imageZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
}
// --- END FIX ---
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false; anyFtpSuccess = false;
} else {
try {
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName);
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) {
debugPrint("Unexpected FTP submission error: $e");
anyFtpSuccess = false;
ftpResults = {'statuses': [{'status': 'Error', 'message': 'FTP process failed: $e.', 'success': false}]};
}
} }
} }
// --- END FIX ---
// 4. Determine Final Status // 4. Determine Final Status
final bool overallSuccess = anyApiSuccess || anyFtpSuccess; final bool overallSuccess = anyApiSuccess || anyFtpSuccess;

207
lib/services/marine_investigative_sampling_service.dart
View File

@ -31,6 +31,7 @@ import 'retry_service.dart';
import 'base_api_service.dart'; // Import for SessionExpiredException import 'base_api_service.dart'; // Import for SessionExpiredException
import 'api_service.dart'; // Import for DatabaseHelper import 'api_service.dart'; // Import for DatabaseHelper
import 'package:environment_monitoring_app/services/database_helper.dart'; import 'package:environment_monitoring_app/services/database_helper.dart';
import 'user_preferences_service.dart'; // ADDED
/// A dedicated service for the Marine Investigative Sampling feature. /// A dedicated service for the Marine Investigative Sampling feature.
@ -49,6 +50,7 @@ class MarineInvestigativeSamplingService {
final DatabaseHelper _dbHelper = DatabaseHelper(); final DatabaseHelper _dbHelper = DatabaseHelper();
final RetryService _retryService = RetryService(); final RetryService _retryService = RetryService();
final TelegramService _telegramService; final TelegramService _telegramService;
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
MarineInvestigativeSamplingService(this._telegramService); MarineInvestigativeSamplingService(this._telegramService);
@ -268,121 +270,147 @@ class MarineInvestigativeSamplingService {
// data.reportId already contains the timestamp ID // data.reportId already contains the timestamp ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
try { // 1. Check module preferences for API
// 1. Submit Form Data final pref = await _userPreferencesService.getModulePreference(moduleName);
apiDataResult = await _submissionApiService.submitPost( bool isApiEnabled = pref?['is_api_enabled'] ?? true;
moduleName: moduleName, bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true;
endpoint: 'marine-investigative/sample',
body: data.toApiFormData(),
);
if (apiDataResult['success'] == true) { if (isApiEnabled) {
anyApiSuccess = true; try {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 1. Submit Form Data
// Store the server's database ID in a separate variable. apiDataResult = await _submissionApiService.submitPost(
apiRecordId = apiDataResult['data']?['man_inves_id']?.toString(); moduleName: moduleName,
// --- END: MODIFIED TO USE TIMESTAMP ID --- endpoint: 'marine-investigative/sample',
body: data.toApiFormData(),
);
if (apiRecordId != null) { if (apiDataResult['success'] == true) {
if (finalImageFiles.isNotEmpty) { anyApiSuccess = true;
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'marine-investigative/images',
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'man_inves_id': apiRecordId}, // Use server's ID
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false; // Mark as failed if images fail
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.'; // Store the server's database ID in a separate variable.
apiRecordId = apiDataResult['data']?['man_inves_id']?.toString();
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
if (apiRecordId != null) {
if (finalImageFiles.isNotEmpty) {
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'marine-investigative/images',
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'man_inves_id': apiRecordId}, // Use server's ID
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false; // Mark as failed if images fail
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
} }
} on SessionExpiredException catch (_) {
debugPrint("Online submission failed due to session expiry that could not be refreshed.");
isSessionKnownToBeExpired = true; // Mark session as expired
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue the API call since SubmissionApiService was never called or failed internally due to session
await _retryService.addApiToQueue(endpoint: 'marine-investigative/sample', method: 'POST', body: data.toApiFormData());
// --- START: MODIFIED TO USE TIMESTAMP ID ---
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
await _retryService.addApiToQueue(endpoint: 'marine-investigative/images', method: 'POST_MULTIPART', fields: {'man_inves_id': apiRecordId}, files: finalImageFiles);
}
// --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
} on SessionExpiredException catch (_) { } else {
debugPrint("Online submission failed due to session expiry that could not be refreshed."); debugPrint("API submission disabled for $moduleName by user preference.");
isSessionKnownToBeExpired = true; // Mark session as expired apiDataResult = {'success': true, 'message': 'API submission disabled by user.'};
anyApiSuccess = false; anyApiSuccess = true; // Treated as success since it was intentional
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue the API call since SubmissionApiService was never called or failed internally due to session
await _retryService.addApiToQueue(endpoint: 'marine-investigative/sample', method: 'POST', body: data.toApiFormData());
// --- START: MODIFIED TO USE TIMESTAMP ID ---
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
await _retryService.addApiToQueue(endpoint: 'marine-investigative/images', method: 'POST_MULTIPART', fields: {'man_inves_id': apiRecordId}, files: finalImageFiles);
}
// --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
// We no longer catch SocketException or TimeoutException here.
// 3. Submit FTP Files // 3. Submit FTP Files
Map<String, dynamic> ftpResults = {'statuses': []}; Map<String, dynamic> ftpResults = {'statuses': []};
bool anyFtpSuccess = false; bool anyFtpSuccess = false;
if (isSessionKnownToBeExpired) { // --- START FIX: Check if FTP is enabled AND if it was already successful ---
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks."); bool previousFtpSuccess = data.submissionStatus == 'L4' || data.submissionStatus == 'S4';
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; if (!isFtpEnabled) {
debugPrint("FTP submission disabled for $moduleName by user preference. Skipping FTP.");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'FTP disabled by user preference.', 'success': true}]};
anyFtpSuccess = true;
} else if (previousFtpSuccess) {
debugPrint("FTP submission skipped because it was already successful (Status: ${data.submissionStatus}).");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'Already successful in previous attempt.', 'success': true}]};
anyFtpSuccess = true;
} else {
// Proceed with FTP logic only if enabled AND not previously successful
if (isSessionKnownToBeExpired) {
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks.");
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
final dataZip = await _zippingService.createDataZip( final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
jsonDataMap: {'db.json': jsonEncode(data.toDbJson())},
baseFileName: baseFileNameForQueue,
destinationDir: null, // Use temp dir
);
if (dataZip != null) {
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: dataZip.path,
remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId
);
}
}
}
if (finalImageFiles.isNotEmpty) { final dataZip = await _zippingService.createDataZip(
final imageZip = await _zippingService.createImageZip( jsonDataMap: {'db.json': jsonEncode(data.toDbJson())},
imageFiles: finalImageFiles.values.toList(),
baseFileName: baseFileNameForQueue, baseFileName: baseFileNameForQueue,
destinationDir: null, // Use temp dir destinationDir: null, // Use temp dir
); );
if (imageZip != null) { if (dataZip != null) {
for (final config in ftpConfigs) { for (final config in ftpConfigs) {
final configId = config['ftp_config_id']; final configId = config['ftp_config_id'];
if (configId != null) { if (configId != null) {
await _retryService.addFtpToQueue( await _retryService.addFtpToQueue(
localFilePath: imageZip.path, localFilePath: dataZip.path,
remotePath: '/${p.basename(imageZip.path)}', remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId ftpConfigId: configId
); );
} }
} }
} }
}
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false;
} else { if (finalImageFiles.isNotEmpty) {
// Session is OK, proceed with normal FTP attempt final imageZip = await _zippingService.createImageZip(
try { imageFiles: finalImageFiles.values.toList(),
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName); baseFileName: baseFileNameForQueue,
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured'); destinationDir: null, // Use temp dir
} catch (e) { );
debugPrint("Unexpected FTP submission error: $e"); if (imageZip != null) {
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: imageZip.path,
remotePath: '/${p.basename(imageZip.path)}',
ftpConfigId: configId
);
}
}
}
}
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false; anyFtpSuccess = false;
} else {
// Session is OK, proceed with normal FTP attempt
try {
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName);
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) {
debugPrint("Unexpected FTP submission error: $e");
anyFtpSuccess = false;
ftpResults = {'statuses': [{'status': 'Error', 'message': 'FTP process failed: $e.', 'success': false}]}; // Provide error status
}
} }
} }
// --- END FIX ---
// 4. Determine Final Status // 4. Determine Final Status
final bool overallSuccess = anyApiSuccess || anyFtpSuccess; final bool overallSuccess = anyApiSuccess || anyFtpSuccess;
@ -609,12 +637,13 @@ class MarineInvestigativeSamplingService {
final logData = { final logData = {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
'submission_id': data.reportId ?? baseFileName, // This is the timestamp ID 'submission_id': data.reportId ?? baseFileName, // Use timestamp ID
'module': 'marine', // *** MODIFIED: Module and Type ***
'type': 'Investigative', 'module': 'marine', // Keep main module as 'river'
'type': 'Investigative', // Specific type
'status': status, 'status': status,
'message': message, 'message': message,
'report_id': apiRecordId, // This is the server DB ID 'report_id': apiRecordId, // Use server DB ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
'created_at': DateTime.now().toIso8601String(), 'created_at': DateTime.now().toIso8601String(),
'form_data': jsonEncode(logMapData), // Log comprehensive map 'form_data': jsonEncode(logMapData), // Log comprehensive map
@ -873,5 +902,5 @@ class MarineInvestigativeSamplingService {
return buffer.toString(); return buffer.toString();
} }
// --- END: MODIFIED ALERT HANDLER & HELPERS --- // --- END: NEW METHOD ---
} }

224
lib/services/marine_tarball_sampling_service.dart
View File

@ -23,6 +23,7 @@ import 'package:environment_monitoring_app/services/telegram_service.dart';
import 'package:environment_monitoring_app/services/retry_service.dart'; import 'package:environment_monitoring_app/services/retry_service.dart';
import 'package:environment_monitoring_app/auth_provider.dart'; import 'package:environment_monitoring_app/auth_provider.dart';
import 'package:environment_monitoring_app/services/base_api_service.dart'; // Import for SessionExpiredException import 'package:environment_monitoring_app/services/base_api_service.dart'; // Import for SessionExpiredException
import 'user_preferences_service.dart'; // ADDED
/// A dedicated service to handle all business logic for the Marine Tarball Sampling feature. /// A dedicated service to handle all business logic for the Marine Tarball Sampling feature.
class MarineTarballSamplingService { class MarineTarballSamplingService {
@ -34,6 +35,7 @@ class MarineTarballSamplingService {
final DatabaseHelper _dbHelper = DatabaseHelper(); final DatabaseHelper _dbHelper = DatabaseHelper();
final RetryService _retryService = RetryService(); final RetryService _retryService = RetryService();
final TelegramService _telegramService; final TelegramService _telegramService;
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
MarineTarballSamplingService(this._telegramService); MarineTarballSamplingService(this._telegramService);
@ -130,6 +132,10 @@ class MarineTarballSamplingService {
required AuthProvider? authProvider, // Accept potentially null provider required AuthProvider? authProvider, // Accept potentially null provider
String? logDirectory, // Added for retry consistency String? logDirectory, // Added for retry consistency
}) async { }) async {
// --- START FIX: Capture the status before attempting submission ---
final String? previousStatus = data.submissionStatus;
// --- END FIX ---
final serverName = (await _serverConfigService.getActiveApiConfig())?['config_name'] as String? ?? 'Default'; final serverName = (await _serverConfigService.getActiveApiConfig())?['config_name'] as String? ?? 'Default';
final imageFiles = data.toImageFiles()..removeWhere((key, value) => value == null); final imageFiles = data.toImageFiles()..removeWhere((key, value) => value == null);
final finalImageFiles = imageFiles.cast<String, File>(); final finalImageFiles = imageFiles.cast<String, File>();
@ -146,130 +152,157 @@ class MarineTarballSamplingService {
// data.reportId already contains the timestamp ID // data.reportId already contains the timestamp ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
try { // 1. Check module preferences for API
// 1. Submit Form Data final pref = await _userPreferencesService.getModulePreference(moduleName);
apiDataResult = await _submissionApiService.submitPost( bool isApiEnabled = pref?['is_api_enabled'] ?? true;
moduleName: moduleName, bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true;
endpoint: 'marine/tarball/sample', // Correct endpoint
body: data.toFormData(), // Use specific method for tarball form data
);
if (apiDataResult['success'] == true) { if (isApiEnabled) {
anyApiSuccess = true; try {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 1. Submit Form Data
// Store the server's database ID in a separate variable. apiDataResult = await _submissionApiService.submitPost(
apiRecordId = apiDataResult['data']?['autoid']?.toString(); // Correct ID key moduleName: moduleName,
// --- END: MODIFIED TO USE TIMESTAMP ID --- endpoint: 'marine/tarball/sample', // Correct endpoint
body: data.toFormData(), // Use specific method for tarball form data
);
if (apiRecordId != null) { if (apiDataResult['success'] == true) {
if (finalImageFiles.isNotEmpty) { anyApiSuccess = true;
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'marine/tarball/images', // Correct endpoint
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'autoid': apiRecordId}, // Correct field key
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false; // Downgrade success if images fail
}
}
// If data succeeded but no images, API part is still successful
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.'; // Store the server's database ID in a separate variable.
apiRecordId = apiDataResult['data']?['autoid']?.toString(); // Correct ID key
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) { if (apiRecordId != null) {
debugPrint("API submission failed with SessionExpiredException during online submission."); if (finalImageFiles.isNotEmpty) {
isSessionKnownToBeExpired = true; // 2. Submit Images
anyApiSuccess = false; apiImageResult = await _submissionApiService.submitMultipart(
apiDataResult = {'success': false, 'message': 'Session expired. API submission queued.'}; moduleName: moduleName,
// Manually queue API calls endpoint: 'marine/tarball/images', // Correct endpoint
await _retryService.addApiToQueue(endpoint: 'marine/tarball/sample', method: 'POST', body: data.toFormData()); // --- START: MODIFIED TO USE TIMESTAMP ID ---
// --- START: MODIFIED TO USE TIMESTAMP ID --- fields: {'autoid': apiRecordId}, // Correct field key
if (finalImageFiles.isNotEmpty && apiRecordId != null) { // --- END: MODIFIED TO USE TIMESTAMP ID ---
// Queue images if data might have partially succeeded files: finalImageFiles,
await _retryService.addApiToQueue(endpoint: 'marine/tarball/images', method: 'POST_MULTIPART', fields: {'autoid': apiRecordId}, files: finalImageFiles); );
if (apiImageResult['success'] != true) {
anyApiSuccess = false; // Downgrade success if images fail
}
}
// If data succeeded but no images, API part is still successful
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) {
debugPrint("API submission failed with SessionExpiredException during online submission.");
isSessionKnownToBeExpired = true;
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'marine/tarball/sample', method: 'POST', body: data.toFormData());
// --- START: MODIFIED TO USE TIMESTAMP ID ---
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Queue images if data might have partially succeeded
await _retryService.addApiToQueue(endpoint: 'marine/tarball/images', method: 'POST_MULTIPART', fields: {'autoid': apiRecordId}, files: finalImageFiles);
}
// --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
// --- END: MODIFIED TO USE TIMESTAMP ID --- } else {
debugPrint("API submission disabled for $moduleName by user preference.");
apiDataResult = {'success': true, 'message': 'API submission disabled by user.'};
anyApiSuccess = true; // Treated as success since it was intentional
} }
// 3. Submit FTP Files // 3. Submit FTP Files
Map<String, dynamic> ftpResults = {'statuses': []}; Map<String, dynamic> ftpResults = {'statuses': []};
bool anyFtpSuccess = false; bool anyFtpSuccess = false;
if (isSessionKnownToBeExpired) { // --- START FIX: Check if FTP is enabled AND if it was already successful ---
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks."); bool previousFtpSuccess = data.submissionStatus == 'L4' || data.submissionStatus == 'S4';
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper
// --- END: MODIFIED TO USE TIMESTAMP ID ---
// --- START FIX: Add ftpConfigId when queuing --- if (!isFtpEnabled) {
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; debugPrint("FTP submission disabled for $moduleName by user preference. Skipping FTP.");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'FTP disabled by user preference.', 'success': true}]};
anyFtpSuccess = true;
} else if (previousFtpSuccess) {
debugPrint("FTP submission skipped because it was already successful (Status: ${data.submissionStatus}).");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'Already successful in previous attempt.', 'success': true}]};
anyFtpSuccess = true;
} else {
// Proceed with FTP logic only if enabled AND not previously successful
if (isSessionKnownToBeExpired) {
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks.");
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper
// --- END: MODIFIED TO USE TIMESTAMP ID ---
final dataZip = await _zippingService.createDataZip( // --- START FIX: Add ftpConfigId when queuing ---
jsonDataMap: { // Use specific JSON structures for Tarball FTP final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
'data.json': jsonEncode(data.toDbJson()),
'basic_form.json': jsonEncode(data.toBasicFormJson()),
'reading.json': jsonEncode(data.toReadingJson()),
'manual_info.json': jsonEncode(data.toManualInfoJson()),
},
baseFileName: baseFileNameForQueue,
destinationDir: null,
);
if (dataZip != null) {
// Queue for each config separately
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: dataZip.path,
remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
if (finalImageFiles.isNotEmpty) { final dataZip = await _zippingService.createDataZip(
final imageZip = await _zippingService.createImageZip( jsonDataMap: { // Use specific JSON structures for Tarball FTP
imageFiles: finalImageFiles.values.toList(), 'data.json': jsonEncode(data.toDbJson()),
'basic_form.json': jsonEncode(data.toBasicFormJson()),
'reading.json': jsonEncode(data.toReadingJson()),
'manual_info.json': jsonEncode(data.toManualInfoJson()),
},
baseFileName: baseFileNameForQueue, baseFileName: baseFileNameForQueue,
destinationDir: null, destinationDir: null,
); );
if (imageZip != null) { if (dataZip != null) {
// Queue for each config separately // Queue for each config separately
for (final config in ftpConfigs) { for (final config in ftpConfigs) {
final configId = config['ftp_config_id']; final configId = config['ftp_config_id'];
if (configId != null) { if (configId != null) {
await _retryService.addFtpToQueue( await _retryService.addFtpToQueue(
localFilePath: imageZip.path, localFilePath: dataZip.path,
remotePath: '/${p.basename(imageZip.path)}', remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID ftpConfigId: configId // Provide the specific config ID
); );
} }
} }
} }
}
// --- END FIX --- if (finalImageFiles.isNotEmpty) {
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]}; final imageZip = await _zippingService.createImageZip(
anyFtpSuccess = false; imageFiles: finalImageFiles.values.toList(),
} else { baseFileName: baseFileNameForQueue,
try { destinationDir: null,
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName); );
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured'); if (imageZip != null) {
} catch (e) { // Queue for each config separately
debugPrint("Unexpected FTP submission error: $e"); for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: imageZip.path,
remotePath: '/${p.basename(imageZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
}
// --- END FIX ---
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false; anyFtpSuccess = false;
} else {
try {
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName);
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) {
debugPrint("Unexpected FTP submission error: $e");
anyFtpSuccess = false;
ftpResults = {'statuses': [{'status': 'Error', 'message': 'FTP process failed: $e.', 'success': false}]}; // Add error status
}
} }
} }
// --- END FIX ---
// 4. Determine Final Status // 4. Determine Final Status
@ -305,9 +338,12 @@ class MarineTarballSamplingService {
); );
// 6. Send Alert // 6. Send Alert
if (overallSuccess) { // --- START FIX: Check if log was already successful before sending alert ---
final bool wasAlreadySuccessful = previousStatus == 'S4' || previousStatus == 'S3' || previousStatus == 'L4';
if (overallSuccess && !wasAlreadySuccessful) {
_handleTarballSuccessAlert(data, appSettings, isDataOnly: finalImageFiles.isEmpty, isSessionExpired: isSessionKnownToBeExpired); _handleTarballSuccessAlert(data, appSettings, isDataOnly: finalImageFiles.isEmpty, isSessionExpired: isSessionKnownToBeExpired);
} }
// --- END FIX ---
return {'success': overallSuccess, 'message': finalMessage, 'reportId': data.reportId}; // Return timestamp ID return {'success': overallSuccess, 'message': finalMessage, 'reportId': data.reportId}; // Return timestamp ID
} }

37
lib/services/retry_service.dart
View File

@ -35,6 +35,7 @@ import 'package:environment_monitoring_app/services/base_api_service.dart';
import 'package:environment_monitoring_app/services/ftp_service.dart'; import 'package:environment_monitoring_app/services/ftp_service.dart';
import 'package:environment_monitoring_app/services/server_config_service.dart'; import 'package:environment_monitoring_app/services/server_config_service.dart';
import 'package:environment_monitoring_app/auth_provider.dart'; import 'package:environment_monitoring_app/auth_provider.dart';
import 'package:environment_monitoring_app/services/user_preferences_service.dart'; // ADDED
/// A dedicated service to manage the queue of failed API, FTP, and complex submission tasks. /// A dedicated service to manage the queue of failed API, FTP, and complex submission tasks.
class RetryService { class RetryService {
@ -42,6 +43,7 @@ class RetryService {
final BaseApiService _baseApiService = BaseApiService(); final BaseApiService _baseApiService = BaseApiService();
final FtpService _ftpService = FtpService(); final FtpService _ftpService = FtpService();
final ServerConfigService _serverConfigService = ServerConfigService(); final ServerConfigService _serverConfigService = ServerConfigService();
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
bool _isProcessing = false; bool _isProcessing = false;
// Sampling Services // Sampling Services
@ -601,10 +603,39 @@ class RetryService {
await _dbHelper.deleteRequestFromQueue(taskId); await _dbHelper.deleteRequestFromQueue(taskId);
return false; return false;
} }
// --- START FIX: Check if this FTP module is enabled in preferences ---
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
final config = ftpConfigs.firstWhere(
(c) => c['ftp_config_id'] == ftpConfigId,
orElse: () => <String, dynamic>{},
);
if (config.isNotEmpty) {
String? moduleKey = config['ftp_module'];
// Map legacy module names if needed (e.g., river_manual -> river_in_situ)
if (moduleKey == 'river_manual') {
moduleKey = 'river_in_situ';
} else if (moduleKey == 'marine_manual') {
moduleKey = 'marine_in_situ';
}
// Add other mappings if needed for consistency with user preferences keys
if (moduleKey != null) {
final pref = await _userPreferencesService.getModulePreference(moduleKey);
final bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true;
if (!isFtpEnabled) {
debugPrint("RetryService: FTP upload for module '$moduleKey' is disabled by user. Removing task $taskId.");
await _dbHelper.deleteRequestFromQueue(taskId);
return false;
}
}
}
// --- END FIX ---
if (await localFile.exists()) { if (await localFile.exists()) {
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; if (config.isEmpty) return false; // Config missing
final config = ftpConfigs.firstWhere((c) => c['ftp_config_id'] == ftpConfigId, orElse: () => <String, dynamic>{});
if (config.isEmpty) return false;
final result = await _ftpService.uploadFile(config: config, fileToUpload: localFile, remotePath: remotePath); final result = await _ftpService.uploadFile(config: config, fileToUpload: localFile, remotePath: remotePath);
success = result['success']; success = result['success'];

259
lib/services/river_in_situ_sampling_service.dart
View File

@ -33,6 +33,7 @@ import 'submission_ftp_service.dart';
import 'telegram_service.dart'; import 'telegram_service.dart';
import 'retry_service.dart'; import 'retry_service.dart';
import 'base_api_service.dart'; // Import for SessionExpiredException import 'base_api_service.dart'; // Import for SessionExpiredException
import 'user_preferences_service.dart'; // ADDED
class RiverInSituSamplingService { class RiverInSituSamplingService {
@ -47,6 +48,7 @@ class RiverInSituSamplingService {
final ZippingService _zippingService = ZippingService(); final ZippingService _zippingService = ZippingService();
final RetryService _retryService = RetryService(); final RetryService _retryService = RetryService();
final TelegramService _telegramService; final TelegramService _telegramService;
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
final ImagePicker _picker = ImagePicker(); final ImagePicker _picker = ImagePicker();
static const platform = MethodChannel('com.example.environment_monitoring_app/usb'); static const platform = MethodChannel('com.example.environment_monitoring_app/usb');
@ -260,149 +262,176 @@ class RiverInSituSamplingService {
// data.reportId already contains the timestamp ID // data.reportId already contains the timestamp ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
try { // 1. Check module preferences for API
// 1. Submit Form Data final pref = await _userPreferencesService.getModulePreference(moduleName);
apiDataResult = await _submissionApiService.submitPost( bool isApiEnabled = pref?['is_api_enabled'] ?? true;
moduleName: moduleName, bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true; // --- MODIFIED: Check FTP pref early ---
endpoint: 'river/manual/sample', // Correct endpoint
body: data.toApiFormData(),
);
if (apiDataResult['success'] == true) { if (isApiEnabled) {
anyApiSuccess = true; try {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 1. Submit Form Data
// Store the server's database ID in a separate variable. apiDataResult = await _submissionApiService.submitPost(
// data.reportId (the timestamp) REMAINS UNCHANGED. moduleName: moduleName,
apiRecordId = apiDataResult['data']?['r_man_id']?.toString(); // Correct ID key endpoint: 'river/manual/sample', // Correct endpoint
// --- END: MODIFIED TO USE TIMESTAMP ID --- body: data.toApiFormData(),
);
if (apiRecordId != null) { // Check if server returned an ID if (apiDataResult['success'] == true) {
if (finalImageFiles.isNotEmpty) { anyApiSuccess = true;
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'river/manual/images', // Correct endpoint
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'r_man_id': apiRecordId}, // Use server's ID for relation
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.'; // Store the server's database ID in a separate variable.
// data.reportId (the timestamp) REMAINS UNCHANGED.
apiRecordId = apiDataResult['data']?['r_man_id']?.toString(); // Correct ID key
// --- END: MODIFIED TO USE TIMESTAMP ID ---
if (apiRecordId != null) { // Check if server returned an ID
if (finalImageFiles.isNotEmpty) {
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'river/manual/images', // Correct endpoint
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'r_man_id': apiRecordId}, // Use server's ID for relation
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) {
debugPrint("Online submission failed due to session expiry that could not be refreshed.");
isSessionKnownToBeExpired = true;
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'river/manual/sample', method: 'POST', body: data.toApiFormData());
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
// --- START: MODIFIED TO USE TIMESTAMP ID ---
await _retryService.addApiToQueue(endpoint: 'river/manual/images', method: 'POST_MULTIPART', fields: {'r_man_id': apiRecordId}, files: finalImageFiles);
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
} }
// If apiDataResult['success'] is false, SubmissionApiService queued it. } else {
debugPrint("API submission disabled for $moduleName by user preference.");
} on SessionExpiredException catch (_) { apiDataResult = {'success': true, 'message': 'API submission disabled by user.'};
debugPrint("Online submission failed due to session expiry that could not be refreshed."); anyApiSuccess = true; // Treated as success since it was intentional
isSessionKnownToBeExpired = true;
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'river/manual/sample', method: 'POST', body: data.toApiFormData());
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
// --- START: MODIFIED TO USE TIMESTAMP ID ---
await _retryService.addApiToQueue(endpoint: 'river/manual/images', method: 'POST_MULTIPART', fields: {'r_man_id': apiRecordId}, files: finalImageFiles);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
} }
// 3. Submit FTP Files // 3. Submit FTP Files
Map<String, dynamic> ftpResults = {'statuses': []}; Map<String, dynamic> ftpResults = {'statuses': []};
bool anyFtpSuccess = false; bool anyFtpSuccess = false;
if (isSessionKnownToBeExpired) { // --- START FIX: Check if FTP is enabled AND if it was already successful ---
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks."); // 'L4' status means API Failed but FTP Succeeded. If re-submitting an L4 record, we skip FTP.
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 'S4' means everything succeeded.
// We can now safely call _generateBaseFileName, as data.reportId is the timestamp bool previousFtpSuccess = data.submissionStatus == 'L4' || data.submissionStatus == 'S4';
final baseFileNameForQueue = _generateBaseFileName(data);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
// --- START FIX: Add ftpConfigId when queuing --- if (!isFtpEnabled) {
// Get all potential FTP configs debugPrint("FTP submission disabled for $moduleName by user preference. Skipping FTP.");
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'FTP disabled by user preference.', 'success': true}]};
anyFtpSuccess = true;
} else if (previousFtpSuccess) {
debugPrint("FTP submission skipped because it was already successful (Status: ${data.submissionStatus}).");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'Already successful in previous attempt.', 'success': true}]};
anyFtpSuccess = true;
} else {
// Proceed with FTP logic only if enabled AND not previously successful
if (isSessionKnownToBeExpired) {
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks.");
// --- START: MODIFIED TO USE TIMESTAMP ID ---
// We can now safely call _generateBaseFileName, as data.reportId is the timestamp
final baseFileNameForQueue = _generateBaseFileName(data);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
final dataZip = await _zippingService.createDataZip( // --- START FIX: Add ftpConfigId when queuing ---
jsonDataMap: { // Use specific JSON structures for River In-Situ FTP // Get all potential FTP configs
'db.json': data.toDbJson(), final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
'river_insitu_basic_form.json': data.toBasicFormJson(),
'river_sampling_reading.json': data.toReadingJson(),
'river_manual_info.json': data.toManualInfoJson(),
},
baseFileName: baseFileNameForQueue,
destinationDir: null,
);
if (dataZip != null) {
// Queue for each config separately
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: dataZip.path,
remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
if (finalImageFiles.isNotEmpty) { final dataZip = await _zippingService.createDataZip(
// Re-construct the map for retry to attempt renaming even in fallback jsonDataMap: { // Use specific JSON structures for River In-Situ FTP
final Map<String, File> retryImages = {}; 'db.json': data.toDbJson(),
final String dateStr = (data.samplingDate ?? '').replaceAll('-', ''); 'river_insitu_basic_form.json': data.toBasicFormJson(),
final String timeStr = (data.samplingTime ?? '').replaceAll(':', ''); 'river_sampling_reading.json': data.toReadingJson(),
final String timestampId = "$dateStr$timeStr"; 'river_manual_info.json': data.toManualInfoJson(),
},
void addRetryMap(File? file, String prefix) {
if(file != null) retryImages['${prefix}_$timestampId.jpg'] = file;
}
addRetryMap(data.backgroundStationImage, 'background');
addRetryMap(data.upstreamRiverImage, 'upstream');
addRetryMap(data.downstreamRiverImage, 'downstream');
addRetryMap(data.sampleTurbidityImage, 'sample_turbidity');
addRetryMap(data.optionalImage1, 'optional_1');
addRetryMap(data.optionalImage2, 'optional_2');
addRetryMap(data.optionalImage3, 'optional_3');
addRetryMap(data.optionalImage4, 'optional_4');
final retryImageZip = await _zippingService.createRenamedImageZip(
imageFiles: retryImages,
baseFileName: baseFileNameForQueue, baseFileName: baseFileNameForQueue,
destinationDir: null, destinationDir: null,
); );
if (dataZip != null) {
if (retryImageZip != null) {
// Queue for each config separately // Queue for each config separately
for (final config in ftpConfigs) { for (final config in ftpConfigs) {
final configId = config['ftp_config_id']; final configId = config['ftp_config_id'];
if (configId != null) { if (configId != null) {
await _retryService.addFtpToQueue( await _retryService.addFtpToQueue(
localFilePath: retryImageZip.path, localFilePath: dataZip.path,
remotePath: '/${p.basename(retryImageZip.path)}', remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID ftpConfigId: configId // Provide the specific config ID
); );
} }
} }
} }
}
// --- END FIX --- if (finalImageFiles.isNotEmpty) {
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]}; // Re-construct the map for retry to attempt renaming even in fallback
anyFtpSuccess = false; final Map<String, File> retryImages = {};
} else { final String dateStr = (data.samplingDate ?? '').replaceAll('-', '');
try { final String timeStr = (data.samplingTime ?? '').replaceAll(':', '');
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName); final String timestampId = "$dateStr$timeStr";
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) { void addRetryMap(File? file, String prefix) {
debugPrint("Unexpected FTP submission error: $e"); if(file != null) retryImages['${prefix}_$timestampId.jpg'] = file;
}
addRetryMap(data.backgroundStationImage, 'background');
addRetryMap(data.upstreamRiverImage, 'upstream');
addRetryMap(data.downstreamRiverImage, 'downstream');
addRetryMap(data.sampleTurbidityImage, 'sample_turbidity');
addRetryMap(data.optionalImage1, 'optional_1');
addRetryMap(data.optionalImage2, 'optional_2');
addRetryMap(data.optionalImage3, 'optional_3');
addRetryMap(data.optionalImage4, 'optional_4');
final retryImageZip = await _zippingService.createRenamedImageZip(
imageFiles: retryImages,
baseFileName: baseFileNameForQueue,
destinationDir: null,
);
if (retryImageZip != null) {
// Queue for each config separately
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: retryImageZip.path,
remotePath: '/${p.basename(retryImageZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
}
// --- END FIX ---
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false; anyFtpSuccess = false;
} else {
try {
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName);
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) {
debugPrint("Unexpected FTP submission error: $e");
anyFtpSuccess = false;
}
} }
} }
@ -574,7 +603,7 @@ class RiverInSituSamplingService {
mapImage(data.backgroundStationImage, 'background'); mapImage(data.backgroundStationImage, 'background');
mapImage(data.upstreamRiverImage, 'upstream'); mapImage(data.upstreamRiverImage, 'upstream');
mapImage(data.downstreamRiverImage, 'downstream'); mapImage(data.downstreamRiverImage, 'downstream');
mapImage(data.sampleTurbidityImage, 'turbidity'); mapImage(data.sampleTurbidityImage, 'sample_turbidity');
mapImage(data.optionalImage1, 'optional_1'); mapImage(data.optionalImage1, 'optional_1');
mapImage(data.optionalImage2, 'optional_2'); mapImage(data.optionalImage2, 'optional_2');
mapImage(data.optionalImage3, 'optional_3'); mapImage(data.optionalImage3, 'optional_3');

623
lib/services/river_investigative_sampling_service.dart
View File

File diff suppressed because it is too large Load Diff

314
lib/services/river_manual_triennial_sampling_service.dart
View File

@ -33,6 +33,7 @@ import 'submission_ftp_service.dart';
import 'telegram_service.dart'; import 'telegram_service.dart';
import 'retry_service.dart'; import 'retry_service.dart';
import 'base_api_service.dart'; // Import for SessionExpiredException import 'base_api_service.dart'; // Import for SessionExpiredException
import 'user_preferences_service.dart'; // ADDED
class RiverManualTriennialSamplingService { class RiverManualTriennialSamplingService {
@ -47,6 +48,7 @@ class RiverManualTriennialSamplingService {
final ZippingService _zippingService = ZippingService(); final ZippingService _zippingService = ZippingService();
final RetryService _retryService = RetryService(); final RetryService _retryService = RetryService();
final TelegramService _telegramService; final TelegramService _telegramService;
final UserPreferencesService _userPreferencesService = UserPreferencesService(); // ADDED
final ImagePicker _picker = ImagePicker(); final ImagePicker _picker = ImagePicker();
static const platform = MethodChannel('com.example.environment_monitoring_app/usb'); static const platform = MethodChannel('com.example.environment_monitoring_app/usb');
@ -239,6 +241,10 @@ class RiverManualTriennialSamplingService {
required AuthProvider authProvider, required AuthProvider authProvider,
String? logDirectory, String? logDirectory,
}) async { }) async {
// --- START FIX: Capture the status before attempting submission ---
final String? previousStatus = data.submissionStatus;
// --- END FIX ---
final serverName = (await _serverConfigService.getActiveApiConfig())?['config_name'] as String? ?? 'Default'; final serverName = (await _serverConfigService.getActiveApiConfig())?['config_name'] as String? ?? 'Default';
final imageFilesWithNulls = data.toApiImageFiles(); final imageFilesWithNulls = data.toApiImageFiles();
imageFilesWithNulls.removeWhere((key, value) => value == null); imageFilesWithNulls.removeWhere((key, value) => value == null);
@ -256,177 +262,204 @@ class RiverManualTriennialSamplingService {
// data.reportId already contains the timestamp ID // data.reportId already contains the timestamp ID
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
try { // 1. Check module preferences for API
// 1. Submit Form Data final pref = await _userPreferencesService.getModulePreference(moduleName);
apiDataResult = await _submissionApiService.submitPost( bool isApiEnabled = pref?['is_api_enabled'] ?? true;
moduleName: moduleName, bool isFtpEnabled = pref?['is_ftp_enabled'] ?? true; // --- MODIFIED: Check FTP pref early ---
endpoint: 'river/triennial/sample', // Correct endpoint
body: data.toApiFormData(),
);
if (apiDataResult['success'] == true) { if (isApiEnabled) {
anyApiSuccess = true; try {
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 1. Submit Form Data
// Store the server's database ID in a separate variable. apiDataResult = await _submissionApiService.submitPost(
apiRecordId = apiDataResult['data']?['r_tri_id']?.toString(); // Correct ID key moduleName: moduleName,
// --- END: MODIFIED TO USE TIMESTAMP ID --- endpoint: 'river/triennial/sample', // Correct endpoint
body: data.toApiFormData(),
);
if (apiRecordId != null) { if (apiDataResult['success'] == true) {
if (finalImageFiles.isNotEmpty) { anyApiSuccess = true;
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'river/triennial/images', // Correct endpoint
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'r_tri_id': apiRecordId}, // Correct field key
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID --- // --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.'; // Store the server's database ID in a separate variable.
apiRecordId = apiDataResult['data']?['r_tri_id']?.toString(); // Correct ID key
// --- END: MODIFIED TO USE TIMESTAMP ID ---
if (apiRecordId != null) {
if (finalImageFiles.isNotEmpty) {
// 2. Submit Images
apiImageResult = await _submissionApiService.submitMultipart(
moduleName: moduleName,
endpoint: 'river/triennial/images', // Correct endpoint
// --- START: MODIFIED TO USE TIMESTAMP ID ---
fields: {'r_tri_id': apiRecordId}, // Correct field key
// --- END: MODIFIED TO USE TIMESTAMP ID ---
files: finalImageFiles,
);
if (apiImageResult['success'] != true) {
anyApiSuccess = false;
}
}
} else {
anyApiSuccess = false;
// --- START: MODIFIED TO USE TIMESTAMP ID ---
apiDataResult['message'] = 'API Error: Submission succeeded but did not return a server record ID.';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) {
debugPrint("Online submission failed due to session expiry that could not be refreshed.");
isSessionKnownToBeExpired = true;
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'river/triennial/sample', method: 'POST', body: data.toApiFormData());
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
// --- START: MODIFIED TO USE TIMESTAMP ID ---
await _retryService.addApiToQueue(endpoint: 'river/triennial/images', method: 'POST_MULTIPART', fields: {'r_tri_id': apiRecordId}, files: finalImageFiles);
// --- END: MODIFIED TO USE TIMESTAMP ID --- // --- END: MODIFIED TO USE TIMESTAMP ID ---
} }
}
// If apiDataResult['success'] is false, SubmissionApiService queued it.
} on SessionExpiredException catch (_) { // --- START FIX: Queue all four JSON files ---
debugPrint("Online submission failed due to session expiry that could not be refreshed."); // Get all potential FTP configs
isSessionKnownToBeExpired = true; final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
anyApiSuccess = false;
apiDataResult = {'success': false, 'message': 'Session expired and re-login failed. API submission queued.'};
// Manually queue API calls
await _retryService.addApiToQueue(endpoint: 'river/triennial/sample', method: 'POST', body: data.toApiFormData());
if (finalImageFiles.isNotEmpty && apiRecordId != null) {
// Also queue images if data call might have partially succeeded before expiry
// --- START: MODIFIED TO USE TIMESTAMP ID ---
await _retryService.addApiToQueue(endpoint: 'river/triennial/images', method: 'POST_MULTIPART', fields: {'r_tri_id': apiRecordId}, files: finalImageFiles);
// --- END: MODIFIED TO USE TIMESTAMP ID ---
}
// --- START FIX: Queue all four JSON files --- final dataZip = await _zippingService.createDataZip(
// Get all potential FTP configs jsonDataMap: { // Use specific JSON structures for River Triennial FTP
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; 'db.json': data.toDbJson(), // Assuming similar structure is needed, adjust if different
'river_triennial_basic_form.json': data.toBasicFormJson(),
final dataZip = await _zippingService.createDataZip( 'river_triennial_reading.json': data.toReadingJson(),
jsonDataMap: { // Use specific JSON structures for River Triennial FTP 'river_triennial_manual_info.json': data.toManualInfoJson(),
'db.json': data.toDbJson(), // Assuming similar structure is needed, adjust if different },
'river_triennial_basic_form.json': data.toBasicFormJson(), baseFileName: _generateBaseFileName(data),
'river_triennial_reading.json': data.toReadingJson(), destinationDir: null,
'river_triennial_manual_info.json': data.toManualInfoJson(), );
}, if (dataZip != null) {
baseFileName: _generateBaseFileName(data), // Queue for each config separately
destinationDir: null, for (final config in ftpConfigs) {
); final configId = config['ftp_config_id'];
if (dataZip != null) { if (configId != null) {
// Queue for each config separately await _retryService.addFtpToQueue(
for (final config in ftpConfigs) { localFilePath: dataZip.path,
final configId = config['ftp_config_id']; remotePath: '/${p.basename(dataZip.path)}',
if (configId != null) { ftpConfigId: configId // Provide the specific config ID
await _retryService.addFtpToQueue( );
localFilePath: dataZip.path, }
remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
} }
} }
// --- END FIX ---
} }
// --- END FIX --- } else {
debugPrint("API submission disabled for $moduleName by user preference.");
apiDataResult = {'success': true, 'message': 'API submission disabled by user.'};
anyApiSuccess = true; // Treated as success since it was intentional
} }
// 3. Submit FTP Files // 3. Submit FTP Files
Map<String, dynamic> ftpResults = {'statuses': []}; Map<String, dynamic> ftpResults = {'statuses': []};
bool anyFtpSuccess = false; bool anyFtpSuccess = false;
if (isSessionKnownToBeExpired) { // --- START FIX: Check if FTP is enabled AND if it was already successful ---
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks."); // 'L4' status means API Failed but FTP Succeeded. If re-submitting an L4 record, we skip FTP.
// --- START: MODIFIED TO USE TIMESTAMP ID --- // 'S4' means everything succeeded.
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper bool previousFtpSuccess = data.submissionStatus == 'L4' || data.submissionStatus == 'S4';
// --- END: MODIFIED TO USE TIMESTAMP ID ---
// --- START FIX: Add ftpConfigId when queuing --- if (!isFtpEnabled) {
// Get all potential FTP configs debugPrint("FTP submission disabled for $moduleName by user preference. Skipping FTP.");
final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? []; ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'FTP disabled by user preference.', 'success': true}]};
anyFtpSuccess = true;
} else if (previousFtpSuccess) {
debugPrint("FTP submission skipped because it was already successful (Status: ${data.submissionStatus}).");
ftpResults = {'statuses': [{'status': 'Skipped', 'message': 'Already successful in previous attempt.', 'success': true}]};
anyFtpSuccess = true;
} else {
// Proceed with FTP logic only if enabled AND not previously successful
if (isSessionKnownToBeExpired) {
debugPrint("Skipping FTP attempt due to known expired session. Manually queuing FTP tasks.");
// --- START: MODIFIED TO USE TIMESTAMP ID ---
final baseFileNameForQueue = _generateBaseFileName(data); // Use helper
// --- END: MODIFIED TO USE TIMESTAMP ID ---
final dataZip = await _zippingService.createDataZip( // --- START FIX: Add ftpConfigId when queuing ---
jsonDataMap: { // Use specific JSON structures for River Triennial FTP // Get all potential FTP configs
'db.json': data.toDbJson(), // Assuming similar structure is needed, adjust if different final ftpConfigs = await _dbHelper.loadFtpConfigs() ?? [];
'river_triennial_basic_form.json': data.toBasicFormJson(), // ADDED
'river_triennial_reading.json': data.toReadingJson(), // ADDED
'river_triennial_manual_info.json': data.toManualInfoJson(), // ADDED
},
baseFileName: baseFileNameForQueue,
destinationDir: null,
);
if (dataZip != null) {
// Queue for each config separately
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: dataZip.path,
remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
if (finalImageFiles.isNotEmpty) { final dataZip = await _zippingService.createDataZip(
// Note: For the session expired case, renaming logic would ideally be here too, jsonDataMap: { // Use specific JSON structures for River Triennial FTP
// but requires complex reconstruction of the map. Following the previous pattern, 'db.json': data.toDbJson(), // Assuming similar structure is needed, adjust if different
// we attempt to respect the rename if possible. 'river_triennial_basic_form.json': data.toBasicFormJson(), // ADDED
final Map<String, File> retryImages = {}; 'river_triennial_reading.json': data.toReadingJson(), // ADDED
final String dateStr = (data.samplingDate ?? '').replaceAll('-', ''); 'river_triennial_manual_info.json': data.toManualInfoJson(), // ADDED
final String timeStr = (data.samplingTime ?? '').replaceAll(':', ''); },
final String timestampId = "$dateStr$timeStr";
void addRetryMap(File? file, String prefix) {
if(file != null) retryImages['${prefix}_$timestampId.jpg'] = file;
}
addRetryMap(data.backgroundStationImage, 'background');
addRetryMap(data.upstreamRiverImage, 'upstream');
addRetryMap(data.downstreamRiverImage, 'downstream');
addRetryMap(data.sampleTurbidityImage, 'sample_turbidity');
addRetryMap(data.optionalImage1, 'optional_1');
addRetryMap(data.optionalImage2, 'optional_2');
addRetryMap(data.optionalImage3, 'optional_3');
addRetryMap(data.optionalImage4, 'optional_4');
final retryImageZip = await _zippingService.createRenamedImageZip(
imageFiles: retryImages,
baseFileName: baseFileNameForQueue, baseFileName: baseFileNameForQueue,
destinationDir: null, destinationDir: null,
); );
if (retryImageZip != null) { if (dataZip != null) {
// Queue for each config separately // Queue for each config separately
for (final config in ftpConfigs) { for (final config in ftpConfigs) {
final configId = config['ftp_config_id']; final configId = config['ftp_config_id'];
if (configId != null) { if (configId != null) {
await _retryService.addFtpToQueue( await _retryService.addFtpToQueue(
localFilePath: retryImageZip.path, localFilePath: dataZip.path,
remotePath: '/${p.basename(retryImageZip.path)}', remotePath: '/${p.basename(dataZip.path)}',
ftpConfigId: configId // Provide the specific config ID ftpConfigId: configId // Provide the specific config ID
); );
} }
} }
} }
}
// --- END FIX --- if (finalImageFiles.isNotEmpty) {
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]}; // Note: For the session expired case, renaming logic would ideally be here too,
anyFtpSuccess = false; // but requires complex reconstruction of the map. Following the previous pattern,
} else { // we attempt to respect the rename if possible.
try { final Map<String, File> retryImages = {};
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName); final String dateStr = (data.samplingDate ?? '').replaceAll('-', '');
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured'); final String timeStr = (data.samplingTime ?? '').replaceAll(':', '');
} catch (e) { final String timestampId = "$dateStr$timeStr";
debugPrint("Unexpected FTP submission error: $e");
void addRetryMap(File? file, String prefix) {
if(file != null) retryImages['${prefix}_$timestampId.jpg'] = file;
}
addRetryMap(data.backgroundStationImage, 'background');
addRetryMap(data.upstreamRiverImage, 'upstream');
addRetryMap(data.downstreamRiverImage, 'downstream');
addRetryMap(data.sampleTurbidityImage, 'sample_turbidity');
addRetryMap(data.optionalImage1, 'optional_1');
addRetryMap(data.optionalImage2, 'optional_2');
addRetryMap(data.optionalImage3, 'optional_3');
addRetryMap(data.optionalImage4, 'optional_4');
final retryImageZip = await _zippingService.createRenamedImageZip(
imageFiles: retryImages,
baseFileName: baseFileNameForQueue,
destinationDir: null,
);
if (retryImageZip != null) {
// Queue for each config separately
for (final config in ftpConfigs) {
final configId = config['ftp_config_id'];
if (configId != null) {
await _retryService.addFtpToQueue(
localFilePath: retryImageZip.path,
remotePath: '/${p.basename(retryImageZip.path)}',
ftpConfigId: configId // Provide the specific config ID
);
}
}
}
}
// --- END FIX ---
ftpResults = {'statuses': [{'status': 'Queued', 'message': 'FTP upload queued due to API session issue.', 'success': false}]};
anyFtpSuccess = false; anyFtpSuccess = false;
} else {
try {
ftpResults = await _generateAndUploadFtpFiles(data, finalImageFiles, serverName, moduleName);
anyFtpSuccess = !(ftpResults['statuses'] as List).any((status) => status['success'] == false && status['status'] != 'Not Configured');
} catch (e) {
debugPrint("Unexpected FTP submission error: $e");
anyFtpSuccess = false;
}
} }
} }
@ -462,9 +495,12 @@ class RiverManualTriennialSamplingService {
); );
// 6. Send Alert // 6. Send Alert
if (overallSuccess) { // --- START FIX: Check if log was already successful before sending alert ---
final bool wasAlreadySuccessful = previousStatus == 'S4' || previousStatus == 'S3' || previousStatus == 'L4';
if (overallSuccess && !wasAlreadySuccessful) {
_handleSuccessAlert(data, appSettings, isDataOnly: finalImageFiles.isEmpty, isSessionExpired: isSessionKnownToBeExpired); _handleSuccessAlert(data, appSettings, isDataOnly: finalImageFiles.isEmpty, isSessionExpired: isSessionKnownToBeExpired);
} }
// --- END FIX ---
// Return consistent format // Return consistent format
return { return {