petegregoryy/mileograph_flutter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 55 Wiki Activity

add transfer all button for admins
All checks were successful
Release / meta (push) Successful in 6s
Details
Release / linux-build (push) Successful in 1m4s
Details
Release / web-build (push) Successful in 2m47s
Details
Release / android-build (push) Successful in 11m45s
Details
Release / release-master (push) Successful in 26s
Details
Release / release-dev (push) Successful in 30s
Details

Browse Source
This commit is contained in:
Pete Gregory
2026-01-12 17:11:37 +00:00
parent 3b7ec31e5d
commit 559f79b805
6 changed files with 236 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
lib/components/pages/new_entry/new_entry_page.dart
View File

@@ -130,11 +130,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
int decimals = 1,
bool includeUnit = true,
}) {
return units.format(
miles,
decimals: decimals,
includeUnit: includeUnit,
);
return units.format(miles, decimals: decimals, includeUnit: includeUnit);
}
String _manualMileageLabel(DistanceUnit unit) {
@@ -191,15 +187,13 @@ class _NewEntryPageState extends State<NewEntryPage> {
}
double _milesFromInputWithUnit(DistanceUnit unit) {
return DistanceFormatter(unit)
.parseInputMiles(_mileageController.text.trim()) ??
return DistanceFormatter(
unit,
).parseInputMiles(_mileageController.text.trim()) ??
0;
}
List<UserSummary> _friendsFromFriendships(
DataService data,
String? selfId,
) {
List<UserSummary> _friendsFromFriendships(DataService data, String? selfId) {
final friends = <UserSummary>[];
for (final f in data.friendships) {
final other = _friendFromFriendship(f, selfId);
@@ -300,9 +294,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
if (!mounted) return;
final baseFriends = _friendsFromFriendships(data, auth.userId);
final initialSelectedIds = {..._shareUserIds};
final initialSelectedUsers = {
for (final u in _shareUsers) u.userId: u,
};
final initialSelectedUsers = {for (final u in _shareUsers) u.userId: u};
final result = await showModalBottomSheet<List<UserSummary>>(
context: context,
@@ -334,8 +326,10 @@ class _NewEntryPageState extends State<NewEntryPage> {
searchError = null;
});
try {
final results =
await data.searchUsers(trimmed, friendsOnly: true);
final results = await data.searchUsers(
trimmed,
friendsOnly: true,
);
setModalState(() {
searchResults = results;
});
@@ -414,8 +408,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
itemCount: list.length,
itemBuilder: (_, index) {
final user = list[index];
final isSelected =
selectedIds.contains(user.userId);
final isSelected = selectedIds.contains(
user.userId,
);
return CheckboxListTile(
value: isSelected,
title: Text(user.displayName),
@@ -481,8 +476,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
if (previousUnit == currentUnit) return;
final miles = _milesFromInputWithUnit(previousUnit);
final nextText = DistanceFormatter(currentUnit)
.format(miles, decimals: 2, includeUnit: false);
final nextText = DistanceFormatter(
currentUnit,
).format(miles, decimals: 2, includeUnit: false);
_mileageController.text = nextText;
_lastDistanceUnit = currentUnit;
}
@@ -842,8 +838,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
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 destinationTime = DateTime.tryParse(
json['leg_destination_time'] ?? '',
);
final hasOriginTime = originTime != null;
final hasDestinationTime = destinationTime != null;
@@ -860,8 +857,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
_selectedOriginDate = originTime ?? beginTime;
_selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
_selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
_selectedDestinationTime =
TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
_selectedDestinationTime = TimeOfDay.fromDateTime(
destinationTime ?? endTime ?? beginTime,
);
_hasOriginTime = hasOriginTime;
_hasDestinationTime = hasDestinationTime;
_useManualMileage = useManual;
@@ -927,18 +925,20 @@ class _NewEntryPageState extends State<NewEntryPage> {
);
final tractionItems = _buildTractionFromApi(
entry.locos
.map((l) => {
"loco_id": l.id,
"type": l.type,
"number": l.number,
"class": l.locoClass,
"name": l.name,
"operator": l.operator,
"notes": l.notes,
"evn": l.evn,
"alloc_pos": l.allocPos,
"alloc_powering": l.powering ? 1 : 0,
})
.map(
(l) => {
"loco_id": l.id,
"type": l.type,
"number": l.number,
"class": l.locoClass,
"name": l.name,
"operator": l.operator,
"notes": l.notes,
"evn": l.evn,
"alloc_pos": l.allocPos,
"alloc_powering": l.powering ? 1 : 0,
},
)
.toList(),
);
final beginDelay = entry.beginDelayMinutes ?? 0;
@@ -963,8 +963,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
_selectedOriginDate = originTime ?? beginTime;
_selectedOriginTime = TimeOfDay.fromDateTime(originTime ?? beginTime);
_selectedDestinationDate = destinationTime ?? endTime ?? beginTime;
_selectedDestinationTime =
TimeOfDay.fromDateTime(destinationTime ?? endTime ?? beginTime);
_selectedDestinationTime = TimeOfDay.fromDateTime(
destinationTime ?? endTime ?? beginTime,
);
_hasOriginTime = hasOriginTime;
_hasDestinationTime = hasDestinationTime;
_useManualMileage = useManual;
@@ -980,12 +981,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
_endDelayController.text = endDelay.toString();
_mileageController.text = mileageVal == 0
? ''
: _formatDistance(
units,
mileageVal,
decimals: 2,
includeUnit: false,
);
: _formatDistance(units, mileageVal, decimals: 2, includeUnit: false);
_tractionItems
..clear()
..addAll(tractionItems);
@@ -1187,10 +1183,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
),
],
if (!matchValue) ...[
_stationField(
label: label,
controller: controller,
),
_stationField(label: label, controller: controller),
CheckboxListTile(
value: hasTime,
onChanged: onTimeChanged,
@@ -1237,8 +1230,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed:
_isEditing || _activeLegShare != null ? null : _openDrafts,
onPressed: _isEditing || _activeLegShare != null
? null
: _openDrafts,
icon: const Icon(Icons.list_alt, size: 16),
label: const Text('Drafts'),
),
@@ -1246,26 +1240,27 @@ class _NewEntryPageState extends State<NewEntryPage> {
TextButton.icon(
style: TextButton.styleFrom(
padding: EdgeInsets.zero,
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed: _isEditing ||
_savingDraft ||
_submitting ||
_activeLegShare != null
? null
: _saveDraftManually,
icon: _savingDraft
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
minimumSize: const Size(0, 36),
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
onPressed:
_isEditing ||
_savingDraft ||
_submitting ||
_activeLegShare != null
? null
: _saveDraftManually,
icon: _savingDraft
? const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Icon(Icons.save_alt, size: 16),
label: Text(_savingDraft ? 'Saving...' : 'Save to drafts'),
),
const Spacer(),
TextButton.icon(
),
const Spacer(),
TextButton.icon(
style: TextButton.styleFrom(
padding: EdgeInsets.zero,
minimumSize: const Size(0, 36),
@@ -1276,17 +1271,17 @@ class _NewEntryPageState extends State<NewEntryPage> {
: () => _resetFormState(clearDraft: true),
icon: const Icon(Icons.clear, size: 16),
label: const Text('Clear form'),
),
],
),
],
),
if (_activeLegShare != null) ...[
const SizedBox(height: 8),
_buildSharedBanner(),
],
if (_activeLegShare != null) ...[
const SizedBox(height: 8),
_buildSharedBanner(),
],
_buildTripSelector(context),
const SizedBox(height: 8),
if (_activeLegShare == null) _buildShareSection(context),
_dateTimeGroup(
_dateTimeGroup(
context,
title: 'Departure time',
onDateTap: _pickDate,
@@ -1393,8 +1388,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
onTimeChanged: _submitting ? null : _toggleDestinationTime,
matchLabel: 'Match entry end',
matchValue: _matchDestinationToEntry,
onMatchChanged:
_submitting ? null : _toggleMatchDestination,
onMatchChanged: _submitting ? null : _toggleMatchDestination,
pickerBuilder: () => _dateTimeGroupSimple(
context,
title: 'Destination arrival',
@@ -1428,7 +1422,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
final tractionPanel = _section('Traction', [
Align(
alignment: Alignment.centerLeft,
child: ElevatedButton.icon(
child: FilledButton.icon(
onPressed: _openTractionPicker,
icon: const Icon(Icons.search),
label: const Text('Search traction'),
@@ -1440,13 +1434,13 @@ class _NewEntryPageState extends State<NewEntryPage> {
final routeStart = _routeResult?.calculatedRoute.isNotEmpty == true
? _routeResult!.calculatedRoute.first
: (_routeResult?.inputRoute.isNotEmpty == true
? _routeResult!.inputRoute.first
: _startController.text.trim());
? _routeResult!.inputRoute.first
: _startController.text.trim());
final routeEnd = _routeResult?.calculatedRoute.isNotEmpty == true
? _routeResult!.calculatedRoute.last
: (_routeResult?.inputRoute.isNotEmpty == true
? _routeResult!.inputRoute.last
: _endController.text.trim());
? _routeResult!.inputRoute.last
: _endController.text.trim());
final mileagePanel = _section(
'Your Journey',
@@ -1456,12 +1450,12 @@ class _NewEntryPageState extends State<NewEntryPage> {
spacing: 12,
runSpacing: 8,
children: [
ElevatedButton.icon(
FilledButton.icon(
onPressed: _openCalculator,
icon: const Icon(Icons.calculate, size: 18),
label: const Text('Open mileage calculator'),
),
OutlinedButton.icon(
TextButton.icon(
onPressed: _reverseRouteAndEndpoints,
icon: const Icon(Icons.swap_horiz),
label: const Text('Reverse route'),
@@ -1493,8 +1487,8 @@ class _NewEntryPageState extends State<NewEntryPage> {
),
decoration: InputDecoration(
labelText: mileageLabel,
helperText: currentDistanceUnit ==
DistanceUnit.milesChains
helperText:
currentDistanceUnit == DistanceUnit.milesChains
? 'Enter as miles.chains (e.g., 12.40 for 12m 40c)'
: null,
border: const OutlineInputBorder(),
@@ -1571,7 +1565,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
],
),
const SizedBox(height: 12),
ElevatedButton.icon(
FilledButton.icon(
onPressed: _submitting ? null : _submit,
icon: _submitting
? const SizedBox(
@@ -1783,52 +1777,52 @@ class _NewEntryPageState extends State<NewEntryPage> {
},
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;
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();
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();
},
);
},
onFieldSubmitted: (_) {
final matches = _matchStations(
textEditingController.text,
stationNames,
).toList();
if (matches.isNotEmpty) {
final top = matches.first;
controller.text = top;
textEditingController.text = top;
_saveDraft();
}
focusNode.unfocus();
},
);
},
);
}
@@ -1842,7 +1836,11 @@ class _NewEntryPageState extends State<NewEntryPage> {
return best;
}
void _insertCandidate(List<String> best, String candidate, {required int max}) {
void _insertCandidate(
List<String> best,
String candidate, {
required int max,
}) {
final existingIndex = best.indexOf(candidate);
if (existingIndex >= 0) return;
@@ -2016,7 +2014,6 @@ class _NewEntryPageState extends State<NewEntryPage> {
],
);
}
}
class _UpperCaseTextFormatter extends TextInputFormatter {