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);
}
}
}