add filter by network for legs, add full export for traction
All checks were successful
Release / meta (push) Successful in 1m45s
Release / linux-build (push) Successful in 1m48s
Release / web-build (push) Successful in 1m56s
Release / android-build (push) Successful in 7m33s
Release / release-dev (push) Successful in 30s
Release / release-master (push) Successful in 5s
All checks were successful
Release / meta (push) Successful in 1m45s
Release / linux-build (push) Successful in 1m48s
Release / web-build (push) Successful in 1m56s
Release / android-build (push) Successful in 7m33s
Release / release-dev (push) Successful in 30s
Release / release-master (push) Successful in 5s
This commit is contained in:
@@ -3,6 +3,7 @@ import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:mileograph_flutter/objects/objects.dart';
|
||||
import 'package:mileograph_flutter/services/api_service.dart';
|
||||
import 'package:mileograph_flutter/components/widgets/multi_select_filter.dart';
|
||||
import 'package:mileograph_flutter/services/data_service.dart';
|
||||
import './route_summary_widget.dart';
|
||||
|
||||
@@ -358,7 +359,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
|
||||
runSpacing: 12,
|
||||
crossAxisAlignment: WrapCrossAlignment.center,
|
||||
children: [
|
||||
_MultiSelectFilter(
|
||||
MultiSelectFilter(
|
||||
label: 'Countries',
|
||||
options: _countries,
|
||||
selected: _selectedCountries,
|
||||
@@ -367,7 +368,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
|
||||
_loadStations();
|
||||
},
|
||||
),
|
||||
_MultiSelectFilter(
|
||||
MultiSelectFilter(
|
||||
label: 'Networks',
|
||||
options: _networks,
|
||||
selected: _selectedNetworks,
|
||||
@@ -375,6 +376,16 @@ class _RouteCalculatorState extends State<RouteCalculator> {
|
||||
setState(() => _selectedNetworks = vals);
|
||||
_loadStations();
|
||||
},
|
||||
onRefresh: () async {
|
||||
final data = context.read<DataService>();
|
||||
await data.fetchStationFilters();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_networks = data.stationNetworks;
|
||||
_countries = data.stationCountryNetworks.keys.toList();
|
||||
});
|
||||
await _loadStations();
|
||||
},
|
||||
),
|
||||
if (_loadingStations)
|
||||
const Padding(
|
||||
@@ -573,159 +584,3 @@ Widget debugPanel(List<String> stations) {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
class _MultiSelectFilter extends StatefulWidget {
|
||||
const _MultiSelectFilter({
|
||||
required this.label,
|
||||
required this.options,
|
||||
required this.selected,
|
||||
required this.onChanged,
|
||||
});
|
||||
|
||||
final String label;
|
||||
final List<String> options;
|
||||
final List<String> selected;
|
||||
final ValueChanged<List<String>> onChanged;
|
||||
|
||||
@override
|
||||
State<_MultiSelectFilter> createState() => _MultiSelectFilterState();
|
||||
}
|
||||
|
||||
class _MultiSelectFilterState extends State<_MultiSelectFilter> {
|
||||
late List<String> _tempSelected;
|
||||
String _query = '';
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_tempSelected = List.from(widget.selected);
|
||||
}
|
||||
|
||||
@override
|
||||
void didUpdateWidget(covariant _MultiSelectFilter oldWidget) {
|
||||
super.didUpdateWidget(oldWidget);
|
||||
if (oldWidget.selected != widget.selected) {
|
||||
_tempSelected = List.from(widget.selected);
|
||||
}
|
||||
}
|
||||
|
||||
void _openPicker() async {
|
||||
_tempSelected = List.from(widget.selected);
|
||||
_query = '';
|
||||
await showModalBottomSheet<void>(
|
||||
context: context,
|
||||
isScrollControlled: true,
|
||||
builder: (ctx) {
|
||||
return StatefulBuilder(
|
||||
builder: (ctx, setModalState) {
|
||||
final filtered = widget.options
|
||||
.where((opt) =>
|
||||
_query.isEmpty || opt.toLowerCase().contains(_query.toLowerCase()))
|
||||
.toList();
|
||||
return SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
'Select ${widget.label.toLowerCase()}',
|
||||
style: Theme.of(context).textTheme.titleMedium?.copyWith(
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
TextButton(
|
||||
onPressed: () {
|
||||
setModalState(() {
|
||||
_tempSelected.clear();
|
||||
});
|
||||
Navigator.of(ctx).pop();
|
||||
widget.onChanged(const []);
|
||||
},
|
||||
child: const Text('Clear'),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
TextField(
|
||||
decoration: const InputDecoration(
|
||||
labelText: 'Search',
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
onChanged: (val) {
|
||||
setModalState(() {
|
||||
_query = val;
|
||||
});
|
||||
},
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
SizedBox(
|
||||
height: 320,
|
||||
child: ListView.builder(
|
||||
itemCount: filtered.length,
|
||||
itemBuilder: (_, index) {
|
||||
final option = filtered[index];
|
||||
final selected = _tempSelected.contains(option);
|
||||
return CheckboxListTile(
|
||||
value: selected,
|
||||
title: Text(option),
|
||||
onChanged: (val) {
|
||||
setModalState(() {
|
||||
if (val == true) {
|
||||
if (!_tempSelected.contains(option)) {
|
||||
_tempSelected.add(option);
|
||||
}
|
||||
} else {
|
||||
_tempSelected.removeWhere((e) => e == option);
|
||||
}
|
||||
});
|
||||
widget.onChanged(List.from(_tempSelected.toSet()));
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Align(
|
||||
alignment: Alignment.centerRight,
|
||||
child: FilledButton.icon(
|
||||
onPressed: () {
|
||||
widget.onChanged(List.from(_tempSelected.toSet()));
|
||||
Navigator.of(ctx).pop();
|
||||
},
|
||||
icon: const Icon(Icons.check),
|
||||
label: const Text('Apply'),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final hasSelection = widget.selected.isNotEmpty;
|
||||
final display =
|
||||
hasSelection ? widget.selected.join(', ') : 'Any ${widget.label.toLowerCase()}';
|
||||
return OutlinedButton.icon(
|
||||
onPressed: _openPicker,
|
||||
icon: const Icon(Icons.filter_alt),
|
||||
label: SizedBox(
|
||||
width: 180,
|
||||
child: Text(
|
||||
'${widget.label}: $display',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user