softvisor/Holzleitner-Lieferservice-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused imports and moved tour bloc to delivery to be shared by overview and detailed view

Browse Source
This commit is contained in:
Dennis Nemec
2026-01-09 12:24:31 +01:00
parent ecf8745762
commit 1d6c62a392
43 changed files with 53 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/dto/delivery.dart
View File

@ -4,7 +4,6 @@ import 'article.dart';
import 'contact_person.dart'; import 'contact_person.dart';
import 'customer.dart'; import 'customer.dart';
import 'discount.dart'; import 'discount.dart';
import 'image.dart';
import 'note.dart'; import 'note.dart';
import 'payment.dart'; import 'payment.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';

1
lib/dto/delivery_update.dart
View File

@ -1,5 +1,4 @@
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:intl/intl.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
part 'delivery_update.g.dart'; part 'delivery_update.g.dart';

1
lib/dto/discount_add_response.dart
View File

@ -59,5 +59,6 @@ class DiscountAddResponseDTO extends BasicResponseDTO {
factory DiscountAddResponseDTO.fromJson(Map<String, dynamic> json) => factory DiscountAddResponseDTO.fromJson(Map<String, dynamic> json) =>
_$DiscountAddResponseDTOFromJson(json); _$DiscountAddResponseDTOFromJson(json);
@override
Map<dynamic, dynamic> toJson() => _$DiscountAddResponseDTOToJson(this); Map<dynamic, dynamic> toJson() => _$DiscountAddResponseDTOToJson(this);
} }

1
lib/dto/discount_remove_response.dart
View File

@ -18,5 +18,6 @@ class DiscountRemoveResponseDTO extends BasicResponseDTO {
factory DiscountRemoveResponseDTO.fromJson(Map<String, dynamic> json) => factory DiscountRemoveResponseDTO.fromJson(Map<String, dynamic> json) =>
_$DiscountRemoveResponseDTOFromJson(json); _$DiscountRemoveResponseDTOFromJson(json);
@override
Map<dynamic, dynamic> toJson() => _$DiscountRemoveResponseDTOToJson(this); Map<dynamic, dynamic> toJson() => _$DiscountRemoveResponseDTOToJson(this);
} }

2
lib/dto/discount_update_response.dart
View File

@ -1,4 +1,3 @@
import 'package:hl_lieferservice/dto/article.dart';
import 'basic_response.dart'; import 'basic_response.dart';
import 'discount_add_response.dart'; import 'discount_add_response.dart';
@ -18,5 +17,6 @@ class DiscountUpdateResponseDTO extends BasicResponseDTO {
factory DiscountUpdateResponseDTO.fromJson(Map<String, dynamic> json) => factory DiscountUpdateResponseDTO.fromJson(Map<String, dynamic> json) =>
_$DiscountUpdateResponseDTOFromJson(json); _$DiscountUpdateResponseDTOFromJson(json);
@override
Map<dynamic, dynamic> toJson() => _$DiscountUpdateResponseDTOToJson(this); Map<dynamic, dynamic> toJson() => _$DiscountUpdateResponseDTOToJson(this);
} }

1
lib/dto/image_note_response.dart
View File

@ -1,4 +1,3 @@
import 'note.dart';
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
part 'image_note_response.g.dart'; part 'image_note_response.g.dart';

1
lib/dto/note_add_response.dart
View File

@ -12,5 +12,6 @@ class NoteAddResponseDTO extends BasicResponseDTO {
final NoteDTO? note; final NoteDTO? note;
factory NoteAddResponseDTO.fromJson(Map<String, dynamic> json) => _$NoteAddResponseDTOFromJson(json); factory NoteAddResponseDTO.fromJson(Map<String, dynamic> json) => _$NoteAddResponseDTOFromJson(json);
@override
Map<dynamic, dynamic> toJson() => _$NoteAddResponseDTOToJson(this); Map<dynamic, dynamic> toJson() => _$NoteAddResponseDTOToJson(this);
} }

1
lib/feature/cars/presentation/car_dialog.dart
View File

