Added custom tour ordering

2025-12-20 21:00:33 +01:00
parent 0c61f65961
commit edb8676f5a
13 changed files with 502 additions and 166 deletions
--- a/lib/feature/delivery/detail/bloc/delivery_bloc.dart
+++ b/lib/feature/delivery/detail/bloc/delivery_bloc.dart
@ -4,6 +4,8 @@ import 'package:hl_lieferservice/dto/discount_add_response.dart';
 import 'package:hl_lieferservice/dto/discount_update_response.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/delivery_event.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/bloc/delivery_state.dart';
+import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';
+import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_event.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/repository/delivery_repository.dart';
 import 'package:hl_lieferservice/feature/delivery/detail/repository/note_repository.dart';
 import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
@ -15,6 +17,7 @@ import '../../../../model/delivery.dart' as model;

 class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
  OperationBloc opBloc;
+  NoteBloc noteBloc;
  DeliveryRepository repository;
  NoteRepository noteRepository;

@ -22,6 +25,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    required this.opBloc,
    required this.repository,
    required this.noteRepository,
+    required this.noteBloc
  }) : super(DeliveryInitial()) {
    on<UnscanArticleEvent>(_unscan);
    on<ResetScanAmountEvent>(_resetAmount);
@ -34,10 +38,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    on<FinishDeliveryEvent>(_finishDelivery);
  }

-  void _finishDelivery(
-    FinishDeliveryEvent event,
-    Emitter<DeliveryState> emit,
-  ) async {
+  void _finishDelivery(FinishDeliveryEvent event,
+      Emitter<DeliveryState> emit,) async {
    final currentState = state;
    opBloc.add(LoadOperation());

@ -70,10 +72,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    }
  }

