Add accepted leg edit notification and class leaderboard
All checks were successful
Release / meta (push) Successful in 12s
Release / linux-build (push) Successful in 1m0s
Release / web-build (push) Successful in 2m6s
Release / android-build (push) Successful in 6m8s
Release / release-master (push) Successful in 16s
Release / release-dev (push) Successful in 19s

This commit is contained in:
2026-01-05 01:09:43 +00:00
parent 42ac7a97e1
commit 8ab3f53c0d
11 changed files with 1114 additions and 132 deletions

View File

@@ -0,0 +1,532 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:provider/provider.dart';
class LegShareEditNotificationCard extends StatefulWidget {
const LegShareEditNotificationCard({super.key, required this.notification});
final UserNotification notification;
@override
State<LegShareEditNotificationCard> createState() => _LegShareEditNotificationCardState();
}
class _LegShareEditNotificationCardState extends State<LegShareEditNotificationCard> {
Map<String, dynamic>? _changes;
int? _legId;
int? _shareId;
Leg? _currentLeg;
bool _loading = false;
static const int _summaryLimit = 3;
@override
void initState() {
super.initState();
_parseNotification();
}
@override
void didUpdateWidget(covariant LegShareEditNotificationCard oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.notification != widget.notification) {
_parseNotification();
}
}
void _parseNotification() {
final rawBody = widget.notification.body.trim();
// Reset
_shareId = null;
_legId = null;
_currentLeg = null;
_changes = null;
final parsed = _decodeBody(rawBody);
if (parsed != null) {
_shareId = _parseInt(parsed['share_id']);
_legId = _parseInt(parsed['leg_id']);
final accepted = _asStringKeyedMap(parsed['accepted_changes']);
if (accepted != null) {
_changes = accepted;
}
}
// Fallback: extract share_id from raw string if still missing.
_shareId ??= _extractShareId(rawBody);
}
int? _parseInt(dynamic value) {
if (value is int) return value;
if (value is num) return value.toInt();
if (value is String) return int.tryParse(value.trim());
return null;
}
Map<String, dynamic>? _decodeBody(String rawBody) {
final attempts = <String>[
rawBody,
_stripWrappingQuotes(rawBody),
_replaceSingleQuotes(rawBody),
].where((s) => s.trim().isNotEmpty).toSet();
for (final attempt in attempts) {
final parsed = _decodeJsonToMap(attempt);
if (parsed != null) return parsed;
}
return null;
}
Map<String, dynamic>? _decodeJsonToMap(String source) {
dynamic parsed = source;
for (int i = 0; i < 3 && parsed is String; i++) {
try {
parsed = jsonDecode(parsed);
} catch (e) {
parsed = null;
break;
}
}
if (parsed is Map) {
final map = parsed.map((k, v) => MapEntry(k.toString(), v));
return map;
}
return null;
}
String _stripWrappingQuotes(String input) {
final trimmed = input.trim();
if (trimmed.length >= 2 &&
((trimmed.startsWith('"') && trimmed.endsWith('"')) ||
(trimmed.startsWith("'") && trimmed.endsWith("'")))) {
return trimmed.substring(1, trimmed.length - 1);
}
return input;
}
String _replaceSingleQuotes(String input) {
if (!input.contains("'")) return input;
return input.replaceAll(RegExp(r"(?<!\\)'"), '"');
}
Map<String, dynamic>? _asStringKeyedMap(dynamic value) {
if (value is Map) {
return value.map((k, v) => MapEntry(k.toString(), v));
}
if (value is String && value.trim().isNotEmpty) {
for (final attempt in [value, _replaceSingleQuotes(value)]) {
try {
final decoded = jsonDecode(attempt);
if (decoded is Map) {
return decoded.map((k, v) => MapEntry(k.toString(), v));
}
} catch (_) {
// Ignore; handled by caller.
}
}
}
return null;
}
int? _extractShareId(String raw) {
final patterns = [
RegExp(r'"share_id"\s*:\s*(\d+)'),
RegExp(r"'share_id'\s*:\s*(\d+)"),
RegExp(r'share_id\s*:\s*(\d+)'),
RegExp(r'"share_id"\s*:\s*"(\d+)"'),
];
for (final pattern in patterns) {
final match = pattern.firstMatch(raw);
if (match != null) {
final parsed = int.tryParse(match.group(1)!);
return parsed;
}
}
return null;
}
Future<void> _loadLegIdIfNeeded() async {
if (_legId != null) return;
if (_shareId == null) {
return;
}
try {
final share = await context.read<DataService>().fetchLegShare(_shareId!.toString());
if (!mounted) return;
_legId = share?.entry.id;
_currentLeg ??= _findCurrentLeg(_legId);
} catch (e) {
}
}
Leg? _findCurrentLeg(int? legId) {
if (legId == null) return null;
final data = context.read<DataService>();
try {
return data.legs.firstWhere((l) => l.id == legId);
} catch (_) {
return null;
}
}
@override
Widget build(BuildContext context) {
final changes = _changes;
if (changes == null || changes.isEmpty) {
return const Text('No changes supplied.');
}
final entries = changes.entries.toList();
final shown = entries.take(_summaryLimit).toList();
final remaining = entries.length - shown.length;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
...shown.map((e) => _changePreview(context, e)),
if (remaining > 0)
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text('+$remaining others…', style: Theme.of(context).textTheme.bodySmall),
),
const SizedBox(height: 8),
Wrap(
spacing: 8,
runSpacing: 8,
children: [
ElevatedButton(
onPressed: _loading ? null : () => _openDrawer(changes),
child: const Text('View changes'),
),
TextButton(
onPressed: _loading ? null : _dismiss,
child: const Text('Dismiss changes'),
),
],
),
],
);
}
Widget _changePreview(BuildContext context, MapEntry<String, dynamic> change) {
final key = _prettyField(change.key);
final value = change.value;
String display;
if (change.key == 'locos' && value is List) {
display = '${value.length} traction update${value.length == 1 ? '' : 's'}';
} else {
display = _stringify(value);
}
return Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text('$key: $display'),
);
}
String _prettyField(String raw) {
switch (raw) {
case 'leg_notes':
return 'Notes';
case 'locos':
return 'Traction';
default:
return raw.replaceAll('_', ' ');
}
}
dynamic _currentValueForField(Leg leg, String key) {
switch (key) {
case 'leg_begin_time':
return leg.beginTime;
case 'leg_end_time':
return leg.endTime;
case 'leg_origin_time':
return leg.originTime;
case 'leg_destination_time':
return leg.destinationTime;
case 'leg_notes':
return leg.notes;
case 'leg_headcode':
return leg.headcode;
case 'leg_network':
return leg.network;
case 'leg_start':
return leg.start;
case 'leg_end':
return leg.end;
case 'leg_origin':
return leg.origin;
case 'leg_destination':
return leg.destination;
case 'leg_route':
return leg.route;
case 'leg_mileage':
return leg.mileage;
case 'leg_begin_delay':
return leg.beginDelayMinutes;
case 'leg_end_delay':
return leg.endDelayMinutes;
case 'locos':
return leg.locos;
default:
return null;
}
}
Widget _buildChangeValueWidget(
String key,
dynamic newValue,
Leg? currentLeg,
Widget Function(List<dynamic>) buildLocos,
) {
final currentValue = currentLeg == null ? null : _currentValueForField(currentLeg, key);
if (key == 'locos' && newValue is List) {
final currentCount = (currentValue is List) ? currentValue.length : 0;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('Current: $currentCount locos'),
const SizedBox(height: 4),
const Text('New:'),
buildLocos(newValue),
],
);
}
final currentStr = _stringify(currentValue);
final newStr = _stringify(newValue);
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(child: Text(currentStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 6.0),
child: Icon(Icons.arrow_right_alt, size: 18),
),
Expanded(child: Text(newStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
],
);
}
String _stringify(dynamic value) {
if (value is DateTime) return value.toIso8601String();
if (value == null) return '';
if (value is List || value is Map) {
return jsonEncode(value);
}
return value.toString();
}
Future<void> _openDrawer(Map<String, dynamic> changes) async {
setState(() => _loading = true);
await _loadLegIdIfNeeded();
_currentLeg ??= _findCurrentLeg(_legId);
if (!mounted) return;
setState(() => _loading = false);
final legId = _legId;
if (legId == null) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Unable to load shared leg.')),
);
return;
}
final selected = Map<String, bool>.fromEntries(
changes.keys.map((k) => MapEntry(k, false)),
);
await showModalBottomSheet<void>(
context: context,
isScrollControlled: true,
builder: (ctx) {
return StatefulBuilder(
builder: (context, setSheetState) {
Future<void> apply() async {
final payload = <String, dynamic>{};
for (final entry in changes.entries) {
if (selected[entry.key] == true) {
payload[entry.key] = entry.value;
}
}
if (payload.isEmpty) {
Navigator.of(context).pop();
return;
}
final messenger = ScaffoldMessenger.of(context);
setSheetState(() => _loading = true);
try {
final data = context.read<DataService>();
await data.applyLegPartialUpdates(
legId: legId,
updates: payload,
);
if (!context.mounted) return;
await data.dismissNotifications([widget.notification.id]);
if (!context.mounted) return;
messenger.showSnackBar(
const SnackBar(content: Text('Changes applied.')),
);
Navigator.of(context).pop();
} catch (e) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to apply changes: $e')),
);
} finally {
setSheetState(() => _loading = false);
}
}
Widget buildLocos(List<dynamic> locos) {
final parsed = locos
.whereType<Map>()
.map((e) => e.map((k, v) => MapEntry(k.toString(), v)))
.toList();
parsed.sort((a, b) => (b['alloc_pos'] ?? 0).compareTo(a['alloc_pos'] ?? 0));
final leading = parsed.where((e) => (e['alloc_pos'] ?? 0) > 0).toList();
final trailing = parsed.where((e) => (e['alloc_pos'] ?? 0) <= 0).toList();
List<Widget> chipsFor(List<Map<String, dynamic>> list) {
return list
.map(
(loco) => Chip(
backgroundColor:
(loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
? Theme.of(context).colorScheme.primary.withValues(alpha: 0.12)
: Theme.of(context).colorScheme.surfaceContainerHighest,
label: Text('Loco ${loco['loco_id'] ?? '?'} (pos ${loco['alloc_pos'] ?? '?'}'),
avatar: Icon(
Icons.train,
size: 16,
color: (loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
? Theme.of(context).colorScheme.primary
: Theme.of(context).hintColor,
),
),
)
.toList();
}
return Wrap(
spacing: 8,
runSpacing: 8,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
...chipsFor(leading),
if (leading.isNotEmpty && trailing.isNotEmpty)
const SizedBox(
width: 24,
child: Center(child: Divider(height: 16)),
),
...chipsFor(trailing),
],
);
}
return SafeArea(
child: Padding(
padding: EdgeInsets.only(
left: 16,
right: 16,
bottom: MediaQuery.of(context).viewInsets.bottom + 16,
top: 16,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('Review changes', style: Theme.of(context).textTheme.titleMedium),
IconButton(
icon: const Icon(Icons.close),
onPressed: () => Navigator.of(context).pop(),
),
],
),
const SizedBox(height: 12),
Row(
children: [
TextButton(
onPressed: () => setSheetState(() {
for (final key in selected.keys) {
selected[key] = true;
}
}),
child: const Text('Select all'),
),
const Spacer(),
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: const Text('Cancel'),
),
],
),
const SizedBox(height: 8),
...changes.entries.map((entry) {
final key = entry.key;
final prettyKey = _prettyField(key);
final value = entry.value;
final currentLeg = _currentLeg ?? _findCurrentLeg(_legId);
final valueWidget = _buildChangeValueWidget(
key,
value,
currentLeg,
buildLocos,
);
return Padding(
padding: const EdgeInsets.only(bottom: 12.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Checkbox(
value: selected[key] ?? false,
onChanged: (v) => setSheetState(() {
selected[key] = v ?? false;
}),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(prettyKey, style: Theme.of(context).textTheme.titleSmall),
const SizedBox(height: 4),
valueWidget,
],
),
),
],
),
);
}),
Align(
alignment: Alignment.centerRight,
child: FilledButton(
onPressed: _loading ? null : apply,
child: _loading
? const SizedBox(
height: 18,
width: 18,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Text('Apply changes'),
),
),
],
),
),
);
},
);
},
);
}
Future<void> _dismiss() async {
await context.read<DataService>().dismissNotifications([widget.notification.id]);
}
}

View File

@@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@@ -14,8 +15,8 @@ class LegShareNotificationCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final data = context.read<DataService>();
final legShareId = notification.body.trim();
if (legShareId.isEmpty) {
final legShareId = _extractLegShareId(notification.body);
if (legShareId == null) {
return const Text('Invalid leg share notification.');
}
final future = data.fetchLegShare(legShareId);
@@ -144,4 +145,19 @@ class LegShareNotificationCard extends StatelessWidget {
final path = '/add?share=${Uri.encodeComponent(share.id)}&ts=$ts';
router.go(path, extra: target);
}
String? _extractLegShareId(String rawBody) {
final trimmed = rawBody.trim();
if (trimmed.isEmpty) return null;
if (RegExp(r'^[0-9]+$').hasMatch(trimmed)) return trimmed;
try {
final decoded = jsonDecode(trimmed);
if (decoded is Map) {
final id = decoded['share_id'] ?? decoded['leg_share_id'];
final str = id?.toString() ?? '';
if (RegExp(r'^[0-9]+$').hasMatch(str)) return str;
}
} catch (_) {}
return null;
}
}