@ -19,7 +19,6 @@ class CarDialog extends StatefulWidget {
} }
class _CarDialogState extends State<CarDialog> { class _CarDialogState extends State<CarDialog> {
bool _isLoading = false;
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
late final TextEditingController _plateController; late final TextEditingController _plateController;

6
lib/feature/cars/presentation/car_management_page.dart
View File

@ -6,9 +6,9 @@ import 'package:hl_lieferservice/feature/cars/bloc/cars_bloc.dart';
import 'package:hl_lieferservice/feature/cars/bloc/cars_event.dart'; import 'package:hl_lieferservice/feature/cars/bloc/cars_event.dart';
import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart'; import 'package:hl_lieferservice/feature/cars/bloc/cars_state.dart';
import 'package:hl_lieferservice/feature/cars/presentation/car_management.dart'; import 'package:hl_lieferservice/feature/cars/presentation/car_management.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/model/car.dart'; import 'package:hl_lieferservice/model/car.dart';
class CarManagementPage extends StatefulWidget { class CarManagementPage extends StatefulWidget {

6
lib/feature/delivery/overview/bloc/tour_bloc.dart → lib/feature/delivery/bloc/tour_bloc.dart
View File

@ -2,8 +2,8 @@ import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart'; import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart';
import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart'; import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart';
import 'package:hl_lieferservice/feature/delivery/overview/service/distance_service.dart'; import 'package:hl_lieferservice/feature/delivery/overview/service/distance_service.dart';
@ -325,7 +325,7 @@ class TourBloc extends Bloc<TourEvent, TourState> {
); );
break; break;
} }
} on TourNotFoundException catch (e) { } on TourNotFoundException {
opBloc.add(FailOperation(message: "Fehler beim Scannen des Artikels")); opBloc.add(FailOperation(message: "Fehler beim Scannen des Artikels"));
} }
} }

0
lib/feature/delivery/overview/bloc/tour_event.dart → lib/feature/delivery/bloc/tour_event.dart
View File

0
lib/feature/delivery/overview/bloc/tour_state.dart → lib/feature/delivery/bloc/tour_state.dart
View File

1
lib/feature/delivery/detail/bloc/note_event.dart
View File

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';

1
lib/feature/delivery/detail/bloc/note_state.dart
View File

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';

1
lib/feature/delivery/detail/model/note.dart
View File

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:hl_lieferservice/model/article.dart'; import 'package:hl_lieferservice/model/article.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';

4
lib/feature/delivery/detail/presentation/article/article_reset_scan_dialog.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import '../../../../../model/article.dart'; import '../../../../../model/article.dart';

4
lib/feature/delivery/detail/presentation/article/article_unscan_dialog.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import '../../../../../model/article.dart'; import '../../../../../model/article.dart';

9
lib/feature/delivery/detail/presentation/delivery_detail_page.dart
View File

