inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-07-02 03:40:47 +00:00
Code Activity

Format Code and Add Format Checks to CI (#643)

Browse Source 
* Remove unused lib/generated/i18n.dart

* Use `fvm dart format .`

* Add contributing guidelines

* Enforce dart format

* Add `dart format off` directive to generated files
This commit is contained in:
Ben Hagen
2025-06-24 01:55:01 +02:00
committed by GitHub
parent e9db6532e4
commit 4444884afa
100 changed files with 5332 additions and 5592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,10 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/labels.dart";
/*
* Widget for displaying detail view for a single StockLocation instance
*/
class LocationDisplayWidget extends StatefulWidget {
LocationDisplayWidget(this.location, {Key? key}) : super(key: key);
final InvenTreeStockLocation? location;
@ -35,7 +33,6 @@ class LocationDisplayWidget extends StatefulWidget {
}
class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
_LocationDisplayState(this.location);
final InvenTreeStockLocation? location;
@ -54,30 +51,29 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Add "locate" button
if (location != null && api.supportsMixin("locate")) {
actions.add(
IconButton(
icon: Icon(Icons.travel_explore),
tooltip: L10().locateLocation,
onPressed: () async {
api.locateItemOrLocation(context, location: location!.pk);
}
)
IconButton(
icon: Icon(Icons.travel_explore),
tooltip: L10().locateLocation,
onPressed: () async {
api.locateItemOrLocation(context, location: location!.pk);
},
),
);
}
// Add "edit" button
if (location != null && InvenTreeStockLocation().canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editLocation,
onPressed: () {
_editLocationDialog(context);
}
)
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editLocation,
onPressed: () {
_editLocationDialog(context);
},
),
);
}
return actions;
}
@ -89,18 +85,18 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Scan items into this location
if (InvenTreeStockItem().canEdit) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.qrcode),
label: L10().barcodeScanItem,
onTap: () {
scanBarcode(
context,
handler: StockLocationScanInItemsHandler(location!),
).then((value) {
refresh(context);
});
}
)
SpeedDialChild(
child: Icon(TablerIcons.qrcode),
label: L10().barcodeScanItem,
onTap: () {
scanBarcode(
context,
handler: StockLocationScanInItemsHandler(location!),
).then((value) {
refresh(context);
});
},
),
);
}
@ -109,41 +105,43 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
SpeedDialChild(
child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts,
onTap:() async {
onTap: () async {
scanBarcode(
context,
handler: POReceiveBarcodeHandler(location: location),
);
},
)
),
);
}
// Scan this location into another one
if (InvenTreeStockLocation().canEdit) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.qrcode),
label: L10().transferStockLocation,
onTap: () {
scanBarcode(
context,
handler: ScanParentLocationHandler(location!),
).then((value) {
refresh(context);
});
}
)
SpeedDialChild(
child: Icon(TablerIcons.qrcode),
label: L10().transferStockLocation,
onTap: () {
scanBarcode(
context,
handler: ScanParentLocationHandler(location!),
).then((value) {
refresh(context);
});
},
),
);
}
// Assign or un-assign barcodes
actions.add(
customBarcodeAction(
context, this,
location!.customBarcode, "stocklocation",
location!.pk
)
customBarcodeAction(
context,
this,
location!.customBarcode,
"stocklocation",
location!.pk,
),
);
}
@ -157,44 +155,44 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
// Create new location
if (InvenTreeStockLocation().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.sitemap),
label: L10().locationCreate,
onTap: () async {
_newLocation(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.sitemap),
label: L10().locationCreate,
onTap: () async {
_newLocation(context);
},
),
);
}
// Create new item
if (InvenTreeStockItem().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.packages),
label: L10().stockItemCreate,
onTap: () async {
_newStockItem(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.packages),
label: L10().stockItemCreate,
onTap: () async {
_newStockItem(context);
},
),
);
}
if (widget.location != null && labels.isNotEmpty) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.printer),
label: L10().printLabel,
onTap: () async {
selectAndPrintLabel(
context,
labels,
widget.location!.pk,
"location",
"location=${widget.location!.pk}"
);
}
)
SpeedDialChild(
child: Icon(TablerIcons.printer),
label: L10().printLabel,
onTap: () async {
selectAndPrintLabel(
context,
labels,
widget.location!.pk,
"location",
"location=${widget.location!.pk}",
);
},
),
);
}
@ -212,12 +210,12 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
}
_loc.editForm(
context,
L10().editLocation,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().locationUpdated, success: true);
}
context,
L10().editLocation,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().locationUpdated, success: true);
},
);
}
@ -238,22 +236,24 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
}
List<Map<String, dynamic>> _labels = [];
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true);
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(
INV_ENABLE_LABEL_PRINTING,
true,
);
allowLabelPrinting &= api.supportsMixin("labels");
if (allowLabelPrinting) {
if (widget.location != null) {
String model_type = api.supportsModernLabelPrinting
? InvenTreeStockLocation.MODEL_TYPE
: "location";
String item_key = api.supportsModernLabelPrinting
? "items"
: "location";
String model_type = api.supportsModernLabelPrinting ? InvenTreeStockLocation.MODEL_TYPE : "location";
String item_key = api.supportsModernLabelPrinting ? "items" : "location";
_labels = await getLabelTemplates(
model_type,
{
item_key: widget.location!.pk.toString()
}
);
_labels = await getLabelTemplates(model_type, {
item_key: widget.location!.pk.toString(),
});
}
}
@ -268,19 +268,17 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
int pk = location?.pk ?? -1;
InvenTreeStockLocation().createForm(
context,
L10().locationCreate,
data: {
"parent": (pk > 0) ? pk : null,
},
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
context,
L10().locationCreate,
data: {"parent": (pk > 0) ? pk : null},
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var loc = InvenTreeStockLocation.fromJson(data);
loc.goToDetailPage(context);
}
if (data.containsKey("pk")) {
var loc = InvenTreeStockLocation.fromJson(data);
loc.goToDetailPage(context);
}
},
);
}
@ -288,7 +286,6 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
* Launch a dialog form to create a new stock item
*/
Future<void> _newStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields();
// Serial number field is not required here
@ -301,94 +298,89 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
}
InvenTreeStockItem().createForm(
context,
L10().stockItemCreate,
data: data,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
context,
L10().stockItemCreate,
data: data,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var item = InvenTreeStockItem.fromJson(data);
item.goToDetailPage(context);
}
if (data.containsKey("pk")) {
var item = InvenTreeStockItem.fromJson(data);
item.goToDetailPage(context);
}
},
);
}
Widget locationDescriptionCard({bool includeActions = true}) {
if (location == null) {
return Card(
child: ListTile(
title: Text(
L10().stockTopLevel,
style: TextStyle(fontStyle: FontStyle.italic)
),
leading: Icon(TablerIcons.packages),
)
child: ListTile(
title: Text(
L10().stockTopLevel,
style: TextStyle(fontStyle: FontStyle.italic),
),
leading: Icon(TablerIcons.packages),
),
);
} else {
List<Widget> children = [
ListTile(
title: Text("${location!.name}"),
subtitle: Text("${location!.description}"),
leading: location!.customIcon == null ? Icon(TablerIcons.packages) : Icon(location!.customIcon)
leading: location!.customIcon == null
? Icon(TablerIcons.packages)
: Icon(location!.customIcon),
),
];
if (includeActions) {
children.add(
ListTile(
title: Text(L10().parentLocation),
subtitle: Text("${location!.parentPathString}"),
leading: Icon(TablerIcons.arrow_move_up, color: COLOR_ACTION),
onTap: () async {
int parentId = location?.parentId ?? -1;
ListTile(
title: Text(L10().parentLocation),
subtitle: Text("${location!.parentPathString}"),
leading: Icon(TablerIcons.arrow_move_up, color: COLOR_ACTION),
onTap: () async {
int parentId = location?.parentId ?? -1;
if (parentId < 0) {
Navigator.push(context, MaterialPageRoute(
builder: (context) => LocationDisplayWidget(null)));
} else {
showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(parentId);
hideLoadingOverlay();
if (parentId < 0) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(null),
),
);
} else {
showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(parentId);
hideLoadingOverlay();
if (loc is InvenTreeStockLocation) {
loc.goToDetailPage(context);
}
if (loc is InvenTreeStockLocation) {
loc.goToDetailPage(context);
}
},
)
}
},
),
);
}
return Card(
child: Column(
children: children,
)
);
return Card(child: Column(children: children));
}
}
@override
List<Widget> getTabIcons(BuildContext context) {
return [
Tab(text: L10().details),
Tab(text: L10().stockItems),
];
return [Tab(text: L10().details), Tab(text: L10().stockItems)];
}
@override
List<Widget> getTabs(BuildContext context) {
return [
Column(children: detailTiles()),
Column(children: stockTiles()),
];
return [Column(children: detailTiles()), Column(children: stockTiles())];
}
// Construct the "details" panel
List<Widget> detailTiles() {
Map<String, String> filters = {};
int? parent = location?.pk;
@ -402,12 +394,9 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
List<Widget> tiles = [
locationDescriptionCard(),
Expanded(
child: PaginatedStockLocationList(
filters,
title: L10().sublocations,
),
child: PaginatedStockLocationList(filters, title: L10().sublocations),
flex: 10,
)
),
];
return tiles;
@ -419,11 +408,6 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
"location": location?.pk.toString() ?? "null",
};
return [
Expanded(
child: PaginatedStockItemList(filters),
flex: 10,
)
];
return [Expanded(child: PaginatedStockItemList(filters), flex: 10)];
}
}

