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

add ability for non admins to add new traction, pending approval. Various QoL updates
All checks were successful
Release / meta (push) Successful in 6s
Details
Release / linux-build (push) Successful in 57s
Details
Release / web-build (push) Successful in 1m14s
Details
Release / android-build (push) Successful in 5m33s
Details
Release / release-master (push) Successful in 18s
Details
Release / release-dev (push) Successful in 20s
Details

Browse Source
This commit is contained in:
Pete Gregory
2026-01-05 22:11:02 +00:00
parent a755644c31
commit d5083e1cc7
18 changed files with 1585 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

516
lib/components/traction/traction_card.dart
View File

@@ -1,6 +1,10 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
import 'package:mileograph_flutter/objects/objects.dart';
import 'package:mileograph_flutter/services/api_service.dart';
import 'package:mileograph_flutter/services/authservice.dart';
import 'package:mileograph_flutter/services/data_service.dart';
import 'package:mileograph_flutter/services/distance_unit_service.dart';
import 'package:provider/provider.dart';
@@ -14,6 +18,8 @@ class TractionCard extends StatelessWidget {
required this.onOpenTimeline,
this.onOpenLegs,
this.onToggleSelect,
this.onReplacePending,
this.onActionComplete,
});
final LocoSummary loco;
@@ -23,12 +29,19 @@ class TractionCard extends StatelessWidget {
final VoidCallback onOpenTimeline;
final VoidCallback? onOpenLegs;
final VoidCallback? onToggleSelect;
final VoidCallback? onReplacePending;
final Future<void> Function()? onActionComplete;
@override
Widget build(BuildContext context) {
final status = loco.status ?? 'Unknown';
final operatorName = loco.operator ?? '';
final domain = loco.domain ?? '';
final isVisibilityPending =
(loco.visibility ?? '').toLowerCase().trim() == 'pending';
final isRejected =
(loco.visibility ?? '').toLowerCase().contains('reject');
final isElevated = context.read<AuthService>().isElevated;
final hasMileageOrTrips = _hasMileageOrTrips(loco);
final statusColors = _statusChipColors(context, status);
final distanceUnits = context.watch<DistanceUnitService>();
@@ -45,23 +58,14 @@ class TractionCard extends StatelessWidget {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
loco.number,
style: Theme.of(context).textTheme.headlineSmall
?.copyWith(fontWeight: FontWeight.w800),
),
if (hasMileageOrTrips)
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: Icon(
Icons.check_circle,
size: 18,
color: Colors.green.shade600,
),
),
],
_LocoNumberWithHistory(
number: loco.number,
matchedNumber: loco.matchedNumber,
matchedNumberValidTo: loco.matchedNumberValidTo,
hasMileageOrTrips: hasMileageOrTrips,
largeStyle: Theme.of(context).textTheme.headlineSmall,
showPendingChip: isVisibilityPending,
showRejectedChip: isRejected && !isVisibilityPending,
),
Text(
loco.locoClass,
@@ -78,10 +82,42 @@ class TractionCard extends StatelessWidget {
),
],
),
Chip(
label: Text(status),
backgroundColor: statusColors.$1,
labelStyle: TextStyle(color: statusColors.$2),
Row(
mainAxisSize: MainAxisSize.min,
children: [
if (isElevated && isVisibilityPending) ...[
PopupMenuButton<_PendingLocoAction>(
tooltip: 'Pending options',
onSelected: (action) => _handlePendingAction(
context,
action,
loco,
onActionComplete: onActionComplete,
),
itemBuilder: (context) => const [
PopupMenuItem(
value: _PendingLocoAction.accept,
child: Text('Accept loco'),
),
PopupMenuItem(
value: _PendingLocoAction.reject,
child: Text('Reject loco'),
),
PopupMenuItem(
value: _PendingLocoAction.replace,
child: Text('Replace...'),
),
],
icon: const Icon(Icons.more_vert),
),
const SizedBox(width: 6),
],
Chip(
label: Text(status),
backgroundColor: statusColors.$1,
labelStyle: TextStyle(color: statusColors.$2),
),
],
),
],
),
@@ -108,17 +144,24 @@ class TractionCard extends StatelessWidget {
),
];
final addButton = selectionMode && onToggleSelect != null
// Prefer replace action when picking a replacement loco.
final addButton = onReplacePending != null
? TextButton.icon(
onPressed: onToggleSelect,
icon: Icon(
isSelected
? Icons.remove_circle_outline
: Icons.add_circle_outline,
),
label: Text(isSelected ? 'Remove' : 'Add to entry'),
onPressed: onReplacePending,
icon: const Icon(Icons.swap_horiz),
label: const Text('Replace'),
)
: null;
: (!isRejected && selectionMode && onToggleSelect != null)
? TextButton.icon(
onPressed: onToggleSelect,
icon: Icon(
isSelected
? Icons.remove_circle_outline
: Icons.add_circle_outline,
),
label: Text(isSelected ? 'Remove' : 'Add to entry'),
)
: null;
if (isNarrow) {
return Column(
@@ -205,13 +248,326 @@ class TractionCard extends StatelessWidget {
}
}
class _LocoNumberWithHistory extends StatelessWidget {
const _LocoNumberWithHistory({
required this.number,
required this.matchedNumber,
required this.matchedNumberValidTo,
required this.hasMileageOrTrips,
this.largeStyle,
this.showPendingChip = false,
this.showRejectedChip = false,
});
final String number;
final String? matchedNumber;
final DateTime? matchedNumberValidTo;
final bool hasMileageOrTrips;
final TextStyle? largeStyle;
final bool showPendingChip;
final bool showRejectedChip;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final historicNumber = matchedNumber?.trim() ?? '';
final hasHistoricDate = matchedNumberValidTo != null;
final showHistoric = historicNumber.isNotEmpty && hasHistoricDate;
final historicDate =
hasHistoricDate ? DateFormat('yyyy-MM-dd').format(matchedNumberValidTo!) : null;
return Row(
children: [
Text(
number,
style: (largeStyle ?? theme.textTheme.titleLarge)?.copyWith(
fontWeight: FontWeight.w800,
),
),
if (hasMileageOrTrips)
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: Icon(
Icons.check_circle,
size: 18,
color: Colors.green.shade600,
),
),
if (showPendingChip) ...[
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.pending, size: 14),
const SizedBox(width: 4),
Text(
'Pending',
style: theme.textTheme.labelSmall
?.copyWith(fontWeight: FontWeight.w700),
),
],
),
),
],
if (showRejectedChip) ...[
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Colors.red.shade700,
borderRadius: BorderRadius.circular(8),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.close, size: 14, color: Colors.white),
const SizedBox(width: 4),
Text(
'Rejected',
style: theme.textTheme.labelSmall?.copyWith(
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
],
),
),
],
if (showHistoric) ...[
const SizedBox(width: 8),
Text(
historicNumber,
style: theme.textTheme.labelMedium?.copyWith(
fontWeight: FontWeight.w800,
color: theme.colorScheme.onSurfaceVariant,
),
),
if (historicDate != null) ...[
const SizedBox(width: 6),
Text(
'until $historicDate',
style: theme.textTheme.labelSmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
),
],
],
],
);
}
}
enum _PendingLocoAction { accept, reject, replace }
Future<void> _handlePendingAction(
BuildContext context,
_PendingLocoAction action,
LocoSummary loco, {
Future<void> Function()? onActionComplete,
}) async {
final navContext = context;
final messenger = ScaffoldMessenger.of(navContext);
final data = navContext.read<DataService>();
if (action == _PendingLocoAction.replace) {
final path = Uri(
path: '/traction',
queryParameters: {
'selection': 'single',
'replacementPendingLocoId': loco.id.toString(),
},
).toString();
final selected = await navContext.push<LocoSummary>(
path,
extra: {
'selection': 'single',
'replacementPendingLocoId': loco.id,
},
);
if (!navContext.mounted) return;
if (selected == null) return;
String rejectionReason = '';
final confirmed = await showDialog<bool>(
context: navContext,
builder: (dialogContext) {
return StatefulBuilder(
builder: (context, setState) {
final canSubmit = rejectionReason.trim().isNotEmpty;
return AlertDialog(
title: const Text('Replace pending loco?'),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Replace ${loco.locoClass} ${loco.number} with ${selected.locoClass} ${selected.number}?',
),
const SizedBox(height: 12),
TextField(
autofocus: true,
maxLines: 2,
decoration: const InputDecoration(
labelText: 'Rejection reason',
hintText: 'Reason for replacing this loco',
),
onChanged: (val) => setState(() {
rejectionReason = val;
}),
),
],
),
actions: [
TextButton(
onPressed: () => Navigator.of(dialogContext).pop(false),
child: const Text('Cancel'),
),
FilledButton(
onPressed: canSubmit
? () => Navigator.of(dialogContext).pop(true)
: null,
child: const Text('Replace'),
),
],
);
},
);
},
);
if (!navContext.mounted) return;
if (confirmed != true) return;
try {
await data.rejectPendingLoco(
locoId: loco.id,
replacementLocoId: selected.id,
rejectedReason: rejectionReason,
);
await data.fetchClassList(force: true);
if (navContext.mounted) {
messenger.showSnackBar(
const SnackBar(content: Text('Pending loco replaced')),
);
}
await onActionComplete?.call();
} catch (e) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to replace loco: $e')),
);
}
return;
}
if (action == _PendingLocoAction.reject) {
String rejectionReason = '';
final confirmed = await showDialog<bool>(
context: context,
builder: (dialogContext) {
return StatefulBuilder(
builder: (context, setState) {
final canSubmit = rejectionReason.trim().isNotEmpty;
return AlertDialog(
title: const Text('Reject loco?'),
content: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextField(
autofocus: true,
maxLines: 2,
decoration: const InputDecoration(
labelText: 'Rejection reason',
hintText: 'Why is this loco being rejected?',
),
onChanged: (val) => setState(() {
rejectionReason = val;
}),
),
],
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: const Text('Cancel'),
),
FilledButton(
onPressed: canSubmit
? () => Navigator.of(context).pop(true)
: null,
child: const Text('Reject'),
),
],
);
},
);
},
);
if (confirmed != true) return;
if (!navContext.mounted) return;
try {
await data.rejectPendingLoco(
locoId: loco.id,
rejectedReason: rejectionReason,
);
await data.fetchClassList(force: true);
if (navContext.mounted) {
messenger.showSnackBar(
const SnackBar(content: Text('Pending loco rejected')),
);
}
await onActionComplete?.call();
} catch (e) {
if (navContext.mounted) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to reject loco: $e')),
);
}
}
return;
}
try {
await data.acceptPendingLoco(locoId: loco.id);
if (navContext.mounted) {
messenger.showSnackBar(
const SnackBar(content: Text('Pending loco accepted')),
);
}
await onActionComplete?.call();
} catch (e) {
if (navContext.mounted) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to accept loco: $e')),
);
}
}
}
Future<void> showTractionDetails(
BuildContext context,
LocoSummary loco,
) async {
LocoSummary loco, {
Future<void> Function()? onActionComplete,
}) async {
final hasMileageOrTrips = _hasMileageOrTrips(loco);
final isVisibilityPending =
(loco.visibility ?? '').toLowerCase().trim() == 'pending';
final isRejected =
(loco.visibility ?? '').toLowerCase().contains('reject');
final rejectedReason =
loco.extra['rejected_reason']?.toString().trim() ?? '';
final distanceUnits = context.read<DistanceUnitService>();
final api = context.read<ApiService>();
final data = context.read<DataService>();
final auth = context.read<AuthService>();
final messenger = ScaffoldMessenger.of(context);
final userId = auth.userId;
final createdBy = loco.extra['created_by']?.toString();
final isOwnedByUser =
userId != null && createdBy != null && createdBy == userId;
final canDeleteAsOwner = isOwnedByUser && (isVisibilityPending || isRejected);
final leaderboardId = _leaderboardId(loco);
final leaderboardFuture = leaderboardId == null
? Future.value(const <LeaderboardEntry>[])
@@ -240,23 +596,13 @@ Future<void> showTractionDetails(
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
loco.number,
style: Theme.of(context).textTheme.titleLarge
?.copyWith(fontWeight: FontWeight.w800),
),
if (hasMileageOrTrips)
Padding(
padding: const EdgeInsets.only(left: 6.0),
child: Icon(
Icons.check_circle,
size: 18,
color: Colors.green.shade600,
),
),
],
_LocoNumberWithHistory(
number: loco.number,
matchedNumber: loco.matchedNumber,
matchedNumberValidTo: loco.matchedNumberValidTo,
hasMileageOrTrips: hasMileageOrTrips,
showPendingChip: isVisibilityPending,
showRejectedChip: isRejected && !isVisibilityPending,
),
Text(
loco.locoClass,
@@ -279,6 +625,15 @@ Future<void> showTractionDetails(
child: ListView(
controller: controller,
children: [
if (isRejected && rejectedReason.isNotEmpty)
...[
_detailRow(
context,
'Rejection reason',
rejectedReason,
),
const Divider(),
],
_detailRow(context, 'Status', loco.status ?? 'Unknown'),
_detailRow(context, 'Operator', loco.operator ?? ''),
_detailRow(context, 'Domain', loco.domain ?? ''),
@@ -355,12 +710,65 @@ Future<void> showTractionDetails(
distanceUnits,
);
}).toList(),
);
},
),
],
);
},
),
),
if (auth.isElevated || canDeleteAsOwner) ...[
const SizedBox(height: 16),
FilledButton.tonal(
style: FilledButton.styleFrom(
backgroundColor:
Theme.of(context).colorScheme.errorContainer,
foregroundColor:
Theme.of(context).colorScheme.onErrorContainer,
),
onPressed: () async {
final confirmed = await showDialog<bool>(
context: context,
builder: (context) {
return AlertDialog(
title: const Text('Delete loco?'),
content: const Text(
'This will permanently delete this loco. Are you sure?',
),
actions: [
TextButton(
onPressed: () => Navigator.of(context).pop(false),
child: const Text('Cancel'),
),
FilledButton(
onPressed: () => Navigator.of(context).pop(true),
style: FilledButton.styleFrom(
backgroundColor:
Theme.of(context).colorScheme.error,
),
child: const Text('Delete'),
),
],
);
},
);
if (confirmed != true) return;
try {
await data.adminDeleteLoco(locoId: loco.id);
messenger.showSnackBar(
const SnackBar(content: Text('Loco deleted')),
);
await onActionComplete?.call();
if (!context.mounted) return;
Navigator.of(ctx).pop();
} catch (e) {
messenger.showSnackBar(
SnackBar(content: Text('Failed to delete loco: $e')),
);
}
},
child: const Text('Delete loco'),
),
],
],
),
),
],
),
);