inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-04-27 21:16:48 +00:00
Code

Refactor loading overlay

Browse Source
This commit is contained in:
Oliver Walters 2024-12-11 21:45:43 +11:00
parent d5a9f4310e
commit e44d1ea5b4
22 changed files with 44 additions and 31 deletions
Show Stats 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,

2
lib/barcode/controller.dart
View File

@ -65,7 +65,7 @@ class InvenTreeBarcodeControllerState extends State<InvenTreeBarcodeController>
context = OneContext.hasContext ? OneContext().context : null;
}
showLoadingOverlay(context);
showLoadingOverlay();
await pauseScan();
await widget.handler.processBarcode(data);

5
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";
/*
@ -121,7 +122,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}issue/", expectedStatusCode: 201);
hideLoadingOverlay();
}
/// Mark this order as "cancelled"
@ -130,7 +133,9 @@ class InvenTreePurchaseOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}cancel/", expectedStatusCode: 201);
hideLoadingOverlay();
}
}

5
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";
/*
@ -76,7 +77,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}issue/", expectedStatusCode: 201);
hideLoadingOverlay();
}
/// Mark this order as "cancelled"
@ -85,7 +88,9 @@ class InvenTreeSalesOrder extends InvenTreeOrder {
return;
}
showLoadingOverlay();
await api.post("${url}cancel/", expectedStatusCode: 201);
hideLoadingOverlay();
}
int get customerId => getInt("customer");

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

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

@ -175,7 +175,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
fields["location"]?["value"] = destination;
}
showLoadingOverlay(context);
showLoadingOverlay();
var order = await InvenTreePurchaseOrder().get(widget.item.orderId);
hideLoadingOverlay();
@ -210,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();
@ -228,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();

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

@ -77,7 +77,7 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
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()

5
lib/widget/progress.dart
View File

@ -3,6 +3,7 @@
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 +43,9 @@ Widget progressIndicator() {
}
void showLoadingOverlay(BuildContext? context) {
void showLoadingOverlay() {
BuildContext? context = OneContext().context;
if (context == null) {
return;

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