inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-10-31 13:25:40 +00:00
Code Activity

Merge pull request #575 from inventree/receive-location

Browse Source 
Receive location
This commit is contained in:
Oliver
2024-12-11 23:01:33 +11:00
committed by GitHub
parent 35f3792d71 6690f10118
commit e93e0241f6
31 changed files with 129 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/api_form.dart
View File

@@ -977,7 +977,7 @@ Future<void> launchApiForm(
IconData icon = TablerIcons.device_floppy
}) async {
showLoadingOverlay(context);
showLoadingOverlay();
// List of fields defined by the server
Map<String, dynamic> serverFields = {};
@@ -1229,7 +1229,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
if (widget.method == "POST") {
showLoadingOverlay(context);
showLoadingOverlay();
final response = await InvenTreeAPI().post(
widget.url,
body: data,
@@ -1240,7 +1240,7 @@ class _APIFormWidgetState extends State<APIFormWidget> {
return response;
} else {
showLoadingOverlay(context);
showLoadingOverlay();
final response = await InvenTreeAPI().patch(
widget.url,
body: data,

40
lib/barcode/camera_controller.dart
View File

@@ -1,10 +1,14 @@
import "dart:math";
import "dart:typed_data";
import "package:camera/camera.dart";
import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/inventree/sentry.dart";
import "package:inventree/preferences.dart";
import "package:inventree/widget/snacks.dart";
import "package:one_context/one_context.dart";
import "package:wakelock_plus/wakelock_plus.dart";
import "package:flutter_zxing/flutter_zxing.dart";
@@ -133,7 +137,28 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
}
});
}
}
void onControllerCreated(CameraController? controller, Exception? error) {
if (error != null) {
sentryReportError(
"CameraBarcodeController.onControllerCreated",
error,
null
);
}
if (controller == null) {
showSnackIcon(
L10().cameraCreationError,
icon: TablerIcons.camera_x,
success: false
);
if (OneContext.hasContext) {
Navigator.pop(OneContext().context!);
}
}
}
/*
@@ -167,6 +192,7 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
tryInverted: true,
tryRotate: true,
showGallery: false,
onControllerCreated: onControllerCreated,
scanDelay: Duration(milliseconds: scan_delay),
resolution: ResolutionPreset.high,
lensDirection: CameraLensDirection.back,
@@ -185,7 +211,12 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
child: Align(
alignment: Alignment.topCenter,
child: Padding(
padding: EdgeInsets.all(10),
padding: EdgeInsets.only(
left: 10,
right: 10,
top: 75,
bottom: 10
),
child: Text(
widget.handler.getOverlayText(context),
style: TextStyle(
@@ -213,7 +244,12 @@ class _CameraBarcodeControllerState extends InvenTreeBarcodeControllerState {
child: Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.all(10),
padding: EdgeInsets.only(
left: 10,
right: 10,
top: 10,
bottom: 75
),
child: Text(
text,
textAlign: TextAlign.center,

12
lib/barcode/controller.dart
View File

@@ -1,11 +1,7 @@
import "package:flutter/material.dart";
import "package:inventree/helpers.dart";
import "package:one_context/one_context.dart";
import "package:inventree/preferences.dart";
import "package:inventree/barcode/handler.dart";
import "package:inventree/widget/progress.dart";
/*
@@ -59,13 +55,7 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
processingBarcode = true;
});
BuildContext? context;
if (hasContext()) {
context = OneContext.hasContext ? OneContext().context : null;
}
showLoadingOverlay(context);
showLoadingOverlay();
await pauseScan();
await widget.handler.processBarcode(data);

9
lib/inventree/bom.dart
View File

@@ -18,7 +18,7 @@ class InvenTreeBomItem extends InvenTreeModel {
String get URL => "bom/";
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"sub_part_detail": "true",
"part_detail": "true",
@@ -26,13 +26,6 @@ class InvenTreeBomItem extends InvenTreeModel {
};
}
@override
Map<String, String> defaultGetFilters() {
return {
"sub_part_detail": "true",
};
}
// Extract the 'reference' value associated with this BomItem
String get reference => getString("reference");

18
lib/inventree/company.dart
View File

@@ -155,7 +155,8 @@ class InvenTreeSupplierPart extends InvenTreeModel {
return fields;
}
Map<String, String> _filters() {
@override
Map<String, String> defaultFilters() {
return {
"manufacturer_detail": "true",
"supplier_detail": "true",
@@ -163,15 +164,6 @@ class InvenTreeSupplierPart extends InvenTreeModel {
};
}
@override
Map<String, String> defaultListFilters() {
return _filters();
}
@override
Map<String, String> defaultGetFilters() {
return _filters();
}
int get manufacturerId => getInt("pk", subKey: "manufacturer_detail");
@@ -197,8 +189,10 @@ class InvenTreeSupplierPart extends InvenTreeModel {
String get partImage => (jsondata["part_detail"]?["thumbnail"] ?? InvenTreeAPI.staticThumb) as String;
String get partName => getString("full_name", subKey: "part_detail");
String get partName => getString("name", subKey: "part_detail");
Map<String, dynamic> get partDetail => getMap("part_detail");
String get partDescription => getString("description", subKey: "part_detail");
String get note => getString("note");

11
lib/inventree/part.dart
View File

@@ -227,16 +227,9 @@ class InvenTreePart extends InvenTreeModel {
}
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"location_detail": "true",
};
}
@override
Map<String, String> defaultGetFilters() {
return {
"category_detail": "true", // Include category detail information
"category_detail": "true",
};
}

26
lib/inventree/purchase_order.dart
View File

@@ -3,6 +3,7 @@ import "package:inventree/helpers.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/orders.dart";
import "package:inventree/widget/progress.dart";
/*
@@ -64,14 +65,7 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
}
@override
Map<String, String> defaultGetFilters() {
return {
"supplier_detail": "true",
};
}
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"supplier_detail": "true",
};
@@ -128,7 +122,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}issue/", expectedStatusCode: 201);
hideLoadingOverlay();
}
/// Mark this order as "cancelled"
@@ -137,7 +133,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}cancel/", expectedStatusCode: 201);
hideLoadingOverlay();
}
}
@@ -178,16 +176,10 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
}
@override
Map<String, String> defaultGetFilters() {
return {
"part_detail": "true",
};
}
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"part_detail": "true",
"order_detail": "true",
};
}
@@ -228,6 +220,8 @@ class InvenTreePOLineItem extends InvenTreeOrderLine {
int get destinationId => getInt("destination");
Map<String, dynamic> get orderDetail => getMap("order_detail");
Map<String, dynamic> get destinationDetail => getMap("destination_detail");
}

23
lib/inventree/sales_order.dart
View File

@@ -6,6 +6,7 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/orders.dart";
import "package:inventree/api.dart";
import "package:inventree/widget/progress.dart";
/*
@@ -65,14 +66,7 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
}
@override
Map<String, String> defaultGetFilters() {
return {
"customer_detail": "true",
};
}
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"customer_detail": "true",
};
@@ -83,7 +77,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}issue/", expectedStatusCode: 201);
hideLoadingOverlay();
}
/// Mark this order as "cancelled"
@@ -92,7 +88,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}cancel/", expectedStatusCode: 201);
hideLoadingOverlay();
}
int get customerId => getInt("customer");
@@ -180,14 +178,7 @@ class InvenTreeSOLineItem extends InvenTreeOrderLine {
}
@override
Map<String, String> defaultGetFilters() {
return {
"part_detail": "true",
};
}
@override
Map<String, String> defaultListFilters() {
Map<String, String> defaultFilters() {
return {
"part_detail": "true",
};

12
lib/inventree/stock.dart
View File

@@ -253,7 +253,7 @@ class InvenTreeStockItem extends InvenTreeModel {
}
@override
Map<String, String> defaultGetFilters() {
Map<String, String> defaultFilters() {
return {
"part_detail": "true",
@@ -263,16 +263,6 @@ class InvenTreeStockItem extends InvenTreeModel {
};
}
@override
Map<String, String> defaultListFilters() {
return {
"part_detail": "true",
"location_detail": "true",
"supplier_detail": "true",
};
}
List<InvenTreePartTestTemplate> testTemplates = [];
int get testTemplateCount => testTemplates.length;

3
lib/l10n/app_en.arb
View File

@@ -202,6 +202,9 @@
"building": "Building",
"@building": {},
"cameraCreationError": "Could not open camera controller",
"@cameraCreationError": {},
"cameraInternal": "Internal Camera",
"@cameraInternal": {},

2
lib/labels.dart
View File

@@ -98,7 +98,7 @@ Future<void> selectAndPrintLabel(
if (labelId != -1 && pluginKey != null) {
showLoadingOverlay(context);
showLoadingOverlay();
if (InvenTreeAPI().supportsModernLabelPrinting) {

2
lib/settings/app_settings.dart
View File

@@ -50,7 +50,7 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
Future <void> loadSettings(BuildContext context) async {
showLoadingOverlay(context);
showLoadingOverlay();
barcodeSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_BARCODE, true) as bool;
serverSounds = await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true) as bool;

2
lib/settings/login.dart
View File

@@ -50,7 +50,7 @@ class _InvenTreeLoginState extends State<InvenTreeLoginWidget> {
currentFocus.unfocus();
}
showLoadingOverlay(context);
showLoadingOverlay();
// Attempt login
final response = await InvenTreeAPI().fetchToken(widget.profile, username, password);

4
lib/widget/attachment_widget.dart
View File

@@ -79,7 +79,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
if (file == null) return;
showLoadingOverlay(context);
showLoadingOverlay();
final bool result = await widget.attachmentClass.uploadAttachment(
file,
@@ -178,7 +178,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
subtitle: Text(attachment.comment),
leading: Icon(attachment.icon, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
await attachment.downloadAttachment();
hideLoadingOverlay();
},

6
lib/widget/company/supplier_part_detail.dart
View File

@@ -119,7 +119,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.partImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
final part = await InvenTreePart().get(widget.supplierPart.partId);
hideLoadingOverlay();
@@ -162,7 +162,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.supplierImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.supplierId);
hideLoadingOverlay();
@@ -193,7 +193,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.manufacturerImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.manufacturerId);
hideLoadingOverlay();

17
lib/widget/order/po_line_detail.dart
View File

@@ -133,6 +133,13 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
// Launch a form to 'receive' this line item
Future<void> receiveLineItem(BuildContext context) async {
// Pre-fill the "destination" to receive into
int destination = widget.item.destinationId;
if (destination < 0) {
destination = (widget.item.orderDetail["destination"] ?? -1) as int;
}
// Construct fields to receive
Map<String, dynamic> fields = {
"line_item": {
@@ -164,7 +171,11 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
}
};
showLoadingOverlay(context);
if (destination > 0) {
fields["location"]?["value"] = destination;
}
showLoadingOverlay();
var order = await InvenTreePurchaseOrder().get(widget.item.orderId);
hideLoadingOverlay();
@@ -199,7 +210,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: api.getThumbnail(widget.item.partImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var part = await InvenTreePart().get(widget.item.partId);
hideLoadingOverlay();
@@ -217,7 +228,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
subtitle: Text(widget.item.SKU),
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var part = await InvenTreeSupplierPart().get(widget.item.supplierPartId);
hideLoadingOverlay();

5
lib/widget/order/po_line_list.dart
View File

@@ -71,13 +71,14 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
InvenTreeSupplierPart? supplierPart = item.supplierPart;
if (supplierPart != null) {
return ListTile(
title: Text(supplierPart.SKU),
subtitle: Text(supplierPart.partName),
subtitle: Text(item.partName),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
leading: InvenTreeAPI().getThumbnail(supplierPart.partImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
await item.reload();
hideLoadingOverlay();
Navigator.push(context, MaterialPageRoute(builder: (context) => POLineDetailWidget(item)));

4
lib/widget/order/purchase_order_detail.dart
View File

@@ -185,7 +185,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
color: Colors.blue,
acceptText: L10().issue,
onAccept: () async {
await widget.order.issueOrder().then((dynamic) {
widget.order.issueOrder().then((dynamic) {
refresh(context);
});
}
@@ -201,7 +201,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
color: Colors.red,
acceptText: L10().cancel,
onAccept: () async {
await widget.order.cancelOrder().then((dynamic) {
widget.order.cancelOrder().then((dynamic) {
refresh(context);
});
}

2
lib/widget/order/sales_order_detail.dart
View File

@@ -127,7 +127,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
color: Colors.blue,
acceptText: L10().issue,
onAccept: () async {
await widget.order.issueOrder().then((dynamic) {
widget.order.issueOrder().then((dynamic) {
refresh(context);
});
}

2
lib/widget/order/so_line_detail.dart
View File

@@ -187,7 +187,7 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: api.getThumbnail(widget.item.partImage),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var part = await InvenTreePart().get(widget.item.partId);
hideLoadingOverlay();

2
lib/widget/order/so_line_list.dart
View File

@@ -65,7 +65,7 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
leading: InvenTreeAPI().getThumbnail(part.thumbnail),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
await item.reload();
hideLoadingOverlay();
Navigator.push(

2
lib/widget/part/bom_list.dart
View File

@@ -154,7 +154,7 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
leading: InvenTreeAPI().getThumbnail(subPart?.thumbnail ?? ""),
onTap: subPart == null ? null : () async {
showLoadingOverlay(context);
showLoadingOverlay();
var part = await InvenTreePart().get(subPart.pk);
hideLoadingOverlay();

2
lib/widget/part/category_display.dart
View File

@@ -159,7 +159,7 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
} else {
showLoadingOverlay(context);
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(parentId);
hideLoadingOverlay();

4
lib/widget/part/part_detail.dart
View File

@@ -366,7 +366,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
onTap: () async {
if (part.categoryId > 0) {
showLoadingOverlay(context);
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(part.categoryId);
hideLoadingOverlay();
@@ -646,7 +646,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (part.isTrackable) {
// read the next available serial number
showLoadingOverlay(context);
showLoadingOverlay();
var response = await api.get("/api/part/${part.pk}/serial-numbers/", expectedStatusCode: null);
hideLoadingOverlay();

2
lib/widget/part/part_parameter_widget.dart
View File

@@ -127,7 +127,7 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
value: parameter.as_bool,
onChanged: (bool value) {
if (parameter.canEdit) {
showLoadingOverlay(context);
showLoadingOverlay();
parameter.update(
values: {
"data": value.toString()

12
lib/widget/progress.dart
View File

@@ -1,8 +1,11 @@
import "dart:io";
import "package:flutter/material.dart";
import "package:flutter_overlay_loader/flutter_overlay_loader.dart";
import "package:inventree/app_colors.dart";
import "package:one_context/one_context.dart";
/*
@@ -42,7 +45,14 @@ Widget progressIndicator() {
}
void showLoadingOverlay(BuildContext? context) {
void showLoadingOverlay() {
// Do not show overlay if running unit tests
if (Platform.environment.containsKey("FLUTTER_TEST")) {
return;
}
BuildContext? context = OneContext.hasContext ? OneContext().context : null;
if (context == null) {
return;

2
lib/widget/snacks.dart
View File

@@ -72,7 +72,7 @@ void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? suc
onAction();
}
),
duration: Duration(seconds: onAction == null ? 1 : 2),
duration: Duration(seconds: onAction == null ? 5 : 10),
)
);

2
lib/widget/stock/location_display.dart
View File

@@ -362,7 +362,7 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
Navigator.push(context, MaterialPageRoute(
builder: (context) => LocationDisplayWidget(null)));
} else {
showLoadingOverlay(context);
showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(parentId);
hideLoadingOverlay();

6
lib/widget/stock/stock_detail.dart
View File

@@ -523,7 +523,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () async {
if (widget.item.partId > 0) {
showLoadingOverlay(context);
showLoadingOverlay();
var part = await InvenTreePart().get(widget.item.partId);
hideLoadingOverlay();
@@ -566,7 +566,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () async {
if (widget.item.locationId > 0) {
showLoadingOverlay(context);
showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(widget.item.locationId);
hideLoadingOverlay();
@@ -651,7 +651,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.item.supplierImage, hideIfNull: true),
onTap: () async {
showLoadingOverlay(context);
showLoadingOverlay();
var sp = await InvenTreeSupplierPart().get(
widget.item.supplierPartId);
hideLoadingOverlay();