@ -7,13 +7,10 @@ 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/bloc/note_event.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_sign.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_sign.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/steps/step.dart';
import 'package:hl_lieferservice/feature/delivery/detail/repository/note_repository.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/detail/service/notes_service.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
class DeliveryDetail extends StatefulWidget { class DeliveryDetail extends StatefulWidget {
final String deliveryId; final String deliveryId;

8
lib/feature/delivery/detail/presentation/delivery_discount.dart
View File

@ -1,9 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import '../../overview/bloc/tour_event.dart'; import '../../bloc/tour_event.dart';
class DeliveryDiscount extends StatefulWidget { class DeliveryDiscount extends StatefulWidget {
const DeliveryDiscount({ const DeliveryDiscount({
@ -176,8 +176,8 @@ class _DeliveryDiscountState extends State<DeliveryDiscount> {
), ),
_incrementDiscount(), _incrementDiscount(),
const Padding( const Padding(
padding: const EdgeInsets.only(top: 10), padding: EdgeInsets.only(top: 10),
child: const Text( child: Text(
"Begründung:", "Begründung:",
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),

4
lib/feature/delivery/detail/presentation/delivery_options.dart
View File

@ -1,9 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/model/delivery.dart' as model; import 'package:hl_lieferservice/model/delivery.dart' as model;
import '../../overview/bloc/tour_event.dart'; import '../../bloc/tour_event.dart';
class DeliveryOptionsView extends StatefulWidget { class DeliveryOptionsView extends StatefulWidget {
const DeliveryOptionsView({ const DeliveryOptionsView({

2
lib/feature/delivery/detail/presentation/delivery_sign.dart
View File

@ -1,11 +1,9 @@
import 'dart:io';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.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/bloc/note_event.dart';
import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_state.dart'; import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_state.dart';
import 'package:hl_lieferservice/model/customer.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';

6
lib/feature/delivery/detail/presentation/delivery_summary.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import '../../../../model/tour.dart'; import '../../../../model/tour.dart';

1
lib/feature/delivery/detail/presentation/note/note_edit_dialog.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/detail/bloc/note_bloc.dart';

6
lib/feature/delivery/detail/presentation/note/note_list_item.dart
View File

@ -4,10 +4,8 @@ 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/bloc/note_event.dart';
import 'package:hl_lieferservice/feature/delivery/detail/model/note.dart'; import 'package:hl_lieferservice/feature/delivery/detail/model/note.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/note/note_edit_dialog.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/note/note_edit_dialog.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import '../../../../../model/delivery.dart';
enum NoteItemAction { noteEdit, noteDelete } enum NoteItemAction { noteEdit, noteDelete }

1
lib/feature/delivery/detail/presentation/note/note_overview.dart
View File

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';

4
lib/feature/delivery/detail/presentation/steps/step_article_management.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/article/article_list.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/article/article_list.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_discount.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_discount.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
class DeliveryStepArticleManagement extends StatefulWidget { class DeliveryStepArticleManagement extends StatefulWidget {

6
lib/feature/delivery/detail/presentation/steps/step_info.dart
View File

@ -1,12 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/model/article.dart'; import 'package:hl_lieferservice/model/article.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import '../../../overview/bloc/tour_bloc.dart'; import '../../../bloc/tour_bloc.dart';
import '../../../overview/bloc/tour_state.dart'; import '../../../bloc/tour_state.dart';
class DeliveryStepInfo extends StatefulWidget { class DeliveryStepInfo extends StatefulWidget {
final Delivery delivery; final Delivery delivery;

1
lib/feature/delivery/detail/presentation/steps/step_note.dart
View File

@ -1,4 +1,3 @@
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';

1
lib/feature/delivery/overview/model/sorting_information.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
class SortingInformation { class SortingInformation {
String deliveryId; String deliveryId;

2
lib/feature/delivery/overview/presentation/delivery_item.dart
View File

@ -3,8 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_detail_page.dart'; import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_detail_page.dart';
import '../../../../bloc/app_bloc.dart';
import '../../../../bloc/app_states.dart';
import '../../../../widget/operations/bloc/operation_bloc.dart'; import '../../../../widget/operations/bloc/operation_bloc.dart';
import '../../detail/bloc/note_bloc.dart'; import '../../detail/bloc/note_bloc.dart';
import '../../detail/repository/note_repository.dart'; import '../../detail/repository/note_repository.dart';

4
lib/feature/delivery/overview/presentation/delivery_list.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart'; import 'package:hl_lieferservice/feature/delivery/overview/model/sorting_information.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';

4
lib/feature/delivery/overview/presentation/delivery_overview.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_info.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_info.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_list.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_list.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart';

6
lib/feature/delivery/overview/presentation/delivery_overview_custom_sort.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/model/delivery.dart'; import 'package:hl_lieferservice/model/delivery.dart';
import '../model/sorting_information.dart'; import '../model/sorting_information.dart';

4
lib/feature/delivery/overview/presentation/delivery_overview_page.dart
View File

@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview.dart';
import '../bloc/tour_bloc.dart'; import '../../bloc/tour_bloc.dart';
import '../bloc/tour_state.dart'; import '../../bloc/tour_state.dart';
class DeliveryOverviewPage extends StatefulWidget { class DeliveryOverviewPage extends StatefulWidget {
const DeliveryOverviewPage({super.key}); const DeliveryOverviewPage({super.key});

6
lib/feature/scan/presentation/scan_page.dart
View File

@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mobile_scanner/mobile_scanner.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/overview/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart';
import 'package:hl_lieferservice/feature/scan/presentation/scan_screen.dart'; import 'package:hl_lieferservice/feature/scan/presentation/scan_screen.dart';
import 'package:hl_lieferservice/model/tour.dart'; import 'package:hl_lieferservice/model/tour.dart';
import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.dart'; import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.dart';

6
lib/feature/scan/presentation/scan_screen.dart
View File

@ -4,8 +4,8 @@ import 'package:collection/collection.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_state.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_state.dart';
import 'package:hl_lieferservice/feature/scan/presentation/scanner.dart'; import 'package:hl_lieferservice/feature/scan/presentation/scanner.dart';
import 'package:hl_lieferservice/feature/settings/bloc/settings_bloc.dart'; import 'package:hl_lieferservice/feature/settings/bloc/settings_bloc.dart';
import 'package:hl_lieferservice/feature/settings/bloc/settings_state.dart'; import 'package:hl_lieferservice/feature/settings/bloc/settings_state.dart';
@ -16,7 +16,7 @@ import 'package:hl_lieferservice/model/tour.dart';
import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart'; import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
import 'package:hl_lieferservice/widget/operations/bloc/operation_event.dart'; import 'package:hl_lieferservice/widget/operations/bloc/operation_event.dart';
import '../../delivery/overview/bloc/tour_bloc.dart'; import '../../delivery/bloc/tour_bloc.dart';
class ArticleScanningScreen extends StatefulWidget { class ArticleScanningScreen extends StatefulWidget {
const ArticleScanningScreen({super.key}); const ArticleScanningScreen({super.key});

4
lib/feature/scan/presentation/scanner.dart
View File

@ -6,9 +6,9 @@ class BarcodeScannerWidget extends StatefulWidget {
final Function(String) onBarcodeDetected; final Function(String) onBarcodeDetected;
const BarcodeScannerWidget({ const BarcodeScannerWidget({
Key? key, super.key,
required this.onBarcodeDetected, required this.onBarcodeDetected,
}) : super(key: key); });
@override @override
State<BarcodeScannerWidget> createState() => _BarcodeScannerWidgetState(); State<BarcodeScannerWidget> createState() => _BarcodeScannerWidgetState();

1
lib/model/article.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:hl_lieferservice/dto/article.dart'; import 'package:hl_lieferservice/dto/article.dart';
class Article { class Article {

2
lib/model/delivery.dart
View File

@ -3,13 +3,11 @@ import 'dart:typed_data';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:hl_lieferservice/dto/contact_person.dart'; import 'package:hl_lieferservice/dto/contact_person.dart';
import 'package:hl_lieferservice/dto/delivery.dart'; import 'package:hl_lieferservice/dto/delivery.dart';
import 'package:hl_lieferservice/dto/image.dart';
import 'package:hl_lieferservice/dto/image_note_response.dart'; import 'package:hl_lieferservice/dto/image_note_response.dart';
import 'package:hl_lieferservice/dto/note.dart'; import 'package:hl_lieferservice/dto/note.dart';
import 'package:hl_lieferservice/dto/note_template.dart'; import 'package:hl_lieferservice/dto/note_template.dart';
import 'package:hl_lieferservice/model/tour.dart'; import 'package:hl_lieferservice/model/tour.dart';
import 'package:hl_lieferservice/util.dart'; import 'package:hl_lieferservice/util.dart';
import '../dto/payment.dart';
import 'article.dart'; import 'article.dart';
import 'customer.dart'; import 'customer.dart';

2
lib/widget/app.dart
View File

@ -5,7 +5,7 @@ import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart';
import 'package:hl_lieferservice/feature/authentication/presentation/login_enforcer.dart'; import 'package:hl_lieferservice/feature/authentication/presentation/login_enforcer.dart';
import 'package:hl_lieferservice/feature/authentication/service/userinfo.dart'; import 'package:hl_lieferservice/feature/authentication/service/userinfo.dart';
import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart'; import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart'; import 'package:hl_lieferservice/feature/delivery/overview/repository/tour_repository.dart';
import 'package:hl_lieferservice/widget/home/bloc/navigation_bloc.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/bloc/operation_bloc.dart';

4
lib/widget/home/presentation/home.dart
View File

@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart'; import 'package:hl_lieferservice/feature/authentication/bloc/auth_bloc.dart';
import 'package:hl_lieferservice/feature/authentication/bloc/auth_state.dart'; import 'package:hl_lieferservice/feature/authentication/bloc/auth_state.dart';
import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart'; import 'package:hl_lieferservice/feature/cars/presentation/car_management_page.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_bloc.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart'; import 'package:hl_lieferservice/feature/delivery/bloc/tour_event.dart';
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_page.dart'; import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_overview_page.dart';
import 'package:hl_lieferservice/feature/scan/presentation/scan_page.dart'; import 'package:hl_lieferservice/feature/scan/presentation/scan_page.dart';
import 'package:hl_lieferservice/widget/app_bar.dart'; import 'package:hl_lieferservice/widget/app_bar.dart';

1
lib/widget/operations/presentation/operation_view_enforcer.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart'; import 'package:hl_lieferservice/widget/operations/bloc/operation_bloc.dart';
import 'package:hl_lieferservice/widget/operations/presentation/message_container.dart';
import '../bloc/operation_state.dart'; import '../bloc/operation_state.dart';

1
pubspec.yaml
View File

@ -53,6 +53,7 @@ dependencies:
shared_preferences: ^2.5.3 shared_preferences: ^2.5.3
rxdart: ^0.28.0 rxdart: ^0.28.0
collection: any
dev_dependencies: dev_dependencies:
build_runner: ^2.5.4 build_runner: ^2.5.4
flutter_test: flutter_test: