support new fields in adding

lib/components/pages/new_entry/new_entry_draft_logic.dart

@@ -13,6 +13,9 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     if (choice == _ExitChoice.save) {
       await _saveDraftEntry(draftId: _activeDraftId);
     } else if (choice == _ExitChoice.discard) {
+      // Delay reset to avoid setState during the dialog/build phase.
+      await Future<void>.delayed(Duration.zero);
+      if (!mounted) return false;
       await _resetFormState(clearDraft: true);
       _activeDraftId = null;
     }
@@ -29,12 +32,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   }
 
   bool _formIsEmpty() {
+    final beginDelayVal = _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal = _parseDelayMinutes(_endDelayController.text);
     return _startController.text.trim().isEmpty &&
         _endController.text.trim().isEmpty &&
         _headcodeController.text.trim().isEmpty &&
         _notesController.text.trim().isEmpty &&
         _networkController.text.trim().isEmpty &&
         _mileageController.text.trim().isEmpty &&
+        _originController.text.trim().isEmpty &&
+        _destinationController.text.trim().isEmpty &&
+        beginDelayVal == 0 &&
+        endDelayVal == 0 &&
+        !_hasOriginTime &&
+        !_hasDestinationTime &&
+        !_hasEndTime &&
         _routeResult == null &&
         _tractionItems.length <= 1;
   }
@@ -122,6 +134,30 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       "notes": _notesController.text,
       "mileage": _mileageController.text,
       "network": _networkController.text,
+      "origin": _originController.text,
+      "destination": _destinationController.text,
+      "hasEndTime": _hasEndTime,
+      "hasOriginTime": _hasOriginTime,
+      "hasDestinationTime": _hasDestinationTime,
+      "endDate": _selectedEndDate.toIso8601String(),
+      "endTime": {
+        "hour": _selectedEndTime.hour,
+        "minute": _selectedEndTime.minute,
+      },
+      "originDate": _selectedOriginDate.toIso8601String(),
+      "originTime": {
+        "hour": _selectedOriginTime.hour,
+        "minute": _selectedOriginTime.minute,
+      },
+      "destinationDate": _selectedDestinationDate.toIso8601String(),
+      "destinationTime": {
+        "hour": _selectedDestinationTime.hour,
+        "minute": _selectedDestinationTime.minute,
+      },
+      "matchOriginToEntry": _matchOriginToEntry,
+      "matchDestinationToEntry": _matchDestinationToEntry,
+      "beginDelay": _parseDelayMinutes(_beginDelayController.text),
+      "endDelay": _parseDelayMinutes(_endDelayController.text),
       "useManualMileage": _useManualMileage,
       "selectedTripId": _selectedTripId,
       "routeResult": _routeResult == null
@@ -200,6 +236,12 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     bool includeTimestamp = true,
   }) {
     final routeStations = _routeResult?.calculatedRoute ?? [];
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     final startVal = _useManualMileage
         ? _startController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.first : '');
