fix: Fehlerbehandlung beim Laden und Meldungen überarbeiten
Reklamationen der Fahrer: Meldungen verdeckten Buttons, und nach dem Abschluss stand „Lieferung nicht in der Tour gefunden" ohne Ausweg da. Meldungen: - Erfolgs-SnackBars entfernt, bei Erfolg bleibt der Spinner - einheitliche, schwebende Meldungen statt Stau über den Buttons - Server-Rohtexte durch verständliche Texte ersetzt (api_failure_text) Laden: - fehlt eine geöffnete Lieferung, wird die Tour einmal neu geholt; die Meldung kommt nur nach erfolgreichem Abruf ohne die Lieferung - Endlos-Spinner auf Lieferdetail, Filial-Abholung und Beladen ersetzt durch Kopfzeile, Fehlergrund und „Erneut versuchen" - Tour wird nach einem Tageswechsel nachgeladen, offene Seiten bleiben dabei unberührt - Abschluss und Zuweisung überschreiben kein zwischenzeitliches Neuladen, alte Antworten drehen einen Abschluss nicht mehr zurück - leere Server-Antworten gelten als Fehler statt als „keine Daten" Anmeldung: - Token-Erneuerung wartet höchstens 12 s, der native Aufruf läuft weiter - App-Start ohne Netz zeigt einen Hinweis mit „Erneut versuchen" - Fehlerseite der Fahrzeugauswahl bietet „Abmelden" Außerdem Podfile.lock an die Plugins angeglichen. Tests für die neuen Fehlerpfade ergänzt. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Dennis Nemec
@ -29,9 +29,12 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
required this.tourRepository,
|
||||
required this.opBloc,
|
||||
required this.attachmentCache,
|
||||
}) : super(const TourInitial()) {
|
||||
DateTime Function()? clock,
|
||||
}) : _clock = clock ?? DateTime.now,
|
||||
super(const TourInitial()) {
|
||||
on<LoadTour>(_onLoad);
|
||||
on<RefreshTour>(_onRefresh);
|
||||
on<RefreshTourIfDayChanged>(_onRefreshIfDayChanged);
|
||||
on<ReorderDeliveries>(_onReorder);
|
||||
on<AssignCarToDelivery>(_onAssignCar);
|
||||
on<AssignCarToDeliveries>(_onAssignCarBulk);
|
||||
@ -67,6 +70,18 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
|
||||
final Uuid _uuid = const Uuid();
|
||||
|
||||
final DateTime Function() _clock;
|
||||
|
||||
/// Kalendertag der letzten erfolgreichen Server-Antwort. Absichtlich nicht
|
||||
/// das Tour-Datum: Das darf vom Gerät abweichen (Server entscheidet über
|
||||
/// „heute") und würde dann bei jeder Rückkehr neu laden.
|
||||
DateTime? _loadedDay;
|
||||
|
||||
DateTime _today() {
|
||||
final now = _clock();
|
||||
return DateTime(now.year, now.month, now.day);
|
||||
}
|
||||
|
||||
/// Aktuell angefragtes Tour-Datum. `null` = „heute" (Server entscheidet).
|
||||
/// Wird vom [LoadTour]-Event gesetzt und von [RefreshTour] wiederverwendet,
|
||||
/// damit ein Pull-to-refresh denselben Tag neu lädt (nicht heute).
|
||||
@ -96,6 +111,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
try {
|
||||
final details = await tourRepository.getMyTourDetails(date: _selectedDate);
|
||||
if (seq != _requestSeq) return; // überholt von neuerer Anfrage
|
||||
_loadedDay = _today();
|
||||
if (details == null) {
|
||||
emit(const TourEmpty());
|
||||
return;
|
||||
@ -127,6 +143,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
try {
|
||||
final details = await tourRepository.getMyTourDetails(date: _selectedDate);
|
||||
if (seq != _requestSeq) return; // überholt von neuerer Anfrage
|
||||
_loadedDay = _today();
|
||||
if (details == null) {
|
||||
emit(const TourEmpty());
|
||||
return;
|
||||
@ -147,6 +164,20 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _onRefreshIfDayChanged(
|
||||
RefreshTourIfDayChanged event,
|
||||
Emitter<TourState> emit,
|
||||
) async {
|
||||
final loadedDay = _loadedDay;
|
||||
if (loadedDay == null || _selectedDate != null) return;
|
||||
if (loadedDay == _today()) return;
|
||||
final current = state;
|
||||
// Läuft schon ein Laden, liefert es den neuen Tag ohnehin.
|
||||
if (current is TourLoading) return;
|
||||
if (current is TourLoaded && current.isRefreshing) return;
|
||||
await _onRefresh(const RefreshTour(), emit);
|
||||
}
|
||||
|
||||
// ─── ReorderDeliveries ───────────────────────────────────────────────
|
||||
|
||||
Future<void> _onReorder(
|
||||
@ -203,8 +234,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
AssignCarToDelivery event,
|
||||
Emitter<TourState> emit,
|
||||
) async {
|
||||
final current = state;
|
||||
if (current is! TourLoaded) return;
|
||||
if (state is! TourLoaded) return;
|
||||
|
||||
opBloc.add(StartOperation());
|
||||
try {
|
||||
@ -217,15 +247,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
// Wir bauen die lokale Delivery so um, dass alle Stamm-Felder vom
|
||||
// Server übernommen werden, Items und sortOrder aus dem lokalen
|
||||
// Aggregat erhalten bleiben.
|
||||
final localDelivery = current.details.deliveries
|
||||
.firstWhere((d) => d.id == event.deliveryId, orElse: () => remoteDelivery);
|
||||
|
||||
final merged = remoteDelivery.copyWith(
|
||||
sortOrder: localDelivery.sortOrder,
|
||||
items: localDelivery.items,
|
||||
);
|
||||
|
||||
emit(current.copyWith(details: current.details.replaceDelivery(merged)));
|
||||
_applyRemoteDelivery(emit, remoteDelivery);
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.AssignCarToDelivery fehlgeschlagen: $e\n$st');
|
||||
@ -657,7 +679,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
details: latest.details.copyWith(paymentsByDeliveryId: next),
|
||||
));
|
||||
}
|
||||
opBloc.add(FinishOperation(message: 'Zahlung protokolliert'));
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.RecordDeliveryPayment fehlgeschlagen: $e\n$st');
|
||||
opBloc.add(FailOperation(
|
||||
@ -778,7 +800,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
_replaceAmountCreditNotes(details, event.deliveryId, newNote);
|
||||
emit(latest.copyWith(details: details));
|
||||
}
|
||||
opBloc.add(FinishOperation(message: 'Gutschrift gespeichert'));
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.SetDeliveryCredit fehlgeschlagen: $e\n$st');
|
||||
final latest = state;
|
||||
@ -829,7 +851,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
),
|
||||
));
|
||||
}
|
||||
opBloc.add(FinishOperation(message: 'Gutschrift entfernt'));
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.RemoveDeliveryCredit fehlgeschlagen: $e\n$st');
|
||||
final latest = state;
|
||||
@ -912,7 +934,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
),
|
||||
));
|
||||
}
|
||||
opBloc.add(FinishOperation(message: 'Checkliste-Eintrag gespeichert'));
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.SetDeliveryServiceValue fehlgeschlagen: $e\n$st');
|
||||
final latest = state;
|
||||
@ -958,7 +980,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
deliveryId: event.deliveryId,
|
||||
serviceId: event.serviceId,
|
||||
);
|
||||
opBloc.add(FinishOperation(message: 'Checkliste-Eintrag entfernt'));
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.RemoveDeliveryServiceValue fehlgeschlagen: $e\n$st');
|
||||
final latest = state;
|
||||
@ -1059,7 +1081,6 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
) async {
|
||||
await _runLifecycle(
|
||||
emit: emit,
|
||||
deliveryId: event.deliveryId,
|
||||
operationLabel: 'Lieferung abbrechen',
|
||||
apply: () => tourRepository.cancelDelivery(
|
||||
deliveryId: event.deliveryId,
|
||||
@ -1074,7 +1095,6 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
) async {
|
||||
await _runLifecycle(
|
||||
emit: emit,
|
||||
deliveryId: event.deliveryId,
|
||||
operationLabel: 'Lieferung pausieren',
|
||||
apply: () => tourRepository.holdDelivery(
|
||||
deliveryId: event.deliveryId,
|
||||
@ -1089,7 +1109,6 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
) async {
|
||||
await _runLifecycle(
|
||||
emit: emit,
|
||||
deliveryId: event.deliveryId,
|
||||
operationLabel: 'Lieferung fortsetzen',
|
||||
apply: () =>
|
||||
tourRepository.resumeDelivery(deliveryId: event.deliveryId),
|
||||
@ -1102,7 +1121,6 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
) async {
|
||||
await _runLifecycle(
|
||||
emit: emit,
|
||||
deliveryId: event.deliveryId,
|
||||
operationLabel: 'Lieferung abschließen',
|
||||
apply: () => tourRepository.completeDelivery(
|
||||
deliveryId: event.deliveryId,
|
||||
@ -1119,6 +1137,26 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
);
|
||||
}
|
||||
|
||||
/// Mergt die Server-Antwort in den **aktuellen** Stand, nicht in den von vor
|
||||
/// dem Request: Sonst ginge ein währenddessen fertig gewordenes Neuladen
|
||||
/// verloren. Ein noch laufendes Neuladen wird verworfen, denn seine Antwort
|
||||
/// kennt diese Änderung eventuell noch nicht und würde sie zurückdrehen.
|
||||
void _applyRemoteDelivery(Emitter<TourState> emit, Delivery remote) {
|
||||
final latest = state;
|
||||
if (latest is! TourLoaded) return;
|
||||
++_requestSeq;
|
||||
final local = latest.details.deliveries
|
||||
.firstWhere((d) => d.id == remote.id, orElse: () => remote);
|
||||
final merged = remote.copyWith(
|
||||
sortOrder: local.sortOrder,
|
||||
items: local.items,
|
||||
);
|
||||
emit(latest.copyWith(
|
||||
isRefreshing: false,
|
||||
details: latest.details.replaceDelivery(merged),
|
||||
));
|
||||
}
|
||||
|
||||
/// Gemeinsamer Pfad für die drei Lifecycle-Operationen: globaler
|
||||
/// Loading-Overlay an, Server-Call, lokales Aggregat mit der neuen
|
||||
/// Stamm-Delivery mergen (Items/sortOrder aus dem aktuellen State
|
||||
@ -1127,25 +1165,14 @@ class TourBloc extends Bloc<TourEvent, TourState> {
|
||||
/// Reason-Dialog reagiert.
|
||||
Future<void> _runLifecycle({
|
||||
required Emitter<TourState> emit,
|
||||
required String deliveryId,
|
||||
required String operationLabel,
|
||||
required Future<Delivery> Function() apply,
|
||||
}) async {
|
||||
final current = state;
|
||||
if (current is! TourLoaded) return;
|
||||
if (state is! TourLoaded) return;
|
||||
|
||||
opBloc.add(StartOperation());
|
||||
try {
|
||||
final remote = await apply();
|
||||
final local = current.details.deliveries
|
||||
.firstWhere((d) => d.id == deliveryId, orElse: () => remote);
|
||||
final merged = remote.copyWith(
|
||||
sortOrder: local.sortOrder,
|
||||
items: local.items,
|
||||
);
|
||||
emit(current.copyWith(
|
||||
details: current.details.replaceDelivery(merged),
|
||||
));
|
||||
_applyRemoteDelivery(emit, await apply());
|
||||
opBloc.add(FinishOperation());
|
||||
} catch (e, st) {
|
||||
debugPrint('TourBloc.$operationLabel fehlgeschlagen: $e\n$st');
|
||||
|
||||
@ -38,6 +38,15 @@ class RefreshTour extends TourEvent {
|
||||
const RefreshTour();
|
||||
}
|
||||
|
||||
/// Lädt die Tour neu, wenn seit dem letzten Laden der Tag gewechselt hat und
|
||||
/// „heute" angezeigt wird. Eine bewusst im Kalender gewählte Tour bleibt.
|
||||
///
|
||||
/// Auslöser ist die Rückkehr in die Tour-Ansicht (siehe `TourDayWatcher`):
|
||||
/// Die App bleibt oft über Nacht geöffnet und zeigte sonst die Tour von gestern.
|
||||
class RefreshTourIfDayChanged extends TourEvent {
|
||||
const RefreshTourIfDayChanged();
|
||||
}
|
||||
|
||||
/// Schreibt die Sortier-Reihenfolge aller Lieferungen einer Tour an das
|
||||
/// Backend. Der Bloc fordert die UI nicht auf, die vollständige Reihenfolge
|
||||
/// zu kennen — sie wird aus der Liste übergeben.
|
||||
|
||||
@ -54,7 +54,8 @@ class TourLoaded extends TourState {
|
||||
/// hängen und wird beim nächsten Reload geleert.
|
||||
final String? refreshError;
|
||||
|
||||
/// Fehler des letzten Reorder-Persist-Versuchs.
|
||||
/// Fehler des letzten Reorder-Persist-Versuchs. Steuert nur den Ablauf der
|
||||
/// Sortier-Page; angezeigt wird er über `FailOperation`.
|
||||
final String? reorderError;
|
||||
|
||||
TourLoaded copyWith({
|
||||
|
||||
@ -17,6 +17,7 @@ import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step_payment.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step_services.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step_summary.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/overview/presentation/tour_not_loaded_scaffold.dart';
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
// Backend-TODOs (siehe Roadmap unten in diesem File)
|
||||
@ -83,7 +84,11 @@ class _DeliveryDetailScaffold extends StatefulWidget {
|
||||
_DeliveryDetailScaffoldState();
|
||||
}
|
||||
|
||||
class _DeliveryDetailScaffoldState extends State<_DeliveryDetailScaffold> {
|
||||
class _DeliveryDetailScaffoldState extends State<_DeliveryDetailScaffold>
|
||||
with DeliveryPresenceGuard {
|
||||
@override
|
||||
String get guardedDeliveryId => widget.deliveryId;
|
||||
|
||||
/// „Gearmt" = die Lieferung war während dieser Page-Session aktiv. Nur dann
|
||||
/// poppen wir bei `completed` automatisch zurück zur Übersicht. Öffnet der
|
||||
/// Fahrer eine bereits abgeschlossene Lieferung, bleibt `_armed == false`
|
||||
@ -110,9 +115,8 @@ class _DeliveryDetailScaffoldState extends State<_DeliveryDetailScaffold> {
|
||||
|
||||
/// Nach erfolgreichem Abschluss (aktiv → completed) zurück zur Übersicht.
|
||||
void _onTourState(BuildContext context, TourState state) {
|
||||
if (_popped || state is! TourLoaded) return;
|
||||
final d = _findDelivery(state.details);
|
||||
if (d == null) return;
|
||||
if (_popped || !deliveryStillPresent(context, state)) return;
|
||||
final d = _findDelivery((state as TourLoaded).details)!;
|
||||
if (d.state == DeliveryState.active) {
|
||||
_armed = true;
|
||||
} else if (_armed && d.state == DeliveryState.completed) {
|
||||
@ -129,41 +133,67 @@ class _DeliveryDetailScaffoldState extends State<_DeliveryDetailScaffold> {
|
||||
child: BlocBuilder<TourBloc, TourState>(
|
||||
builder: (context, tourState) {
|
||||
if (tourState is! TourLoaded) {
|
||||
return const Scaffold(
|
||||
body: Center(child: CircularProgressIndicator()),
|
||||
);
|
||||
return TourNotLoadedScaffold(title: 'Lieferung', state: tourState);
|
||||
}
|
||||
final details = tourState.details;
|
||||
final delivery = _findDelivery(details);
|
||||
if (delivery == null) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Lieferung')),
|
||||
body: Center(
|
||||
child: Text(
|
||||
'Lieferung ${widget.deliveryId} nicht in der Tour gefunden.',
|
||||
),
|
||||
),
|
||||
);
|
||||
// Der Guard lädt gerade neu oder das Neuladen ist gescheitert.
|
||||
return TourNotLoadedScaffold(title: 'Lieferung', state: tourState);
|
||||
}
|
||||
// Titel = Empfänger vor Ort, wie in den Listen-Kacheln.
|
||||
final recipient = details.recipientOf(delivery);
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
backgroundColor: theme.primaryColor,
|
||||
foregroundColor: theme.colorScheme.onPrimary,
|
||||
title: Text(recipient.name),
|
||||
),
|
||||
body: Column(
|
||||
children: [
|
||||
_StepHeader(delivery: delivery, details: details),
|
||||
const Divider(height: 1),
|
||||
Expanded(
|
||||
child: _StepBody(delivery: delivery, details: details),
|
||||
// Feste Bedienelemente liegen in den Scaffold-Slots: Nur die kennt
|
||||
// der Scaffold und zeigt SnackBars darüber statt darauf.
|
||||
return BlocSelector<
|
||||
DeliveryWorkflowBloc,
|
||||
DeliveryWorkflowState,
|
||||
WorkflowStep
|
||||
>(
|
||||
selector: (state) => state.step,
|
||||
builder: (context, step) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
backgroundColor: theme.primaryColor,
|
||||
foregroundColor: theme.colorScheme.onPrimary,
|
||||
title: Text(recipient.name),
|
||||
),
|
||||
const Divider(height: 1),
|
||||
_BottomNav(delivery: delivery, details: details),
|
||||
],
|
||||
),
|
||||
body: Column(
|
||||
children: [
|
||||
_StepHeader(delivery: delivery, details: details),
|
||||
const Divider(height: 1),
|
||||
Expanded(
|
||||
child: _StepBody(delivery: delivery, details: details),
|
||||
),
|
||||
],
|
||||
),
|
||||
// Nur bei aktiver Lieferung — sonst ist Hinzufügen gesperrt.
|
||||
floatingActionButton:
|
||||
step == WorkflowStep.notes &&
|
||||
delivery.state == DeliveryState.active
|
||||
? StepNotesAddButton(delivery: delivery)
|
||||
: null,
|
||||
// Das Padding hält die Leiste über der Tastatur (Eingabefelder
|
||||
// im Step „Services"), was der Slot von sich aus nicht tut.
|
||||
bottomNavigationBar: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
bottom: MediaQuery.viewInsetsOf(context).bottom,
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (step == WorkflowStep.payment)
|
||||
StepPaymentCollectPanel(
|
||||
delivery: delivery,
|
||||
details: details,
|
||||
),
|
||||
const Divider(height: 1),
|
||||
_BottomNav(delivery: delivery, details: details),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
@ -15,6 +15,7 @@ import 'package:hl_lieferservice/feature/delivery/detail/bloc/workflow_bloc.dart
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/bloc/workflow_event.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/bloc/workflow_state.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/presentation/widget/reason_dialog.dart';
|
||||
import 'package:hl_lieferservice/widget/app_message.dart';
|
||||
|
||||
/// Step 1 — Informationen zur Lieferung.
|
||||
///
|
||||
@ -342,9 +343,7 @@ class _QuickActions extends StatelessWidget {
|
||||
Future<void> _call(BuildContext context, String phone) async {
|
||||
final ok = await launchUrl(Uri(scheme: 'tel', path: phone));
|
||||
if (!ok && context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Anruf konnte nicht gestartet werden: $phone')),
|
||||
);
|
||||
context.showAppMessage('Anruf konnte nicht gestartet werden: $phone');
|
||||
}
|
||||
}
|
||||
|
||||
@ -666,9 +665,7 @@ class _CustomerCard extends StatelessWidget {
|
||||
Future<void> _call(BuildContext context, String phone) async {
|
||||
final ok = await launchUrl(Uri(scheme: 'tel', path: phone));
|
||||
if (!ok && context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('Anruf konnte nicht gestartet werden: $phone')),
|
||||
);
|
||||
context.showAppMessage('Anruf konnte nicht gestartet werden: $phone');
|
||||
}
|
||||
}
|
||||
|
||||
@ -1075,9 +1072,7 @@ class _ArticleRow extends StatelessWidget {
|
||||
Future<void> _launchContact(BuildContext context, Uri uri, String label) async {
|
||||
final ok = await launchUrl(uri);
|
||||
if (!ok && context.mounted) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text('$label konnte nicht geöffnet werden')),
|
||||
);
|
||||
context.showAppMessage('$label konnte nicht geöffnet werden');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -29,6 +29,58 @@ class StepNotes extends StatelessWidget {
|
||||
final Delivery delivery;
|
||||
final TourDetails details;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final notes = details.notesOf(delivery.id);
|
||||
// Notizen & Fotos sind nur bei aktiver Lieferung änderbar. Ist die
|
||||
// Lieferung beendet (abgeschlossen/abgebrochen/pausiert), bleiben sie
|
||||
// sichtbar, aber read-only: kein FAB, keine Aktions-Menüs, kein Löschen.
|
||||
final active = delivery.state == DeliveryState.active;
|
||||
// Sauber in Text-Notizen und Fotos aufteilen — getrennte Sektionen.
|
||||
final textNotes =
|
||||
notes.where((n) => n.imageAttachment == null).toList(growable: false);
|
||||
final photoNotes =
|
||||
notes.where((n) => n.imageAttachment != null).toList(growable: false);
|
||||
return ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 100),
|
||||
children: [
|
||||
if (!active) ...[
|
||||
const _ReadOnlyBanner(),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
_SectionHeader(text: 'Notizen (${textNotes.length})'),
|
||||
const SizedBox(height: 8),
|
||||
if (textNotes.isEmpty)
|
||||
const _EmptyHint(
|
||||
icon: Icons.notes,
|
||||
text: 'Noch keine Notizen erfasst.',
|
||||
)
|
||||
else
|
||||
for (final n in textNotes)
|
||||
_NoteCard(note: n, deliveryId: delivery.id, active: active),
|
||||
const SizedBox(height: 24),
|
||||
_SectionHeader(text: 'Fotos (${photoNotes.length})'),
|
||||
const SizedBox(height: 8),
|
||||
if (photoNotes.isEmpty)
|
||||
const _EmptyHint(
|
||||
icon: Icons.photo_camera_outlined,
|
||||
text: 'Noch keine Fotos aufgenommen.',
|
||||
)
|
||||
else
|
||||
for (final n in photoNotes)
|
||||
_PhotoCard(note: n, deliveryId: delivery.id, active: active),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// „Hinzufügen"-Button des Notizen-Steps. Sitzt im `floatingActionButton`-Slot
|
||||
/// der Detail-Page, damit SnackBars ihn nicht verdecken.
|
||||
class StepNotesAddButton extends StatelessWidget {
|
||||
const StepNotesAddButton({super.key, required this.delivery});
|
||||
|
||||
final Delivery delivery;
|
||||
|
||||
void _openAddNoteDialog(BuildContext context) {
|
||||
final tourBloc = context.read<TourBloc>();
|
||||
showDialog<void>(
|
||||
@ -81,61 +133,9 @@ class StepNotes extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final notes = details.notesOf(delivery.id);
|
||||
// Notizen & Fotos sind nur bei aktiver Lieferung änderbar. Ist die
|
||||
// Lieferung beendet (abgeschlossen/abgebrochen/pausiert), bleiben sie
|
||||
// sichtbar, aber read-only: kein FAB, keine Aktions-Menüs, kein Löschen.
|
||||
final active = delivery.state == DeliveryState.active;
|
||||
// Sauber in Text-Notizen und Fotos aufteilen — getrennte Sektionen.
|
||||
final textNotes =
|
||||
notes.where((n) => n.imageAttachment == null).toList(growable: false);
|
||||
final photoNotes =
|
||||
notes.where((n) => n.imageAttachment != null).toList(growable: false);
|
||||
return Stack(
|
||||
children: [
|
||||
ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 100),
|
||||
children: [
|
||||
if (!active) ...[
|
||||
const _ReadOnlyBanner(),
|
||||
const SizedBox(height: 16),
|
||||
],
|
||||
_SectionHeader(text: 'Notizen (${textNotes.length})'),
|
||||
const SizedBox(height: 8),
|
||||
if (textNotes.isEmpty)
|
||||
const _EmptyHint(
|
||||
icon: Icons.notes,
|
||||
text: 'Noch keine Notizen erfasst.',
|
||||
)
|
||||
else
|
||||
for (final n in textNotes)
|
||||
_NoteCard(note: n, deliveryId: delivery.id, active: active),
|
||||
const SizedBox(height: 24),
|
||||
_SectionHeader(text: 'Fotos (${photoNotes.length})'),
|
||||
const SizedBox(height: 8),
|
||||
if (photoNotes.isEmpty)
|
||||
const _EmptyHint(
|
||||
icon: Icons.photo_camera_outlined,
|
||||
text: 'Noch keine Fotos aufgenommen.',
|
||||
)
|
||||
else
|
||||
for (final n in photoNotes)
|
||||
_PhotoCard(note: n, deliveryId: delivery.id, active: active),
|
||||
],
|
||||
),
|
||||
// FAB nur bei aktiver Lieferung — sonst ist Hinzufügen gesperrt.
|
||||
if (active)
|
||||
Align(
|
||||
alignment: Alignment.bottomRight,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: _AddMenu(
|
||||
onAddNote: () => _openAddNoteDialog(context),
|
||||
onAddImage: () => _pickImage(context),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
return _AddMenu(
|
||||
onAddNote: () => _openAddNoteDialog(context),
|
||||
onAddImage: () => _pickImage(context),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,38 +31,51 @@ class StepPayment extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final status = DeliveryPaymentStatus.of(delivery, details);
|
||||
final canCollect =
|
||||
delivery.state == DeliveryState.active && status.hasOpenAmount;
|
||||
|
||||
return Column(
|
||||
return ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 24),
|
||||
children: [
|
||||
Expanded(
|
||||
child: ListView(
|
||||
padding: const EdgeInsets.fromLTRB(16, 16, 16, 24),
|
||||
children: [
|
||||
const _SectionHeader(text: 'Ausgelieferte Artikel'),
|
||||
const SizedBox(height: 8),
|
||||
DeliveredItemsCard(delivery: delivery, details: details),
|
||||
const SizedBox(height: 24),
|
||||
const _SectionHeader(text: 'Betrag'),
|
||||
const SizedBox(height: 8),
|
||||
PaymentBreakdownCard(
|
||||
status: status,
|
||||
credit: details.creditOf(delivery.id),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
PaymentRecordCard(status: status),
|
||||
],
|
||||
),
|
||||
const _SectionHeader(text: 'Ausgelieferte Artikel'),
|
||||
const SizedBox(height: 8),
|
||||
DeliveredItemsCard(delivery: delivery, details: details),
|
||||
const SizedBox(height: 24),
|
||||
const _SectionHeader(text: 'Betrag'),
|
||||
const SizedBox(height: 8),
|
||||
PaymentBreakdownCard(
|
||||
status: status,
|
||||
credit: details.creditOf(delivery.id),
|
||||
),
|
||||
if (canCollect)
|
||||
_CollectPanel(
|
||||
status: status,
|
||||
onCollect: () => _openPaymentSheet(context, status),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
PaymentRecordCard(status: status),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Fester Bereich unten: offener Betrag + großer „Zahlung abwickeln"-Button.
|
||||
/// Bleibt sichtbar, auch wenn die Artikelliste lang ist. Sitzt in der
|
||||
/// Bottom-Bar der Detail-Page, damit SnackBars ihn nicht verdecken.
|
||||
class StepPaymentCollectPanel extends StatelessWidget {
|
||||
const StepPaymentCollectPanel({
|
||||
super.key,
|
||||
required this.delivery,
|
||||
required this.details,
|
||||
});
|
||||
|
||||
final Delivery delivery;
|
||||
final TourDetails details;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final status = DeliveryPaymentStatus.of(delivery, details);
|
||||
if (delivery.state != DeliveryState.active || !status.hasOpenAmount) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
return _CollectPanel(
|
||||
status: status,
|
||||
onCollect: () => _openPaymentSheet(context, status),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _openPaymentSheet(
|
||||
BuildContext context,
|
||||
@ -104,8 +117,6 @@ class StepPayment extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
/// Fester Bereich unten: offener Betrag + großer „Zahlung abwickeln"-Button.
|
||||
/// Bleibt sichtbar, auch wenn die Artikelliste lang ist.
|
||||
class _CollectPanel extends StatelessWidget {
|
||||
const _CollectPanel({required this.status, required this.onCollect});
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||
|
||||
/// Fallback-Page, die der Übersichts- und Beladen-Pfad anzeigt, wenn der
|
||||
/// Initial-Tour-Load gescheitert ist. Tap auf "Erneut versuchen" feuert
|
||||
@ -16,6 +17,12 @@ class DeliveryLoadingFailedPage extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final state = context.watch<TourBloc>().state;
|
||||
final reason = switch (state) {
|
||||
TourLoadFailed(:final message) => message,
|
||||
TourLoaded(:final refreshError) => refreshError,
|
||||
_ => null,
|
||||
};
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(50),
|
||||
@ -33,6 +40,11 @@ class DeliveryLoadingFailedPage extends StatelessWidget {
|
||||
'Leider ist es beim Laden der Fahrten zu einem Fehler gekommen.',
|
||||
),
|
||||
),
|
||||
if (reason != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 12),
|
||||
child: Text(reason, textAlign: TextAlign.center),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 30),
|
||||
child: FilledButton(
|
||||
|
||||
@ -47,9 +47,6 @@ class _DeliverySortPageState extends State<DeliverySortPage> {
|
||||
final SortableDeliveryListController _listController =
|
||||
SortableDeliveryListController();
|
||||
|
||||
/// Verhindert mehrfache SnackBars für denselben Fehler-State.
|
||||
String? _lastShownErrorSignature;
|
||||
|
||||
/// True, sobald `_confirm` gefeuert wurde — wir nutzen das, um den
|
||||
/// Übergang persisting → fertig zuverlässig zu erkennen.
|
||||
bool _isAwaitingConfirm = false;
|
||||
@ -222,19 +219,14 @@ class _DeliverySortPageState extends State<DeliverySortPage> {
|
||||
listener: (context, state) {
|
||||
if (state is! TourLoaded) return;
|
||||
|
||||
final err = state.reorderError;
|
||||
if (err != null && err != _lastShownErrorSignature) {
|
||||
_lastShownErrorSignature = err;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(err)),
|
||||
);
|
||||
// Die Meldung zeigt der OperationViewEnforcer (FailOperation im
|
||||
// TourBloc); hier geht es nur darum, nicht weiterzuschalten.
|
||||
if (state.reorderError != null) {
|
||||
_isAwaitingConfirm = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (_isAwaitingConfirm &&
|
||||
!state.isPersistingReorder &&
|
||||
err == null) {
|
||||
if (_isAwaitingConfirm && !state.isPersistingReorder) {
|
||||
_isAwaitingConfirm = false;
|
||||
_advanceToLoading();
|
||||
}
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
||||
|
||||
/// Holt bei einem Tageswechsel die aktuelle Tour, sobald der Fahrer zur
|
||||
/// Tour-Ansicht zurückkehrt: beim Öffnen der App und beim Schließen einer
|
||||
/// darüberliegenden Seite.
|
||||
///
|
||||
/// Solange eine Seite darüber liegt (Lieferung, Unterschrift, Zahlung), wird
|
||||
/// nicht geladen: Die neue Tour enthielte die offene Lieferung nicht mehr, und
|
||||
/// der Fahrer verlöre seine Eingaben, z. B. bei einer Tour über Mitternacht.
|
||||
class TourDayWatcher extends StatefulWidget {
|
||||
const TourDayWatcher({super.key, required this.child});
|
||||
|
||||
final Widget child;
|
||||
|
||||
@override
|
||||
State<TourDayWatcher> createState() => _TourDayWatcherState();
|
||||
}
|
||||
|
||||
class _TourDayWatcherState extends State<TourDayWatcher>
|
||||
with WidgetsBindingObserver {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
WidgetsBinding.instance.addObserver(this);
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
WidgetsBinding.instance.removeObserver(this);
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeAppLifecycleState(AppLifecycleState state) {
|
||||
if (state == AppLifecycleState.resumed) _checkDay();
|
||||
}
|
||||
|
||||
/// Läuft auch, wenn eine darüberliegende Seite geschlossen wird: `ModalRoute`
|
||||
/// meldet dann, dass diese Route wieder die oberste ist.
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
_checkDay();
|
||||
}
|
||||
|
||||
void _checkDay() {
|
||||
if (ModalRoute.of(context)?.isCurrent ?? true) {
|
||||
context.read<TourBloc>().add(const RefreshTourIfDayChanged());
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) => widget.child;
|
||||
}
|
||||
@ -0,0 +1,117 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_fail_page.dart';
|
||||
import 'package:hl_lieferservice/widget/app_message.dart';
|
||||
|
||||
/// Rahmen für Unterseiten einer Lieferung, solange keine Tour-Daten vorliegen.
|
||||
///
|
||||
/// Immer mit Kopfzeile: Scheitert das Laden, bleibt der Fahrer sonst ohne
|
||||
/// Zurück-Button vor einem Spinner stehen.
|
||||
class TourNotLoadedScaffold extends StatelessWidget {
|
||||
const TourNotLoadedScaffold({
|
||||
super.key,
|
||||
required this.title,
|
||||
required this.state,
|
||||
});
|
||||
|
||||
final String title;
|
||||
final TourState state;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: Text(title)),
|
||||
body: SafeArea(
|
||||
child: switch (state) {
|
||||
TourLoadFailed() ||
|
||||
TourLoaded(
|
||||
refreshError: String _,
|
||||
) => const DeliveryLoadingFailedPage(),
|
||||
TourEmpty() => const _NoTour(),
|
||||
_ => const Center(child: CircularProgressIndicator()),
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _NoTour extends StatelessWidget {
|
||||
const _NoTour();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(32),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Text(
|
||||
'Für diesen Tag ist keine Tour zugewiesen.',
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
FilledButton.tonalIcon(
|
||||
onPressed: () => context.read<TourBloc>().add(const LoadTour()),
|
||||
icon: const Icon(Icons.refresh),
|
||||
label: const Text('Neu laden'),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Für Seiten einer einzelnen Lieferung: Fehlt sie in den geladenen Daten, wird
|
||||
/// die Tour erst einmal neu geholt. Die Meldung kommt nur, wenn sie auch nach
|
||||
/// einem **erfolgreichen** Neuladen fehlt. Scheitert das Neuladen, ist nichts
|
||||
/// bewiesen; die Seite zeigt dann den Fehler mit „Erneut versuchen".
|
||||
mixin DeliveryPresenceGuard<T extends StatefulWidget> on State<T> {
|
||||
String get guardedDeliveryId;
|
||||
|
||||
bool _refetched = false;
|
||||
bool _left = false;
|
||||
|
||||
/// Aus dem Listener auf den [TourBloc] aufrufen. Liefert `true`, wenn die
|
||||
/// Lieferung in den geladenen Daten steht.
|
||||
bool deliveryStillPresent(BuildContext context, TourState state) {
|
||||
if (_left) return false;
|
||||
if (state is TourLoaded) {
|
||||
if (state.details.deliveries.any((d) => d.id == guardedDeliveryId)) {
|
||||
_refetched = false;
|
||||
return true;
|
||||
}
|
||||
if (state.isRefreshing) return false;
|
||||
if (_refetched && state.refreshError != null) return false;
|
||||
} else if (state is! TourEmpty) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Hier steht fest: Eine Antwort des Servers enthält die Lieferung nicht.
|
||||
if (!_refetched) {
|
||||
_refetched = true;
|
||||
context.read<TourBloc>().add(const RefreshTour());
|
||||
return false;
|
||||
}
|
||||
_left = true;
|
||||
_leaveUnavailableDelivery(context);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Führt zurück zur Übersicht, wenn die geöffnete Lieferung nicht in der
|
||||
/// geladenen Tour steht. Das sagt nichts darüber, ob es sie gibt: Sie kann zu
|
||||
/// einem anderen Tag gehören. Schließt auch Seiten, die darüber liegen
|
||||
/// (Unterschrift, Zahlung): Sie beziehen sich auf dieselbe Lieferung.
|
||||
void _leaveUnavailableDelivery(BuildContext context) {
|
||||
context.showAppMessage(
|
||||
'Diese Lieferung ist in der geladenen Tour nicht enthalten. '
|
||||
'Bitte das Tour-Datum prüfen.',
|
||||
);
|
||||
Navigator.of(context).popUntil((route) => route.isFirst);
|
||||
}
|
||||
@ -97,7 +97,7 @@ class _SortableDeliveryListState extends State<SortableDeliveryList> {
|
||||
if (delivery == null) {
|
||||
return ListTile(
|
||||
key: Key('reorder-item-orphan-$id'),
|
||||
title: Text('Lieferung $id nicht mehr in der Tour'),
|
||||
title: const Text('Lieferung nicht mehr in der Tour'),
|
||||
);
|
||||
}
|
||||
final customer = widget.details.customerOf(delivery);
|
||||
|
||||
@ -12,8 +12,10 @@ import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_detail_page.dart';
|
||||
import 'package:hl_lieferservice/widget/scanner/article_scanner_stripe.dart';
|
||||
import 'package:hl_lieferservice/widget/scanner/item_matcher.dart';
|
||||
import 'package:hl_lieferservice/widget/app_message.dart';
|
||||
import 'package:hl_lieferservice/widget/scanner/manual_entry_dialog.dart';
|
||||
import 'package:hl_lieferservice/widget/scanner/scan_code_parser.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/overview/presentation/tour_not_loaded_scaffold.dart';
|
||||
|
||||
/// Scan-Screen für die Filial-Abholung in der Auslieferungs-Phase.
|
||||
///
|
||||
@ -40,7 +42,11 @@ class FilialePickupScanPage extends StatefulWidget {
|
||||
State<FilialePickupScanPage> createState() => _FilialePickupScanPageState();
|
||||
}
|
||||
|
||||
class _FilialePickupScanPageState extends State<FilialePickupScanPage> {
|
||||
class _FilialePickupScanPageState extends State<FilialePickupScanPage>
|
||||
with DeliveryPresenceGuard {
|
||||
@override
|
||||
String get guardedDeliveryId => widget.deliveryId;
|
||||
|
||||
static const String _notIntendedMessage =
|
||||
'Dieser Artikel gehört nicht zu dieser Filial-Abholung';
|
||||
|
||||
@ -51,9 +57,7 @@ class _FilialePickupScanPageState extends State<FilialePickupScanPage> {
|
||||
}
|
||||
|
||||
void _showSnackbar(String message) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(content: Text(message), duration: const Duration(seconds: 2)),
|
||||
);
|
||||
context.showAppMessage(message, duration: const Duration(seconds: 2));
|
||||
}
|
||||
|
||||
/// Nur scanbare, nicht-entfernte Filial-Items dieser Lieferung,
|
||||
@ -172,22 +176,17 @@ class _FilialePickupScanPageState extends State<FilialePickupScanPage> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BlocBuilder<TourBloc, TourState>(
|
||||
return BlocConsumer<TourBloc, TourState>(
|
||||
listener: deliveryStillPresent,
|
||||
builder: (context, state) {
|
||||
if (state is! TourLoaded) {
|
||||
return const Scaffold(
|
||||
body: Center(child: CircularProgressIndicator()),
|
||||
);
|
||||
return TourNotLoadedScaffold(title: 'Filial-Abholung', state: state);
|
||||
}
|
||||
final details = state.details;
|
||||
final delivery = _findDelivery(details);
|
||||
if (delivery == null) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Filial-Abholung')),
|
||||
body: const Center(
|
||||
child: Text('Lieferung nicht in der Tour gefunden.'),
|
||||
),
|
||||
);
|
||||
// Der Guard lädt gerade neu oder das Neuladen ist gescheitert.
|
||||
return TourNotLoadedScaffold(title: 'Filial-Abholung', state: state);
|
||||
}
|
||||
|
||||
final recipient = details.recipientOf(delivery);
|
||||
@ -242,9 +241,10 @@ class _FilialePickupScanPageState extends State<FilialePickupScanPage> {
|
||||
],
|
||||
),
|
||||
),
|
||||
if (allDone) _DoneBar(onConfirm: _openDelivery),
|
||||
],
|
||||
),
|
||||
bottomNavigationBar:
|
||||
allDone ? _DoneBar(onConfirm: _openDelivery) : null,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user