37
lib/widget/stock/location_list.dart
View File

@ -7,9 +7,7 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/l10.dart";
class StockLocationList extends StatefulWidget {
const StockLocationList(this.filters);
final Map<String, String> filters;
@ -18,9 +16,7 @@ class StockLocationList extends StatefulWidget {
_StockLocationListState createState() => _StockLocationListState(filters);
}
class _StockLocationListState extends RefreshableState<StockLocationList> {
_StockLocationListState(this.filters);
final Map<String, String> filters;
@ -34,21 +30,22 @@ class _StockLocationListState extends RefreshableState<StockLocationList> {
}
}
class PaginatedStockLocationList extends PaginatedSearchWidget {
const PaginatedStockLocationList(Map<String, String> filters, {String title = ""}) : super(filters: filters, title: title);
const PaginatedStockLocationList(
Map<String, String> filters, {
String title = "",
}) : super(filters: filters, title: title);
@override
String get searchTitle => title.isNotEmpty ? title : L10().stockLocations;
@override
_PaginatedStockLocationListState createState() => _PaginatedStockLocationListState();
_PaginatedStockLocationListState createState() =>
_PaginatedStockLocationListState();
}
class _PaginatedStockLocationListState extends PaginatedSearchState<PaginatedStockLocationList> {
class _PaginatedStockLocationListState
extends PaginatedSearchState<PaginatedStockLocationList> {
_PaginatedStockLocationListState() : super();
@override
@ -64,20 +61,26 @@ class _PaginatedStockLocationListState extends PaginatedSearchState<PaginatedSto
"label": L10().includeSublocations,
"help_text": L10().includeSublocationsDetail,
"tristate": false,
}
},
};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeStockLocation().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeStockLocation().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeStockLocation location = model as InvenTreeStockLocation;
return ListTile(
@ -90,4 +93,4 @@ class _PaginatedStockLocationListState extends PaginatedSearchState<PaginatedSto
},
);
}
}
}

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