@@ -210,27 +252,33 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
         ? double.tryParse(_mileageController.text.trim()) ?? 0
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
+    final commonPayload = {
+      "leg_trip": _selectedTripId,
+      "leg_begin_time": _legDateTime.toIso8601String(),
+      if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+      if (originTime != null) "leg_origin_time": originTime.toIso8601String(),
+      if (destinationTime != null)
+        "leg_destination_time": destinationTime.toIso8601String(),
+      "leg_notes": _notesController.text.trim(),
+      "leg_headcode": _headcodeController.text.trim(),
+      "leg_network": _networkController.text.trim(),
+      "leg_origin": _originController.text.trim(),
+      "leg_destination": _destinationController.text.trim(),
+      "leg_begin_delay": beginDelay,
+      if (_hasEndTime) "leg_end_delay": endDelay,
+      "locos": tractionPayload,
+    };
     final payload = _useManualMileage
         ? {
-            "leg_trip": _selectedTripId,
+            ...commonPayload,
             "leg_start": startVal,
             "leg_end": endVal,
-            "leg_begin_time": _legDateTime.toIso8601String(),
-            "leg_network": _networkController.text.trim(),
             "leg_distance": mileageVal,
             "isKilometers": false,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "locos": tractionPayload,
           }
         : {
-            "leg_trip": _selectedTripId,
-            "leg_begin_time": _legDateTime.toIso8601String(),
+            ...commonPayload,
             "leg_route": routeStations,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "leg_network": _networkController.text.trim(),
-            "locos": tractionPayload,
             "leg_mileage": _routeResult?.distance ?? mileageVal,
           };
     return {
@@ -265,6 +313,29 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     final beginTime = beginStr == null
         ? DateTime.now()
         : DateTime.tryParse(beginStr) ?? DateTime.now();
+    final originTimeStr = payload['leg_origin_time'] as String?;
+    final destinationTimeStr = payload['leg_destination_time'] as String?;
+    final originTime =
+        originTimeStr == null ? null : DateTime.tryParse(originTimeStr);
+    final destinationTime = destinationTimeStr == null
+        ? null
+        : DateTime.tryParse(destinationTimeStr);
+    final endStr = payload['leg_end_time'] as String?;
+    final endTime =
+        endStr == null ? null : DateTime.tryParse(endStr);
+    final beginDelay =
+        _parseDelayMinutes('${payload['leg_begin_delay'] ?? ''}');
+    final endDelay =
+        _parseDelayMinutes('${payload['leg_end_delay'] ?? ''}');
+    final hasEndTime = endTime != null || endDelay != 0;
+    final matchOrigin = data['matchOriginToEntry'] == true;
+    final matchDestination = data['matchDestinationToEntry'] == true;
+    final hasOriginTime =
+        originTime != null || data['hasOriginTime'] == true;
+    final hasDestinationTime =
+        destinationTime != null || data['hasDestinationTime'] == true;
+    final origin = payload['leg_origin'] as String? ?? '';
+    final destination = payload['leg_destination'] as String? ?? '';
     final tripRaw = payload['leg_trip'];
     final tripId = tripRaw is num ? tripRaw.toInt() : null;
 
@@ -312,6 +383,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _useManualMileage = useManual;
       _selectedDate = beginTime;
       _selectedTime = TimeOfDay.fromDateTime(beginTime);
+      _selectedEndDate = endTime ?? beginTime;
+      _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+      _hasEndTime = hasEndTime;
+      _matchOriginToEntry = matchOrigin;
+      _matchDestinationToEntry = matchDestination;
+      _selectedOriginDate = originTime ?? beginTime;
+      _selectedOriginTime =
+          TimeOfDay.fromDateTime(originTime ?? beginTime);
+      _selectedDestinationDate =
+          destinationTime ?? endTime ?? beginTime;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(
+        destinationTime ?? endTime ?? beginTime,
+      );
+      _hasOriginTime = hasOriginTime;
+      _hasDestinationTime = hasDestinationTime;
       _selectedTripId = tripId == null || tripId == 0 ? null : tripId;
       _routeResult = restoredRouteResult;
       _headcodeController.text = (payload['leg_headcode'] as String? ?? '')
@@ -319,6 +405,10 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _networkController.text = (payload['leg_network'] as String? ?? '')
           .toUpperCase();
       _notesController.text = payload['leg_notes'] ?? '';
+      _originController.text = origin;
+      _destinationController.text = destination;
+      _beginDelayController.text = beginDelay.toString();
+      _endDelayController.text = endDelay.toString();
 
       if (useManual) {
         _startController.text = payload['leg_start'] ?? '';
@@ -359,6 +449,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       includeTimestamp: false,
     );
     _restoringDraft = false;
+    _scheduleMatchUpdate();
   }
 
   Future<void> _loadDraft() async {

lib/components/pages/new_entry/new_entry_page.dart

@@ -14,15 +14,32 @@ class _NewEntryPageState extends State<NewEntryPage> {
   final _formKey = GlobalKey<FormState>();
   DateTime _selectedDate = DateTime.now();
   TimeOfDay _selectedTime = TimeOfDay.now();
+  DateTime _selectedEndDate = DateTime.now();
+  TimeOfDay _selectedEndTime = TimeOfDay.now();
   final _startController = TextEditingController();
   final _endController = TextEditingController();
   final _headcodeController = TextEditingController();
   final _notesController = TextEditingController();
   final _mileageController = TextEditingController();
   final _networkController = TextEditingController();
+  final _originController = TextEditingController();
+  final _destinationController = TextEditingController();
+  final _beginDelayController = TextEditingController(text: '0');
+  final _endDelayController = TextEditingController(text: '0');
+  DateTime _selectedOriginDate = DateTime.now();
+  DateTime _selectedDestinationDate = DateTime.now();
+  TimeOfDay _selectedOriginTime = TimeOfDay.now();
+  TimeOfDay _selectedDestinationTime = TimeOfDay.now();
+  bool _hasOriginTime = false;
+  bool _hasDestinationTime = false;
   bool _submitting = false;
   bool _useManualMileage = false;
+  bool _hasEndTime = false;
+  bool _matchOriginToEntry = false;
+  bool _matchDestinationToEntry = false;
   RouteResult? _routeResult;
+  List<Station> _stations = const [];
+  bool _loadingStations = false;
   final List<_TractionItem> _tractionItems = [_TractionItem.marker()];
   int? _selectedTripId;
   bool _restoringDraft = false;
@@ -50,9 +67,11 @@ class _NewEntryPageState extends State<NewEntryPage> {
       final data = context.read<DataService>();
       data.fetchClassList();
       data.fetchTripOptions();
+      _loadStations();
       if (_draftPersistenceEnabled) {
         _loadDraft();
       }
+      _loadStations();
       if (_isEditing && widget.editLegId != null) {
         _loadLegForEdit(widget.editLegId!);
       }
@@ -68,6 +87,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
     _notesController.dispose();
     _mileageController.dispose();
     _networkController.dispose();
+    _originController.dispose();
+    _destinationController.dispose();
+    _beginDelayController.dispose();
+    _endDelayController.dispose();
     super.dispose();
   }
 
@@ -136,7 +159,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
             child: const Text('Cancel'),
           ),
           ElevatedButton(
-            onPressed: () => Navigator.of(dialogContext).pop(controller.text.trim()),
+            onPressed: () =>
+                Navigator.of(dialogContext).pop(controller.text.trim()),
             child: const Text('Add'),
           ),
         ],
