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
@ -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});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user