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

Implemented settings, new scan, enhanced UI/UX

Browse Source
This commit is contained in:
Dennis Nemec
2025-11-04 16:52:39 +01:00
parent b19a6e1cd4
commit 7ea9108f62
79 changed files with 3306 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/feature/delivery/detail/bloc/delivery_bloc.dart
View File

@ -5,6 +5,7 @@ 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/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';
import 'package:hl_lieferservice/widget/operations/bloc/operation_event.dart';
@ -15,21 +16,62 @@ import '../../../../model/delivery.dart' as model;
class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
OperationBloc opBloc;
DeliveryRepository repository;
NoteRepository noteRepository;
DeliveryBloc({required this.opBloc, required this.repository})
: super(DeliveryInitial()) {
DeliveryBloc({
required this.opBloc,
required this.repository,
required this.noteRepository,
}) : super(DeliveryInitial()) {
on<UnscanArticleEvent>(_unscan);
on<ResetScanAmountEvent>(_resetAmount);
on<LoadDeliveryEvent>(_load);
on<AddDiscountEvent>(_addDiscount);
on<RemoveDiscountEvent>(_removeDiscount);
on<UpdateDiscountEvent>(_updateDiscount);
on<UpdateDeliveryOption>(_updateDeliveryOptions);
on<UpdateSelectedPaymentMethod>(_updatePayment);
on<UpdateDeliveryOptionEvent>(_updateDeliveryOptions);
on<UpdateSelectedPaymentMethodEvent>(_updatePayment);
on<FinishDeliveryEvent>(_finishDelivery);
}
void _finishDelivery(
FinishDeliveryEvent event,
Emitter<DeliveryState> emit,
) async {
final currentState = state;
opBloc.add(LoadOperation());
if (currentState is DeliveryLoaded) {
try {
model.Delivery newDelivery = event.delivery.copyWith();
newDelivery.state = model.DeliveryState.finished;
for (final option in event.delivery.options) {
debugPrint("VALUE=${option.value};KEY=${option.key}");
}
await repository.updateDelivery(newDelivery);
await noteRepository.addNamedImage(
event.delivery.id,
event.driverSignature,
"delivery_${event.delivery.id}_signature_driver.jpg",
);
await noteRepository.addNamedImage(
event.delivery.id,
event.customerSignature,
"delivery_${event.delivery.id}_signature_customer.jpg",
);
emit(DeliveryFinished(delivery: newDelivery));
opBloc.add(FinishOperation());
} catch (e, st) {
opBloc.add(FailOperation(message: "Failed to update delivery"));
debugPrint(st.toString());
}
}
}
void _updatePayment(
UpdateSelectedPaymentMethod event,
UpdateSelectedPaymentMethodEvent event,
Emitter<DeliveryState> emit,
) {
final currentState = state;
@ -44,7 +86,7 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
}
void _updateDeliveryOptions(
UpdateDeliveryOption event,
UpdateDeliveryOptionEvent event,
Emitter<DeliveryState> emit,
) {
final currentState = state;
@ -53,7 +95,11 @@ class DeliveryBloc extends Bloc<DeliveryEvent, DeliveryState> {
List<model.DeliveryOption> options =
currentState.delivery.options.map((option) {
if (option.key == event.key) {
return option.copyWith(value: event.value.toString());
if (option.numerical) {
return option.copyWith(value: event.value);
} else {
return option.copyWith(value: event.value == true ? "1" : "0");
}
}
return option;

22
lib/feature/delivery/detail/bloc/delivery_event.dart
View File

@ -1,3 +1,5 @@
import 'dart:typed_data';
import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/model/tour.dart';
@ -57,15 +59,27 @@ class UpdateDiscountEvent extends DeliveryEvent {
int? value;
}
class UpdateDeliveryOption extends DeliveryEvent {
UpdateDeliveryOption({required this.key, required this.value});
class UpdateDeliveryOptionEvent extends DeliveryEvent {
UpdateDeliveryOptionEvent({required this.key, required this.value});
String key;
dynamic value;
}
class UpdateSelectedPaymentMethod extends DeliveryEvent {
UpdateSelectedPaymentMethod({required this.payment});
class UpdateSelectedPaymentMethodEvent extends DeliveryEvent {
UpdateSelectedPaymentMethodEvent({required this.payment});
Payment payment;
}
class FinishDeliveryEvent extends DeliveryEvent {
FinishDeliveryEvent({
required this.delivery,
required this.driverSignature,
required this.customerSignature,
});
Delivery delivery;
Uint8List customerSignature;
Uint8List driverSignature;
}

12
lib/feature/delivery/detail/bloc/delivery_state.dart
View File

@ -12,4 +12,14 @@ class DeliveryLoaded extends DeliveryState {
DeliveryLoaded copyWith(Delivery? delivery) {
return DeliveryLoaded(delivery: delivery ?? this.delivery);
}
}
}
class DeliveryFinished extends DeliveryState {
DeliveryFinished({required this.delivery});
Delivery delivery;
DeliveryFinished copyWith(Delivery? delivery) {
return DeliveryFinished(delivery: delivery ?? this.delivery);
}
}

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

@ -41,4 +41,4 @@ class RemoveImageNote extends NoteEvent {
final String objectId;
final String deliveryId;
}
}

1
lib/feature/delivery/detail/exceptions.dart Normal file
View File

@ -0,0 +1 @@
class NoteImageAddException implements Exception {}

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

@ -8,6 +8,9 @@ import 'package:hl_lieferservice/feature/delivery/detail/bloc/delivery_event.dar
import 'package:hl_lieferservice/feature/delivery/detail/bloc/delivery_state.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/overview/bloc/tour_bloc.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' as model;
class DeliveryDetail extends StatefulWidget {
@ -126,7 +129,14 @@ class _DeliveryDetailState extends State<DeliveryDetail> {
}
void _onSign(Uint8List customer, Uint8List driver) async {
final currentState = context.read<DeliveryBloc>().state as DeliveryLoaded;
context.read<DeliveryBloc>().add(
FinishDeliveryEvent(
delivery: currentState.delivery,
customerSignature: customer,
driverSignature: driver,
),
);
}
Widget _stepsNavigation() {
@ -143,7 +153,10 @@ class _DeliveryDetailState extends State<DeliveryDetail> {
Padding(
padding: const EdgeInsets.only(left: 20),
child: FilledButton(
onPressed: _step == _steps.length - 1 ? _openSignatureView : _clickForward,
onPressed:
_step == _steps.length - 1
? _openSignatureView
: _clickForward,
child:
_step == _steps.length - 1
? const Text("Unterschreiben")
@ -159,7 +172,24 @@ class _DeliveryDetailState extends State<DeliveryDetail> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: const Text("Auslieferungsdetails")),
body: BlocBuilder<DeliveryBloc, DeliveryState>(
body: BlocConsumer<DeliveryBloc, DeliveryState>(
listener: (context, state) {
if (state is DeliveryFinished) {
final tourState = context.read<TourBloc>().state as TourLoaded;
final newTour = tourState.tour.copyWith(deliveries: tourState.tour.deliveries.map((delivery) {
if (delivery.id == state.delivery.id) {
return state.delivery;
}
return delivery;
}).toList());
context.read<TourBloc>().add(UpdateTour(tour: newTour));
Navigator.pop(context);
Navigator.pop(context);
}
},
builder: (context, state) {
final currentState = state;

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

@ -25,17 +25,34 @@ class _DeliveryOptionsViewState extends State<DeliveryOptionsView> {
}
void _update(model.DeliveryOption option, dynamic value) {
debugPrint(option.key);
if (value is bool) {
context.read<DeliveryBloc>().add(
UpdateDeliveryOptionEvent(key: option.key, value: !value),
);
return;
}
context.read<DeliveryBloc>().add(
UpdateDeliveryOption(key: option.key, value: value),
UpdateDeliveryOptionEvent(key: option.key, value: value),
);
}
List<Widget> _options() {
List<Widget> boolOptions =
widget.options.where((option) => !option.numerical).map((option) {
debugPrint("Value: ${option.value}, Key: ${option.key}");
return CheckboxListTile(
value: option.getValue() as bool,
onChanged: (value) => _update(option, value),
value: option.getValue(),
onChanged: (value) {
debugPrint("HAHAHA");
debugPrint(value.toString());
_update(option, option.getValue());
},
title: Text(option.display),
);
}).toList();
@ -49,7 +66,9 @@ class _DeliveryOptionsViewState extends State<DeliveryOptionsView> {
initialValue: option.getValue().toString(),
keyboardType: TextInputType.number,
onTapOutside: (event) => FocusScope.of(context).unfocus(),
onChanged: (value) => _update(option, value),
onChanged: (value) {
_update(option, value);
},
),
);
}).toList();

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

@ -98,7 +98,7 @@ class _DeliverySummaryState extends State<DeliverySummary> {
initialSelection: widget.delivery.payment.id,
onSelected: (id) {
context.read<DeliveryBloc>().add(
UpdateSelectedPaymentMethod(
UpdateSelectedPaymentMethodEvent(
payment: _paymentMethods.firstWhere(
(payment) => payment.id == id,
),
@ -108,10 +108,6 @@ class _DeliverySummaryState extends State<DeliverySummary> {
);
}
Widget _payment() {
return _paymentOptions();
}
Widget _paymentDone() {
return DecoratedBox(
decoration: BoxDecoration(
@ -174,7 +170,7 @@ class _DeliverySummaryState extends State<DeliverySummary> {
),
),
Padding(padding: insets, child: _payment()),
Padding(padding: insets, child: _paymentOptions()),
],
),
);

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

@ -39,6 +39,8 @@ class _NoteOverviewState extends State<NoteOverview> {
}
Widget _images() {
debugPrint("IMAGES: ${widget.images}");
return NoteImageOverview(
images: widget.images,
deliveryId: widget.deliveryId,

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

@ -1,7 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hl_lieferservice/feature/delivery/overview/bloc/tour_event.dart';
import 'package:hl_lieferservice/model/article.dart';
import 'package:hl_lieferservice/model/delivery.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../overview/bloc/tour_bloc.dart';
import '../../../overview/bloc/tour_state.dart';
@ -16,6 +18,100 @@ class DeliveryStepInfo extends StatefulWidget {
}
class _DeliveryStepInfo extends State<DeliveryStepInfo> {
void _launchMapsUrl(String mapsApp) async {
final address = widget.delivery.customer.address.toString();
final encodedAddress = Uri.encodeComponent(address);
Uri url;
switch (mapsApp) {
case 'google':
url = Uri.parse(
'https://www.google.com/maps/search/?api=1&query=$encodedAddress',
);
break;
case 'apple':
url = Uri.parse('http://maps.apple.com/?daddr=$encodedAddress');
break;
default:
return;
}
await launchUrl(url, mode: LaunchMode.externalApplication);
}
Widget _deliveryStatusChangeActions() {
List<Widget> actions = [];
if (widget.delivery.state == DeliveryState.ongoing) {
actions = [
Column(
children: [
IconButton(
onPressed: () {
context.read<TourBloc>().add(
HoldDeliveryEvent(deliveryId: widget.delivery.id),
);
Navigator.of(context).pop();
},
icon: Icon(
Icons.change_circle,
color: Colors.orangeAccent,
size: 42,
),
),
Text("Zurückstellen"),
],
),
Column(
children: [
IconButton(
onPressed: () {
context.read<TourBloc>().add(
CancelDeliveryEvent(deliveryId: widget.delivery.id),
);
Navigator.of(context).pop();
},
//style: IconButton.styleFrom(backgroundColor: Colors.red),
icon: Icon(Icons.cancel, color: Colors.red, size: 42),
),
Text("Abbrechen"),
],
),
];
}
if (widget.delivery.state == DeliveryState.canceled ||
widget.delivery.state == DeliveryState.onhold ||
widget.delivery.state == DeliveryState.finished) {
actions = [
Column(
children: [
IconButton(
onPressed: () {
context.read<TourBloc>().add(
ReactivateDeliveryEvent(deliveryId: widget.delivery.id),
);
},
icon: Icon(
Icons.published_with_changes,
color: Colors.blueAccent,
size: 42
),
),
Text("Reaktivieren"),
],
),
];
}
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: actions,
);
}
Widget _fastActions() {
return SizedBox(
width: double.infinity,
@ -23,25 +119,55 @@ class _DeliveryStepInfo extends State<DeliveryStepInfo> {
color: Theme.of(context).colorScheme.onSecondary,
child: Padding(
padding: const EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
child: Column(
children: [
Column(
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
IconButton.filled(onPressed: () {}, icon: Icon(Icons.phone)),
Text("Anrufen"),
Column(
children: [
IconButton.filled(
onPressed:
widget.delivery.contactPerson?.phoneNumber != null
? () async {
await launchUrl(
Uri(
scheme: "tel",
path:
widget
.delivery
.contactPerson
?.phoneNumber!,
),
);
}
: null,
icon: Icon(Icons.phone),
),
Text("Anrufen"),
],
),
Column(
children: [
IconButton.filled(
onPressed: () {
_launchMapsUrl("google");
},
icon: Icon(Icons.map_outlined),
),
Text("Google Maps"),
],
),
],
),
Column(
children: [
IconButton.filled(
onPressed: () {},
icon: Icon(Icons.map_outlined),
),
Text("Navigation starten"),
],
const Padding(
padding: EdgeInsets.only(top: 10, bottom: 10),
child: Divider(),
),
_deliveryStatusChangeActions(),
],
),
),
@ -149,6 +275,34 @@ class _DeliveryStepInfo extends State<DeliveryStepInfo> {
);
}
Widget _deliveryAgreements() {
String agreements = "keine Vereinbarungen getroffen!";
if (widget.delivery.specialAgreements != null &&
widget.delivery.specialAgreements != "") {
agreements = widget.delivery.specialAgreements!;
}
return Card(
color: Theme.of(context).colorScheme.onSecondary,
child: Padding(
padding: const EdgeInsets.all(10),
child: Row(
children: [
Padding(
padding: EdgeInsets.all(15),
child: Icon(
Icons.warning,
color: Theme.of(context).primaryColor,
size: 28,
),
),
Expanded(child: Text(agreements)),
],
),
),
);
}
@override
Widget build(BuildContext context) {
return Container(
@ -167,6 +321,18 @@ class _DeliveryStepInfo extends State<DeliveryStepInfo> {
child: _fastActions(),
),
Padding(
padding: const EdgeInsets.only(top: 20),
child: Text(
"Sondervereinbarungen",
style: Theme.of(context).textTheme.headlineSmall,
),
),
Padding(
padding: const EdgeInsets.only(top: 10),
child: _deliveryAgreements(),
),
Padding(
padding: const EdgeInsets.only(top: 20),
child: Text(

5
lib/feature/delivery/detail/repository/delivery_repository.dart
View File

@ -2,6 +2,7 @@ import 'package:hl_lieferservice/dto/discount_add_response.dart';
import 'package:hl_lieferservice/dto/discount_remove_response.dart';
import 'package:hl_lieferservice/dto/discount_update_response.dart';
import 'package:hl_lieferservice/feature/delivery/overview/service/delivery_info_service.dart';
import 'package:hl_lieferservice/model/delivery.dart';
class DeliveryRepository {
DeliveryRepository({required this.service});
@ -35,4 +36,8 @@ class DeliveryRepository {
) {
return service.updateDiscount(deliveryId, reason, value);
}
Future<void> updateDelivery(Delivery delivery) {
return service.updateDelivery(delivery);
}
}

11
lib/feature/delivery/detail/repository/note_repository.dart
View File

@ -52,6 +52,17 @@ class NoteRepository {
return ImageNote.make(objectId, fileName);
}
Future<ImageNote> addNamedImage(String deliveryId, Uint8List bytes, String filename) async {
String objectId = await service.uploadImage(
deliveryId,
filename,
bytes,
"image/png",
);
return ImageNote.make(objectId, filename);
}
Future<void> deleteImage(String deliveryId, String objectId) async {
await service.removeImage(objectId);
}

225
lib/feature/delivery/detail/service/notes_service.dart
View File

@ -1,32 +1,40 @@
import 'dart:collection';
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:hl_lieferservice/dto/note_get_response.dart';
import 'package:hl_lieferservice/feature/delivery/detail/exceptions.dart';
import 'package:hl_lieferservice/services/erpframe.dart';
import 'package:docuframe/docuframe.dart' as df;
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;
import 'package:http_parser/http_parser.dart';
import '../../../../dto/basic_response.dart';
import '../../../../dto/note_add_response.dart';
import '../../../../dto/note_template_response.dart';
import '../../../../model/delivery.dart';
import '../../../../util.dart';
import '../../../authentication/exceptions.dart';
class NoteService extends ErpFrameService {
NoteService({required super.config});
Future<void> deleteNote(int noteId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute("_web_deleteNote", parameter: {"id": noteId});
var response = await http.post(
urlBuilder("_web_deleteNote"),
headers: getSessionOrThrow(),
body: {"id": noteId.toString()},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint("NOTE DELETE: ${response.body}");
BasicResponseDTO responseDto = BasicResponseDTO.fromJson(responseJson);
if (responseDto.succeeded == true) {
@ -40,25 +48,22 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<void> editNote(Note newNote) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute(
"_web_editNote",
parameter: {"id": newNote.id, "note": newNote.content},
var response = await http.post(
urlBuilder("_web_editNote"),
headers: getSessionOrThrow(),
body: {"id": newNote.id.toString(), "note": newNote.content},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
BasicResponseDTO responseDto = BasicResponseDTO.fromJson(responseJson);
if (responseDto.succeeded == true) {
@ -72,22 +77,22 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<List<NoteTemplate>> getNoteTemplates() async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute("_web_getNoteTemplates");
var response = await http.post(
urlBuilder("_web_getNoteTemplates"),
headers: getSessionOrThrow(),
body: {},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
NoteTemplateResponseDTO responseDto = NoteTemplateResponseDTO.fromJson(
responseJson,
);
@ -103,23 +108,22 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<List<Note>> getNotes(String deliveryId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute("_web_getNotes", parameter: {"delivery_id": deliveryId});
debugPrint(deliveryId);
var response = await http.post(
urlBuilder("_web_getNotes"),
headers: getSessionOrThrow(),
body: {"delivery_id": deliveryId},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint(responseJson.toString());
NoteGetResponseDTO responseDto = NoteGetResponseDTO.fromJson(
responseJson,
@ -138,27 +142,22 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<Note> addNote(String note, int deliveryId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute(
"_web_addNote",
parameter: {"receipt_id": deliveryId, "note": note},
var response = await http.post(
urlBuilder("_web_addNote"),
headers: getSessionOrThrow(),
body: {"receipt_id": deliveryId.toString(), "note": note},
);
debugPrint(deliveryId.toString());
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body!);
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint(responseJson.toString());
NoteAddResponseDTO responseDto = NoteAddResponseDTO.fromJson(
responseJson,
@ -172,8 +171,6 @@ class NoteService extends ErpFrameService {
}
} catch (e) {
rethrow;
} finally {
await logout(session);
}
}
@ -183,63 +180,79 @@ class NoteService extends ErpFrameService {
Uint8List bytes,
String? mimeType,
) async {
df.LoginSession? session;
try {
session = await getSession();
// First get UPLOAD ID
df.UploadFile uploadHandler = df.UploadFile(
config: dfConfig,
session: session,
var config = getConfig();
var basePath = "${config.backendUrl}/v1/uploadFile";
var response = await http.get(
Uri.parse(basePath),
headers: getSessionOrThrow(),
);
df.GetUploadIdResponse uploadIdResponse =
await uploadHandler.getUploadId();
// Upload binary data to DOCUframe
debugPrint(filename);
df.FileInformationResponse response = await uploadHandler.uploadFile(
uploadIdResponse.uploadId,
bytes,
filename,
mimeType ?? "image/jpeg",
);
debugPrint(response.body);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
// Commit file upload
df.CommitFileUploadResponse commitResponse = await uploadHandler
.commitUpload(uploadIdResponse.uploadId);
debugPrint(commitResponse.body);
Map<String, dynamic> jsonResponse = jsonDecode(response.body);
debugPrint("GET UPLOADID : ${response.body}");
return commitResponse.objectId;
if (!jsonResponse.containsKey("data")) {
debugPrint("No data structure in uploadFile request");
debugPrint("RAW RESPONSE: ${response.body}");
throw NoteImageAddException();
}
Map<String, dynamic> data = jsonResponse["data"];
if (!data.containsKey("uploadId")) {
debugPrint("No data.uploadId structure in uploadFile request");
debugPrint("RAW RESPONSE: ${response.body}");
throw NoteImageAddException();
}
String uploadId = data["uploadId"];
http.MultipartRequest request =
http.MultipartRequest("POST", Uri.parse("$basePath/$uploadId"));
HashMap<String, String> header = HashMap();
header["Content-Type"] = "multipart/form-data";
header.addAll(getSessionOrThrow());
request.headers.addAll(header);
request.files.add(http.MultipartFile.fromBytes("file", bytes,
filename: filename,
contentType: MediaType.parse(mimeType ?? "application/octet-stream")));
http.Response fileUploadResponse = await http.Response.fromStream(await request.send());
Map<String, dynamic> fileUploadResponseJson = jsonDecode(fileUploadResponse.body);
debugPrint("UPLOAD IMAGE RESPONSE: ${fileUploadResponse.body}");
if (fileUploadResponseJson["status"]["internalStatus"] != "0") {
debugPrint("Failed to upload image");
debugPrint("RAW: ${fileUploadResponseJson.toString()}");
throw NoteImageAddException();
}
var fileCommitResponse = await http.patch(Uri.parse("$basePath/$uploadId"), headers: getSessionOrThrow());
debugPrint("FILE COMMIT BODY: ${fileCommitResponse.body}");
var fileCommitResponseJson = jsonDecode(fileCommitResponse.body);
return fileCommitResponseJson["data"]["~ObjectID"];
} catch (e, st) {
debugPrint("An error occured:");
debugPrint("$e");
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<List<Future<Uint8List>>> downloadImages(List<String> urls) async {
df.LoginSession? session;
debugPrint(urls.toString());
try {
session = await getSession();
final header = {
"sessionId": session.getAuthorizationHeader().$2,
"appKey": config.appNames[0],
};
return urls.map((url) async {
return (await http.get(
Uri.parse("${config.host}$url"),
headers: header,
Uri.parse("${config.backendUrl}$url"),
headers: getSessionOrThrow(),
)).bodyBytes;
}).toList();
} catch (e, st) {
@ -248,22 +261,22 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<void> removeImage(String oid) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response = await df.Macro(
config: dfConfig,
session: session,
).execute("_web_removeImage", parameter: {"oid": oid});
var response = await http.post(
urlBuilder("_web_removeImage"),
headers: getSessionOrThrow(),
body: {"oid": oid},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint(oid);
debugPrint(responseJson.toString());
@ -280,8 +293,6 @@ class NoteService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
}

236
lib/feature/delivery/overview/bloc/tour_bloc.dart
View File

@ -1,28 +1,254 @@
import 'package:flutter/cupertino.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/overview/bloc/tour_state.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/model/delivery.dart';
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_event.dart';
class TourBloc extends Bloc<TourEvent, TourState> {
OperationBloc opBloc;
TourRepository deliveryRepository;
TourRepository tourRepository;
TourBloc({required this.opBloc, required this.deliveryRepository})
TourBloc({required this.opBloc, required this.tourRepository})
: super(TourInitial()) {
on<LoadTour>(_load);
on<UpdateTour>(_update);
on<AssignCarEvent>(_assignCar);
on<IncrementArticleScanAmount>(_increment);
on<ScanArticleEvent>(_scan);
on<HoldDeliveryEvent>(_holdDelivery);
on<CancelDeliveryEvent>(_cancelDelivery);
on<ReactivateDeliveryEvent>(_reactiveateDelivery);
}
void _reactiveateDelivery(
ReactivateDeliveryEvent event,
Emitter<TourState> emit,
) async {
final currentState = state;
if (currentState is TourLoaded) {
opBloc.add(LoadOperation());
try {
Tour tourCopied = currentState.tour.copyWith();
Delivery delivery = tourCopied.deliveries.firstWhere((delivery) => delivery.id == event.deliveryId);
delivery.state = DeliveryState.ongoing;
await tourRepository.updateDelivery(
delivery,
);
opBloc.add(FinishOperation());
emit(TourLoaded(tour: tourCopied, distances: currentState.distances));
} catch (e, st) {
debugPrint("$e");
debugPrint("$st");
opBloc.add(
FailOperation(message: "Fehler beim Zurückstellen der Lieferung"),
);
}
}
}
void _holdDelivery(
HoldDeliveryEvent event,
Emitter<TourState> emit,
) async {
final currentState = state;
if (currentState is TourLoaded) {
opBloc.add(LoadOperation());
try {
Tour tourCopied = currentState.tour.copyWith();
Delivery delivery = tourCopied.deliveries.firstWhere((delivery) => delivery.id == event.deliveryId);
delivery.state = DeliveryState.onhold;
await tourRepository.updateDelivery(
delivery,
);
opBloc.add(FinishOperation());
emit(TourLoaded(tour: tourCopied, distances: currentState.distances));
} catch (e, st) {
debugPrint("$e");
debugPrint("$st");
opBloc.add(
FailOperation(message: "Fehler beim Zurückstellen der Lieferung"),
);
}
}
}
void _cancelDelivery(CancelDeliveryEvent event, Emitter<TourState> emit) async {
final currentState = state;
if (currentState is TourLoaded) {
opBloc.add(LoadOperation());
try {
Tour tourCopied = currentState.tour.copyWith();
Delivery delivery = tourCopied.deliveries.firstWhere((delivery) => delivery.id == event.deliveryId);
delivery.state = DeliveryState.canceled;
await tourRepository.updateDelivery(
delivery,
);
opBloc.add(FinishOperation());
emit(TourLoaded(tour: tourCopied, distances: currentState.distances));
} catch (e, st) {
debugPrint("$e");
debugPrint("$st");
opBloc.add(
FailOperation(message: "Fehler beim Zurückstellen der Lieferung"),
);
}
}
}
void _scan(ScanArticleEvent event, Emitter<TourState> emit) async {
final currentState = state;
opBloc.add(LoadOperation());
if (currentState is TourLoaded) {
try {
if (currentState.tour.deliveries.any(
(delivery) => delivery.articles.any(
(article) => article.articleNumber == event.articleNumber,
),
)) {
var tourCopied = currentState.tour.copyWith();
var delivery = tourCopied.deliveries.firstWhere(
(delivery) => delivery.id == event.deliveryId,
);
var article = delivery.articles.firstWhere(
(article) => article.articleNumber == event.articleNumber,
);
await tourRepository.scanArticle(article.internalId.toString());
if (article.scannedAmount < article.amount) {
article.scannedAmount += 1;
emit(TourLoaded(tour: tourCopied, distances: currentState.distances));
opBloc.add(FinishOperation(message: '${article.name} gescannt'));
} else {
opBloc.add(
FailOperation(
message: 'Alle ${article.name} wurden bereits gescannt',
),
);
}
} else {
opBloc.add(
FailOperation(
message: 'Fehler: Artikel ist für keine Lieferung vorgesehen',
),
);
}
} catch (e, st) {
debugPrint(st.toString());
opBloc.add(FailOperation(message: "Fehler beim Scannnen des Artikels"));
}
}
}
Future<void> _update(UpdateTour event, Emitter<TourState> emit) async {
final currentState = state;
if (currentState is TourLoaded) {
emit(TourLoaded(tour: event.tour, distances: currentState.distances));
}
}
Future<void> _increment(
IncrementArticleScanAmount event,
Emitter<TourState> emit,
) async {
final currentState = state;
if (currentState is TourLoaded) {
var deliveryCopied = currentState.tour.deliveries.firstWhere(
(delivery) => delivery.id == event.deliveryId,
);
var articleCopied = deliveryCopied.articles.firstWhere(
(article) => article.internalId == int.parse(event.internalArticleId),
);
articleCopied.scannedAmount += 1;
emit(
TourLoaded(
tour: currentState.tour.copyWith(
deliveries:
currentState.tour.deliveries.map((delivery) {
if (delivery.id == event.deliveryId) {
return deliveryCopied;
}
return delivery;
}).toList(),
),
distances: currentState.distances
),
);
}
}
Future<void> _assignCar(AssignCarEvent event, Emitter<TourState> emit) async {
final currentState = state;
if (currentState is TourLoaded) {
opBloc.add(LoadOperation());
var copiedTour = currentState.tour.copyWith();
var delivery = copiedTour.deliveries.firstWhere(
(delivery) => delivery.id == event.deliveryId,
);
try {
await tourRepository.assignCar(event.deliveryId, event.carId);
delivery.carId = int.parse(event.carId);
emit(
TourLoaded(
tour: copiedTour.copyWith(
deliveries:
copiedTour.deliveries.map((d) {
if (d.id == delivery.id) {
return delivery;
}
return d;
}).toList(),
),
distances: currentState.distances
),
);
opBloc.add(FinishOperation());
} catch (e, st) {
debugPrint(st.toString());
opBloc.add(
FailOperation(message: "Fehler beim Zuweisen des Fahrzeugs"),
);
}
}
}
Future<void> _load(LoadTour event, Emitter<TourState> emit) async {
opBloc.add(LoadOperation());
try {
Tour tour = await deliveryRepository.loadAll(event.teamId);
List<Payment> payments = await deliveryRepository.loadPaymentOptions();
Tour tour = await tourRepository.loadAll(event.teamId);
List<Payment> payments = await tourRepository.loadPaymentOptions();
tour.paymentMethods = payments;
Map<String, double> distances = {};
emit(TourLoaded(tour: tour));
for (final delivery in tour.deliveries) {
distances[delivery.id] = await DistanceService.getDistanceByRoad(delivery.customer.address.toString());
}
emit(TourLoaded(tour: tour, distances: distances));
opBloc.add(FinishOperation());
} catch (e) {
opBloc.add(

48
lib/feature/delivery/overview/bloc/tour_event.dart
View File

@ -1,3 +1,5 @@
import 'package:hl_lieferservice/model/tour.dart';
abstract class TourEvent {}
class LoadTour extends TourEvent {
@ -5,3 +7,49 @@ class LoadTour extends TourEvent {
LoadTour({required this.teamId});
}
class UpdateTour extends TourEvent {
Tour tour;
UpdateTour({required this.tour});
}
class AssignCarEvent extends TourEvent {
String deliveryId;
String carId;
AssignCarEvent({required this.deliveryId, required this.carId});
}
class IncrementArticleScanAmount extends TourEvent {
String internalArticleId;
String deliveryId;
IncrementArticleScanAmount({required this.internalArticleId, required this.deliveryId});
}
class ScanArticleEvent extends TourEvent {
ScanArticleEvent({required this.articleNumber, required this.carId, required this.deliveryId});
String articleNumber;
String deliveryId;
String carId;
}
class CancelDeliveryEvent extends TourEvent {
String deliveryId;
CancelDeliveryEvent({required this.deliveryId});
}
class HoldDeliveryEvent extends TourEvent {
String deliveryId;
HoldDeliveryEvent({required this.deliveryId});
}
class ReactivateDeliveryEvent extends TourEvent {
String deliveryId;
ReactivateDeliveryEvent({required this.deliveryId});
}

3
lib/feature/delivery/overview/bloc/tour_state.dart
View File

@ -8,6 +8,7 @@ class TourLoading extends TourState {}
class TourLoaded extends TourState {
Tour tour;
Map<String, double> distances;
TourLoaded({required this.tour});
TourLoaded({required this.tour, required this.distances});
}

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

@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/feature/delivery/detail/presentation/delivery_detail_page.dart';
class DeliveryListItem extends StatelessWidget {
final Delivery delivery;
final double distance;
const DeliveryListItem({super.key, required this.delivery});
const DeliveryListItem({super.key, required this.delivery, required this.distance});
Widget _leading(BuildContext context) {
if (delivery.state == DeliveryState.finished) {
@ -21,7 +21,7 @@ class DeliveryListItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Icon(Icons.location_on, color: Theme.of(context).primaryColor),
Text("5min"),
Text("${distance.toStringAsFixed(2)}km"),
],
);
}

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

@ -5,8 +5,13 @@ import 'delivery_item.dart';
class DeliveryList extends StatefulWidget {
final List<Delivery> deliveries;
final Map<String, double> distances;
const DeliveryList({super.key, required this.deliveries});
const DeliveryList({
super.key,
required this.deliveries,
required this.distances,
});
@override
State<StatefulWidget> createState() => _DeliveryListState();
@ -23,9 +28,13 @@ class _DeliveryListState extends State<DeliveryList> {
return ListView.separated(
separatorBuilder: (context, index) => const Divider(height: 0),
itemBuilder:
(context, index) =>
DeliveryListItem(delivery: widget.deliveries[index]),
itemBuilder: (context, index) {
Delivery delivery = widget.deliveries[index];
return DeliveryListItem(
delivery: delivery,
distance: widget.distances[delivery.id]!,
);
},
itemCount: widget.deliveries.length,
);
}

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

@ -6,32 +6,48 @@ import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery
import 'package:hl_lieferservice/feature/delivery/overview/presentation/delivery_list.dart';
import 'package:hl_lieferservice/model/tour.dart';
import '../../../../model/delivery.dart';
import '../../../authentication/bloc/auth_bloc.dart';
import '../../../authentication/bloc/auth_state.dart';
class DeliveryOverview extends StatefulWidget {
const DeliveryOverview({super.key, required this.tour});
const DeliveryOverview({super.key, required this.tour, required this.distances});
final Tour tour;
final Map<String, double> distances;
@override
State<StatefulWidget> createState() => _DeliveryOverviewState();
}
class _DeliveryOverviewState extends State<DeliveryOverview> {
String? _selectedCarPlate;
int? _selectedCarId;
late List<Delivery> _deliveries;
@override
void initState() {
super.initState();
// Select the first car for initialization
_selectedCarPlate = widget.tour.driver.cars.firstOrNull?.plate;
_selectedCarId = widget.tour.driver.cars.firstOrNull?.id;
_updateDeliveries();
}
@override
void didUpdateWidget(covariant DeliveryOverview oldWidget) {
super.didUpdateWidget(oldWidget);
_updateDeliveries();
}
void _updateDeliveries() {
_deliveries = [...widget.tour.deliveries];
}
Future<void> _loadTour() async {
Authenticated state = context.read<AuthBloc>().state as Authenticated;
context.read<TourBloc>().add(LoadTour(teamId: state.teamId));
Authenticated state = context
.read<AuthBloc>()
.state as Authenticated;
context.read<TourBloc>().add(LoadTour(teamId: state.user.number));
}
Widget _carSelection() {
@ -41,47 +57,58 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
child: ListView(
scrollDirection: Axis.horizontal,
children:
widget.tour.driver.cars.map((car) {
Color? backgroundColor;
Color? iconColor = Theme.of(context).primaryColor;
Color? textColor;
widget.tour.driver.cars.map((car) {
Color? backgroundColor;
Color? iconColor = Theme
.of(context)
.primaryColor;
Color? textColor;
if (_selectedCarPlate == car.plate) {
backgroundColor = Theme.of(context).primaryColor;
textColor = Theme.of(context).colorScheme.onSecondary;
iconColor = Theme.of(context).colorScheme.onSecondary;
}
if (_selectedCarId == car.id) {
backgroundColor = Theme
.of(context)
.primaryColor;
textColor = Theme
.of(context)
.colorScheme
.onSecondary;
iconColor = Theme
.of(context)
.colorScheme
.onSecondary;
}
return Padding(
padding: const EdgeInsets.only(right: 8),
child: GestureDetector(
onTap: () {
setState(() {
_selectedCarPlate = car.plate;
});
},
child: Chip(
backgroundColor: backgroundColor,
label: Row(
children: [
Icon(Icons.local_shipping, color: iconColor, size: 20),
Padding(
padding: const EdgeInsets.only(left: 5),
child: Text(
car.plate,
style: TextStyle(color: textColor, fontSize: 12),
),
),
],
return Padding(
padding: const EdgeInsets.only(right: 8),
child: GestureDetector(
onTap: () {
setState(() {
_selectedCarId = car.id;
});
},
child: Chip(
backgroundColor: backgroundColor,
label: Row(
children: [
Icon(Icons.local_shipping, color: iconColor, size: 20),
Padding(
padding: const EdgeInsets.only(left: 5),
child: Text(
car.plate,
style: TextStyle(color: textColor, fontSize: 12),
),
),
),
],
),
);
}).toList(),
),
),
);
}).toList(),
),
);
}
@override
Widget build(BuildContext context) {
return RefreshIndicator(
@ -99,11 +126,46 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
children: [
Text(
"Fahrten",
style: Theme.of(context).textTheme.headlineSmall,
style: Theme
.of(context)
.textTheme
.headlineSmall,
),
],
),
IconButton(icon: Icon(Icons.filter_list), onPressed: () {}),
PopupMenuButton<String>(
onSelected: (String value) {
setState(() {
if (value == "name-asc") {
setState(() {
_deliveries.sort();
});
}
if (value == "name-desc") {
setState(() {
_deliveries = _deliveries.reversed.toList();
});
}
});
},
itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
PopupMenuItem<String>(
value: 'name-asc',
child: Text('Name (A-Z)'),
),
PopupMenuItem<String>(
value: 'name-desc',
child: Text('Name (Z-A)'),
),
PopupMenuItem<String>(
value: 'distance',
child: Text('Entfernung'),
),
],
child: Icon(Icons.filter_list),
)
],
),
),
@ -111,7 +173,19 @@ class _DeliveryOverviewState extends State<DeliveryOverview> {
padding: const EdgeInsets.only(left: 10, right: 10, bottom: 20),
child: _carSelection(),
),
Expanded(child: DeliveryList(deliveries: widget.tour.deliveries)),
Expanded(
child: DeliveryList(
distances: widget.distances,
deliveries:
_deliveries
.where(
(delivery) =>
delivery.carId == _selectedCarId &&
delivery.allArticlesScanned(),
)
.toList(),
),
),
],
),
);

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

@ -20,7 +20,7 @@ class _DeliveryOverviewPageState extends State<DeliveryOverviewPage> {
if (state is TourLoaded) {
final currentState = state;
return Center(child: DeliveryOverview(tour: currentState.tour));
return Center(child: DeliveryOverview(tour: currentState.tour, distances: currentState.distances));
}
return Container();

13
lib/feature/delivery/overview/repository/tour_repository.dart
View File

@ -1,4 +1,5 @@
import 'package:hl_lieferservice/feature/delivery/overview/service/delivery_info_service.dart';
import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/model/tour.dart';
class TourRepository {
@ -16,4 +17,16 @@ class TourRepository {
.map((option) => Payment.fromDTO(option))
.toList();
}
Future<void> assignCar(String deliveryId, String carId) async {
await service.assignCar(deliveryId, carId);
}
Future<void> scanArticle(String internalArticleId) async {
return await service.scanArticle(internalArticleId);
}
Future<void> updateDelivery(Delivery delivery) {
return service.updateDelivery(delivery);
}
}

275
lib/feature/delivery/overview/service/delivery_info_service.dart
View File

@ -1,4 +1,5 @@
import 'dart:convert';
import 'dart:io';
import 'package:docuframe/docuframe.dart' as df;
import 'package:flutter/material.dart';
@ -13,30 +14,41 @@ import 'package:hl_lieferservice/model/delivery.dart';
import 'package:hl_lieferservice/model/tour.dart';
import 'package:hl_lieferservice/util.dart';
import 'package:hl_lieferservice/services/erpframe.dart';
import 'package:http/http.dart';
import '../../../../dto/basic_response.dart';
import '../../../../dto/discount_add_response.dart';
import '../../../../dto/discount_remove_response.dart';
import '../../../../dto/discount_update_response.dart';
import '../../../../dto/scan_response.dart';
import '../../../authentication/exceptions.dart';
class DeliveryInfoService extends ErpFrameService {
DeliveryInfoService({required super.config});
Future<void> updateDelivery(Delivery delivery) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session).execute(
"_web_updateDelivery",
parameter: DeliveryUpdateDTO.fromEntity(delivery).toJson()
as Map<String, dynamic>);
var headers = {
"Content-Type": "application/json"
};
headers.addAll(getSessionOrThrow());
df.Logout(config: dfConfig, session: session).logout();
debugPrint(getSessionOrThrow().toString());
debugPrint(jsonEncode(DeliveryUpdateDTO.fromEntity(delivery).toJson()));
Map<String, dynamic> responseJson = jsonDecode(response.body!);
var response = await post(
urlBuilder("_web_updateDelivery"),
headers: headers,
body: jsonEncode(DeliveryUpdateDTO.fromEntity(delivery).toJson()),
);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
debugPrint("BODY: ${response.body}");
Map<String, dynamic> responseJson = jsonDecode(response.body);
DeliveryUpdateResponseDTO responseDto =
DeliveryUpdateResponseDTO.fromJson(responseJson);
@ -44,7 +56,45 @@ class DeliveryInfoService extends ErpFrameService {
return;
}
throw responseDto.message;
debugPrint("ERROR UPDATING:");
debugPrint(responseDto.message);
} on df.DocuFrameException catch (e, st) {
debugPrint("ERROR WHILE UPDATING DELIVERY");
debugPrint(e.errorMessage);
debugPrint(e.errorCode);
debugPrint(st.toString());
rethrow;
}
}
Future<void> assignCar(String deliveryId, String carId) async {
try {
var headers = {
"Content-Type": "application/json"
};
headers.addAll(getSessionOrThrow());
var response = await post(
urlBuilder("_web_updateDelivery"),
headers: headers,
body: jsonEncode({"delivery_id": deliveryId, "car_id": carId}),
);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
DeliveryUpdateResponseDTO responseDto =
DeliveryUpdateResponseDTO.fromJson(responseJson);
if (responseDto.code == "200") {
return;
}
debugPrint("ERROR UPDATING:");
debugPrint(responseDto.message);
} on df.DocuFrameException catch (e, st) {
debugPrint("ERROR WHILE UPDATING DELIVERY");
debugPrint(e.errorMessage);
@ -52,27 +102,25 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
/// List all available deliveries for today.
Future<Tour?> getTourOfToday(String userId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session).execute(
"_web_getDeliveries",
parameter: {"driver_id": userId, "date": getTodayDate()});
Map<String, dynamic> responseJson = jsonDecode(response.body!);
var response = await post(
urlBuilder("_web_getDeliveries"),
headers: getSessionOrThrow(),
body: {"driver_id": userId, "date": getTodayDate()},
);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
DeliveryResponseDTO responseDto =
DeliveryResponseDTO.fromJson(responseJson);
DeliveryResponseDTO.fromJson(jsonDecode(response.body));
return Tour(
discountArticleNumber: responseDto.discountArticleNumber,
@ -93,21 +141,22 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint("RANDOM EXCEPTION!");
rethrow;
} finally {
await logout(session);
}
}
Future<List<PaymentMethodDTO>> getPaymentMethods() async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session)
.execute("_web_getPaymentMethods", parameter: {});
var response = await post(
urlBuilder("_web_getPaymentMethods"),
headers: getSessionOrThrow(),
body: {},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
PaymentMethodListDTO responseDto =
PaymentMethodListDTO.fromJson(responseJson);
@ -118,30 +167,27 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<String?> unscanArticle(
String internalId, int amount, String reason) async {
df.LoginSession? session;
debugPrint("AMOUNT: $amount");
debugPrint("ID: $internalId");
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session)
.execute("_web_unscanArticle", parameter: {
"article_id": internalId,
"amount": amount.toString(),
"reason": reason
});
var response = await post(
urlBuilder("_web_unscanArticle"),
headers: getSessionOrThrow(),
body: {
"article_id": internalId,
"amount": amount.toString(),
"reason": reason
},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
debugPrint(responseJson.toString());
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
ScanResponseDTO responseDto = ScanResponseDTO.fromJson(responseJson);
if (responseDto.succeeded == true) {
@ -155,22 +201,22 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<void> resetScannedArticleAmount(String receiptRowId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session).execute(
"_web_unscanArticleReset",
parameter: {"receipt_row_id": receiptRowId});
var response = await post(
urlBuilder("_web_unscanArticleReset"),
headers: getSessionOrThrow(),
body: {"receipt_row_id": receiptRowId},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
BasicResponseDTO responseDto = BasicResponseDTO.fromJson(responseJson);
if (responseDto.succeeded == true) {
@ -184,27 +230,27 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<DiscountAddResponseDTO> addDiscount(
String deliveryId, int discount, String note) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session)
.execute("_web_addDiscount", parameter: {
"delivery_id": deliveryId,
"discount": discount.toString(),
"note": note
});
var response = await post(
urlBuilder("_web_addDiscount"),
headers: getSessionOrThrow(),
body: {
"delivery_id": deliveryId,
"discount": discount.toString(),
"note": note
},
);
debugPrint("BODY: ${response.body!}");
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
// let it throw, if the values are invalid
return DiscountAddResponseDTO.fromJson(responseJson);
@ -214,25 +260,24 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<DiscountRemoveResponseDTO> removeDiscount(String deliveryId) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session)
.execute("_web_removeDiscount", parameter: {
"delivery_id": deliveryId,
});
var response = await post(
urlBuilder("_web_removeDiscount"),
headers: getSessionOrThrow(),
body: {
"delivery_id": deliveryId,
},
);
debugPrint("${response.body!}");
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body!);
Map<String, dynamic> responseJson = jsonDecode(response.body);
// let it throw, if the values are invalid
return DiscountRemoveResponseDTO.fromJson(responseJson);
@ -242,26 +287,27 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<DiscountUpdateResponseDTO> updateDiscount(
String deliveryId, String? note, int? discount) async {
df.LoginSession? session;
try {
session = await getSession();
df.DocuFrameMacroResponse response =
await df.Macro(config: dfConfig, session: session)
.execute("_web_updateDiscount", parameter: {
"delivery_id": deliveryId,
"discount": discount,
"note": note
});
var response = await post(
urlBuilder("_web_updateDiscount"),
headers: getSessionOrThrow(),
body: {
"delivery_id": deliveryId,
"discount": discount,
"note": note
},
);
Map<String, dynamic> responseJson = jsonDecode(response.body!);
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
// let it throw, if the values are invalid
return DiscountUpdateResponseDTO.fromJson(responseJson);
@ -271,8 +317,37 @@ class DeliveryInfoService extends ErpFrameService {
debugPrint(st.toString());
rethrow;
} finally {
await logout(session);
}
}
Future<void> scanArticle(String internalId) async {
try {
var response = await post(
urlBuilder("_web_scanArticle"),
headers: getSessionOrThrow(),
body: {"internal_id": internalId},
);
debugPrint(jsonEncode({"internal_id": internalId}));
if (response.statusCode == HttpStatus.unauthorized) {
throw UserUnauthorized();
}
Map<String, dynamic> responseJson = jsonDecode(response.body);
debugPrint(responseJson.toString());
ScanResponseDTO responseDto = ScanResponseDTO.fromJson(
responseJson,
);
if (responseDto.succeeded == true) {
return;
} else {
debugPrint("ERROR: ${responseDto.message}");
throw responseDto.message;
}
} catch (e) {
rethrow;
}
}
}

14
lib/feature/delivery/overview/service/discount_service.dart
View File

@ -1,14 +0,0 @@
import 'dart:convert';
import '../../../../services/erpframe.dart';
import 'package:docuframe/docuframe.dart' as df;
import 'package:flutter/cupertino.dart';
import '../../../../dto/discount_add_response.dart';
import '../../../../dto/discount_remove_response.dart';
import '../../../../dto/discount_update_response.dart';
class DiscountService extends ErpFrameService {
DiscountService({required super.config});
}

82
lib/feature/delivery/overview/service/distance_service.dart Normal file
View File

@ -0,0 +1,82 @@
import 'package:flutter/cupertino.dart';
import 'package:geolocator/geolocator.dart';
import 'package:http/http.dart' as http;
import 'dart:convert';
class DistanceService {
static const String GOOGLE_MAPS_API_KEY = 'DEIN_API_KEY_HIER';
static Future<Position> getCurrentLocation() async {
bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
if (!serviceEnabled) {
throw Exception('Location services sind deaktiviert');
}
LocationPermission permission = await Geolocator.checkPermission();
if (permission == LocationPermission.denied) {
permission = await Geolocator.requestPermission();
}
return await Geolocator.getCurrentPosition();
}
// Adresse in Koordinaten umwandeln (Geocoding)
static Future<Map<String, double>> getCoordinates(String address) async {
String url =
'https://maps.googleapis.com/maps/api/geocode/json'
'?address=${Uri.encodeComponent(address)}'
'&key=AIzaSyB5_1ftLnoswoy59FzNFkrQ7SSDma5eu5E';
final response = await http.get(Uri.parse(url));
if (response.statusCode == 200) {
var json = jsonDecode(response.body);
if (json['results'].isNotEmpty) {
var location = json['results'][0]['geometry']['location'];
return {
'lat': location['lat'],
'lng': location['lng'],
};
}
throw Exception('Adresse nicht gefunden');
}
throw Exception('Geocoding Fehler: ${response.statusCode}');
}
// Distanz berechnen
static Future<double> getDistanceByRoad(String address) async {
try {
Position currentPos = await getCurrentLocation();
Map<String, double> coords = await getCoordinates(address);
String origin = "${currentPos.latitude},${currentPos.longitude}";
String destination = "${coords['lat']},${coords['lng']}";
String url =
'https://maps.googleapis.com/maps/api/distancematrix/json'
'?origins=$origin'
'&destinations=$destination'
'&key=AIzaSyB5_1ftLnoswoy59FzNFkrQ7SSDma5eu5E';
final response = await http.get(Uri.parse(url));
debugPrint(response.body);
if (response.statusCode == 200) {
var json = jsonDecode(response.body);
if (json['rows'][0]['elements'][0]['status'] == 'OK') {
int distanceMeters = json['rows'][0]['elements'][0]['distance']['value'];
return distanceMeters / 1000; // In km
} else {
throw Exception('Route nicht gefunden');
}
} else {
throw Exception('API Fehler: ${response.statusCode}');
}
} catch (e) {
throw Exception('Fehler: $e');
}
}
}