@@ -147,15 +171,15 @@ class _NewEntryPageState extends State<NewEntryPage> {
       return;
     }
     if (result != null && result.isNotEmpty) {
-        final api = context.read<ApiService>();
-        final data = context.read<DataService>();
-        final messenger = ScaffoldMessenger.maybeOf(context);
-        try {
-          final encoded = Uri.encodeComponent(result);
-          final res = await api.put('/trips/new?trip_name=$encoded', {});
-          await data.fetchTripOptions();
-          if (!context.mounted) return;
-          final trips = data.tripList;
+      final api = context.read<ApiService>();
+      final data = context.read<DataService>();
+      final messenger = ScaffoldMessenger.maybeOf(context);
+      try {
+        final encoded = Uri.encodeComponent(result);
+        final res = await api.put('/trips/new?trip_name=$encoded', {});
+        await data.fetchTripOptions();
+        if (!context.mounted) return;
+        final trips = data.tripList;
         final apiTripId = res is Map ? res['trip_id'] as int? : null;
         TripSummary match;
         try {
@@ -206,6 +230,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
         _useManualMileage = false;
       });
       _saveDraft();
+      _scheduleMatchUpdate();
     }
   }
 
@@ -218,6 +243,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
     );
     if (picked != null) setState(() => _selectedDate = picked);
     _saveDraft();
+    _scheduleMatchUpdate();
   }
 
   Future<void> _pickTime() async {
@@ -229,6 +255,158 @@ class _NewEntryPageState extends State<NewEntryPage> {
       setState(() => _selectedTime = picked);
       _saveDraft();
     }
+    _scheduleMatchUpdate();
+  }
+
+  Future<void> _pickEndDate() async {
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedEndDate,
+      firstDate: DateTime(1970),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) setState(() => _selectedEndDate = picked);
+    _saveDraft();
+    _scheduleMatchUpdate();
+  }
+
+  Future<void> _pickEndTime() async {
+    final picked = await showTimePicker(
+      context: context,
+      initialTime: _selectedEndTime,
+    );
+    if (picked != null) {
+      setState(() => _selectedEndTime = picked);
+      _saveDraft();
+    }
+    _scheduleMatchUpdate();
+  }
+
+  void _toggleEndTime(bool? value) {
+    final useEndTime = value ?? false;
+    final wasEnabled = _hasEndTime;
+    setState(() {
+      _hasEndTime = useEndTime;
+      if (useEndTime && !wasEnabled) {
+        _selectedEndDate = _selectedDate;
+        _selectedEndTime = _selectedTime;
+        if (_endDelayController.text.isEmpty) {
+          _endDelayController.text = '0';
+        }
+      }
+    });
+    _saveDraft();
+    _scheduleMatchUpdate();
+  }
+
+  void _toggleMatchOrigin(bool? value) {
+    final enabled = value ?? false;
+    setState(() {
+      _matchOriginToEntry = enabled;
+      if (enabled) _hasOriginTime = true;
+    });
+    _scheduleMatchUpdate();
+    _saveDraft();
+  }
+
+  void _toggleMatchDestination(bool? value) {
+    final enabled = value ?? false;
+    setState(() {
+      _matchDestinationToEntry = enabled;
+      if (enabled) _hasDestinationTime = true;
+    });
+    _scheduleMatchUpdate();
+    _saveDraft();
+  }
+
+  Future<void> _pickOriginDate() async {
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedOriginDate,
+      firstDate: DateTime(1970),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) setState(() => _selectedOriginDate = picked);
+    _saveDraft();
+    _scheduleMatchUpdate();
+  }
+
+  Future<void> _pickOriginTime() async {
+    final picked = await showTimePicker(
+      context: context,
+      initialTime: _selectedOriginTime,
+    );
+    if (picked != null) {
+      setState(() => _selectedOriginTime = picked);
+      _saveDraft();
+    }
+    _scheduleMatchUpdate();
+  }
+
+  Future<void> _pickDestinationDate() async {
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedDestinationDate,
+      firstDate: DateTime(1970),
+      lastDate: DateTime.now().add(const Duration(days: 365)),
+    );
+    if (picked != null) setState(() => _selectedDestinationDate = picked);
+    _saveDraft();
+    _scheduleMatchUpdate();
+  }
+
+  Future<void> _pickDestinationTime() async {
+    final picked = await showTimePicker(
+      context: context,
+      initialTime: _selectedDestinationTime,
+    );
+    if (picked != null) {
+      setState(() => _selectedDestinationTime = picked);
+      _saveDraft();
+    }
+    _scheduleMatchUpdate();
+  }
+
+  void _toggleOriginTime(bool? value) {
+    final enabled = value ?? false;
+    setState(() {
+      _hasOriginTime = enabled;
+      if (enabled) {
+        _selectedOriginDate = _selectedDate;
+        _selectedOriginTime = _selectedTime;
+      }
+    });
+    _scheduleMatchUpdate();
+    _saveDraft();
+  }
+
+  void _toggleDestinationTime(bool? value) {
+    final enabled = value ?? false;
+    setState(() {
+      _hasDestinationTime = enabled;
+      if (enabled) {
+        _selectedDestinationDate = _selectedEndDate;
+        _selectedDestinationTime = _selectedEndTime;
+      }
+    });
+    _scheduleMatchUpdate();
+    _saveDraft();
+  }
+
+  Future<void> _loadStations() async {
+    if (_loadingStations) return;
+    setState(() => _loadingStations = true);
+    try {
+      final data = context.read<DataService>();
+      await data.fetchStationFilters();
+      final stations = await data.fetchStations();
+      if (!mounted) return;
+      setState(() => _stations = stations);
+    } catch (e) {
+      debugPrint('Failed to load stations: $e');
+    } finally {
+      if (mounted) setState(() => _loadingStations = false);
+    }
   }
 
   Future<void> _loadLegForEdit(int legId) async {
@@ -245,6 +423,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
       }
       final beginTime =
           DateTime.tryParse(json['leg_begin_time'] ?? '') ?? _selectedDate;