-  void _updatePayment(
-    UpdateSelectedPaymentMethodEvent event,
-    Emitter<DeliveryState> emit,
-  ) {
+  void _updatePayment(UpdateSelectedPaymentMethodEvent event,
+      Emitter<DeliveryState> emit,) {
    final currentState = state;

    if (currentState is DeliveryLoaded) {
@ -85,25 +85,23 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    }
  }

-  void _updateDeliveryOptions(
-    UpdateDeliveryOptionEvent event,
-    Emitter<DeliveryState> emit,
-  ) {
+  void _updateDeliveryOptions(UpdateDeliveryOptionEvent event,
+      Emitter<DeliveryState> emit,) {
    final currentState = state;

    if (currentState is DeliveryLoaded) {
      List<model.DeliveryOption> options =
-          currentState.delivery.options.map((option) {
-            if (option.key == event.key) {
-              if (option.numerical) {
-                return option.copyWith(value: event.value);
-              } else {
-                return option.copyWith(value: event.value == true ? "1" : "0");
-              }
-            }
+      currentState.delivery.options.map((option) {
+        if (option.key == event.key) {
+          if (option.numerical) {
+            return option.copyWith(value: event.value);
+          } else {
+            return option.copyWith(value: event.value == true ? "1" : "0");
+          }
+        }

-            return option;
-          }).toList();
+        return option;
+      }).toList();

      emit(
        DeliveryLoaded(
@ -113,10 +111,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    }
  }

-  void _updateDiscount(
-    UpdateDiscountEvent event,
-    Emitter<DeliveryState> emit,
-  ) async {
+  void _updateDiscount(UpdateDiscountEvent event,
+      Emitter<DeliveryState> emit,) async {
    opBloc.add(LoadOperation());

    try {
@ -139,22 +135,22 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
        String discountArticleNumber = delivery.discount!.article.articleNumber;
        delivery.discount = model.Discount(
          article:
-              response.values?.article != null
-                  ? Article.fromDTO(response.values!.article)
-                  : delivery.discount!.article,
+          response.values?.article != null
+              ? Article.fromDTO(response.values!.article)
+              : delivery.discount!.article,
          note:
-              response.values?.note != null
-                  ? response.values!.note.noteDescription
-                  : delivery.discount!.note,
+          response.values?.note != null
+              ? response.values!.note.noteDescription
+              : delivery.discount!.note,
          noteId:
-              response.values?.note != null
-                  ? response.values!.note.rowId
-                  : delivery.discount!.noteId,
+          response.values?.note != null
+              ? response.values!.note.rowId
+              : delivery.discount!.noteId,
        );

        delivery.articles = [
          ...delivery.articles.where(
-            (article) => article.articleNumber != discountArticleNumber,
+                (article) => article.articleNumber != discountArticleNumber,
          ),
          delivery.discount!.article,
        ];
@ -165,7 +161,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
      }
    } catch (e, st) {
      debugPrint(
-        "Fehler beim Hinzufügen eins Discounts zur Lieferung: ${event.deliveryId}:",
+        "Fehler beim Hinzufügen eins Discounts zur Lieferung: ${event
+            .deliveryId}:",
      );
      debugPrint("$e");
      debugPrint("$st");
@ -176,10 +173,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    }
  }

-  void _removeDiscount(
-    RemoveDiscountEvent event,
-    Emitter<DeliveryState> emit,
-  ) async {
+  void _removeDiscount(RemoveDiscountEvent event,
+      Emitter<DeliveryState> emit,) async {
    opBloc.add(LoadOperation());

    try {
@ -196,9 +191,9 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
            delivery.articles
                .where(
                  (article) =>
-                      article.internalId !=
-                      delivery.discount?.article.internalId,
-                )
+              article.internalId !=
+                  delivery.discount?.article.internalId,
+            )
                .toList();

        delivery.discount = null;
@ -245,6 +240,10 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
          noteId: response.values.note.rowId,
        );

+        noteBloc.add(AddNoteOffline(note: response.values.note.noteDescription,
+            deliveryId: delivery.id,
+            noteId: response.values.note.rowId));
+
        delivery.articles = [...delivery.articles, delivery.discount!.article];

        emit(currentState.copyWith(delivery));
@ -253,7 +252,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
      }
    } catch (e, st) {
      debugPrint(
-        "Fehler beim Hinzufügen eins Discounts zur Lieferung: ${event.deliveryId}:",
+        "Fehler beim Hinzufügen eins Discounts zur Lieferung: ${event
+            .deliveryId}:",
      );
      debugPrint("$e");
      debugPrint("$st");
@ -284,7 +284,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {

        if (currentState is DeliveryLoaded) {
          Article article = currentState.delivery.articles.firstWhere(
-            (article) => article.internalId == int.parse(event.articleId),
+                (article) => article.internalId == int.parse(event.articleId),
          );

          article.removeNoteId = noteId;
@ -293,7 +293,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {

          List<Article> articles = [
            ...currentState.delivery.articles.where(
-              (article) => article.internalId != int.parse(event.articleId),
+                  (article) => article.internalId != int.parse(event.articleId),
            ),
            article,
          ];
@ -313,10 +313,8 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
    }
  }

-  void _resetAmount(
-    ResetScanAmountEvent event,
-    Emitter<DeliveryState> emit,
-  ) async {
+  void _resetAmount(ResetScanAmountEvent event,
+      Emitter<DeliveryState> emit,) async {
    opBloc.add(LoadOperation());

    try {
@ -325,7 +323,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {

      if (currentState is DeliveryLoaded) {
        Article article = currentState.delivery.articles.firstWhere(
-          (article) => article.internalId == int.parse(event.articleId),
+              (article) => article.internalId == int.parse(event.articleId),
        );

        article.removeNoteId = null;
@ -334,7 +332,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {

        List<Article> articles = [
          ...currentState.delivery.articles.where(
-            (article) => article.internalId != int.parse(event.articleId),
+                (article) => article.internalId != int.parse(event.articleId),
          ),
          article,
        ];