@ -28,9 +28,7 @@ import "package:inventree/widget/stock/stock_item_history.dart";
import "package:inventree/widget/stock/stock_item_test_results.dart";
import "package:inventree/widget/notes_widget.dart";
class StockDetailWidget extends StatefulWidget {
const StockDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeStockItem item;
@ -39,9 +37,7 @@ class StockDetailWidget extends StatefulWidget {
_StockItemDisplayState createState() => _StockItemDisplayState();
}
class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
_StockItemDisplayState();
@override
@ -62,25 +58,25 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
if (api.supportsMixin("locate")) {
actions.add(
IconButton(
icon: Icon(Icons.travel_explore),
tooltip: L10().locateItem,
onPressed: () async {
api.locateItemOrLocation(context, item: widget.item.pk);
}
)
IconButton(
icon: Icon(Icons.travel_explore),
tooltip: L10().locateItem,
onPressed: () async {
api.locateItemOrLocation(context, item: widget.item.pk);
},
),
);
}
if (widget.item.canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editItem,
onPressed: () {
_editStockItem(context);
}
)
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editItem,
onPressed: () {
_editStockItem(context);
},
),
);
}
@ -89,20 +85,17 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
@override
List<SpeedDialChild> actionButtons(BuildContext context) {
List<SpeedDialChild> actions = [];
if (widget.item.canEdit) {
// Stock adjustment actions available if item is *not* serialized
if (!widget.item.isSerialized()) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_check, color: Colors.blue),
label: L10().countStock,
onTap: _countStockDialog,
)
),
);
actions.add(
@ -110,7 +103,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
child: Icon(TablerIcons.circle_minus, color: Colors.red),
label: L10().removeStock,
onTap: _removeStockDialog,
)
),
);
actions.add(
@ -118,7 +111,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().addStock,
onTap: _addStockDialog,
)
),
);
}
@ -129,8 +122,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
label: L10().transferStock,
onTap: () {
_transferStockDialog(context);
}
)
},
),
);
}
@ -141,26 +134,26 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
label: L10().printLabel,
onTap: () async {
selectAndPrintLabel(
context,
labels,
widget.item.pk,
"stock",
"item=${widget.item.pk}"
context,
labels,
widget.item.pk,
"stock",
"item=${widget.item.pk}",
);
}
)
},
),
);
}
if (widget.item.canDelete) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.trash, color: Colors.red),
label: L10().stockItemDelete,
onTap: () {
_deleteItem(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.trash, color: Colors.red),
label: L10().stockItemDelete,
onTap: () {
_deleteItem(context);
},
),
);
}
@ -174,26 +167,28 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
if (widget.item.canEdit) {
// Scan item into location
actions.add(
SpeedDialChild(
child: Icon(Icons.qr_code_scanner),
label: L10().scanIntoLocation,
onTap: () {
scanBarcode(
context,
handler: StockItemScanIntoLocationHandler(widget.item)
).then((ctx) {
refresh(context);
});
}
)
SpeedDialChild(
child: Icon(Icons.qr_code_scanner),
label: L10().scanIntoLocation,
onTap: () {
scanBarcode(
context,
handler: StockItemScanIntoLocationHandler(widget.item),
).then((ctx) {
refresh(context);
});
},
),
);
actions.add(
customBarcodeAction(
context, this,
widget.item.customBarcode,
"stockitem", widget.item.pk
)
customBarcodeAction(
context,
this,
widget.item.customBarcode,
"stockitem",
widget.item.pk,
),
);
}
@ -217,8 +212,12 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
@override
Future<void> request(BuildContext context) async {
await api.StockStatus.load();
stockShowHistory = await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_HISTORY, false) as bool;
stockShowTests = await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_TESTS, true) as bool;
stockShowHistory =
await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_HISTORY, false)
as bool;
stockShowTests =
await InvenTreeSettingsManager().getValue(INV_STOCK_SHOW_TESTS, true)
as bool;
final bool result = widget.item.pk > 0 && await widget.item.reload();
@ -238,7 +237,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request test results (async)
if (stockShowTests) {
widget.item.getTestResults().then((value) {
if (mounted) {
setState(() {
// Update
@ -248,7 +246,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}
// Request the number of attachments
InvenTreeStockItemAttachment().countAttachments(widget.item.pk).then((int value) {
InvenTreeStockItemAttachment().countAttachments(widget.item.pk).then((
int value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
@ -258,13 +258,18 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request SalesOrder information
if (widget.item.hasSalesOrder) {
InvenTreeSalesOrder().get(widget.item.salesOrderId).then((instance) => {
if (mounted) {
setState(() {
salesOrder = instance as InvenTreeSalesOrder?;
})
}
});
InvenTreeSalesOrder()
.get(widget.item.salesOrderId)
.then(
(instance) => {
if (mounted)
{
setState(() {
salesOrder = instance as InvenTreeSalesOrder?;
}),
},
},
);
} else {
if (mounted) {
setState(() {
@ -275,13 +280,18 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
// Request Customer information
if (widget.item.hasCustomer) {
InvenTreeCompany().get(widget.item.customerId).then((instance) => {
if (mounted) {
setState(() {
customer = instance as InvenTreeCompany?;
})
}
});
InvenTreeCompany()
.get(widget.item.customerId)
.then(
(instance) => {
if (mounted)
{
setState(() {
customer = instance as InvenTreeCompany?;
}),
},
},
);
} else {
if (mounted) {
setState(() {
@ -291,22 +301,23 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}
List<Map<String, dynamic>> _labels = [];
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true);
bool allowLabelPrinting = await InvenTreeSettingsManager().getBool(
INV_ENABLE_LABEL_PRINTING,
true,
);
allowLabelPrinting &= api.supportsMixin("labels");
// Request information on labels available for this stock item
if (allowLabelPrinting) {
String model_type = api.supportsModernLabelPrinting ? InvenTreeStockItem.MODEL_TYPE : "stock";
String model_type = api.supportsModernLabelPrinting
? InvenTreeStockItem.MODEL_TYPE
: "stock";
String item_key = api.supportsModernLabelPrinting ? "items" : "item";
// Clear the existing labels list
_labels = await getLabelTemplates(
model_type,
{
item_key: widget.item.pk.toString()
}
);
_labels = await getLabelTemplates(model_type, {
item_key: widget.item.pk.toString(),
});
}
if (mounted) {
@ -318,7 +329,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
/// Delete the stock item from the database
Future<void> _deleteItem(BuildContext context) async {
confirmationDialog(
L10().stockItemDelete,
L10().stockItemDeleteConfirm,
@ -327,7 +337,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
acceptText: L10().delete,
onAccept: () async {
final bool result = await widget.item.delete();
if (result) {
Navigator.of(context).pop();
showSnackIcon(L10().stockItemDeleteSuccess, success: true);
@ -336,11 +346,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}
},
);
}
Future <void> _editStockItem(BuildContext context) async {
Future<void> _editStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields();
// Some fields we don't want to edit!
@ -360,16 +368,14 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().stockItemUpdated, success: true);
}
},
);
}
/*
* Launch a dialog to 'add' quantity to this StockItem
*/
Future <void> _addStockDialog() async {
Future<void> _addStockDialog() async {
Map<String, dynamic> fields = {
"pk": {
"parent": "items",
@ -377,11 +383,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
"hidden": true,
"value": widget.item.pk,
},
"quantity": {
"parent": "items",
"nested": true,
"value": 0,
},
"quantity": {"parent": "items", "nested": true, "value": 0},
"notes": {},
};
@ -395,12 +397,11 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
}
},
);
}
void _stockUpdateMessage(bool result) {
if (result) {
showSnackIcon(L10().stockItemUpdated, success: true);
}
@ -410,7 +411,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
* Launch a dialog to 'remove' quantity from this StockItem
*/
void _removeStockDialog() {
Map<String, dynamic> fields = {
"pk": {
"parent": "items",
@ -418,30 +418,25 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
"hidden": true,
"value": widget.item.pk,
},
"quantity": {
"parent": "items",
"nested": true,
"value": 0,
},
"quantity": {"parent": "items", "nested": true, "value": 0},
"notes": {},
};
launchApiForm(
context,
L10().removeStock,
InvenTreeStockItem.removeStockUrl(),
fields,
method: "POST",
icon: TablerIcons.circle_minus,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
}
context,
L10().removeStock,
InvenTreeStockItem.removeStockUrl(),
fields,
method: "POST",
icon: TablerIcons.circle_minus,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
},
);
}
Future <void> _countStockDialog() async {
Future<void> _countStockDialog() async {
Map<String, dynamic> fields = {
"pk": {
"parent": "items",
@ -458,58 +453,51 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
};
launchApiForm(
context,
L10().countStock,
InvenTreeStockItem.countStockUrl(),
fields,
method: "POST",
icon: TablerIcons.clipboard_check,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
}
context,
L10().countStock,
InvenTreeStockItem.countStockUrl(),
fields,
method: "POST",
icon: TablerIcons.clipboard_check,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
},
);
}
/*
* Launches an API Form to transfer this stock item to a new location
*/
Future <void> _transferStockDialog(BuildContext context) async {
Future<void> _transferStockDialog(BuildContext context) async {
Map<String, dynamic> fields = widget.item.transferFields();
launchApiForm(
context,
L10().transferStock,
InvenTreeStockItem.transferStockUrl(),
fields,
method: "POST",
icon: TablerIcons.transfer,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
}
context,
L10().transferStock,
InvenTreeStockItem.transferStockUrl(),
fields,
method: "POST",
icon: TablerIcons.transfer,
onSuccess: (data) async {
_stockUpdateMessage(true);
refresh(context);
},
);
}
Widget headerTile() {
Widget? trailing;
if (!widget.item.isInStock) {
trailing = Text(
L10().unavailable,
style: TextStyle(
color: COLOR_DANGER
)
);
trailing = Text(L10().unavailable, style: TextStyle(color: COLOR_DANGER));
} else if (!widget.item.isSerialized()) {
trailing = Text(
widget.item.quantityString(),
style: TextStyle(
fontSize: 20,
color: api.StockStatus.color(widget.item.status),
)
widget.item.quantityString(),
style: TextStyle(
fontSize: 20,
color: api.StockStatus.color(widget.item.status),
),
);
}
@ -521,7 +509,6 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
trailing: trailing,
onTap: () async {
if (widget.item.partId > 0) {
showLoadingOverlay();
var part = await InvenTreePart().get(widget.item.partId);
hideLoadingOverlay();
@ -532,7 +519,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
}
},
//trailing: Text(item.serialOrQuantityDisplay()),
)
),
);
}
@ -558,15 +545,13 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
ListTile(
title: Text(L10().stockLocation),
subtitle: Text("${widget.item.locationPathString}"),
leading: Icon(
TablerIcons.location,
color: COLOR_ACTION,
),
leading: Icon(TablerIcons.location, color: COLOR_ACTION),
onTap: () async {
if (widget.item.locationId > 0) {
showLoadingOverlay();
var loc = await InvenTreeStockLocation().get(widget.item.locationId);
var loc = await InvenTreeStockLocation().get(
widget.item.locationId,
);
hideLoadingOverlay();
if (loc is InvenTreeStockLocation) {
@ -578,30 +563,32 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
);
} else {
tiles.add(
ListTile(
title: Text(L10().stockLocation),
leading: Icon(TablerIcons.location),
subtitle: Text(L10().locationNotSet),
)
ListTile(
title: Text(L10().stockLocation),
leading: Icon(TablerIcons.location),
subtitle: Text(L10().locationNotSet),
),
);
}
// Quantity information
if (widget.item.isSerialized()) {
tiles.add(
ListTile(
title: Text(L10().serialNumber),
leading: Icon(TablerIcons.hash),
subtitle: Text("${widget.item.serialNumber}"),
)
ListTile(
title: Text(L10().serialNumber),
leading: Icon(TablerIcons.hash),
subtitle: Text("${widget.item.serialNumber}"),
),
);
} else if (widget.item.isInStock) {
tiles.add(
ListTile(
title: widget.item.allocated > 0 ? Text(L10().quantityAvailable) : Text(L10().quantity),
leading: Icon(TablerIcons.packages),
trailing: Text("${widget.item.quantityString()}"),
)
ListTile(
title: widget.item.allocated > 0
? Text(L10().quantityAvailable)
: Text(L10().quantity),
leading: Icon(TablerIcons.packages),
trailing: Text("${widget.item.quantityString()}"),
),
);
}
@ -611,18 +598,13 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
leading: Icon(TablerIcons.box_off),
title: Text(
L10().unavailable,
style: TextStyle(
color: COLOR_DANGER,
fontWeight: FontWeight.bold,
),
style: TextStyle(color: COLOR_DANGER, fontWeight: FontWeight.bold),
),
subtitle: Text(
L10().unavailableDetail,
style: TextStyle(
color: COLOR_DANGER
)
)
)
style: TextStyle(color: COLOR_DANGER),
),
),
);
}
@ -633,11 +615,9 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
leading: Icon(TablerIcons.help_circle),
trailing: Text(
api.StockStatus.label(widget.item.status),
style: TextStyle(
color: api.StockStatus.color(widget.item.status),
)
)
)
style: TextStyle(color: api.StockStatus.color(widget.item.status)),
),
),
);
// Supplier part information (if available)
@ -647,20 +627,26 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
title: Text(L10().supplierPart),
subtitle: Text(widget.item.supplierSKU),
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.item.supplierImage, hideIfNull: true),
trailing: InvenTreeAPI().getThumbnail(
widget.item.supplierImage,
hideIfNull: true,
),
onTap: () async {
showLoadingOverlay();
var sp = await InvenTreeSupplierPart().get(
widget.item.supplierPartId);
widget.item.supplierPartId,
);
hideLoadingOverlay();
if (sp is InvenTreeSupplierPart) {
Navigator.push(
context, MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(sp))
context,
MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(sp),
),
);
}
}
)
},
),
);
}
@ -673,7 +659,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () {
// TODO: Click through to the "build order"
},
)
),
);
}
@ -686,8 +672,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
trailing: Text(salesOrder?.reference ?? ""),
onTap: () {
salesOrder?.goToDetailPage(context);
}
)
},
),
);
}
@ -701,7 +687,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () {
customer?.goToDetailPage(context);
},
)
),
);
}
@ -711,7 +697,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
title: Text(L10().batchCode),
subtitle: Text(widget.item.batch),
leading: Icon(TablerIcons.clipboard_text),
)
),
);
}
@ -721,18 +707,23 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
title: Text(L10().packaging),
subtitle: Text(widget.item.packaging),
leading: Icon(TablerIcons.package),
)
),
);
}
if (expiryEnabled && widget.item.expiryDate != null) {
Widget? _expiryIcon;
if (widget.item.expired) {
_expiryIcon = Text(L10().expiryExpired, style: TextStyle(color: COLOR_DANGER));
_expiryIcon = Text(
L10().expiryExpired,
style: TextStyle(color: COLOR_DANGER),
);
} else if (widget.item.stale) {
_expiryIcon = Text(L10().expiryStale, style: TextStyle(color: COLOR_WARNING));
_expiryIcon = Text(
L10().expiryStale,
style: TextStyle(color: COLOR_WARNING),
);
}
tiles.add(
@ -741,19 +732,18 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
subtitle: Text(widget.item.expiryDateString),
leading: Icon(TablerIcons.calendar_x),
trailing: _expiryIcon,
)
),
);
}
// Last update?
if (widget.item.updatedDateString.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().lastUpdated),
subtitle: Text(widget.item.updatedDateString),
leading: Icon(TablerIcons.calendar)
)
leading: Icon(TablerIcons.calendar),
),
);
}
@ -763,8 +753,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
ListTile(
title: Text(L10().lastStocktake),
subtitle: Text(widget.item.stocktakeDateString),
leading: Icon(TablerIcons.calendar)
)
leading: Icon(TablerIcons.calendar),
),
);
}
@ -776,26 +766,27 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () {
widget.item.openLink();
},
)
),
);
}
if (stockShowTests || (widget.item.testResultCount > 0)) {
tiles.add(
ListTile(
title: Text(L10().testResults),
leading: Icon(TablerIcons.list_check, color: COLOR_ACTION),
trailing: Text("${widget.item.testResultCount}"),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockItemTestResultsWidget(widget.item))
).then((ctx) {
refresh(context);
});
}
)
ListTile(
title: Text(L10().testResults),
leading: Icon(TablerIcons.list_check, color: COLOR_ACTION),
trailing: Text("${widget.item.testResultCount}"),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockItemTestResultsWidget(widget.item),
),
).then((ctx) {
refresh(context);
});
},
),
);
}
@ -805,9 +796,12 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
title: Text(L10().purchasePrice),
leading: Icon(TablerIcons.currency_dollar),
trailing: Text(
renderCurrency(widget.item.purchasePrice, widget.item.purchasePriceCurrency)
)
)
renderCurrency(
widget.item.purchasePrice,
widget.item.purchasePriceCurrency,
),
),
),
);
}
@ -823,12 +817,13 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockItemHistoryWidget(widget.item))
).then((ctx) {
refresh(context);
builder: (context) => StockItemHistoryWidget(widget.item),
),
).then((ctx) {
refresh(context);
});
},
)
),
);
}
@ -840,34 +835,33 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => NotesWidget(widget.item))
MaterialPageRoute(builder: (context) => NotesWidget(widget.item)),
);
}
)
},
),
);
tiles.add(
ListTile(
title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeStockItemAttachment(),
widget.item.pk,
L10().stockItem,
widget.item.canEdit,
)
)
);
},
)
ListTile(
title: Text(L10().attachments),
leading: Icon(TablerIcons.file, color: COLOR_ACTION),
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeStockItemAttachment(),
widget.item.pk,
L10().stockItem,
widget.item.canEdit,
),
),
);
},
),
);
return tiles;
}
}
}