+      final endTime = DateTime.tryParse(json['leg_end_time'] ?? '');
       final routeStations = _parseRouteStations(json['leg_route']);
       final mileageVal = (json['leg_mileage'] as num?)?.toDouble() ?? 0.0;
       final useManual = routeStations.isEmpty;
@@ -262,6 +441,16 @@ class _NewEntryPageState extends State<NewEntryPage> {
             .map((e) => Map<String, dynamic>.from(e))
             .toList(),
       );
+      final beginDelay = (json['leg_begin_delay'] as num?)?.toInt() ?? 0;
+      final endDelay = (json['leg_end_delay'] as num?)?.toInt() ?? 0;
+      final origin = json['leg_origin'] as String? ?? '';
+      final destination = json['leg_destination'] as String? ?? '';
+      final hasEndTime = endTime != null || endDelay != 0;
+      final originTime = DateTime.tryParse(json['leg_origin_time'] ?? '');
+      final destinationTime =
+          DateTime.tryParse(json['leg_destination_time'] ?? '');
+      final hasOriginTime = originTime != null;
+      final hasDestinationTime = destinationTime != null;
 
       _restoringDraft = true;
       setState(() {
@@ -270,6 +459,16 @@ class _NewEntryPageState extends State<NewEntryPage> {
         _selectedTripId = tripId == null || tripId == 0 ? null : tripId;
         _selectedDate = beginTime;
         _selectedTime = TimeOfDay.fromDateTime(beginTime);
+        _selectedEndDate = endTime ?? beginTime;
+        _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+        _hasEndTime = hasEndTime;
+        _selectedOriginDate = originTime ?? beginTime;
+        _selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
+        _selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
+        _selectedDestinationTime =
+            TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
+        _hasOriginTime = hasOriginTime;
+        _hasDestinationTime = hasDestinationTime;
         _useManualMileage = useManual;
         _routeResult = routeResult;
         _startController.text = json['leg_start'] ?? '';
@@ -279,6 +478,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
         _notesController.text = json['leg_notes'] ?? '';
         _networkController.text = (json['leg_network'] as String? ?? '')
             .toUpperCase();
+        _originController.text = origin;
+        _destinationController.text = destination;
+        _beginDelayController.text = beginDelay.toString();
+        _endDelayController.text = endDelay.toString();
         _mileageController.text = mileageVal == 0
             ? ''
             : mileageVal.toStringAsFixed(2);
@@ -357,6 +560,161 @@ class _NewEntryPageState extends State<NewEntryPage> {
     _selectedTime.minute,
   );
 
+  DateTime? get _legEndDateTime {
+    if (!_hasEndTime) return null;
+    return DateTime(
+      _selectedEndDate.year,
+      _selectedEndDate.month,
+      _selectedEndDate.day,
+      _selectedEndTime.hour,
+      _selectedEndTime.minute,
+    );
+  }
+
+  DateTime? get _originDateTime {
+    if (!_hasOriginTime) return null;
+    return DateTime(
+      _selectedOriginDate.year,
+      _selectedOriginDate.month,
+      _selectedOriginDate.day,
+      _selectedOriginTime.hour,
+      _selectedOriginTime.minute,
+    );
+  }
+
+  DateTime? get _destinationDateTime {
+    if (!_hasDestinationTime) return null;
+    return DateTime(
+      _selectedDestinationDate.year,
+      _selectedDestinationDate.month,
+      _selectedDestinationDate.day,
+      _selectedDestinationTime.hour,
+      _selectedDestinationTime.minute,
+    );
+  }
+
+  int _parseDelayMinutes(String value) {
+    final trimmed = value.trim();
+    final parsed = int.tryParse(trimmed);
+    return parsed ?? 0;
+  }
+
+  String _derivedStartLocation() {
+    if (_useManualMileage) return _startController.text.trim();
+    final routeStations = _routeResult?.calculatedRoute ?? [];
+    if (routeStations.isNotEmpty) return routeStations.first;
+    return _startController.text.trim();
+  }
+
+  String _derivedEndLocation() {
+    if (_useManualMileage) return _endController.text.trim();
+    final routeStations = _routeResult?.calculatedRoute ?? [];
+    if (routeStations.isNotEmpty) return routeStations.last;
+    return _endController.text.trim();
+  }
+
+  void _applyMatchSelections() {
+    if (!mounted) return;
+    if (!(_matchOriginToEntry || _matchDestinationToEntry)) return;
+    setState(() {
+      if (_matchOriginToEntry) {
+        final startVal = _derivedStartLocation();
+        if (_originController.text != startVal) {
+          _originController.text = startVal;
+        }
+        if (_hasOriginTime) {
+          final startTime = _legDateTime;
+          _selectedOriginDate = DateTime(
+            startTime.year,
+            startTime.month,
+            startTime.day,
+          );
+          _selectedOriginTime = TimeOfDay.fromDateTime(startTime);
+        }
+      }
+      if (_matchDestinationToEntry) {
+        final endVal = _derivedEndLocation();
+        if (_destinationController.text != endVal) {
+          _destinationController.text = endVal;
+        }
+        if (_hasDestinationTime) {
+          final endTime = _legEndDateTime ?? _legDateTime;
+          _selectedDestinationDate = DateTime(
+            endTime.year,
+            endTime.month,
+            endTime.day,
+          );
+          _selectedDestinationTime = TimeOfDay.fromDateTime(endTime);
+        }
+      }
+    });
+    _saveDraft();
+  }
+
+  bool _matchUpdateScheduled = false;
+
+  void _scheduleMatchUpdate() {
+    if (!(_matchOriginToEntry || _matchDestinationToEntry)) return;
+    if (_matchUpdateScheduled) return;
+    _matchUpdateScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _matchUpdateScheduled = false;
+      _applyMatchSelections();
+    });
+  }
+
+  Widget _trainLocationBlock({
+    required String label,
+    required TextEditingController controller,
+    required bool hasTime,
+    required ValueChanged<bool?>? onTimeChanged,
+    required String matchLabel,
+    required bool matchValue,
+    required ValueChanged<bool?>? onMatchChanged,
+    required Widget Function() pickerBuilder,
+  }) {
+    final matchInfo = matchValue
+        ? Text(
+            '$label set to entry ${label == 'Origin' ? 'start' : 'end'}',
+            style: Theme.of(context).textTheme.bodySmall,
+          )
+        : null;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        CheckboxListTile(
+          value: matchValue,
+          onChanged: onMatchChanged,
+          dense: true,
+          contentPadding: EdgeInsets.zero,
+          controlAffinity: ListTileControlAffinity.leading,
+          title: Text(matchLabel),
+        ),
+        if (matchInfo != null) ...[
+          Padding(
+            padding: const EdgeInsets.only(left: 12.0, bottom: 4),
+            child: matchInfo,
+          ),
+        ],
+        if (!matchValue) ...[
+          _stationField(
+            label: label,
+            controller: controller,
+          ),
+          CheckboxListTile(
+            value: hasTime,
+            onChanged: onTimeChanged,
+            dense: true,
+            contentPadding: EdgeInsets.zero,
+            controlAffinity: ListTileControlAffinity.leading,
+            title: Text('Add $label time'),
+          ),
+          if (hasTime) pickerBuilder(),
+        ],
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     Widget body;
@@ -376,7 +734,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
             final balancePanels = twoCol && tractionEmpty && mileageEmpty;
             final balancedHeight = balancePanels ? 165.0 : null;
 
-            final detailPanel = _section('Details', [
+            final entryPanel = _section('Entry', [
               Row(
                 children: [
                   TextButton.icon(
@@ -424,31 +782,46 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 ],
               ),
               _buildTripSelector(context),
+              _dateTimeGroup(
+                context,
+                title: 'Departure time',
+                onDateTap: _pickDate,
+                onTimeTap: _pickTime,
+                selectedDate: _selectedDate,
+                selectedTime: _selectedTime,
+                delayController: _beginDelayController,
+                singleColumn: isMobile,
+              ),
               Row(
                 children: [
-                  Expanded(
-                    child: OutlinedButton.icon(
-                      onPressed: _pickDate,
-                      icon: const Icon(Icons.calendar_today),
-                      label: Text(DateFormat.yMMMd().format(_selectedDate)),
-                    ),
-                  ),
-                  const SizedBox(width: 12),
-                  Expanded(
-                    child: OutlinedButton.icon(
-                      onPressed: _pickTime,
-                      icon: const Icon(Icons.schedule),
-                      label: Text(_selectedTime.format(context)),
-                    ),
+                  Checkbox(
+                    value: _hasEndTime,
+                    onChanged: _submitting ? null : _toggleEndTime,
                   ),
+                  const Text('Add arrival time'),
                 ],
               ),
+              if (_hasEndTime)
+                _dateTimeGroup(
+                  context,
+                  title: 'Arrival time',
+                  onDateTap: _pickEndDate,
+                  onTimeTap: _pickEndTime,
+                  selectedDate: _selectedEndDate,
+                  selectedTime: _selectedEndTime,
+                  delayController: _endDelayController,
+                  singleColumn: isMobile,
+                ),
               if (_useManualMileage)
                 Row(
                   children: [
                     Expanded(
                       child: TextFormField(
                         controller: _startController,
+                        onChanged: (_) {
+                          _saveDraft();
+                          _scheduleMatchUpdate();
+                        },
                         decoration: const InputDecoration(
                           labelText: 'From',
                           border: OutlineInputBorder(),
@@ -462,6 +835,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     Expanded(
                       child: TextFormField(
                         controller: _endController,
+                        onChanged: (_) {
+                          _saveDraft();
+                          _scheduleMatchUpdate();
+                        },
                         decoration: const InputDecoration(
                           labelText: 'To',
                           border: OutlineInputBorder(),
@@ -473,6 +850,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     ),
                   ],
                 ),
+            ]);
+
+            final trainPanel = _section('Train', [
               TextFormField(
                 controller: _headcodeController,
                 textCapitalization: TextCapitalization.characters,
@@ -482,6 +862,43 @@ class _NewEntryPageState extends State<NewEntryPage> {
                   border: OutlineInputBorder(),
                 ),
               ),
+              _trainLocationBlock(
+                label: 'Origin',
+                controller: _originController,
+                hasTime: _hasOriginTime,
+                onTimeChanged: _submitting ? null : _toggleOriginTime,
+                matchLabel: 'Match entry start',
+                matchValue: _matchOriginToEntry,
+                onMatchChanged: _submitting ? null : _toggleMatchOrigin,
+                pickerBuilder: () => _dateTimeGroupSimple(
+                  context,
+                  title: 'Origin departure',
+                  onDateTap: _pickOriginDate,
+                  onTimeTap: _pickOriginTime,
+                  selectedDate: _selectedOriginDate,
+                  selectedTime: _selectedOriginTime,
+                  singleColumn: true,
+                ),
+              ),
+              _trainLocationBlock(
+                label: 'Destination',
+                controller: _destinationController,
+                hasTime: _hasDestinationTime,
+                onTimeChanged: _submitting ? null : _toggleDestinationTime,
+                matchLabel: 'Match entry end',
+                matchValue: _matchDestinationToEntry,
+                onMatchChanged:
+                    _submitting ? null : _toggleMatchDestination,
+                pickerBuilder: () => _dateTimeGroupSimple(
+                  context,
+                  title: 'Destination arrival',
+                  onDateTap: _pickDestinationDate,
+                  onTimeTap: _pickDestinationTime,
+                  selectedDate: _selectedDestinationDate,
+                  selectedTime: _selectedDestinationTime,
+                  singleColumn: true,
+                ),
+              ),
               TextFormField(
                 controller: _networkController,
                 textCapitalization: TextCapitalization.characters,
@@ -519,14 +936,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 if (!_useManualMileage)
                   Align(
                     alignment: Alignment.centerLeft,
-                    child: TextButton.icon(
-                      style: TextButton.styleFrom(
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 10,
-                          vertical: 6,
-                        ),
-                        minimumSize: const Size(0, 32),
-                      ),
+                    child: ElevatedButton.icon(
                       onPressed: _openCalculator,
                       icon: const Icon(Icons.calculate, size: 18),
                       label: const Text('Open mileage calculator'),
@@ -565,6 +975,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 onSelected: (val) {
                   setState(() => _useManualMileage = val);
                   _saveDraft();
+                  _scheduleMatchUpdate();
                 },
               ),
               minHeight: balancedHeight,
@@ -575,7 +986,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
-                  detailPanel,
+                  entryPanel,
+                  const SizedBox(height: 16),
+                  trainPanel,
                   const SizedBox(height: 16),
                   twoCol
                       ? Row(
@@ -736,6 +1149,150 @@ class _NewEntryPageState extends State<NewEntryPage> {
     );
   }
 
+  Widget _delayField(
+    TextEditingController controller, {
+    required String label,
+    bool expand = false,
+  }) {
+    final field = TextFormField(
+      controller: controller,
+      keyboardType: const TextInputType.numberWithOptions(signed: true),
+      inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'-?\d*'))],
+      decoration: InputDecoration(
+        labelText: label,
+        border: const OutlineInputBorder(),
+        suffixText: 'min',
+      ),
+      textAlign: TextAlign.right,
+      onChanged: (_) => _saveDraft(),
+    );
+    if (expand) return field;
+    return SizedBox(width: 150, child: field);
+  }
+
+  Widget _stationField({
+    required String label,
+    required TextEditingController controller,
+  }) {
+    final stationNames = _stations
+        .map((s) => s.name.trim())
+        .where((name) => name.isNotEmpty)
+        .toSet()
+        .toList();
+    if (stationNames.isEmpty) {
+      return TextFormField(
+        controller: controller,
+        textCapitalization: TextCapitalization.words,
+        decoration: InputDecoration(
+          labelText: label,
+          border: const OutlineInputBorder(),
+          suffixIcon: _loadingStations
+              ? const SizedBox(
+                  width: 20,
+                  height: 20,
+                  child: Padding(
+                    padding: EdgeInsets.all(4.0),
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                )
+              : const Icon(Icons.search),
+        ),
+        onChanged: (_) => _saveDraft(),
+      );
+    }
+
+    Iterable<String> optionsBuilder(TextEditingValue value) {
+      final query = value.text.trim();
+      if (query.isEmpty) return const Iterable<String>.empty();
+      return _matchStations(query, stationNames);
+    }
+
+    return Autocomplete<String>(
+      optionsBuilder: optionsBuilder,
+      onSelected: (selection) {
+        controller.text = selection;
+        _saveDraft();
+      },
+      fieldViewBuilder:
+          (context, textEditingController, focusNode, onFieldSubmitted) {
+        if (textEditingController.text != controller.text) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (!mounted) return;
+            if (textEditingController.text != controller.text) {
+              textEditingController.value = controller.value;
+            }
+          });
+        }
+        return TextFormField(
+          controller: textEditingController,
+          focusNode: focusNode,
+          textCapitalization: TextCapitalization.words,
+          decoration: InputDecoration(
+            labelText: label,
+            border: const OutlineInputBorder(),
+            suffixIcon: _loadingStations
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: Padding(
+                      padding: EdgeInsets.all(4.0),
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    ),
+                  )
+                : const Icon(Icons.search),
+          ),
+          textInputAction: TextInputAction.done,
+          onChanged: (_) {
+            controller.value = textEditingController.value;
+            _saveDraft();
+          },
+          onFieldSubmitted: (_) {
+            final matches = _matchStations(
+              textEditingController.text,
+              stationNames,
+            ).toList();
+            if (matches.isNotEmpty) {
+              final top = matches.first;
+              controller.text = top;
+              textEditingController.text = top;
+              _saveDraft();
+            }
+            focusNode.unfocus();
+          },
+        );
+      },
+    );
+  }
+
+  Iterable<String> _matchStations(String rawQuery, List<String> stationNames) {
+    final query = rawQuery.toLowerCase();
+    final best = <String>[];
+    for (final name in stationNames) {
+      if (!name.toLowerCase().contains(query)) continue;
+      _insertCandidate(best, name, max: 10);
+    }
+    return best;
+  }
+
+  void _insertCandidate(List<String> best, String candidate, {required int max}) {
+    final existingIndex = best.indexOf(candidate);
+    if (existingIndex >= 0) return;
+
+    int insertAt = 0;
+    while (insertAt < best.length &&
+        _candidateCompare(best[insertAt], candidate) <= 0) {
+      insertAt++;
+    }
+    best.insert(insertAt, candidate);
+    if (best.length > max) best.removeLast();
+  }
+
+  int _candidateCompare(String a, String b) {
+    final byLength = a.length.compareTo(b.length);
+    if (byLength != 0) return byLength;
+    return a.compareTo(b);
+  }
+
   Widget _section(
     String title,
     List<Widget> children, {
@@ -781,6 +1338,154 @@ class _NewEntryPageState extends State<NewEntryPage> {
 
     return card;
   }
+
+  Widget _dateTimeGroup(
+    BuildContext context, {
+    required String title,
+    required VoidCallback onDateTap,
+    required VoidCallback onTimeTap,
+    required DateTime selectedDate,
+    required TimeOfDay selectedTime,
+    required TextEditingController delayController,
+    bool singleColumn = false,
+  }) {
+    final headerStyle = Theme.of(context).textTheme.labelLarge;
+    final dateButton = OutlinedButton.icon(
+      onPressed: onDateTap,
+      icon: const Icon(Icons.calendar_today),
+      label: Text(DateFormat.yMMMd().format(selectedDate)),
+    );
+    final timeButton = OutlinedButton.icon(
+      onPressed: onTimeTap,
+      icon: const Icon(Icons.schedule),
+      label: Text(selectedTime.format(context)),
+    );
+    final delayField = _delayField(
+      delayController,
+      label: 'Delay',
+      expand: singleColumn,
+    );
+
+    if (singleColumn) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(title, style: headerStyle),
+          const SizedBox(height: 6),
+          SizedBox(width: double.infinity, child: dateButton),
+          const SizedBox(height: 8),
+          SizedBox(width: double.infinity, child: timeButton),
+          const SizedBox(height: 8),
+          SizedBox(width: double.infinity, child: delayField),
+        ],
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(title, style: headerStyle),
+        const SizedBox(height: 6),
+        Row(
+          children: [
+            Expanded(child: dateButton),
+            const SizedBox(width: 12),
+            Expanded(child: timeButton),
+            const SizedBox(width: 12),
+            delayField,
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _dateTimeGroupSimple(
+    BuildContext context, {
+    required String title,
+    required VoidCallback onDateTap,
+    required VoidCallback onTimeTap,
+    required DateTime selectedDate,
+    required TimeOfDay selectedTime,
+    bool singleColumn = true,
+  }) {
+    final headerStyle = Theme.of(context).textTheme.labelLarge;
+    final dateButton = OutlinedButton.icon(
+      onPressed: onDateTap,
+      icon: const Icon(Icons.calendar_today),
+      label: Text(DateFormat.yMMMd().format(selectedDate)),
+    );
+    final timeButton = OutlinedButton.icon(
+      onPressed: onTimeTap,
+      icon: const Icon(Icons.schedule),
+      label: Text(selectedTime.format(context)),
+    );
+
+    if (singleColumn) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(title, style: headerStyle),
+          const SizedBox(height: 6),
+          SizedBox(width: double.infinity, child: dateButton),
+          const SizedBox(height: 8),
+          SizedBox(width: double.infinity, child: timeButton),
+        ],
+      );
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(title, style: headerStyle),
+        const SizedBox(height: 6),
+        Row(
+          children: [
+            Expanded(child: dateButton),
+            const SizedBox(width: 12),
+            Expanded(child: timeButton),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _timeToggleBlock({
+    required String label,
+    required bool value,
+    required ValueChanged<bool?>? onChanged,
+    required String matchLabel,
+    required bool matchValue,
+    required ValueChanged<bool?>? onMatchChanged,
+    required bool showMatch,
+    Widget? picker,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        CheckboxListTile(
+          value: value,
+          onChanged: onChanged,
+          dense: true,
+          contentPadding: EdgeInsets.zero,
+          controlAffinity: ListTileControlAffinity.leading,
+          title: Text(label),
+        ),
+        if (showMatch)
+          CheckboxListTile(
+            value: matchValue,
+            onChanged: onMatchChanged,
+            dense: true,
+            contentPadding: const EdgeInsets.only(left: 12),
+            controlAffinity: ListTileControlAffinity.leading,
+            title: Text(matchLabel),
+          ),
+        if (picker != null) ...[
+          const SizedBox(height: 6),
+          picker,
+        ],
+      ],
+    );
+  }
 }
 
 class _UpperCaseTextFormatter extends TextInputFormatter {

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -62,6 +62,12 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         ? double.tryParse(_mileageController.text.trim()) ?? 0
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     final snapshot = _buildSubmissionSnapshot(
       routeStations: routeStations,
       startVal: startVal,
@@ -82,19 +88,31 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final isEditingExisting = _isEditing && widget.editLegId != null;
 
     try {
+      final commonPayload = {
+        if (isEditingExisting) "leg_id": widget.editLegId,
+        "leg_trip": _selectedTripId,
+        "leg_begin_time": _legDateTime.toIso8601String(),
+        if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+        if (originTime != null)
+          "leg_origin_time": originTime.toIso8601String(),
+        if (destinationTime != null)
+          "leg_destination_time": destinationTime.toIso8601String(),
+        "leg_notes": _notesController.text.trim(),
+        "leg_headcode": _headcodeController.text.trim(),
+        "leg_network": _networkController.text.trim(),
+        "leg_origin": _originController.text.trim(),
+        "leg_destination": _destinationController.text.trim(),
+        "leg_begin_delay": beginDelay,
+        if (_hasEndTime) "leg_end_delay": endDelay,
+        "locos": tractionPayload,
+      };
       if (_useManualMileage) {
         final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
-          "leg_trip": _selectedTripId,
+          ...commonPayload,
           "leg_start": startVal,
           "leg_end": endVal,
-          "leg_begin_time": _legDateTime.toIso8601String(),
-          "leg_network": _networkController.text.trim(),
           "leg_distance": mileageVal,
           "isKilometers": false,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "locos": tractionPayload,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -103,14 +121,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         }
       } else {
         final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
-          "leg_trip": _selectedTripId,
-          "leg_begin_time": _legDateTime.toIso8601String(),
+          ...commonPayload,
           "leg_route": routeStations,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "leg_network": _networkController.text.trim(),
-          "locos": tractionPayload,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -148,18 +160,31 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     required double mileageVal,
     required List<Map<String, dynamic>> tractionPayload,
   }) {
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     return {
       "legId": widget.editLegId,
       "useManualMileage": _useManualMileage,
       "tripId": _selectedTripId,
       "legDateTime": _legDateTime.toIso8601String(),
+      "legEndTime": _legEndDateTime?.toIso8601String(),
+      "hasEndTime": _hasEndTime,
+      "legOriginTime": _originDateTime?.toIso8601String(),
+      "hasOriginTime": _hasOriginTime,
+      "legDestinationTime": _destinationDateTime?.toIso8601String(),
+      "hasDestinationTime": _hasDestinationTime,
       "start": startVal,
       "end": endVal,
+      "origin": _originController.text.trim(),
+      "destination": _destinationController.text.trim(),
       "routeStations": routeStations,
       "mileage": mileageVal,
       "network": _networkController.text.trim(),
       "notes": _notesController.text.trim(),
       "headcode": _headcodeController.text.trim(),
+      "beginDelay": beginDelay,
+      "endDelay": endDelay,
       "locos": tractionPayload,
       "routeResult": _routeResult == null
           ? null
@@ -202,11 +227,27 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     _notesController.clear();
     _mileageController.clear();
     _networkController.clear();
+    _originController.clear();
+    _destinationController.clear();
+    _beginDelayController.text = '0';
+    _endDelayController.text = '0';
     final now = DateTime.now();
     _setState(() {
       _selectedDate = now;
       _selectedTime = TimeOfDay.fromDateTime(now);
+      _selectedEndDate = now;
+      _selectedEndTime = TimeOfDay.fromDateTime(now);
+      _selectedOriginDate = now;
+      _selectedOriginTime = TimeOfDay.fromDateTime(now);
+      _selectedDestinationDate = now;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(now);
       _useManualMileage = false;
+      _hasEndTime = false;
+      _hasOriginTime = false;
+      _hasDestinationTime = false;
+      _matchOriginToEntry = false;
+      _matchDestinationToEntry = false;
+      _matchUpdateScheduled = false;
       _routeResult = null;
       _tractionItems
         ..clear()