Final commit.
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:hl_lieferservice/bloc/app_bloc.dart';
|
||||
import 'package:hl_lieferservice/data/cache/attachment_cache.dart';
|
||||
import 'package:hl_lieferservice/data/network/keycloak_oidc_token_provider.dart';
|
||||
import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/authentication/bloc/auth_event.dart';
|
||||
@ -11,18 +12,20 @@ import 'package:hl_lieferservice/feature/car_selection/presentation/car_selectio
|
||||
import 'package:hl_lieferservice/feature/car_selection/repository/car_selection_repository.dart';
|
||||
import 'package:hl_lieferservice/data/repository/cars_repository_impl.dart';
|
||||
import 'package:hl_lieferservice/feature/cars/bloc/cars_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart';
|
||||
import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart';
|
||||
import 'package:hl_lieferservice/data/repository/payment_methods_repository_impl.dart';
|
||||
import 'package:hl_lieferservice/feature/payment_methods/bloc/payment_methods_cubit.dart';
|
||||
import 'package:holzleitner_api/holzleitner_api.dart' show HolzleitnerApi;
|
||||
import 'package:hl_lieferservice/data/repository/tour_repository_impl.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/phase_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
|
||||
import 'package:hl_lieferservice/feature/delivery/repository/tour_repository.dart';
|
||||
import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.dart';
|
||||
import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
|
||||
import 'package:hl_lieferservice/widget/operations/presentation/operation_view_enforcer.dart';
|
||||
|
||||
import 'package:hl_lieferservice/bloc/app_states.dart';
|
||||
import '../feature/delivery/service/tour_service.dart';
|
||||
import 'home/presentation/home.dart';
|
||||
|
||||
class DeliveryApp extends StatefulWidget {
|
||||
@ -55,14 +58,15 @@ class _DeliveryAppState extends State<DeliveryApp> {
|
||||
..add(const RestoreSessionRequested()),
|
||||
),
|
||||
BlocProvider(
|
||||
create:
|
||||
(context) => TourBloc(
|
||||
opBloc: context.read<OperationBloc>(),
|
||||
authBloc: context.read<AuthBloc>(),
|
||||
tourRepository: TourRepository(
|
||||
service: TourService(),
|
||||
),
|
||||
),
|
||||
// Phase-C+D-2-Migration: produktive TourRepository-Impl
|
||||
// gegen das generierte Rust-Backend-API. Account-Filter
|
||||
// serverseitig aus dem JWT, deshalb braucht der Bloc
|
||||
// keinen AuthBloc-Bezug mehr.
|
||||
create: (context) => TourBloc(
|
||||
tourRepository: TourRepositoryImpl(locator<HolzleitnerApi>()),
|
||||
opBloc: context.read<OperationBloc>(),
|
||||
attachmentCache: locator<AttachmentCache>(),
|
||||
),
|
||||
),
|
||||
BlocProvider(
|
||||
create: (context) =>
|
||||
@ -79,19 +83,41 @@ class _DeliveryAppState extends State<DeliveryApp> {
|
||||
),
|
||||
),
|
||||
BlocProvider(
|
||||
// PhaseBloc darf erst NACH dem TourBloc gebaut werden,
|
||||
// da er die Anzahl der Team-Fahrzeuge daraus liest, um
|
||||
// beim ersten Load eines Fahrzeugs die korrekte
|
||||
// Eintrittsphase (Auswählen vs. Sortieren) zu bestimmen.
|
||||
// PhaseBloc liest die Team-Fahrzeug-Anzahl jetzt direkt
|
||||
// aus dem CarsBloc — der ist die alleinige Quelle der
|
||||
// Fahrzeug-Stammdaten. Beim ersten Load eines Fahrzeugs
|
||||
// bestimmt das die Eintrittsphase (Auswählen vs. Sortieren).
|
||||
create: (context) => PhaseBloc(
|
||||
carCountResolver: () {
|
||||
final carsState = context.read<CarsBloc>().state;
|
||||
return carsState is CarsLoaded
|
||||
? carsState.cars.length
|
||||
: null;
|
||||
},
|
||||
// Bindet die persistierten Phasen-Häkchen an die aktuelle
|
||||
// Tour-Version (Tour.syncedAt). Ein erneuter Sync/Seed
|
||||
// schreibt eine neue syncedAt → neuer Token → frische
|
||||
// Phasen, ohne dass alte lokale Häkchen hängen bleiben.
|
||||
tourTokenResolver: () {
|
||||
final tourState = context.read<TourBloc>().state;
|
||||
return tourState is TourLoaded
|
||||
? tourState.tour.driver.cars.length
|
||||
? tourState.details.tour.syncedAt
|
||||
.millisecondsSinceEpoch
|
||||
.toString()
|
||||
: null;
|
||||
},
|
||||
),
|
||||
),
|
||||
BlocProvider(
|
||||
// Zahlungsmethoden sind firmenweite Stammdaten — wir laden
|
||||
// sie einmal beim App-Start und cachen sie im Cubit. Der
|
||||
// Detail-Screen einer Lieferung greift darauf zu, um den
|
||||
// `paymentMethodId`-FK auf einen lesbaren Namen aufzulösen.
|
||||
create: (context) => PaymentMethodsCubit(
|
||||
repository:
|
||||
PaymentMethodsRepositoryImpl(locator<HolzleitnerApi>()),
|
||||
)..load(),
|
||||
),
|
||||
],
|
||||
child: MaterialApp(
|
||||
// Wrap the Navigator (not just the home route) so the loading
|
||||
|
||||
Reference in New Issue
Block a user