29
lib/widget/stock/stock_item_history.dart
View File

@ -14,10 +14,12 @@ class StockItemHistoryWidget extends StatefulWidget {
final InvenTreeStockItem item;
@override
_StockItemHistoryDisplayState createState() => _StockItemHistoryDisplayState(item);
_StockItemHistoryDisplayState createState() =>
_StockItemHistoryDisplayState(item);
}
class _StockItemHistoryDisplayState extends RefreshableState<StockItemHistoryWidget> {
class _StockItemHistoryDisplayState
extends RefreshableState<StockItemHistoryWidget> {
_StockItemHistoryDisplayState(this.item);
final InvenTreeStockItem item;
@ -30,20 +32,18 @@ class _StockItemHistoryDisplayState extends RefreshableState<StockItemHistoryWid
@override
Widget getBody(BuildContext context) {
Map<String, String> filters = {
"item": widget.item.pk.toString(),
};
Map<String, String> filters = {"item": widget.item.pk.toString()};
return PaginatedStockHistoryList(filters);
}
}
/*
* Widget which displays a paginated stock history list
*/
class PaginatedStockHistoryList extends PaginatedSearchWidget {
const PaginatedStockHistoryList(Map<String, String> filters) : super(filters: filters);
const PaginatedStockHistoryList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().stockItemHistory;
@ -67,15 +67,22 @@ class _PaginatedStockHistoryState
@override
Map<String, Map<String, dynamic>> get filterOptions => {
// TODO: Add filter options
};
// TODO: Add filter options
};
@override
Future<InvenTreePageResponse?> requestPage(
int limit, int offset, Map<String, String> params) async {
int limit,
int offset,
Map<String, String> params,
) async {
await InvenTreeAPI().StockHistoryStatus.load();
final page = await InvenTreeStockItemHistory().listPaginated(limit, offset, filters: params);
final page = await InvenTreeStockItemHistory().listPaginated(
limit,
offset,
filters: params,
);
return page;
}

97
lib/widget/stock/stock_item_test_results.dart
View File

@ -13,20 +13,18 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/progress.dart";
import "package:inventree/widget/refreshable_state.dart";
class StockItemTestResultsWidget extends StatefulWidget {
const StockItemTestResultsWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeStockItem item;
@override
_StockItemTestResultDisplayState createState() => _StockItemTestResultDisplayState(item);
_StockItemTestResultDisplayState createState() =>
_StockItemTestResultDisplayState(item);
}
class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestResultsWidget> {
class _StockItemTestResultDisplayState
extends RefreshableState<StockItemTestResultsWidget> {
_StockItemTestResultDisplayState(this.item);
@override
@ -46,8 +44,8 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
label: L10().testResultAdd,
onTap: () {
addTestResult(context);
}
)
},
),
);
}
@ -62,9 +60,18 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
final InvenTreeStockItem item;
Future <void> addTestResult(BuildContext context, {int templateId = 0, String name = "", bool nameIsEditable = true, bool result = false, String value = "", bool valueRequired = false, bool attachmentRequired = false}) async {
Map<String, Map<String, dynamic>> fields = InvenTreeStockItemTestResult().formFields();
Future<void> addTestResult(
BuildContext context, {
int templateId = 0,
String name = "",
bool nameIsEditable = true,
bool result = false,
String value = "",
bool valueRequired = false,
bool attachmentRequired = false,
}) async {
Map<String, Map<String, dynamic>> fields = InvenTreeStockItemTestResult()
.formFields();
// Add additional filters
fields["template"]?["filters"]?["part"] = "${item.partId}";
@ -102,7 +109,6 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
bool match = false;
for (var ii = 0; ii < outputs.length; ii++) {
// Check against templates
if (outputs[ii] is InvenTreePartTestTemplate) {
var template = outputs[ii] as InvenTreePartTestTemplate;
@ -143,16 +149,17 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
title: Text(item.partName),
subtitle: Text(item.partDescription),
leading: InvenTreeAPI().getThumbnail(item.partImage),
)
)
),
),
);
tiles.add(
ListTile(
title: Text(L10().testResults,
style: TextStyle(fontWeight: FontWeight.bold)
)
)
title: Text(
L10().testResults,
style: TextStyle(fontWeight: FontWeight.bold),
),
),
);
if (loading) {
@ -163,16 +170,17 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
var results = getTestResults();
if (results.isEmpty) {
tiles.add(ListTile(
title: Text(L10().testResultNone),
subtitle: Text(L10().testResultNoneDetail),
));
tiles.add(
ListTile(
title: Text(L10().testResultNone),
subtitle: Text(L10().testResultNoneDetail),
),
);
return tiles;
}
for (var item in results) {
bool _hasResult = false;
bool _required = false;
String _test = "";
@ -213,35 +221,38 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
_icon = Icon(TablerIcons.circle_x, color: COLOR_DANGER);
}
tiles.add(ListTile(
title: Text(_test, style: TextStyle(
fontWeight: _required ? FontWeight.bold : FontWeight.normal,
fontStyle: _hasResult ? FontStyle.normal : FontStyle.italic
)),
subtitle: Text(_value),
trailing: Text(_date),
leading: _icon,
onTap: () {
if (InvenTreeStockItemTestResult().canCreate) {
addTestResult(
tiles.add(
ListTile(
title: Text(
_test,
style: TextStyle(
fontWeight: _required ? FontWeight.bold : FontWeight.normal,
fontStyle: _hasResult ? FontStyle.normal : FontStyle.italic,
),
),
subtitle: Text(_value),
trailing: Text(_date),
leading: _icon,
onTap: () {
if (InvenTreeStockItemTestResult().canCreate) {
addTestResult(
context,
name: _test,
templateId: _templateId,
nameIsEditable: !_required,
valueRequired: _valueRequired,
attachmentRequired: _attachmentRequired
);
}
}
));
attachmentRequired: _attachmentRequired,
);
}
},
),
);
}
if (tiles.isEmpty) {
tiles.add(ListTile(
title: Text(L10().testResultNone),
));
tiles.add(ListTile(title: Text(L10().testResultNone)));
}
return tiles;
}
}
}

33
lib/widget/stock/stock_list.dart
View File

@ -7,9 +7,7 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/l10.dart";
import "package:inventree/api.dart";
class StockItemList extends StatefulWidget {
const StockItemList(this.filters);
final Map<String, String> filters;
@ -18,9 +16,7 @@ class StockItemList extends StatefulWidget {
_StockListState createState() => _StockListState(filters);
}
class _StockListState extends RefreshableState<StockItemList> {
_StockListState(this.filters);
final Map<String, String> filters;
@ -35,20 +31,18 @@ class _StockListState extends RefreshableState<StockItemList> {
}
class PaginatedStockItemList extends PaginatedSearchWidget {
const PaginatedStockItemList(Map<String, String> filters) : super(filters: filters);
const PaginatedStockItemList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().stockItems;
@override
_PaginatedStockItemListState createState() => _PaginatedStockItemListState();
}
class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockItemList> {
class _PaginatedStockItemListState
extends PaginatedSearchState<PaginatedStockItemList> {
_PaginatedStockItemListState() : super();
@override
@ -100,7 +94,7 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
"label": L10().status,
"help_text": L10().statusCode,
"choices": InvenTreeAPI().StockStatus.choices,
}
},
};
if (!InvenTreeAPI().supportsStatusLabelEndpoints) {
@ -111,15 +105,18 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
}
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
// Ensure StockStatus codes are loaded
await InvenTreeAPI().StockStatus.load();
final page = await InvenTreeStockItem().listPaginated(
limit,
offset,
filters: params
filters: params,
);
return page;
@ -127,7 +124,6 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeStockItem item = model as InvenTreeStockItem;
return ListTile(
@ -136,17 +132,18 @@ class _PaginatedStockItemListState extends PaginatedSearchState<PaginatedStockIt
leading: InvenTreeAPI().getThumbnail(item.partThumbnail),
trailing: SizedBox(
width: 48,
child: Text("${item.displayQuantity}",
child: Text(
"${item.displayQuantity}",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14,
color: InvenTreeAPI().StockStatus.color(item.status),
),
)
),
),
onTap: () {
item.goToDetailPage(context);
},
);
}
}
}