inventree/inventree-app
2
0
Fork 0
mirror of https://github.com/inventree/inventree-app.git synced 2025-07-01 19:30:44 +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

146
lib/widget/attachment_widget.dart
View File

@ -1,4 +1,3 @@
import "dart:io";
import "package:flutter/material.dart";
@ -17,7 +16,6 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/refreshable_state.dart";
/*
* A generic widget for displaying a list of attachments.
*
@ -25,8 +23,12 @@ import "package:inventree/widget/refreshable_state.dart";
* we pass a subclassed instance of the InvenTreeAttachment model.
*/
class AttachmentWidget extends StatefulWidget {
const AttachmentWidget(this.attachmentClass, this.modelId, this.imagePrefix, this.hasUploadPermission) : super();
const AttachmentWidget(
this.attachmentClass,
this.modelId,
this.imagePrefix,
this.hasUploadPermission,
) : super();
final InvenTreeAttachment attachmentClass;
final int modelId;
@ -37,9 +39,7 @@ class AttachmentWidget extends StatefulWidget {
_AttachmentWidgetState createState() => _AttachmentWidgetState();
}
class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
_AttachmentWidgetState();
List<InvenTreeAttachment> attachments = [];
@ -64,7 +64,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context);
});
});
}
},
),
IconButton(
icon: Icon(TablerIcons.file_upload),
@ -74,20 +74,19 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context);
});
});
}
)
},
),
];
}
Future<void> upload(BuildContext context, File? file) async {
if (file == null) return;
showLoadingOverlay();
final bool result = await widget.attachmentClass.uploadAttachment(
file,
widget.modelId
file,
widget.modelId,
);
hideLoadingOverlay();
@ -101,35 +100,39 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
refresh(context);
}
Future<void> editAttachment(BuildContext context, InvenTreeAttachment attachment) async
{
attachment.editForm(context, L10().editAttachment).then((result) => {
refresh(context)
});
Future<void> editAttachment(
BuildContext context,
InvenTreeAttachment attachment,
) async {
attachment
.editForm(context, L10().editAttachment)
.then((result) => {refresh(context)});
}
/*
* Delete the specified attachment
*/
Future<void> deleteAttachment(BuildContext context, InvenTreeAttachment attachment) async {
Future<void> deleteAttachment(
BuildContext context,
InvenTreeAttachment attachment,
) async {
final bool result = await attachment.delete();
showSnackIcon(
result ? L10().deleteSuccess : L10().deleteFailed,
success: result
success: result,
);
refresh(context);
}
/*
* Display an option context menu for the selected attachment
*/
Future<void> showOptionsMenu(BuildContext context, InvenTreeAttachment attachment) async {
Future<void> showOptionsMenu(
BuildContext context,
InvenTreeAttachment attachment,
) async {
OneContext().showDialog(
builder: (BuildContext ctx) {
return SimpleDialog(
@ -144,7 +147,7 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
child: ListTile(
title: Text(L10().edit),
leading: Icon(TablerIcons.edit),
)
),
),
SimpleDialogOption(
onPressed: () async {
@ -154,29 +157,27 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
child: ListTile(
title: Text(L10().delete),
leading: Icon(TablerIcons.trash, color: COLOR_DANGER),
)
)
]
),
),
],
);
}
},
);
}
@override
Future<void> request(BuildContext context) async {
Map<String, String> filters = {};
if (InvenTreeAPI().supportsModernAttachments) {
filters["model_type"] = widget.attachmentClass.REF_MODEL_TYPE;
filters["model_id"] = widget.modelId.toString();
} else {
filters[widget.attachmentClass.REFERENCE_FIELD] = widget.modelId.toString();
filters[widget.attachmentClass.REFERENCE_FIELD] = widget.modelId
.toString();
}
await widget.attachmentClass.list(
filters: filters
).then((var results) {
await widget.attachmentClass.list(filters: filters).then((var results) {
attachments.clear();
for (var result in results) {
@ -186,57 +187,58 @@ class _AttachmentWidgetState extends RefreshableState<AttachmentWidget> {
}
});
setState(() {
});
setState(() {});
}
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [];
// An "attachment" can either be a file, or a URL
for (var attachment in attachments) {
if (attachment.filename.isNotEmpty) {
tiles.add(ListTile(
title: Text(attachment.filename),
subtitle: Text(attachment.comment),
leading: Icon(attachment.icon, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay();
await attachment.downloadAttachment();
hideLoadingOverlay();
},
onLongPress: () {
showOptionsMenu(context, attachment);
},
));
}
else if (attachment.link.isNotEmpty) {
tiles.add(ListTile(
title: Text(attachment.link),
subtitle: Text(attachment.comment),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
var uri = Uri.tryParse(attachment.link.trimLeft());
if (uri != null && await canLaunchUrl(uri)) {
await launchUrl(uri);
}
},
onLongPress: () {
showOptionsMenu(context, attachment);
},
));
tiles.add(
ListTile(
title: Text(attachment.filename),
subtitle: Text(attachment.comment),
leading: Icon(attachment.icon, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay();
await attachment.downloadAttachment();
hideLoadingOverlay();
},
onLongPress: () {
showOptionsMenu(context, attachment);
},
),
);
} else if (attachment.link.isNotEmpty) {
tiles.add(
ListTile(
title: Text(attachment.link),
subtitle: Text(attachment.comment),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
var uri = Uri.tryParse(attachment.link.trimLeft());
if (uri != null && await canLaunchUrl(uri)) {
await launchUrl(uri);
}
},
onLongPress: () {
showOptionsMenu(context, attachment);
},
),
);
}
}
if (tiles.isEmpty) {
tiles.add(ListTile(
leading: Icon(TablerIcons.file_x, color: COLOR_WARNING),
title: Text(L10().attachmentNone),
));
tiles.add(
ListTile(
leading: Icon(TablerIcons.file_x, color: COLOR_WARNING),
title: Text(L10().attachmentNone),
),
);
}
return tiles;

3
lib/widget/back.dart
View File

@ -6,7 +6,6 @@ import "package:flutter/material.dart";
* Long-pressing on this will return the user to the home screen
*/
Widget backButton(BuildContext context, GlobalKey<ScaffoldState> key) {
return GestureDetector(
onLongPress: () {
// Display the menu
@ -21,4 +20,4 @@ Widget backButton(BuildContext context, GlobalKey<ScaffoldState> key) {
},
),
);
}
}

355
lib/widget/company/company_detail.dart
View File

@ -16,24 +16,19 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/company/supplier_part_list.dart";
/*
* Widget for displaying detail view of a single Company instance
*/
class CompanyDetailWidget extends StatefulWidget {
const CompanyDetailWidget(this.company, {Key? key}) : super(key: key);
final InvenTreeCompany company;
@override
_CompanyDetailState createState() => _CompanyDetailState();
}
class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
_CompanyDetailState();
int supplierPartCount = 0;
@ -61,15 +56,15 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
if (InvenTreeCompany().canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().companyEdit,
onPressed: () {
editCompany(context);
}
)
icon: Icon(TablerIcons.edit),
tooltip: L10().companyEdit,
onPressed: () {
editCompany(context);
},
),
);
}
return actions;
}
@ -78,23 +73,27 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
List<SpeedDialChild> actions = [];
if (widget.company.isCustomer && InvenTreeSalesOrder().canCreate) {
actions.add(SpeedDialChild(
child: Icon(TablerIcons.truck),
label: L10().salesOrderCreate,
onTap: () async {
_createSalesOrder(context);
}
));
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.truck),
label: L10().salesOrderCreate,
onTap: () async {
_createSalesOrder(context);
},
),
);
}
if (widget.company.isSupplier && InvenTreePurchaseOrder().canCreate) {
actions.add(SpeedDialChild(
child: Icon(TablerIcons.shopping_cart),
label: L10().purchaseOrderCreate,
onTap: () async {
_createPurchaseOrder(context);
}
));
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.shopping_cart),
label: L10().purchaseOrderCreate,
onTap: () async {
_createPurchaseOrder(context);
},
),
);
}
return actions;
@ -109,17 +108,17 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
fields["customer"]?["value"] = widget.company.pk;
InvenTreeSalesOrder().createForm(
context,
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
context,
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context);
}
if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context);
}
},
);
}
@ -132,17 +131,17 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
fields["supplier"]?["value"] = widget.company.pk;
InvenTreePurchaseOrder().createForm(
context,
L10().purchaseOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
context,
L10().purchaseOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var order = InvenTreePurchaseOrder.fromJson(data);
order.goToDetailPage(context);
}
if (data.containsKey("pk")) {
var order = InvenTreePurchaseOrder.fromJson(data);
order.goToDetailPage(context);
}
},
);
}
@ -156,32 +155,37 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
return;
}
outstandingPurchaseOrders = widget.company.isSupplier ?
await InvenTreePurchaseOrder().count(filters: {
"supplier": widget.company.pk.toString(),
"outstanding": "true"
}) : 0;
outstandingPurchaseOrders = widget.company.isSupplier
? await InvenTreePurchaseOrder().count(
filters: {
"supplier": widget.company.pk.toString(),
"outstanding": "true",
},
)
: 0;
outstandingSalesOrders = widget.company.isCustomer ?
await InvenTreeSalesOrder().count(filters: {
"customer": widget.company.pk.toString(),
"outstanding": "true"
}) : 0;
InvenTreeSupplierPart().count(
filters: {
"supplier": widget.company.pk.toString()
}
).then((value) {
if (mounted) {
setState(() {
supplierPartCount = value;
outstandingSalesOrders = widget.company.isCustomer
? await InvenTreeSalesOrder().count(
filters: {
"customer": widget.company.pk.toString(),
"outstanding": "true",
},
)
: 0;
InvenTreeSupplierPart()
.count(filters: {"supplier": widget.company.pk.toString()})
.then((value) {
if (mounted) {
setState(() {
supplierPartCount = value;
});
}
});
}
});
InvenTreeCompanyAttachment().countAttachments(widget.company.pk)
.then((value) {
InvenTreeCompanyAttachment().countAttachments(widget.company.pk).then((
value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
@ -190,15 +194,14 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
});
}
Future <void> editCompany(BuildContext context) async {
Future<void> editCompany(BuildContext context) async {
widget.company.editForm(
context,
L10().companyEdit,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().companyUpdated, success: true);
}
},
);
}
@ -207,87 +210,86 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
*/
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [];
bool sep = false;
tiles.add(Card(
child: ListTile(
title: Text("${widget.company.name}"),
subtitle: Text("${widget.company.description}"),
leading: InvenTreeAPI().getThumbnail(widget.company.image),
tiles.add(
Card(
child: ListTile(
title: Text("${widget.company.name}"),
subtitle: Text("${widget.company.description}"),
leading: InvenTreeAPI().getThumbnail(widget.company.image),
),
),
));
);
if (!widget.company.active) {
tiles.add(
ListTile(
title: Text(
L10().inactive,
style: TextStyle(
color: COLOR_DANGER
)
),
subtitle: Text(
L10().inactiveCompany,
style: TextStyle(
color: COLOR_DANGER
)
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
ListTile(
title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
subtitle: Text(
L10().inactiveCompany,
style: TextStyle(color: COLOR_DANGER),
),
leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
),
);
}
if (widget.company.website.isNotEmpty) {
tiles.add(ListTile(
title: Text("${widget.company.website}"),
leading: Icon(TablerIcons.globe, color: COLOR_ACTION),
onTap: () async {
openLink(widget.company.website);
},
));
if (widget.company.website.isNotEmpty) {
tiles.add(
ListTile(
title: Text("${widget.company.website}"),
leading: Icon(TablerIcons.globe, color: COLOR_ACTION),
onTap: () async {
openLink(widget.company.website);
},
),
);
sep = true;
}
sep = true;
}
if (widget.company.email.isNotEmpty) {
tiles.add(ListTile(
title: Text("${widget.company.email}"),
leading: Icon(TablerIcons.at, color: COLOR_ACTION),
onTap: () async {
openLink("mailto:${widget.company.email}");
},
));
if (widget.company.email.isNotEmpty) {
tiles.add(
ListTile(
title: Text("${widget.company.email}"),
leading: Icon(TablerIcons.at, color: COLOR_ACTION),
onTap: () async {
openLink("mailto:${widget.company.email}");
},
),
);
sep = true;
}
sep = true;
}
if (widget.company.phone.isNotEmpty) {
tiles.add(ListTile(
title: Text("${widget.company.phone}"),
leading: Icon(TablerIcons.phone, color: COLOR_ACTION),
onTap: () {
openLink("tel:${widget.company.phone}");
},
));
if (widget.company.phone.isNotEmpty) {
tiles.add(
ListTile(
title: Text("${widget.company.phone}"),
leading: Icon(TablerIcons.phone, color: COLOR_ACTION),
onTap: () {
openLink("tel:${widget.company.phone}");
},
),
);
sep = true;
}
sep = true;
}
// External link
if (widget.company.link.isNotEmpty) {
tiles.add(ListTile(
title: Text("${widget.company.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () {
widget.company.openLink();
},
));
tiles.add(
ListTile(
title: Text("${widget.company.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () {
widget.company.openLink();
},
),
);
sep = true;
}
@ -297,7 +299,6 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
}
if (widget.company.isSupplier) {
if (supplierPartCount > 0) {
tiles.add(
ListTile(
@ -309,12 +310,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
context,
MaterialPageRoute(
builder: (context) => SupplierPartList({
"supplier": widget.company.pk.toString()
})
)
"supplier": widget.company.pk.toString(),
}),
),
);
}
)
},
),
);
}
@ -328,14 +329,12 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(
filters: {
"supplier": "${widget.company.pk}"
}
)
)
filters: {"supplier": "${widget.company.pk}"},
),
),
);
}
)
},
),
);
// TODO: Display "supplied parts" count (click through to list of supplier parts)
@ -365,46 +364,46 @@ class _CompanyDetailState extends RefreshableState<CompanyDetailWidget> {
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(
filters: {
"customer": widget.company.pk.toString()
}
)
)
filters: {"customer": widget.company.pk.toString()},
),
),
);
}
)
},
),
);
}
if (widget.company.notes.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note),
onTap: null,
));
tiles.add(
ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note),
onTap: null,
),
);
}
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(
InvenTreeCompanyAttachment(),
widget.company.pk,
widget.company.name,
InvenTreeCompany().canEdit
)
)
);
}
));
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(
InvenTreeCompanyAttachment(),
widget.company.pk,
widget.company.name,
InvenTreeCompany().canEdit,
),
),
);
},
),
);
return tiles;
}
}
}

46
lib/widget/company/company_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -12,13 +11,12 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
/*
* Widget for displaying a filterable list of Company instances
*/
class CompanyListWidget extends StatefulWidget {
const CompanyListWidget(this.title, this.filters, {Key? key}) : super(key: key);
const CompanyListWidget(this.title, this.filters, {Key? key})
: super(key: key);
final String title;
@ -28,16 +26,13 @@ class CompanyListWidget extends StatefulWidget {
_CompanyListWidgetState createState() => _CompanyListWidgetState();
}
class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
_CompanyListWidgetState();
@override
String getAppBarTitle() => widget.title;
Future<void> _addCompany(BuildContext context) async {
InvenTreeCompany().createForm(
context,
L10().companyAdd,
@ -49,7 +44,7 @@ class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
var company = InvenTreeCompany.fromJson(data);
company.goToDetailPage(context);
}
}
},
);
}
@ -59,13 +54,13 @@ class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
if (InvenTreeAPI().checkPermission("company", "add")) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().companyAdd,
onTap: () {
_addCompany(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().companyAdd,
onTap: () {
_addCompany(context);
},
),
);
}
@ -76,12 +71,11 @@ class _CompanyListWidgetState extends RefreshableState<CompanyListWidget> {
Widget getBody(BuildContext context) {
return PaginatedCompanyList(widget.title, widget.filters);
}
}
class PaginatedCompanyList extends PaginatedSearchWidget {
const PaginatedCompanyList(this.companyTitle, Map<String, String> filters) : super(filters: filters);
const PaginatedCompanyList(this.companyTitle, Map<String, String> filters)
: super(filters: filters);
final String companyTitle;
@ -93,12 +87,10 @@ class PaginatedCompanyList extends PaginatedSearchWidget {
}
class _CompanyListState extends PaginatedSearchState<PaginatedCompanyList> {
_CompanyListState() : super();
@override
Map<String, Map<String, dynamic>> get filterOptions {
Map<String, Map<String, dynamic>> filters = {};
if (InvenTreeAPI().supportsCompanyActiveStatus) {
@ -113,16 +105,22 @@ class _CompanyListState extends PaginatedSearchState<PaginatedCompanyList> {
}
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeCompany().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeCompany().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeCompany company = model as InvenTreeCompany;
return ListTile(

146
lib/widget/company/manufacturer_part_detail.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -19,19 +18,18 @@ import "package:url_launcher/url_launcher.dart";
* Detail widget for viewing a single ManufacturerPart instance
*/
class ManufacturerPartDetailWidget extends StatefulWidget {
const ManufacturerPartDetailWidget(this.manufacturerPart, {Key? key})
: super(key: key);
: super(key: key);
final InvenTreeManufacturerPart manufacturerPart;
@override
_ManufacturerPartDisplayState createState() => _ManufacturerPartDisplayState();
_ManufacturerPartDisplayState createState() =>
_ManufacturerPartDisplayState();
}
class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDetailWidget> {
class _ManufacturerPartDisplayState
extends RefreshableState<ManufacturerPartDetailWidget> {
_ManufacturerPartDisplayState();
@override
@ -39,7 +37,8 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
@override
Future<void> request(BuildContext context) async {
final bool result = widget.manufacturerPart.pk > 0 &&
final bool result =
widget.manufacturerPart.pk > 0 &&
await widget.manufacturerPart.reload();
if (!result) {
@ -49,12 +48,12 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
Future<void> editManufacturerPart(BuildContext context) async {
widget.manufacturerPart.editForm(
context,
L10().manufacturerPartEdit,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().itemUpdated, success: true);
}
context,
L10().manufacturerPartEdit,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().itemUpdated, success: true);
},
);
}
@ -73,13 +72,13 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
if (widget.manufacturerPart.canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().edit,
onPressed: () {
editManufacturerPart(context);
}
)
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().edit,
onPressed: () {
editManufacturerPart(context);
},
),
);
}
@ -100,78 +99,85 @@ class _ManufacturerPartDisplayState extends RefreshableState<ManufacturerPartDet
// Internal Part
tiles.add(
ListTile(
title: Text(L10().internalPart),
subtitle: Text(widget.manufacturerPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.manufacturerPart.partImage),
onTap: () async {
showLoadingOverlay();
final part = await InvenTreePart().get(widget.manufacturerPart.partId);
hideLoadingOverlay();
ListTile(
title: Text(L10().internalPart),
subtitle: Text(widget.manufacturerPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(
widget.manufacturerPart.partImage,
),
onTap: () async {
showLoadingOverlay();
final part = await InvenTreePart().get(
widget.manufacturerPart.partId,
);
hideLoadingOverlay();
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
)
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
),
);
// Manufacturer details
tiles.add(
ListTile(
title: Text(L10().manufacturer),
subtitle: Text(widget.manufacturerPart.manufacturerName),
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.manufacturerPart.manufacturerImage),
onTap: () async {
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.manufacturerPart.manufacturerId);
hideLoadingOverlay();
ListTile(
title: Text(L10().manufacturer),
subtitle: Text(widget.manufacturerPart.manufacturerName),
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(
widget.manufacturerPart.manufacturerImage,
),
onTap: () async {
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(
widget.manufacturerPart.manufacturerId,
);
hideLoadingOverlay();
if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context);
}
}
)
if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context);
}
},
),
);
// MPN (part number)
tiles.add(
ListTile(
title: Text(L10().manufacturerPartNumber),
subtitle: Text(widget.manufacturerPart.MPN),
leading: Icon(TablerIcons.hash),
)
ListTile(
title: Text(L10().manufacturerPartNumber),
subtitle: Text(widget.manufacturerPart.MPN),
leading: Icon(TablerIcons.hash),
),
);
// Description
if (widget.manufacturerPart.description.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().description),
subtitle: Text(widget.manufacturerPart.description),
leading: Icon(TablerIcons.info_circle),
)
ListTile(
title: Text(L10().description),
subtitle: Text(widget.manufacturerPart.description),
leading: Icon(TablerIcons.info_circle),
),
);
}
if (widget.manufacturerPart.link.isNotEmpty) {
tiles.add(
ListTile(
title: Text(widget.manufacturerPart.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
var uri = Uri.tryParse(widget.manufacturerPart.link);
if (uri != null && await canLaunchUrl(uri)) {
await launchUrl(uri);
}
},
)
ListTile(
title: Text(widget.manufacturerPart.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
var uri = Uri.tryParse(widget.manufacturerPart.link);
if (uri != null && await canLaunchUrl(uri)) {
await launchUrl(uri);
}
},
),
);
}
return tiles;
}
}

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

@ -17,13 +17,12 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/company/manufacturer_part_detail.dart";
/*
* Detail widget for viewing a single SupplierPart instance
*/
class SupplierPartDetailWidget extends StatefulWidget {
const SupplierPartDetailWidget(this.supplierPart, {Key? key}) : super(key: key);
const SupplierPartDetailWidget(this.supplierPart, {Key? key})
: super(key: key);
final InvenTreeSupplierPart supplierPart;
@ -31,9 +30,8 @@ class SupplierPartDetailWidget extends StatefulWidget {
_SupplierPartDisplayState createState() => _SupplierPartDisplayState();
}
class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidget> {
class _SupplierPartDisplayState
extends RefreshableState<SupplierPartDetailWidget> {
_SupplierPartDisplayState();
@override
@ -44,12 +42,12 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
*/
Future<void> editSupplierPart(BuildContext context) async {
widget.supplierPart.editForm(
context,
L10().supplierPartEdit,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().supplierPartUpdated, success: true);
}
context,
L10().supplierPartEdit,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().supplierPartUpdated, success: true);
},
);
}
@ -60,11 +58,12 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
if (widget.supplierPart.canEdit) {
actions.add(
customBarcodeAction(
context, this,
context,
this,
widget.supplierPart.customBarcode,
"supplierpart",
widget.supplierPart.pk
)
widget.supplierPart.pk,
),
);
}
@ -77,13 +76,13 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
if (widget.supplierPart.canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().edit,
onPressed: () {
editSupplierPart(context);
}
)
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().edit,
onPressed: () {
editSupplierPart(context);
},
),
);
}
@ -92,7 +91,8 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
@override
Future<void> request(BuildContext context) async {
final bool result = widget.supplierPart.pk > 0 && await widget.supplierPart.reload();
final bool result =
widget.supplierPart.pk > 0 && await widget.supplierPart.reload();
if (!result) {
Navigator.of(context).pop();
@ -113,43 +113,33 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
// Internal Part
tiles.add(
ListTile(
title: Text(L10().internalPart),
subtitle: Text(widget.supplierPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.partImage),
onTap: () async {
showLoadingOverlay();
final part = await InvenTreePart().get(widget.supplierPart.partId);
hideLoadingOverlay();
ListTile(
title: Text(L10().internalPart),
subtitle: Text(widget.supplierPart.partName),
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.partImage),
onTap: () async {
showLoadingOverlay();
final part = await InvenTreePart().get(widget.supplierPart.partId);
hideLoadingOverlay();
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
)
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
),
);
if (!widget.supplierPart.active) {
tiles.add(
ListTile(
title: Text(
L10().inactive,
style: TextStyle(
color: COLOR_DANGER
)
),
subtitle: Text(
L10().inactiveDetail,
style: TextStyle(
color: COLOR_DANGER
)
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
ListTile(
title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
subtitle: Text(
L10().inactiveDetail,
style: TextStyle(color: COLOR_DANGER),
),
leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
),
);
}
@ -159,26 +149,30 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
title: Text(L10().supplier),
subtitle: Text(widget.supplierPart.supplierName),
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.supplierImage),
trailing: InvenTreeAPI().getThumbnail(
widget.supplierPart.supplierImage,
),
onTap: () async {
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.supplierId);
var supplier = await InvenTreeCompany().get(
widget.supplierPart.supplierId,
);
hideLoadingOverlay();
if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context);
}
}
)
},
),
);
// SKU (part number)
tiles.add(
ListTile(
title: Text(L10().supplierPartNumber),
subtitle: Text(widget.supplierPart.SKU),
leading: Icon(TablerIcons.hash),
)
ListTile(
title: Text(L10().supplierPartNumber),
subtitle: Text(widget.supplierPart.SKU),
leading: Icon(TablerIcons.hash),
),
);
// Manufacturer information
@ -188,17 +182,21 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
title: Text(L10().manufacturer),
subtitle: Text(widget.supplierPart.manufacturerName),
leading: Icon(TablerIcons.building_factory_2, color: COLOR_ACTION),
trailing: InvenTreeAPI().getThumbnail(widget.supplierPart.manufacturerImage),
trailing: InvenTreeAPI().getThumbnail(
widget.supplierPart.manufacturerImage,
),
onTap: () async {
showLoadingOverlay();
var supplier = await InvenTreeCompany().get(widget.supplierPart.manufacturerId);
var supplier = await InvenTreeCompany().get(
widget.supplierPart.manufacturerId,
);
hideLoadingOverlay();
if (supplier is InvenTreeCompany) {
supplier.goToDetailPage(context);
}
}
)
},
),
);
tiles.add(
@ -208,28 +206,39 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
leading: Icon(TablerIcons.hash, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay();
var manufacturerPart = await InvenTreeManufacturerPart().get(widget.supplierPart.manufacturerPartId);
var manufacturerPart = await InvenTreeManufacturerPart().get(
widget.supplierPart.manufacturerPartId,
);
hideLoadingOverlay();
if (manufacturerPart is InvenTreeManufacturerPart) {
Navigator.push(context, MaterialPageRoute(
builder: (context) => ManufacturerPartDetailWidget(manufacturerPart)
));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
ManufacturerPartDetailWidget(manufacturerPart),
),
);
}
},
)
),
);
}
// Packaging
if (widget.supplierPart.packaging.isNotEmpty || widget.supplierPart.pack_quantity.isNotEmpty) {
if (widget.supplierPart.packaging.isNotEmpty ||
widget.supplierPart.pack_quantity.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().packaging),
subtitle: widget.supplierPart.packaging.isNotEmpty ? Text(widget.supplierPart.packaging) : null,
subtitle: widget.supplierPart.packaging.isNotEmpty
? Text(widget.supplierPart.packaging)
: null,
leading: Icon(TablerIcons.package),
trailing: widget.supplierPart.pack_quantity.isNotEmpty ? Text(widget.supplierPart.pack_quantity) : null,
)
trailing: widget.supplierPart.pack_quantity.isNotEmpty
? Text(widget.supplierPart.pack_quantity)
: null,
),
);
}
@ -244,7 +253,7 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
await launchUrl(uri);
}
},
)
),
);
}
@ -253,11 +262,10 @@ class _SupplierPartDisplayState extends RefreshableState<SupplierPartDetailWidge
ListTile(
title: Text(widget.supplierPart.note),
leading: Icon(TablerIcons.pencil),
)
),
);
}
return tiles;
}
}
}

38
lib/widget/company/supplier_part_list.dart
View File

@ -10,12 +10,10 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/company/supplier_part_detail.dart";
/*
* Widget for displaying a list of Supplier Part instances
*/
class SupplierPartList extends StatefulWidget {
const SupplierPartList(this.filters);
final Map<String, String> filters;
@ -24,9 +22,7 @@ class SupplierPartList extends StatefulWidget {
_SupplierPartListState createState() => _SupplierPartListState();
}
class _SupplierPartListState extends RefreshableState<SupplierPartList> {
@override
String getAppBarTitle() => L10().supplierParts;
@ -34,25 +30,22 @@ class _SupplierPartListState extends RefreshableState<SupplierPartList> {
Widget getBody(BuildContext context) {
return PaginatedSupplierPartList(widget.filters);
}
}
class PaginatedSupplierPartList extends PaginatedSearchWidget {
const PaginatedSupplierPartList(Map<String, String> filters) : super(filters: filters);
const PaginatedSupplierPartList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().supplierParts;
@override
_PaginatedSupplierPartListState createState() => _PaginatedSupplierPartListState();
_PaginatedSupplierPartListState createState() =>
_PaginatedSupplierPartListState();
}
class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupplierPartList> {
class _PaginatedSupplierPartListState
extends PaginatedSearchState<PaginatedSupplierPartList> {
_PaginatedSupplierPartListState() : super();
@override
@ -63,7 +56,6 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
@override
Map<String, Map<String, dynamic>> get filterOptions {
Map<String, Map<String, dynamic>> filters = {};
if (InvenTreeAPI().supportsCompanyActiveStatus) {
@ -78,8 +70,16 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
}
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSupplierPart().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeSupplierPart().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@ -96,10 +96,10 @@ class _PaginatedSupplierPartListState extends PaginatedSearchState<PaginatedSupp
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(supplierPart)
)
builder: (context) => SupplierPartDetailWidget(supplierPart),
),
);
},
);
}
}
}

140
lib/widget/dialogs.dart
View File

@ -9,12 +9,14 @@ import "package:inventree/l10.dart";
import "package:inventree/preferences.dart";
import "package:inventree/widget/snacks.dart";
/*
* Launch a dialog allowing the user to select from a list of options
*/
Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelected}) async {
Future<void> choiceDialog(
String title,
List<Widget> items, {
Function? onSelected,
}) async {
List<Widget> choices = [];
for (int idx = 0; idx < items.length; idx++) {
@ -27,7 +29,7 @@ Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelecte
onSelected(idx);
}
},
)
),
);
}
@ -39,31 +41,33 @@ Future<void> choiceDialog(String title, List<Widget> items, {Function? onSelecte
builder: (BuildContext context) {
return AlertDialog(
title: Text(title),
content: SingleChildScrollView(
child: Column(
children: choices,
)
),
content: SingleChildScrollView(child: Column(children: choices)),
actions: [
TextButton(
child: Text(L10().cancel),
onPressed: () {
Navigator.pop(context);
},
)
),
],
);
}
},
);
}
/*
* Display a "confirmation" dialog allowing the user to accept or reject an action
*/
Future<void> confirmationDialog(String title, String text, {Color? color, IconData icon = TablerIcons.help_circle, String? acceptText, String? rejectText, Function? onAccept, Function? onReject}) async {
Future<void> confirmationDialog(
String title,
String text, {
Color? color,
IconData icon = TablerIcons.help_circle,
String? acceptText,
String? rejectText,
Function? onAccept,
Function? onReject,
}) async {
String _accept = acceptText ?? L10().ok;
String _reject = rejectText ?? L10().cancel;
@ -90,7 +94,7 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
if (onReject != null) {
onReject();
}
}
},
),
TextButton(
child: Text(_accept),
@ -102,14 +106,13 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
onAccept();
}
},
)
]
),
],
);
}
},
);
}
/*
* Construct an error dialog showing information to the user
*
@ -117,24 +120,23 @@ Future<void> confirmationDialog(String title, String text, {Color? color, IconDa
* @description = Simple string description of error
* @data = Error response (e.g from server)
*/
Future<void> showErrorDialog(String title, {String description = "", APIResponse? response, IconData icon = TablerIcons.exclamation_circle, Function? onDismissed}) async {
Future<void> showErrorDialog(
String title, {
String description = "",
APIResponse? response,
IconData icon = TablerIcons.exclamation_circle,
Function? onDismissed,
}) async {
List<Widget> children = [];
if (description.isNotEmpty) {
children.add(
ListTile(
title: Text(description),
)
);
children.add(ListTile(title: Text(description)));
} else if (response != null) {
// Look for extra error information in the provided APIResponse object
switch (response.statusCode) {
case 400: // Bad request (typically bad input)
case 400: // Bad request (typically bad input)
if (response.data is Map<String, dynamic>) {
for (String field in response.asMap().keys) {
dynamic error = response.data[field];
if (error is List) {
@ -143,15 +145,15 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
ListTile(
title: Text(field),
subtitle: Text(error[ii].toString()),
)
),
);
}
} else {
children.add(
ListTile(
title: Text(field),
subtitle: Text(response.data[field].toString()),
)
ListTile(
title: Text(field),
subtitle: Text(response.data[field].toString()),
),
);
}
}
@ -159,8 +161,8 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
children.add(
ListTile(
title: Text(L10().responseInvalid),
subtitle: Text(response.data.toString())
)
subtitle: Text(response.data.toString()),
),
);
}
default:
@ -169,16 +171,15 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
ListTile(
title: Text(L10().statusCode),
subtitle: Text(response.statusCode.toString()),
)
),
);
children.add(
ListTile(
title: Text(L10().responseData),
subtitle: Text(response.data.toString()),
)
),
);
}
}
@ -186,26 +187,28 @@ Future<void> showErrorDialog(String title, {String description = "", APIResponse
return;
}
OneContext().showDialog(
builder: (context) => SimpleDialog(
title: ListTile(
title: Text(title),
leading: Icon(icon),
),
children: children
)
).then((value) {
if (onDismissed != null) {
onDismissed();
}
});
OneContext()
.showDialog(
builder: (context) => SimpleDialog(
title: ListTile(title: Text(title), leading: Icon(icon)),
children: children,
),
)
.then((value) {
if (onDismissed != null) {
onDismissed();
}
});
}
/*
* Display a message indicating the nature of a server / API error
*/
Future<void> showServerError(String url, String title, String description) async {
Future<void> showServerError(
String url,
String title,
String description,
) async {
if (!hasContext()) {
return;
}
@ -220,7 +223,9 @@ Future<void> showServerError(String url, String title, String description) async
}
// Play a sound
final bool tones = await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true) as bool;
final bool tones =
await InvenTreeSettingsManager().getValue(INV_SOUNDS_SERVER, true)
as bool;
if (tones) {
playAudioFile("sounds/server_error.mp3");
@ -234,19 +239,22 @@ Future<void> showServerError(String url, String title, String description) async
actionText: L10().details,
onAction: () {
showErrorDialog(
title,
description: description,
icon: TablerIcons.server
title,
description: description,
icon: TablerIcons.server,
);
}
},
);
}
/*
* Displays an error indicating that the server returned an unexpected status code
*/
Future<void> showStatusCodeError(String url, int status, {String details=""}) async {
Future<void> showStatusCodeError(
String url,
int status, {
String details = "",
}) async {
String msg = statusCodeToString(status);
String extra = url + "\n" + "${L10().statusCode}: ${status}";
@ -255,14 +263,9 @@ Future<void> showStatusCodeError(String url, int status, {String details=""}) as
extra += details;
}
showServerError(
url,
msg,
extra,
);
showServerError(url, msg, extra);
}
/*
* Provide a human-readable descriptor for a particular error code
*/
@ -297,7 +300,6 @@ String statusCodeToString(int status) {
}
}
/*
* Displays a message indicating that the server timed out on a certain request
*/

89
lib/widget/drawer.dart
View File

@ -16,12 +16,10 @@ import "package:inventree/widget/notifications.dart";
import "package:inventree/widget/order/purchase_order_list.dart";
import "package:inventree/widget/stock/location_display.dart";
/*
* Custom "drawer" widget for the InvenTree app.
*/
class InvenTreeDrawer extends StatelessWidget {
const InvenTreeDrawer(this.context);
final BuildContext context;
@ -53,8 +51,8 @@ class InvenTreeDrawer extends StatelessWidget {
if (_checkConnection()) {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null))
context,
MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)),
);
}
}
@ -65,8 +63,8 @@ class InvenTreeDrawer extends StatelessWidget {
if (_checkConnection()) {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => LocationDisplayWidget(null))
context,
MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)),
);
}
}
@ -77,24 +75,24 @@ class InvenTreeDrawer extends StatelessWidget {
if (_checkConnection()) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {})
)
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {}),
),
);
}
}
// Load "purchase orders" page
void _purchaseOrders() {
_closeDrawer();
if (_checkConnection()) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(filters: {})
)
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(filters: {}),
),
);
}
}
@ -104,15 +102,20 @@ class InvenTreeDrawer extends StatelessWidget {
_closeDrawer();
if (_checkConnection()) {
Navigator.push(context,
MaterialPageRoute(builder: (context) => NotificationWidget()));
Navigator.push(
context,
MaterialPageRoute(builder: (context) => NotificationWidget()),
);
}
}
// Load settings widget
void _settings() {
_closeDrawer();
Navigator.push(context, MaterialPageRoute(builder: (context) => InvenTreeSettingsWidget()));
Navigator.push(
context,
MaterialPageRoute(builder: (context) => InvenTreeSettingsWidget()),
);
}
// Construct list of tiles to display in the "drawer" menu
@ -120,14 +123,16 @@ class InvenTreeDrawer extends StatelessWidget {
List<Widget> tiles = [];
// "Home" access
tiles.add(ListTile(
leading: Icon(TablerIcons.home, color: COLOR_ACTION),
title: Text(
L10().appTitle,
style: TextStyle(fontWeight: FontWeight.bold),
tiles.add(
ListTile(
leading: Icon(TablerIcons.home, color: COLOR_ACTION),
title: Text(
L10().appTitle,
style: TextStyle(fontWeight: FontWeight.bold),
),
onTap: _home,
),
onTap: _home,
));
);
tiles.add(Divider());
@ -137,7 +142,7 @@ class InvenTreeDrawer extends StatelessWidget {
title: Text(L10().parts),
leading: Icon(TablerIcons.box, color: COLOR_ACTION),
onTap: _parts,
)
),
);
}
@ -147,7 +152,7 @@ class InvenTreeDrawer extends StatelessWidget {
title: Text(L10().stock),
leading: Icon(TablerIcons.package, color: COLOR_ACTION),
onTap: _stock,
)
),
);
}
@ -157,7 +162,7 @@ class InvenTreeDrawer extends StatelessWidget {
title: Text(L10().purchaseOrders),
leading: Icon(TablerIcons.shopping_cart, color: COLOR_ACTION),
onTap: _purchaseOrders,
)
),
);
}
@ -167,7 +172,7 @@ class InvenTreeDrawer extends StatelessWidget {
title: Text(L10().salesOrders),
leading: Icon(TablerIcons.truck_delivery, color: COLOR_ACTION),
onTap: _salesOrders,
)
),
);
}
@ -180,10 +185,12 @@ class InvenTreeDrawer extends StatelessWidget {
tiles.add(
ListTile(
leading: Icon(TablerIcons.bell, color: COLOR_ACTION),
trailing: notification_count > 0 ? Text(notification_count.toString()) : null,
trailing: notification_count > 0
? Text(notification_count.toString())
: null,
title: Text(L10().notifications),
onTap: _notifications,
)
),
);
tiles.add(Divider());
@ -198,14 +205,9 @@ class InvenTreeDrawer extends StatelessWidget {
},
title: Text(L10().colorScheme),
subtitle: Text(L10().colorSchemeDetail),
leading: Icon(
TablerIcons.sun_moon,
color: COLOR_ACTION
),
trailing: Icon(
darkMode ? TablerIcons.moon : TablerIcons.sun,
)
)
leading: Icon(TablerIcons.sun_moon, color: COLOR_ACTION),
trailing: Icon(darkMode ? TablerIcons.moon : TablerIcons.sun),
),
);
tiles.add(
@ -213,7 +215,7 @@ class InvenTreeDrawer extends StatelessWidget {
title: Text(L10().settings),
leading: Icon(Icons.settings, color: COLOR_ACTION),
onTap: _settings,
)
),
);
return tiles;
@ -221,11 +223,6 @@ class InvenTreeDrawer extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Drawer(
child: ListView(
children: drawerTiles(context),
)
);
return Drawer(child: ListView(children: drawerTiles(context)));
}
}

176
lib/widget/fields.dart
View File

@ -9,11 +9,8 @@ import "package:one_context/one_context.dart";
import "package:inventree/l10.dart";
class FilePickerDialog {
static Future<File?> pickImageFromCamera() async {
final picker = ImagePicker();
final pickedImage = await picker.pickImage(source: ImageSource.camera);
@ -26,7 +23,6 @@ class FilePickerDialog {
}
static Future<File?> pickImageFromGallery() async {
final picker = ImagePicker();
final pickedImage = await picker.pickImage(source: ImageSource.gallery);
@ -39,7 +35,6 @@ class FilePickerDialog {
}
static Future<File?> pickFileFromDevice() async {
final FilePickerResult? result = await FilePicker.platform.pickFiles();
if (result != null) {
@ -54,8 +49,12 @@ class FilePickerDialog {
}
// Present a dialog to pick a file, either from local file system or from camera
static Future<void> pickFile({String message = "", bool allowImages = true, bool allowFiles = true, Function(File)? onPicked}) async {
static Future<void> pickFile({
String message = "",
bool allowImages = true,
bool allowFiles = true,
Function(File)? onPicked,
}) async {
String title = "";
if (allowImages && !allowFiles) {
@ -65,16 +64,10 @@ class FilePickerDialog {
}
// Construct actions
List<Widget> actions = [
];
List<Widget> actions = [];
if (message.isNotEmpty) {
actions.add(
ListTile(
title: Text(message)
)
);
actions.add(ListTile(title: Text(message)));
}
actions.add(
@ -84,7 +77,6 @@ class FilePickerDialog {
title: Text(allowFiles ? L10().selectFile : L10().selectImage),
),
onPressed: () async {
// Close the dialog
OneContext().popDialog();
@ -101,7 +93,7 @@ class FilePickerDialog {
}
}
},
)
),
);
if (allowImages) {
@ -122,100 +114,104 @@ class FilePickerDialog {
onPicked(file);
}
}
}
)
},
),
);
}
OneContext().showDialog(
builder: (context) {
return SimpleDialog(
title: Text(title),
children: actions,
);
}
builder: (context) {
return SimpleDialog(title: Text(title), children: actions);
},
);
}
}
class CheckBoxField extends FormField<bool> {
CheckBoxField({
String? label,
bool? initial = false,
bool tristate = false,
Function(bool?)? onSaved,
TextStyle? labelStyle,
String? helperText,
TextStyle? helperStyle,
}) :
super(
onSaved: onSaved,
initialValue: initial,
builder: (FormFieldState<bool> state) {
return CheckboxListTile(
title: label != null ? Text(label, style: labelStyle) : null,
value: state.value,
tristate: tristate,
onChanged: state.didChange,
subtitle: helperText != null ? Text(helperText, style: helperStyle) : null,
contentPadding: EdgeInsets.zero,
);
}
);
String? label,
bool? initial = false,
bool tristate = false,
Function(bool?)? onSaved,
TextStyle? labelStyle,
String? helperText,
TextStyle? helperStyle,
}) : super(
onSaved: onSaved,
initialValue: initial,
builder: (FormFieldState<bool> state) {
return CheckboxListTile(
title: label != null ? Text(label, style: labelStyle) : null,
value: state.value,
tristate: tristate,
onChanged: state.didChange,
subtitle: helperText != null
? Text(helperText, style: helperStyle)
: null,
contentPadding: EdgeInsets.zero,
);
},
);
}
class StringField extends TextFormField {
StringField({
String label = "",
String? hint,
String? initial,
Function(String?)? onSaved,
Function(String?)? validator,
bool allowEmpty = false,
bool isEnabled = true,
}) : super(
decoration: InputDecoration(
labelText: allowEmpty ? label : label + "*",
hintText: hint,
),
initialValue: initial,
onSaved: onSaved,
enabled: isEnabled,
validator: (value) {
if (!allowEmpty && value != null && value.isEmpty) {
return L10().valueCannotBeEmpty;
}
StringField({String label = "", String? hint, String? initial, Function(String?)? onSaved, Function(String?)? validator, bool allowEmpty = false, bool isEnabled = true}) :
super(
decoration: InputDecoration(
labelText: allowEmpty ? label : label + "*",
hintText: hint
),
initialValue: initial,
onSaved: onSaved,
enabled: isEnabled,
validator: (value) {
if (!allowEmpty && value != null && value.isEmpty) {
return L10().valueCannotBeEmpty;
}
if (validator != null) {
return validator(value) as String?;
}
if (validator != null) {
return validator(value) as String?;
}
return null;
}
);
return null;
},
);
}
/*
* Helper class for quantity values
*/
class QuantityField extends TextFormField {
QuantityField({
String label = "",
String hint = "",
double? max,
TextEditingController? controller,
}) : super(
decoration: InputDecoration(labelText: label, hintText: hint),
controller: controller,
keyboardType: TextInputType.numberWithOptions(
signed: false,
decimal: true,
),
validator: (value) {
if (value != null && value.isEmpty) return L10().quantityEmpty;
QuantityField({String label = "", String hint = "", double? max, TextEditingController? controller}) :
super(
decoration: InputDecoration(
labelText: label,
hintText: hint,
),
controller: controller,
keyboardType: TextInputType.numberWithOptions(signed: false, decimal: true),
validator: (value) {
double quantity = double.tryParse(value.toString()) ?? 0;
if (value != null && value.isEmpty) return L10().quantityEmpty;
if (quantity <= 0) return L10().quantityPositive;
if ((max != null) && (quantity > max)) {
return "Quantity must not exceed ${max}";
}
double quantity = double.tryParse(value.toString()) ?? 0;
if (quantity <= 0) return L10().quantityPositive;
if ((max != null) && (quantity > max)) return "Quantity must not exceed ${max}";
return null;
},
);
}
return null;
},
);
}

231
lib/widget/home.dart
View File

@ -26,18 +26,15 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/spinner.dart";
import "package:inventree/widget/company/company_list.dart";
class InvenTreeHomePage extends StatefulWidget {
const InvenTreeHomePage({Key? key}) : super(key: key);
@override
_InvenTreeHomePageState createState() => _InvenTreeHomePageState();
}
class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetProperties {
class _InvenTreeHomePageState extends State<InvenTreeHomePage>
with BaseWidgetProperties {
_InvenTreeHomePageState() : super() {
// Load display settings
_loadSettings();
@ -46,7 +43,6 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
_loadProfile();
InvenTreeAPI().registerCallback(() {
if (mounted) {
setState(() {
// Reload the widget
@ -70,7 +66,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
void _showParts(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
Navigator.push(
context,
MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)),
);
}
void _showStarredParts(BuildContext context) {
@ -78,18 +77,17 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartList({
"starred": "true"
})
)
MaterialPageRoute(builder: (context) => PartList({"starred": "true"})),
);
}
void _showStock(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)));
Navigator.push(
context,
MaterialPageRoute(builder: (context) => LocationDisplayWidget(null)),
);
}
void _showPurchaseOrders(BuildContext context) {
@ -98,8 +96,8 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(filters: {})
)
builder: (context) => PurchaseOrderListWidget(filters: {}),
),
);
}
@ -107,17 +105,23 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {})
)
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(filters: {}),
),
);
}
void _showSuppliers(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().suppliers, {"is_supplier": "true"})));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CompanyListWidget(L10().suppliers, {"is_supplier": "true"}),
),
);
}
/*
@ -131,39 +135,60 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
void _showCustomers(BuildContext context) {
if (!InvenTreeAPI().checkConnection()) return;
Navigator.push(context, MaterialPageRoute(builder: (context) => CompanyListWidget(L10().customers, {"is_customer": "true"})));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
CompanyListWidget(L10().customers, {"is_customer": "true"}),
),
);
}
void _selectProfile() {
Navigator.push(
context, MaterialPageRoute(builder: (context) => InvenTreeSelectServerWidget())
context,
MaterialPageRoute(builder: (context) => InvenTreeSelectServerWidget()),
).then((context) {
// Once we return
_loadProfile();
});
}
Future <void> _loadSettings() async {
Future<void> _loadSettings() async {
homeShowSubscribed =
await InvenTreeSettingsManager().getValue(
INV_HOME_SHOW_SUBSCRIBED,
true,
)
as bool;
homeShowPo =
await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_PO, true)
as bool;
homeShowSo =
await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SO, true)
as bool;
homeShowManufacturers =
await InvenTreeSettingsManager().getValue(
INV_HOME_SHOW_MANUFACTURERS,
true,
)
as bool;
homeShowCustomers =
await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_CUSTOMERS, true)
as bool;
homeShowSuppliers =
await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUPPLIERS, true)
as bool;
homeShowSubscribed = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUBSCRIBED, true) as bool;
homeShowPo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_PO, true) as bool;
homeShowSo = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SO, true) as bool;
homeShowManufacturers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_MANUFACTURERS, true) as bool;
homeShowCustomers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_CUSTOMERS, true) as bool;
homeShowSuppliers = await InvenTreeSettingsManager().getValue(INV_HOME_SHOW_SUPPLIERS, true) as bool;
setState(() {
});
setState(() {});
}
Future <void> _loadProfile() async {
Future<void> _loadProfile() async {
_profile = await UserProfileDBManager().getSelectedProfile();
// A valid profile was loaded!
if (_profile != null) {
if (!InvenTreeAPI().isConnected() && !InvenTreeAPI().isConnecting()) {
// Attempt server connection
InvenTreeAPI().connectToServer(_profile!).then((result) {
if (mounted) {
@ -176,8 +201,15 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
setState(() {});
}
Widget _listTile(BuildContext context, String label, IconData icon, {Function()? callback, String role = "", String permission = "", Widget? trailing}) {
Widget _listTile(
BuildContext context,
String label,
IconData icon, {
Function()? callback,
String role = "",
String permission = "",
Widget? trailing,
}) {
bool connected = InvenTreeAPI().isConnected();
bool allowed = true;
@ -192,20 +224,15 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
child: Align(
child: ListTile(
leading: Icon(
icon,
size: 32,
color: connected && allowed ? COLOR_ACTION : Colors.grey
),
title: Text(
label,
style: TextStyle(
fontSize: 20
),
icon,
size: 32,
color: connected && allowed ? COLOR_ACTION : Colors.grey,
),
title: Text(label, style: TextStyle(fontSize: 20)),
trailing: trailing,
),
alignment: Alignment.center,
)
),
),
onTap: () {
if (!allowed) {
@ -228,78 +255,89 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
* Constructs a list of tiles for the main screen
*/
List<Widget> getListTiles(BuildContext context) {
List<Widget> tiles = [];
// Parts
if (InvenTreePart().canView) {
tiles.add(_listTile(
context,
L10().parts,
TablerIcons.box,
callback: () {
_showParts(context);
},
));
tiles.add(
_listTile(
context,
L10().parts,
TablerIcons.box,
callback: () {
_showParts(context);
},
),
);
}
// Starred parts
if (homeShowSubscribed && InvenTreePart().canView) {
tiles.add(_listTile(
context,
L10().partsStarred,
TablerIcons.bell,
callback: () {
_showStarredParts(context);
}
));
tiles.add(
_listTile(
context,
L10().partsStarred,
TablerIcons.bell,
callback: () {
_showStarredParts(context);
},
),
);
}
// Stock button
if (InvenTreeStockItem().canView) {
tiles.add(_listTile(
tiles.add(
_listTile(
context,
L10().stock,
TablerIcons.package,
callback: () {
_showStock(context);
}
));
},
),
);
}
// Purchase orders
if (homeShowPo && InvenTreePurchaseOrder().canView) {
tiles.add(_listTile(
tiles.add(
_listTile(
context,
L10().purchaseOrders,
TablerIcons.shopping_cart,
callback: () {
_showPurchaseOrders(context);
}
));
},
),
);
}
if (homeShowSo && InvenTreeSalesOrder().canView) {
tiles.add(_listTile(
context,
L10().salesOrders,
TablerIcons.truck_delivery,
callback: () {
_showSalesOrders(context);
}
));
tiles.add(
_listTile(
context,
L10().salesOrders,
TablerIcons.truck_delivery,
callback: () {
_showSalesOrders(context);
},
),
);
}
// Suppliers
if (homeShowSuppliers && InvenTreePurchaseOrder().canView) {
tiles.add(_listTile(
tiles.add(
_listTile(
context,
L10().suppliers,
TablerIcons.building,
callback: () {
_showSuppliers(context);
}
));
},
),
);
}
// TODO: Add these tiles back in once the features are fleshed out
@ -320,14 +358,16 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
*/
// Customers
if (homeShowCustomers) {
tiles.add(_listTile(
tiles.add(
_listTile(
context,
L10().customers,
TablerIcons.building_store,
callback: () {
_showCustomers(context);
}
));
},
),
);
}
return tiles;
@ -338,10 +378,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
* display a connection status widget
*/
Widget _connectionStatusWidget(BuildContext context) {
String? serverAddress = InvenTreeAPI().serverAddress;
bool validAddress = serverAddress != null;
bool connecting = !InvenTreeAPI().isConnected() && InvenTreeAPI().isConnecting();
bool connecting =
!InvenTreeAPI().isConnected() && InvenTreeAPI().isConnecting();
Widget leading = Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER);
Widget trailing = Icon(TablerIcons.server, color: COLOR_ACTION);
@ -373,8 +413,8 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
trailing: trailing,
leading: leading,
onTap: _selectProfile,
)
]
),
],
),
);
}
@ -384,7 +424,6 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
*/
@override
Widget getBody(BuildContext context) {
if (!InvenTreeAPI().isConnected()) {
return _connectionStatusWidget(context);
}
@ -398,7 +437,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
int hTiles = smallScreen ? 1 : 2;
double aspect = smallScreen ? 5 : 3;
double padding = smallScreen ? 2 : 10;
return GridView.count(
crossAxisCount: w > h ? vTiles : hTiles,
children: getListTiles(context),
@ -408,12 +447,10 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
mainAxisSpacing: padding,
padding: EdgeInsets.all(padding),
);
}
@override
Widget build(BuildContext context) {
var connected = InvenTreeAPI().isConnected();
var connecting = !connected && InvenTreeAPI().isConnecting();
@ -426,15 +463,19 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> with BaseWidgetPr
IconButton(
icon: Icon(
TablerIcons.server,
color: connected ? COLOR_SUCCESS : (connecting ? COLOR_PROGRESS: COLOR_DANGER),
color: connected
? COLOR_SUCCESS
: (connecting ? COLOR_PROGRESS : COLOR_DANGER),
),
onPressed: _selectProfile,
)
),
],
),
drawer: InvenTreeDrawer(context),
body: getBody(context),
bottomNavigationBar: InvenTreeAPI().isConnected() ? buildBottomAppBar(context, homeKey) : null,
bottomNavigationBar: InvenTreeAPI().isConnected()
? buildBottomAppBar(context, homeKey)
: null,
);
}
}

23
lib/widget/notes_widget.dart
View File

@ -5,7 +5,6 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:flutter_markdown/flutter_markdown.dart";
import "package:inventree/l10.dart";
/*
* A widget for displaying the notes associated with a given model.
* We need to pass in the following parameters:
@ -14,7 +13,6 @@ import "package:inventree/l10.dart";
* - Title for the app bar
*/
class NotesWidget extends StatefulWidget {
const NotesWidget(this.model, {Key? key}) : super(key: key);
final InvenTreeModel model;
@ -23,12 +21,10 @@ class NotesWidget extends StatefulWidget {
_NotesState createState() => _NotesState();
}
/*
* Class representing the state of the NotesWidget
*/
class _NotesState extends RefreshableState<NotesWidget> {
_NotesState();
@override
@ -41,7 +37,6 @@ class _NotesState extends RefreshableState<NotesWidget> {
@override
List<Widget> appBarActions(BuildContext context) {
List<Widget> actions = [];
if (widget.model.canEdit) {
@ -54,16 +49,14 @@ class _NotesState extends RefreshableState<NotesWidget> {
context,
L10().editNotes,
fields: {
"notes": {
"multiline": true,
}
"notes": {"multiline": true},
},
onSuccess: (data) async {
refresh(context);
}
},
);
}
)
},
),
);
}
@ -72,10 +65,6 @@ class _NotesState extends RefreshableState<NotesWidget> {
@override
Widget getBody(BuildContext context) {
return Markdown(
selectable: false,
data: widget.model.notes,
);
return Markdown(selectable: false, data: widget.model.notes);
}
}
}

37
lib/widget/notifications.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -8,17 +7,12 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/inventree/notification.dart";
import "package:inventree/widget/refreshable_state.dart";
class NotificationWidget extends StatefulWidget {
@override
_NotificationState createState() => _NotificationState();
}
class _NotificationState extends RefreshableState<NotificationWidget> {
_NotificationState() : super();
List<InvenTreeNotification> notifications = [];
@ -29,8 +23,7 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
String getAppBarTitle() => L10().notifications;
@override
Future<void> request (BuildContext context) async {
Future<void> request(BuildContext context) async {
final results = await InvenTreeNotification().list();
notifications.clear();
@ -45,8 +38,10 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
/*
* Dismiss an individual notification entry (mark it as "read")
*/
Future<void> dismissNotification(BuildContext context, InvenTreeNotification notification) async {
Future<void> dismissNotification(
BuildContext context,
InvenTreeNotification notification,
) async {
if (mounted) {
setState(() {
isDismissing = true;
@ -71,18 +66,17 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
*/
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [];
tiles.add(
ListTile(
title: Text(
L10().notifications,
),
title: Text(L10().notifications),
subtitle: notifications.isEmpty ? Text(L10().notificationsEmpty) : null,
leading: notifications.isEmpty ? Icon(TablerIcons.bell_exclamation) : Icon(TablerIcons.bell),
leading: notifications.isEmpty
? Icon(TablerIcons.bell_exclamation)
: Icon(TablerIcons.bell),
trailing: Text("${notifications.length}"),
)
),
);
for (var notification in notifications) {
@ -92,15 +86,16 @@ class _NotificationState extends RefreshableState<NotificationWidget> {
subtitle: Text(notification.message),
trailing: IconButton(
icon: Icon(TablerIcons.bookmark),
onPressed: isDismissing ? null : () async {
dismissNotification(context, notification);
},
onPressed: isDismissing
? null
: () async {
dismissNotification(context, notification);
},
),
)
),
);
}
return tiles;
}
}

54
lib/widget/order/extra_line_detail.dart
View File

@ -8,7 +8,6 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/inventree/orders.dart";
class ExtraLineDetailWidget extends StatefulWidget {
const ExtraLineDetailWidget(this.item, {Key? key}) : super(key: key);
@ -18,8 +17,8 @@ class ExtraLineDetailWidget extends StatefulWidget {
_ExtraLineDetailWidgetState createState() => _ExtraLineDetailWidgetState();
}
class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget> {
class _ExtraLineDetailWidgetState
extends RefreshableState<ExtraLineDetailWidget> {
_ExtraLineDetailWidgetState();
@override
@ -35,8 +34,8 @@ class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget
icon: Icon(TablerIcons.edit),
onPressed: () {
_editLineItem(context);
}
)
},
),
);
}
@ -54,13 +53,13 @@ class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget
var fields = widget.item.formFields();
widget.item.editForm(
context,
L10().editLineItem,
fields: fields,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
context,
L10().editLineItem,
fields: fields,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
},
);
}
@ -69,44 +68,41 @@ class _ExtraLineDetailWidgetState extends RefreshableState<ExtraLineDetailWidget
List<Widget> tiles = [];
tiles.add(
ListTile(
title: Text(L10().reference),
trailing: Text(widget.item.reference),
)
ListTile(
title: Text(L10().reference),
trailing: Text(widget.item.reference),
),
);
tiles.add(
ListTile(
title: Text(L10().description),
trailing: Text(widget.item.description),
)
ListTile(
title: Text(L10().description),
trailing: Text(widget.item.description),
),
);
tiles.add(
ListTile(
title: Text(L10().quantity),
trailing: Text(widget.item.quantity.toString()),
)
),
);
tiles.add(
ListTile(
title: Text(L10().unitPrice),
trailing: Text(
renderCurrency(widget.item.price, widget.item.priceCurrency)
)
)
renderCurrency(widget.item.price, widget.item.priceCurrency),
),
),
);
if (widget.item.notes.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().notes),
subtitle: Text(widget.item.notes),
)
ListTile(title: Text(L10().notes), subtitle: Text(widget.item.notes)),
);
}
return tiles;
}
}
}

47
lib/widget/order/po_extra_line_list.dart
View File

@ -9,28 +9,27 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart";
class POExtraLineListWidget extends StatefulWidget {
const POExtraLineListWidget(this.order, {this.filters = const {}, Key? key}) : super(key: key);
const POExtraLineListWidget(this.order, {this.filters = const {}, Key? key})
: super(key: key);
final InvenTreePurchaseOrder order;
final Map<String, String> filters;
@override
_PurchaseOrderExtraLineListWidgetState createState() => _PurchaseOrderExtraLineListWidgetState();
_PurchaseOrderExtraLineListWidgetState createState() =>
_PurchaseOrderExtraLineListWidgetState();
}
class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLineListWidget> {
class _PurchaseOrderExtraLineListWidgetState
extends RefreshableState<POExtraLineListWidget> {
_PurchaseOrderExtraLineListWidgetState();
@override
String getAppBarTitle() => L10().extraLineItems;
Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreePOExtraLineItem().formFields();
fields["order"]?["value"] = widget.order.pk;
@ -42,7 +41,7 @@ class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLin
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
},
);
}
@ -57,8 +56,8 @@ class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLin
label: L10().lineItemAdd,
onTap: () {
_addLineItem(context);
}
)
},
),
);
}
@ -71,35 +70,41 @@ class _PurchaseOrderExtraLineListWidgetState extends RefreshableState<POExtraLin
}
}
class PaginatedPOExtraLineList extends PaginatedSearchWidget {
const PaginatedPOExtraLineList(Map<String, String> filters) : super(filters: filters);
const PaginatedPOExtraLineList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().extraLineItems;
@override
_PaginatedPOExtraLineListState createState() => _PaginatedPOExtraLineListState();
_PaginatedPOExtraLineListState createState() =>
_PaginatedPOExtraLineListState();
}
class _PaginatedPOExtraLineListState extends PaginatedSearchState<PaginatedPOExtraLineList> {
class _PaginatedPOExtraLineListState
extends PaginatedSearchState<PaginatedPOExtraLineList> {
_PaginatedPOExtraLineListState() : super();
@override
String get prefix => "po_extra_line_";
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePOExtraLineItem().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreePOExtraLineItem().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePOExtraLineItem line = model as InvenTreePOExtraLineItem;
return ListTile(
@ -113,4 +118,4 @@ class _PaginatedPOExtraLineListState extends PaginatedSearchState<PaginatedPOExt
},
);
}
}
}

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

@ -21,22 +21,18 @@ import "package:inventree/widget/company/supplier_part_detail.dart";
* Widget for displaying detail view of a single PurchaseOrderLineItem
*/
class POLineDetailWidget extends StatefulWidget {
const POLineDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreePOLineItem item;
@override
_POLineDetailWidgetState createState() => _POLineDetailWidgetState();
}
/*
* State for the POLineDetailWidget
*/
class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
_POLineDetailWidgetState();
InvenTreeStockLocation? destination;
@ -55,7 +51,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
onPressed: () {
_editLineItem(context);
},
)
),
);
}
@ -75,8 +71,8 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
label: L10().receiveItem,
onTap: () async {
receiveLineItem(context);
}
)
},
),
);
}
}
@ -89,7 +85,9 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
await widget.item.reload();
if (widget.item.destinationId > 0) {
InvenTreeStockLocation().get(widget.item.destinationId).then((InvenTreeModel? loc) {
InvenTreeStockLocation().get(widget.item.destinationId).then((
InvenTreeModel? loc,
) {
if (mounted) {
if (loc != null && loc is InvenTreeStockLocation) {
setState(() {
@ -109,7 +107,6 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
});
}
}
}
// Callback to edit this line item
@ -123,21 +120,21 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
},
);
}
// Launch a form to 'receive' this line item
// Launch a form to 'receive' this line item
Future<void> receiveLineItem(BuildContext context) async {
widget.item.receive(
context,
onSuccess: () => {
showSnackIcon(L10().receivedItem, success: true),
refresh(context)
}
refresh(context),
},
);
}
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [];
@ -158,7 +155,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
part.goToDetailPage(context);
}
},
)
),
);
// Reference to the supplier part
@ -169,26 +166,33 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
onTap: () async {
showLoadingOverlay();
var part = await InvenTreeSupplierPart().get(widget.item.supplierPartId);
var part = await InvenTreeSupplierPart().get(
widget.item.supplierPartId,
);
hideLoadingOverlay();
if (part is InvenTreeSupplierPart) {
Navigator.push(context, MaterialPageRoute(builder: (context) => SupplierPartDetailWidget(part)));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SupplierPartDetailWidget(part),
),
);
}
},
)
),
);
// Destination
if (destination != null) {
tiles.add(ListTile(
tiles.add(
ListTile(
title: Text(L10().destination),
subtitle: Text(destination!.name),
leading: Icon(TablerIcons.map_pin, color: COLOR_ACTION),
onTap: () => {
destination!.goToDetailPage(context)
}
));
onTap: () => {destination!.goToDetailPage(context)},
),
);
}
// Received quantity
@ -197,23 +201,23 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
title: Text(L10().received),
subtitle: ProgressBar(widget.item.progressRatio),
trailing: Text(
widget.item.progressString,
style: TextStyle(
color: widget.item.isComplete ? COLOR_SUCCESS: COLOR_WARNING
)
widget.item.progressString,
style: TextStyle(
color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING,
),
),
leading: Icon(TablerIcons.progress),
)
),
);
// Reference
if (widget.item.reference.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().reference),
subtitle: Text(widget.item.reference),
leading: Icon(TablerIcons.hash),
)
ListTile(
title: Text(L10().reference),
subtitle: Text(widget.item.reference),
leading: Icon(TablerIcons.hash),
),
);
}
@ -223,9 +227,12 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
title: Text(L10().unitPrice),
leading: Icon(TablerIcons.currency_dollar),
trailing: Text(
renderCurrency(widget.item.purchasePrice, widget.item.purchasePriceCurrency)
renderCurrency(
widget.item.purchasePrice,
widget.item.purchasePriceCurrency,
),
),
)
),
);
// Note
@ -235,7 +242,7 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
title: Text(L10().notes),
subtitle: Text(widget.item.notes),
leading: Icon(TablerIcons.note),
)
),
);
}
@ -249,11 +256,10 @@ class _POLineDetailWidgetState extends RefreshableState<POLineDetailWidget> {
onTap: () async {
await openLink(widget.item.link);
},
)
),
);
}
return tiles;
}
}
}

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

@ -16,22 +16,21 @@ import "package:inventree/widget/progress.dart";
* Paginated widget class for displaying a list of purchase order line items
*/
class PaginatedPOLineList extends PaginatedSearchWidget {
const PaginatedPOLineList(Map<String, String> filters) : super(filters: filters);
const PaginatedPOLineList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().lineItems;
@override
_PaginatedPOLineListState createState() => _PaginatedPOLineListState();
}
/*
* State class for PaginatedPOLineList
*/
class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList> {
class _PaginatedPOLineListState
extends PaginatedSearchState<PaginatedPOLineList> {
_PaginatedPOLineListState() : super();
@override
@ -55,13 +54,20 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
"label": L10().received,
"help_text": L10().receivedFilterDetail,
"tristate": true,
}
},
};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePOLineItem().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreePOLineItem().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@ -71,24 +77,34 @@ class _PaginatedPOLineListState extends PaginatedSearchState<PaginatedPOLineList
InvenTreeSupplierPart? supplierPart = item.supplierPart;
if (supplierPart != null) {
return ListTile(
title: Text(supplierPart.SKU),
subtitle: Text(item.partName),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
trailing: Text(
item.progressString,
style: TextStyle(
color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING,
),
),
leading: InvenTreeAPI().getThumbnail(supplierPart.partImage),
onTap: () async {
showLoadingOverlay();
await item.reload();
hideLoadingOverlay();
Navigator.push(context, MaterialPageRoute(builder: (context) => POLineDetailWidget(item)));
Navigator.push(
context,
MaterialPageRoute(builder: (context) => POLineDetailWidget(item)),
);
},
);
} else {
// Return an error tile
return ListTile(
title: Text(L10().error),
subtitle: Text("supplier part not defined", style: TextStyle(color: COLOR_DANGER)),
subtitle: Text(
"supplier part not defined",
style: TextStyle(color: COLOR_DANGER),
),
);
}
}

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

@ -18,7 +18,6 @@ import "package:inventree/widget/order/po_extra_line_list.dart";
import "package:inventree/widget/stock/location_display.dart";
import "package:inventree/widget/order/po_line_list.dart";
import "package:inventree/widget/attachment_widget.dart";
import "package:inventree/widget/notes_widget.dart";
import "package:inventree/widget/progress.dart";
@ -27,13 +26,11 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/preferences.dart";
/*
* Widget for viewing a single PurchaseOrder instance
*/
class PurchaseOrderDetailWidget extends StatefulWidget {
const PurchaseOrderDetailWidget(this.order, {Key? key}): super(key: key);
const PurchaseOrderDetailWidget(this.order, {Key? key}) : super(key: key);
final InvenTreePurchaseOrder order;
@ -41,11 +38,10 @@ class PurchaseOrderDetailWidget extends StatefulWidget {
_PurchaseOrderDetailState createState() => _PurchaseOrderDetailState();
}
class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidget> {
class _PurchaseOrderDetailState
extends RefreshableState<PurchaseOrderDetailWidget> {
_PurchaseOrderDetailState();
List<InvenTreePOLineItem> lines = [];
int extraLineCount = 0;
@ -79,8 +75,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
tooltip: L10().purchaseOrderEdit,
onPressed: () {
editOrder(context);
}
)
},
),
);
}
@ -93,27 +89,26 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
if (showCameraShortcut && widget.order.canEdit) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture,
onTap: () async {
_uploadImage(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture,
onTap: () async {
_uploadImage(context);
},
),
);
}
if (widget.order.canCreate) {
if (widget.order.isPending) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd,
onTap: () async {
_addLineItem(context);
}
)
},
),
);
actions.add(
@ -122,8 +117,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
label: L10().issueOrder,
onTap: () async {
_issueOrder(context);
}
)
},
),
);
}
@ -134,8 +129,8 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
label: L10().cancelOrder,
onTap: () async {
_cancelOrder(context);
}
)
},
),
);
}
}
@ -145,14 +140,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
/// Add a new line item to this order
Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreePOLineItem().formFields();
// Update part field definition
fields["part"]?["hidden"] = false;
fields["part"]?["filters"] = {
"supplier": widget.order.supplierId
};
fields["part"]?["filters"] = {"supplier": widget.order.supplierId};
fields["order"]?["value"] = widget.order.pk;
@ -163,24 +155,22 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
},
);
}
/// Upload an image against the current PurchaseOrder
Future<void> _uploadImage(BuildContext context) async {
InvenTreePurchaseOrderAttachment().uploadImage(
widget.order.pk,
prefix: widget.order.reference,
).then((result) => refresh(context));
InvenTreePurchaseOrderAttachment()
.uploadImage(widget.order.pk, prefix: widget.order.reference)
.then((result) => refresh(context));
}
/// Issue this order
Future<void> _issueOrder(BuildContext context) async {
confirmationDialog(
L10().issueOrder, "",
L10().issueOrder,
"",
icon: TablerIcons.send,
color: Colors.blue,
acceptText: L10().issue,
@ -188,15 +178,15 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
widget.order.issueOrder().then((dynamic) {
refresh(context);
});
}
},
);
}
/// Cancel this order
Future<void> _cancelOrder(BuildContext context) async {
confirmationDialog(
L10().cancelOrder, "",
L10().cancelOrder,
"",
icon: TablerIcons.circle_x,
color: Colors.red,
acceptText: L10().cancel,
@ -204,7 +194,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
widget.order.cancelOrder().then((dynamic) {
refresh(context);
});
}
},
);
}
@ -217,7 +207,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
SpeedDialChild(
child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts,
onTap:() async {
onTap: () async {
scanBarcode(
context,
handler: POReceiveBarcodeHandler(purchaseOrder: widget.order),
@ -225,7 +215,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
refresh(context);
});
},
)
),
);
}
@ -239,15 +229,14 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
context,
handler: POAllocateBarcodeHandler(purchaseOrder: widget.order),
);
}
)
},
),
);
}
return actions;
}
@override
Future<void> request(BuildContext context) async {
await widget.order.reload();
@ -256,8 +245,16 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
lines = await widget.order.getLineItems();
showCameraShortcut = await InvenTreeSettingsManager().getBool(INV_PO_SHOW_CAMERA, true);
supportProjectCodes = api.supportsProjectCodes && await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED", backup: true);
showCameraShortcut = await InvenTreeSettingsManager().getBool(
INV_PO_SHOW_CAMERA,
true,
);
supportProjectCodes =
api.supportsProjectCodes &&
await api.getGlobalBooleanSetting(
"PROJECT_CODES_ENABLED",
backup: true,
);
completedLines = 0;
@ -267,7 +264,9 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
}
}
InvenTreePurchaseOrderAttachment().countAttachments(widget.order.pk).then((int value) {
InvenTreePurchaseOrderAttachment().countAttachments(widget.order.pk).then((
int value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
@ -275,8 +274,11 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
}
});
if (api.supportsPurchaseOrderDestination && widget.order.destinationId > 0) {
InvenTreeStockLocation().get(widget.order.destinationId).then((InvenTreeModel? loc) {
if (api.supportsPurchaseOrderDestination &&
widget.order.destinationId > 0) {
InvenTreeStockLocation().get(widget.order.destinationId).then((
InvenTreeModel? loc,
) {
if (mounted) {
if (loc != null && loc is InvenTreeStockLocation) {
setState(() {
@ -298,17 +300,19 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
}
// Count number of "extra line items" against this order
InvenTreePOExtraLineItem().count(filters: {"order": widget.order.pk.toString() }).then((int value) {
if (mounted) {
setState(() {
extraLineCount = value;
InvenTreePOExtraLineItem()
.count(filters: {"order": widget.order.pk.toString()})
.then((int value) {
if (mounted) {
setState(() {
extraLineCount = value;
});
}
});
}
});
}
// Edit the currently displayed PurchaseOrder
Future <void> editOrder(BuildContext context) async {
Future<void> editOrder(BuildContext context) async {
var fields = widget.order.formFields();
// Cannot edit supplier field from here
@ -331,32 +335,29 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().purchaseOrderUpdated, success: true);
}
},
);
}
Widget headerTile(BuildContext context) {
InvenTreeCompany? supplier = widget.order.supplier;
return Card(
child: ListTile(
title: Text(widget.order.reference),
subtitle: Text(widget.order.description),
leading: supplier == null ? null : api.getThumbnail(supplier.thumbnail),
trailing: Text(
api.PurchaseOrderStatus.label(widget.order.status),
style: TextStyle(
color: api.PurchaseOrderStatus.color(widget.order.status)
),
)
)
child: ListTile(
title: Text(widget.order.reference),
subtitle: Text(widget.order.description),
leading: supplier == null ? null : api.getThumbnail(supplier.thumbnail),
trailing: Text(
api.PurchaseOrderStatus.label(widget.order.status),
style: TextStyle(
color: api.PurchaseOrderStatus.color(widget.order.status),
),
),
),
);
}
List<Widget> orderTiles(BuildContext context) {
List<Widget> tiles = [];
InvenTreeCompany? supplier = widget.order.supplier;
@ -364,165 +365,204 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
tiles.add(headerTile(context));
if (supportProjectCodes && widget.order.hasProjectCode) {
tiles.add(ListTile(
title: Text(L10().projectCode),
subtitle: Text("${widget.order.projectCode} - ${widget.order.projectCodeDescription}"),
leading: Icon(TablerIcons.list),
));
tiles.add(
ListTile(
title: Text(L10().projectCode),
subtitle: Text(
"${widget.order.projectCode} - ${widget.order.projectCodeDescription}",
),
leading: Icon(TablerIcons.list),
),
);
}
if (supplier != null) {
tiles.add(ListTile(
title: Text(L10().supplier),
subtitle: Text(supplier.name),
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
onTap: () {
supplier.goToDetailPage(context);
},
));
tiles.add(
ListTile(
title: Text(L10().supplier),
subtitle: Text(supplier.name),
leading: Icon(TablerIcons.building, color: COLOR_ACTION),
onTap: () {
supplier.goToDetailPage(context);
},
),
);
}
if (widget.order.supplierReference.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().supplierReference),
subtitle: Text(widget.order.supplierReference),
leading: Icon(TablerIcons.hash),
));
tiles.add(
ListTile(
title: Text(L10().supplierReference),
subtitle: Text(widget.order.supplierReference),
leading: Icon(TablerIcons.hash),
),
);
}
// Order destination
if (destination != null) {
tiles.add(ListTile(
title: Text(L10().destination),
subtitle: Text(destination!.name),
leading: Icon(TablerIcons.map_pin, color: COLOR_ACTION),
tiles.add(
ListTile(
title: Text(L10().destination),
subtitle: Text(destination!.name),
leading: Icon(TablerIcons.map_pin, color: COLOR_ACTION),
onTap: () => {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(destination),
),
),
},
),
);
}
Color lineColor = completedLines < widget.order.lineItemCount
? COLOR_WARNING
: COLOR_SUCCESS;
tiles.add(
ListTile(
title: Text(L10().lineItems),
subtitle: ProgressBar(
completedLines.toDouble(),
maximum: widget.order.lineItemCount.toDouble(),
),
leading: Icon(TablerIcons.clipboard_check),
trailing: Text(
"${completedLines} / ${widget.order.lineItemCount}",
style: TextStyle(color: lineColor),
),
),
);
// Extra line items
tiles.add(
ListTile(
title: Text(L10().extraLineItems),
leading: Icon(TablerIcons.clipboard_list, color: COLOR_ACTION),
trailing: Text(extraLineCount.toString()),
onTap: () => {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LocationDisplayWidget(destination)
)
)
}
));
}
Color lineColor = completedLines < widget.order.lineItemCount ? COLOR_WARNING : COLOR_SUCCESS;
tiles.add(ListTile(
title: Text(L10().lineItems),
subtitle: ProgressBar(
completedLines.toDouble(),
maximum: widget.order.lineItemCount.toDouble(),
builder: (context) => POExtraLineListWidget(
widget.order,
filters: {"order": widget.order.pk.toString()},
),
),
),
},
),
leading: Icon(TablerIcons.clipboard_check),
trailing: Text("${completedLines} / ${widget.order.lineItemCount}", style: TextStyle(color: lineColor)),
));
);
// Extra line items
tiles.add(ListTile(
title: Text(L10().extraLineItems),
leading: Icon(TablerIcons.clipboard_list, color: COLOR_ACTION),
trailing: Text(extraLineCount.toString()),
onTap: () => {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => POExtraLineListWidget(widget.order, filters: {"order": widget.order.pk.toString()})
)
)
},
));
tiles.add(ListTile(
title: Text(L10().totalPrice),
leading: Icon(TablerIcons.currency_dollar),
trailing: Text(
renderCurrency(widget.order.totalPrice, widget.order.totalPriceCurrency)
tiles.add(
ListTile(
title: Text(L10().totalPrice),
leading: Icon(TablerIcons.currency_dollar),
trailing: Text(
renderCurrency(
widget.order.totalPrice,
widget.order.totalPriceCurrency,
),
),
),
));
);
if (widget.order.issueDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().issueDate),
trailing: Text(widget.order.issueDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().issueDate),
trailing: Text(widget.order.issueDate),
leading: Icon(TablerIcons.calendar),
),
);
}
if (widget.order.startDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().startDate),
trailing: Text(widget.order.startDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().startDate),
trailing: Text(widget.order.startDate),
leading: Icon(TablerIcons.calendar),
),
);
}
if (widget.order.targetDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().targetDate),
trailing: Text(widget.order.targetDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().targetDate),
trailing: Text(widget.order.targetDate),
leading: Icon(TablerIcons.calendar),
),
);
}
if (widget.order.completionDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().completionDate),
trailing: Text(widget.order.completionDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().completionDate),
trailing: Text(widget.order.completionDate),
leading: Icon(TablerIcons.calendar),
),
);
}
// Responsible "owner"
if (widget.order.responsibleName.isNotEmpty && widget.order.responsibleLabel.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().responsible),
leading: Icon(widget.order.responsibleLabel == "group" ? TablerIcons.users : TablerIcons.user),
trailing: Text(widget.order.responsibleName)
));
if (widget.order.responsibleName.isNotEmpty &&
widget.order.responsibleLabel.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().responsible),
leading: Icon(
widget.order.responsibleLabel == "group"
? TablerIcons.users
: TablerIcons.user,
),
trailing: Text(widget.order.responsibleName),
),
);
}
// Notes tile
tiles.add(
ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => NotesWidget(widget.order)
)
);
},
)
ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => NotesWidget(widget.order)),
);
},
),
);
// Attachments
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(
InvenTreePurchaseOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.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(
InvenTreePurchaseOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.canEdit,
),
),
);
},
),
);
return tiles;
}
@override
@ -530,10 +570,10 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
return [
Tab(text: L10().details),
Tab(text: L10().lineItems),
Tab(text: L10().received)
Tab(text: L10().received),
];
}
@override
List<Widget> getTabs(BuildContext context) {
return [

65
lib/widget/order/purchase_order_list.dart
View File

@ -16,18 +16,18 @@ import "package:inventree/inventree/purchase_order.dart";
* Widget class for displaying a list of Purchase Orders
*/
class PurchaseOrderListWidget extends StatefulWidget {
const PurchaseOrderListWidget({this.filters = const {}, Key? key}) : super(key: key);
const PurchaseOrderListWidget({this.filters = const {}, Key? key})
: super(key: key);
final Map<String, String> filters;
@override
_PurchaseOrderListWidgetState createState() => _PurchaseOrderListWidgetState();
_PurchaseOrderListWidgetState createState() =>
_PurchaseOrderListWidgetState();
}
class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWidget> {
class _PurchaseOrderListWidgetState
extends RefreshableState<PurchaseOrderListWidget> {
_PurchaseOrderListWidgetState();
@override
@ -44,8 +44,8 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
label: L10().purchaseOrderCreate,
onTap: () {
_createPurchaseOrder(context);
}
)
},
),
);
}
@ -70,7 +70,7 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
var order = InvenTreePurchaseOrder.fromJson(data);
order.goToDetailPage(context);
}
}
},
);
}
@ -83,13 +83,10 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
SpeedDialChild(
child: Icon(Icons.barcode_reader),
label: L10().scanReceivedParts,
onTap:() async {
scanBarcode(
context,
handler: POReceiveBarcodeHandler(),
);
onTap: () async {
scanBarcode(context, handler: POReceiveBarcodeHandler());
},
)
),
);
}
@ -102,22 +99,20 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
}
}
class PaginatedPurchaseOrderList extends PaginatedSearchWidget {
const PaginatedPurchaseOrderList(Map<String, String> filters) : super(filters: filters);
const PaginatedPurchaseOrderList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().purchaseOrders;
@override
_PaginatedPurchaseOrderListState createState() => _PaginatedPurchaseOrderListState();
_PaginatedPurchaseOrderListState createState() =>
_PaginatedPurchaseOrderListState();
}
class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPurchaseOrderList> {
class _PaginatedPurchaseOrderListState
extends PaginatedSearchState<PaginatedPurchaseOrderList> {
_PaginatedPurchaseOrderListState() : super();
@override
@ -147,29 +142,37 @@ class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPur
"label": L10().assignedToMe,
"help_text": L10().assignedToMeDetail,
"tristate": true,
}
},
};
@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 {
await InvenTreeAPI().PurchaseOrderStatus.load();
final page = await InvenTreePurchaseOrder().listPaginated(limit, offset, filters: params);
final page = await InvenTreePurchaseOrder().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePurchaseOrder order = model as InvenTreePurchaseOrder;
InvenTreeCompany? supplier = order.supplier;
return ListTile(
title: Text(order.reference),
subtitle: Text(order.description),
leading: supplier == null ? null : InvenTreeAPI().getThumbnail(supplier.thumbnail),
leading: supplier == null
? null
: InvenTreeAPI().getThumbnail(supplier.thumbnail),
trailing: Text(
InvenTreeAPI().PurchaseOrderStatus.label(order.status),
style: TextStyle(
@ -181,4 +184,4 @@ class _PaginatedPurchaseOrderListState extends PaginatedSearchState<PaginatedPur
},
);
}
}
}

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

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -25,7 +24,6 @@ import "package:inventree/widget/progress.dart";
* Widget for viewing a single SalesOrder instance
*/
class SalesOrderDetailWidget extends StatefulWidget {
const SalesOrderDetailWidget(this.order, {Key? key}) : super(key: key);
final InvenTreeSalesOrder order;
@ -34,9 +32,7 @@ class SalesOrderDetailWidget extends StatefulWidget {
_SalesOrderDetailState createState() => _SalesOrderDetailState();
}
class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
_SalesOrderDetailState();
List<InvenTreeSOLineItem> lines = [];
@ -68,7 +64,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
onPressed: () {
editOrder(context);
},
)
),
);
}
@ -77,7 +73,6 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
// Add a new shipment against this sales order
Future<void> _addShipment(BuildContext context) async {
var fields = InvenTreeSalesOrderShipment().formFields();
fields["order"]?["value"] = widget.order.pk;
@ -89,9 +84,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
fields: fields,
onSuccess: (result) async {
refresh(context);
}
},
);
}
// Add a new line item to this sales order
@ -102,52 +96,51 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
fields["order"]?["hidden"] = true;
InvenTreeSOLineItem().createForm(
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (result) async {
refresh(context);
}
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (result) async {
refresh(context);
},
);
}
/// Upload an image for this order
Future<void> _uploadImage(BuildContext context) async {
InvenTreeSalesOrderAttachment().uploadImage(
widget.order.pk,
prefix: widget.order.reference,
).then((result) => refresh(context));
InvenTreeSalesOrderAttachment()
.uploadImage(widget.order.pk, prefix: widget.order.reference)
.then((result) => refresh(context));
}
/// Issue this order
Future<void> _issueOrder(BuildContext context) async {
confirmationDialog(
L10().issueOrder, "",
icon: TablerIcons.send,
color: Colors.blue,
acceptText: L10().issue,
onAccept: () async {
widget.order.issueOrder().then((dynamic) {
refresh(context);
});
}
L10().issueOrder,
"",
icon: TablerIcons.send,
color: Colors.blue,
acceptText: L10().issue,
onAccept: () async {
widget.order.issueOrder().then((dynamic) {
refresh(context);
});
},
);
}
/// Cancel this order
Future<void> _cancelOrder(BuildContext context) async {
confirmationDialog(
L10().cancelOrder, "",
icon: TablerIcons.circle_x,
color: Colors.red,
acceptText: L10().cancel,
onAccept: () async {
await widget.order.cancelOrder().then((dynamic) {
refresh(context);
});
}
L10().cancelOrder,
"",
icon: TablerIcons.circle_x,
color: Colors.red,
acceptText: L10().cancel,
onAccept: () async {
await widget.order.cancelOrder().then((dynamic) {
refresh(context);
});
},
);
}
@ -157,50 +150,51 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
if (showCameraShortcut && widget.order.canEdit) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture,
onTap: () async {
_uploadImage(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.camera, color: Colors.blue),
label: L10().takePicture,
onTap: () async {
_uploadImage(context);
},
),
);
}
if (widget.order.isPending) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.send, color: Colors.blue),
label: L10().issueOrder,
onTap: () async {
_issueOrder(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.send, color: Colors.blue),
label: L10().issueOrder,
onTap: () async {
_issueOrder(context);
},
),
);
}
if (widget.order.isOpen) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_x, color: Colors.red),
label: L10().cancelOrder,
onTap: () async {
_cancelOrder(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.circle_x, color: Colors.red),
label: L10().cancelOrder,
onTap: () async {
_cancelOrder(context);
},
),
);
}
// Add line item
if ((widget.order.isPending || widget.order.isInProgress) && InvenTreeSOLineItem().canCreate) {
if ((widget.order.isPending || widget.order.isInProgress) &&
InvenTreeSOLineItem().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd,
onTap: () async {
_addLineItem(context);
}
)
},
),
);
actions.add(
@ -209,8 +203,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
label: L10().shipmentAdd,
onTap: () async {
_addShipment(context);
}
)
},
),
);
}
@ -221,7 +215,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
List<SpeedDialChild> barcodeButtons(BuildContext context) {
List<SpeedDialChild> actions = [];
if ((widget.order.isInProgress || widget.order.isPending) && InvenTreeSOLineItem().canCreate) {
if ((widget.order.isInProgress || widget.order.isPending) &&
InvenTreeSOLineItem().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(Icons.barcode_reader),
@ -231,8 +226,8 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
context,
handler: SOAddItemBarcodeHandler(salesOrder: widget.order),
);
}
)
},
),
);
if (api.supportsBarcodeSOAllocateEndpoint) {
@ -243,12 +238,10 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
onTap: () async {
scanBarcode(
context,
handler: SOAllocateStockHandler(
salesOrder: widget.order,
)
handler: SOAllocateStockHandler(salesOrder: widget.order),
);
}
)
},
),
);
}
}
@ -261,10 +254,20 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
await widget.order.reload();
await api.SalesOrderStatus.load();
supportsProjectCodes = api.supportsProjectCodes && await api.getGlobalBooleanSetting("PROJECT_CODES_ENABLED", backup: true);
showCameraShortcut = await InvenTreeSettingsManager().getBool(INV_SO_SHOW_CAMERA, true);
supportsProjectCodes =
api.supportsProjectCodes &&
await api.getGlobalBooleanSetting(
"PROJECT_CODES_ENABLED",
backup: true,
);
showCameraShortcut = await InvenTreeSettingsManager().getBool(
INV_SO_SHOW_CAMERA,
true,
);
InvenTreeSalesOrderAttachment().countAttachments(widget.order.pk).then((int value) {
InvenTreeSalesOrderAttachment().countAttachments(widget.order.pk).then((
int value,
) {
if (mounted) {
setState(() {
attachmentCount = value;
@ -273,13 +276,15 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
});
// Count number of "extra line items" against this order
InvenTreeSOExtraLineItem().count(filters: {"order": widget.order.pk.toString() }).then((int value) {
if (mounted) {
setState(() {
extraLineCount = value;
InvenTreeSOExtraLineItem()
.count(filters: {"order": widget.order.pk.toString()})
.then((int value) {
if (mounted) {
setState(() {
extraLineCount = value;
});
}
});
}
});
}
// Edit the current SalesOrder instance
@ -305,7 +310,7 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().salesOrderUpdated, success: true);
}
},
);
}
@ -321,121 +326,154 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
trailing: Text(
api.SalesOrderStatus.label(widget.order.status),
style: TextStyle(
color: api.SalesOrderStatus.color(widget.order.status)
color: api.SalesOrderStatus.color(widget.order.status),
),
),
)
),
);
}
List<Widget> orderTiles(BuildContext context) {
List<Widget> tiles = [
headerTile(context)
];
List<Widget> tiles = [headerTile(context)];
InvenTreeCompany? customer = widget.order.customer;
if (supportsProjectCodes && widget.order.hasProjectCode) {
tiles.add(ListTile(
title: Text(L10().projectCode),
subtitle: Text("${widget.order.projectCode} - ${widget.order.projectCodeDescription}"),
leading: Icon(TablerIcons.list),
));
tiles.add(
ListTile(
title: Text(L10().projectCode),
subtitle: Text(
"${widget.order.projectCode} - ${widget.order.projectCodeDescription}",
),
leading: Icon(TablerIcons.list),
),
);
}
if (customer != null) {
tiles.add(ListTile(
title: Text(L10().customer),
subtitle: Text(customer.name),
leading: Icon(TablerIcons.user, color: COLOR_ACTION),
onTap: () {
customer.goToDetailPage(context);
}
));
tiles.add(
ListTile(
title: Text(L10().customer),
subtitle: Text(customer.name),
leading: Icon(TablerIcons.user, color: COLOR_ACTION),
onTap: () {
customer.goToDetailPage(context);
},
),
);
}
if (widget.order.customerReference.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().customerReference),
trailing: Text(widget.order.customerReference),
leading: Icon(TablerIcons.hash),
));
tiles.add(
ListTile(
title: Text(L10().customerReference),
trailing: Text(widget.order.customerReference),
leading: Icon(TablerIcons.hash),
),
);
}
Color lineColor = widget.order.complete ? COLOR_SUCCESS : COLOR_WARNING;
tiles.add(ListTile(
title: Text(L10().lineItems),
subtitle: ProgressBar(
widget.order.completedLineItemCount.toDouble(),
maximum: widget.order.lineItemCount.toDouble()
tiles.add(
ListTile(
title: Text(L10().lineItems),
subtitle: ProgressBar(
widget.order.completedLineItemCount.toDouble(),
maximum: widget.order.lineItemCount.toDouble(),
),
leading: Icon(TablerIcons.clipboard_check),
trailing: Text(
"${widget.order.completedLineItemCount} / ${widget.order.lineItemCount}",
style: TextStyle(color: lineColor),
),
),
leading: Icon(TablerIcons.clipboard_check),
trailing: Text("${widget.order.completedLineItemCount} / ${widget.order.lineItemCount}", style: TextStyle(color: lineColor)),
));
);
// Extra line items
tiles.add(ListTile(
title: Text(L10().extraLineItems),
leading: Icon(TablerIcons.clipboard_list, color: COLOR_ACTION),
trailing: Text(extraLineCount.toString()),
onTap: () => {
Navigator.push(
tiles.add(
ListTile(
title: Text(L10().extraLineItems),
leading: Icon(TablerIcons.clipboard_list, color: COLOR_ACTION),
trailing: Text(extraLineCount.toString()),
onTap: () => {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SOExtraLineListWidget(widget.order, filters: {"order": widget.order.pk.toString()})
)
)
},
));
builder: (context) => SOExtraLineListWidget(
widget.order,
filters: {"order": widget.order.pk.toString()},
),
),
),
},
),
);
// Shipment progress
if (widget.order.shipmentCount > 0) {
tiles.add(ListTile(
title: Text(L10().shipments),
subtitle: ProgressBar(
widget.order.completedShipmentCount.toDouble(),
maximum: widget.order.shipmentCount.toDouble()
tiles.add(
ListTile(
title: Text(L10().shipments),
subtitle: ProgressBar(
widget.order.completedShipmentCount.toDouble(),
maximum: widget.order.shipmentCount.toDouble(),
),
leading: Icon(TablerIcons.truck_delivery),
trailing: Text(
"${widget.order.completedShipmentCount} / ${widget.order.shipmentCount}",
style: TextStyle(color: lineColor),
),
),
leading: Icon(TablerIcons.truck_delivery),
trailing: Text("${widget.order.completedShipmentCount} / ${widget.order.shipmentCount}", style: TextStyle(color: lineColor)),
));
);
}
// TODO: total price
if (widget.order.startDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().startDate),
trailing: Text(widget.order.startDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().startDate),
trailing: Text(widget.order.startDate),
leading: Icon(TablerIcons.calendar),
),
);
}
if (widget.order.targetDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().targetDate),
trailing: Text(widget.order.targetDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().targetDate),
trailing: Text(widget.order.targetDate),
leading: Icon(TablerIcons.calendar),
),
);
}
if (widget.order.shipmentDate.isNotEmpty) {
tiles.add(ListTile(
title: Text(L10().completionDate),
trailing: Text(widget.order.shipmentDate),
leading: Icon(TablerIcons.calendar),
));
tiles.add(
ListTile(
title: Text(L10().completionDate),
trailing: Text(widget.order.shipmentDate),
leading: Icon(TablerIcons.calendar),
),
);
}
// Responsible "owner"
if (widget.order.responsibleName.isNotEmpty && widget.order.responsibleLabel.isNotEmpty) {
tiles.add(ListTile(
if (widget.order.responsibleName.isNotEmpty &&
widget.order.responsibleLabel.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().responsible),
leading: Icon(widget.order.responsibleLabel == "group" ? TablerIcons.users : TablerIcons.user),
trailing: Text(widget.order.responsibleName)
));
leading: Icon(
widget.order.responsibleLabel == "group"
? TablerIcons.users
: TablerIcons.user,
),
trailing: Text(widget.order.responsibleName),
),
);
}
// Notes tile
@ -446,12 +484,10 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => NotesWidget(widget.order)
)
MaterialPageRoute(builder: (context) => NotesWidget(widget.order)),
);
},
)
),
);
// Attachments
@ -462,18 +498,18 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
trailing: attachmentCount > 0 ? Text(attachmentCount.toString()) : null,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeSalesOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.canEdit
)
)
);
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreeSalesOrderAttachment(),
widget.order.pk,
widget.order.reference,
widget.order.canEdit,
),
),
);
},
)
),
);
return tiles;
@ -496,5 +532,4 @@ class _SalesOrderDetailState extends RefreshableState<SalesOrderDetailWidget> {
PaginatedSOShipmentList({"order": widget.order.pk.toString()}),
];
}
}

86
lib/widget/order/sales_order_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_speed_dial/flutter_speed_dial.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -12,20 +11,18 @@ import "package:inventree/api.dart";
import "package:inventree/inventree/company.dart";
import "package:inventree/inventree/model.dart";
class SalesOrderListWidget extends StatefulWidget {
const SalesOrderListWidget({this.filters = const {}, Key? key}) : super(key: key);
const SalesOrderListWidget({this.filters = const {}, Key? key})
: super(key: key);
final Map<String, String> filters;
@override
_SalesOrderListWidgetState createState() => _SalesOrderListWidgetState();
}
class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget> {
class _SalesOrderListWidgetState
extends RefreshableState<SalesOrderListWidget> {
_SalesOrderListWidgetState();
@override
@ -37,13 +34,13 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
if (InvenTreeSalesOrder().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus),
label: L10().salesOrderCreate,
onTap: () {
_createSalesOrder(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.circle_plus),
label: L10().salesOrderCreate,
onTap: () {
_createSalesOrder(context);
},
),
);
}
@ -58,17 +55,17 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
fields.remove("contact");
InvenTreeSalesOrder().createForm(
context,
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
context,
L10().salesOrderCreate,
fields: fields,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context);
}
if (data.containsKey("pk")) {
var order = InvenTreeSalesOrder.fromJson(data);
order.goToDetailPage(context);
}
},
);
}
@ -82,25 +79,22 @@ class _SalesOrderListWidgetState extends RefreshableState<SalesOrderListWidget>
Widget getBody(BuildContext context) {
return PaginatedSalesOrderList(widget.filters);
}
}
class PaginatedSalesOrderList extends PaginatedSearchWidget {
const PaginatedSalesOrderList(Map<String, String> filters) : super(filters: filters);
const PaginatedSalesOrderList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().salesOrders;
@override
_PaginatedSalesOrderListState createState() => _PaginatedSalesOrderListState();
_PaginatedSalesOrderListState createState() =>
_PaginatedSalesOrderListState();
}
class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesOrderList> {
class _PaginatedSalesOrderListState
extends PaginatedSearchState<PaginatedSalesOrderList> {
_PaginatedSalesOrderListState() : super();
@override
@ -130,21 +124,27 @@ class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesO
"label": L10().assignedToMe,
"help_text": L10().assignedToMeDetail,
"tristate": true,
}
},
};
@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 {
await InvenTreeAPI().SalesOrderStatus.load();
final page = await InvenTreeSalesOrder().listPaginated(limit, offset, filters: params);
final page = await InvenTreeSalesOrder().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSalesOrder order = model as InvenTreeSalesOrder;
InvenTreeCompany? customer = order.customer;
@ -152,18 +152,18 @@ class _PaginatedSalesOrderListState extends PaginatedSearchState<PaginatedSalesO
return ListTile(
title: Text(order.reference),
subtitle: Text(order.description),
leading: customer == null ? null : InvenTreeAPI().getThumbnail(customer.thumbnail),
leading: customer == null
? null
: InvenTreeAPI().getThumbnail(customer.thumbnail),
trailing: Text(
InvenTreeAPI().SalesOrderStatus.label(order.status),
style: TextStyle(
color: InvenTreeAPI().SalesOrderStatus.color(order.status),
)
),
),
onTap: () async {
order.goToDetailPage(context);
}
},
);
}
}
}

69
lib/widget/order/so_extra_line_list.dart
View File

@ -11,40 +11,39 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/widget/snacks.dart";
class SOExtraLineListWidget extends StatefulWidget {
const SOExtraLineListWidget(this.order, {this.filters = const {}, Key? key}) : super(key: key);
const SOExtraLineListWidget(this.order, {this.filters = const {}, Key? key})
: super(key: key);
final InvenTreeSalesOrder order;
final Map<String, String> filters;
@override
_SalesOrderExtraLineListWidgetState createState() => _SalesOrderExtraLineListWidgetState();
_SalesOrderExtraLineListWidgetState createState() =>
_SalesOrderExtraLineListWidgetState();
}
class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineListWidget> {
class _SalesOrderExtraLineListWidgetState
extends RefreshableState<SOExtraLineListWidget> {
_SalesOrderExtraLineListWidgetState();
@override
String getAppBarTitle() => L10().extraLineItems;
Future<void> _addLineItem(BuildContext context) async {
var fields = InvenTreeSOExtraLineItem().formFields();
fields["order"]?["value"] = widget.order.pk;
InvenTreeSOExtraLineItem().createForm(
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
context,
L10().lineItemAdd,
fields: fields,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
},
);
}
@ -54,13 +53,13 @@ class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineLi
if (widget.order.canEdit) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd,
onTap: () {
_addLineItem(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.circle_plus, color: Colors.green),
label: L10().lineItemAdd,
onTap: () {
_addLineItem(context);
},
),
);
}
@ -73,35 +72,41 @@ class _SalesOrderExtraLineListWidgetState extends RefreshableState<SOExtraLineLi
}
}
class PaginatedSOExtraLineList extends PaginatedSearchWidget {
const PaginatedSOExtraLineList(Map<String, String> filters) : super(filters: filters);
const PaginatedSOExtraLineList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().extraLineItems;
@override
_PaginatedSOExtraLineListState createState() => _PaginatedSOExtraLineListState();
_PaginatedSOExtraLineListState createState() =>
_PaginatedSOExtraLineListState();
}
class _PaginatedSOExtraLineListState extends PaginatedSearchState<PaginatedSOExtraLineList> {
class _PaginatedSOExtraLineListState
extends PaginatedSearchState<PaginatedSOExtraLineList> {
_PaginatedSOExtraLineListState() : super();
@override
String get prefix => "so_extra_line_";
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSOExtraLineItem().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeSOExtraLineItem().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSOExtraLineItem line = model as InvenTreeSOExtraLineItem;
return ListTile(
@ -115,4 +120,4 @@ class _PaginatedSOExtraLineListState extends PaginatedSearchState<PaginatedSOExt
},
);
}
}
}

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

@ -1,5 +1,3 @@
/*
* Widget for displaying detail view of a single SalesOrderLineItem
*/
@ -22,21 +20,16 @@ import "package:inventree/l10.dart";
import "package:inventree/helpers.dart";
import "package:inventree/api_form.dart";
class SoLineDetailWidget extends StatefulWidget {
const SoLineDetailWidget(this.item, {Key? key}) : super(key: key);
final InvenTreeSOLineItem item;
@override
_SOLineDetailWidgetState createState() => _SOLineDetailWidgetState();
}
class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
_SOLineDetailWidgetState();
InvenTreeSalesOrder? order;
@ -51,10 +44,11 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
if (widget.item.canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
onPressed: () {
_editLineItem(context);
}),
icon: Icon(TablerIcons.edit),
onPressed: () {
_editLineItem(context);
},
),
);
}
@ -62,7 +56,6 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
}
Future<void> _allocateStock(BuildContext context) async {
if (order == null) {
return;
}
@ -73,12 +66,10 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
fields["stock_item"]?["filters"] = {
"in_stock": true,
"available": true,
"part": widget.item.partId.toString()
"part": widget.item.partId.toString(),
};
fields["quantity"]?["value"] = widget.item.unallocatedQuantity.toString();
fields["shipment"]?["filters"] = {
"order": order!.pk.toString()
};
fields["shipment"]?["filters"] = {"order": order!.pk.toString()};
launchApiForm(
context,
@ -89,9 +80,8 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
icon: TablerIcons.transition_right,
onSuccess: (data) async {
refresh(context);
}
},
);
}
Future<void> _editLineItem(BuildContext context) async {
@ -109,13 +99,12 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().lineItemUpdated, success: true);
}
},
);
}
@override
List<SpeedDialChild> actionButtons(BuildContext context) {
List<SpeedDialChild> buttons = [];
if (order != null && order!.isOpen) {
@ -125,8 +114,8 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
label: L10().allocateStock,
onTap: () async {
_allocateStock(context);
}
)
},
),
);
}
@ -138,22 +127,21 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
List<SpeedDialChild> actions = [];
if (order != null && order!.isOpen && InvenTreeSOLineItem().canCreate) {
if (api.supportsBarcodeSOAllocateEndpoint) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.transition_right),
label: L10().allocateStock,
onTap: () async {
scanBarcode(
context,
handler: SOAllocateStockHandler(
salesOrder: order,
lineItem: widget.item
)
);
}
)
SpeedDialChild(
child: Icon(TablerIcons.transition_right),
label: L10().allocateStock,
onTap: () async {
scanBarcode(
context,
handler: SOAllocateStockHandler(
salesOrder: order,
lineItem: widget.item,
),
);
},
),
);
}
}
@ -193,8 +181,8 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
}
)
},
),
);
// Available quantity
@ -202,8 +190,8 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
ListTile(
title: Text(L10().availableStock),
leading: Icon(TablerIcons.packages),
trailing: Text(simpleNumberString(widget.item.availableStock))
)
trailing: Text(simpleNumberString(widget.item.availableStock)),
),
);
// Allocated quantity
@ -215,10 +203,10 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
trailing: Text(
widget.item.allocatedString,
style: TextStyle(
color: widget.item.isAllocated ? COLOR_SUCCESS : COLOR_WARNING
)
)
)
color: widget.item.isAllocated ? COLOR_SUCCESS : COLOR_WARNING,
),
),
),
);
// Shipped quantity
@ -229,11 +217,11 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
trailing: Text(
widget.item.progressString,
style: TextStyle(
color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING
color: widget.item.isComplete ? COLOR_SUCCESS : COLOR_WARNING,
),
),
leading: Icon(TablerIcons.truck)
)
leading: Icon(TablerIcons.truck),
),
);
// Reference
@ -242,36 +230,36 @@ class _SOLineDetailWidgetState extends RefreshableState<SoLineDetailWidget> {
ListTile(
title: Text(L10().reference),
subtitle: Text(widget.item.reference),
leading: Icon(TablerIcons.hash)
)
leading: Icon(TablerIcons.hash),
),
);
}
// Note
if (widget.item.notes.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().notes),
subtitle: Text(widget.item.notes),
leading: Icon(TablerIcons.note),
)
ListTile(
title: Text(L10().notes),
subtitle: Text(widget.item.notes),
leading: Icon(TablerIcons.note),
),
);
}
// External link
if (widget.item.link.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().link),
subtitle: Text(widget.item.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
await openLink(widget.item.link);
},
)
ListTile(
title: Text(L10().link),
subtitle: Text(widget.item.link),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () async {
await openLink(widget.item.link);
},
),
);
}
return tiles;
}
}
}

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

@ -9,28 +9,26 @@ import "package:inventree/api.dart";
import "package:inventree/app_colors.dart";
import "package:inventree/widget/progress.dart";
/*
* Paginated widget class for displaying a list of sales order line items
*/
class PaginatedSOLineList extends PaginatedSearchWidget {
const PaginatedSOLineList(Map<String, String> filters) : super(filters: filters);
const PaginatedSOLineList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().lineItems;
@override
_PaginatedSOLineListState createState() => _PaginatedSOLineListState();
}
/*
* State class for PaginatedSOLineList
*/
class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList> {
class _PaginatedSOLineListState
extends PaginatedSearchState<PaginatedSOLineList> {
_PaginatedSOLineListState() : super();
@override
@ -43,13 +41,19 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
};
@override
Map<String, Map<String, dynamic>> get filterOptions => {
};
Map<String, Map<String, dynamic>> get filterOptions => {};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSOLineItem().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeSOLineItem().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@ -63,24 +67,30 @@ class _PaginatedSOLineListState extends PaginatedSearchState<PaginatedSOLineList
title: Text(part.name),
subtitle: Text(part.description),
leading: InvenTreeAPI().getThumbnail(part.thumbnail),
trailing: Text(item.progressString, style: TextStyle(color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING)),
trailing: Text(
item.progressString,
style: TextStyle(
color: item.isComplete ? COLOR_SUCCESS : COLOR_WARNING,
),
),
onTap: () async {
showLoadingOverlay();
await item.reload();
hideLoadingOverlay();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SoLineDetailWidget(item))
MaterialPageRoute(builder: (context) => SoLineDetailWidget(item)),
);
}
},
);
} else {
return ListTile(
title: Text(L10().error),
subtitle: Text("Missing part detail", style: TextStyle(color: COLOR_DANGER)),
subtitle: Text(
"Missing part detail",
style: TextStyle(color: COLOR_DANGER),
),
);
}
}
}

35
lib/widget/order/so_shipment_list.dart
View File

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
import "package:inventree/app_colors.dart";
@ -9,19 +8,19 @@ import "package:inventree/inventree/model.dart";
import "package:inventree/l10.dart";
class PaginatedSOShipmentList extends PaginatedSearchWidget {
const PaginatedSOShipmentList(Map<String, String> filters) : super(filters: filters);
const PaginatedSOShipmentList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().shipments;
@override
_PaginatedSOShipmentListState createState() => _PaginatedSOShipmentListState();
_PaginatedSOShipmentListState createState() =>
_PaginatedSOShipmentListState();
}
class _PaginatedSOShipmentListState extends PaginatedSearchState<PaginatedSOShipmentList> {
class _PaginatedSOShipmentListState
extends PaginatedSearchState<PaginatedSOShipmentList> {
_PaginatedSOShipmentListState() : super();
@override
@ -34,22 +33,30 @@ class _PaginatedSOShipmentListState extends PaginatedSearchState<PaginatedSOShip
Map<String, Map<String, dynamic>> get filterOptions => {};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeSalesOrderShipment().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeSalesOrderShipment().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeSalesOrderShipment shipment = model as InvenTreeSalesOrderShipment;
return ListTile(
title: Text(shipment.reference),
subtitle: Text(shipment.tracking_number),
leading: shipment.shipped ? Icon(TablerIcons.calendar_check, color: COLOR_SUCCESS) : Icon(TablerIcons.calendar_cancel, color: COLOR_WARNING),
trailing: shipment.shipped ? Text(shipment.shipment_date ?? "") : null
leading: shipment.shipped
? Icon(TablerIcons.calendar_check, color: COLOR_SUCCESS)
: Icon(TablerIcons.calendar_cancel, color: COLOR_WARNING),
trailing: shipment.shipped ? Text(shipment.shipment_date ?? "") : null,
);
}
}
}

177
lib/widget/paginator.dart
View File

@ -15,12 +15,10 @@ import "package:inventree/preferences.dart";
import "package:inventree/widget/refreshable_state.dart";
/*
* Abstract base widget class for rendering a PaginatedSearchState
*/
abstract class PaginatedSearchWidget extends StatefulWidget {
const PaginatedSearchWidget({this.filters = const {}, this.title = ""});
final String title;
@ -30,12 +28,12 @@ abstract class PaginatedSearchWidget extends StatefulWidget {
final Map<String, String> filters;
}
/*
* Generic stateful widget for displaying paginated data retrieved via the API
*/
abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends State<T> with BaseWidgetProperties {
abstract class PaginatedSearchState<T extends PaginatedSearchWidget>
extends State<T>
with BaseWidgetProperties {
static const _pageSize = 25;
bool showSearchWidget = false;
@ -73,7 +71,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Construct the boolean filter options for this list
Future<Map<String, String>> constructFilters() async {
Map<String, String> f = {};
for (String k in filterOptions.keys) {
@ -95,7 +92,10 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Return the selected ordering "field" for this list widget
Future<String> orderingField() async {
dynamic field = await InvenTreeSettingsManager().getValue("${prefix}ordering_field", null);
dynamic field = await InvenTreeSettingsManager().getValue(
"${prefix}ordering_field",
null,
);
if (field != null && orderingOptions.containsKey(field.toString())) {
// A valid ordering field has been found
@ -110,7 +110,10 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Return the selected ordering "order" ("+" or "-") for this list widget
Future<String> orderingOrder() async {
dynamic order = await InvenTreeSettingsManager().getValue("${prefix}ordering_order", "+");
dynamic order = await InvenTreeSettingsManager().getValue(
"${prefix}ordering_order",
"+",
);
return order == "+" ? "+" : "-";
}
@ -137,10 +140,10 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Construct the 'ordering' options
List<Map<String, dynamic>> _opts = [];
orderingOptions.forEach((k, v) => _opts.add({
"value": k.toString(),
"display_name": v.toString()
}));
orderingOptions.forEach(
(k, v) =>
_opts.add({"value": k.toString(), "display_name": v.toString()}),
);
if (_field == null && _opts.isNotEmpty) {
_field = _opts.first["value"];
@ -160,16 +163,10 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
"required": true,
"value": _order,
"choices": [
{
"value": "+",
"display_name": "Ascending",
},
{
"value": "-",
"display_name": "Descending",
}
]
}
{"value": "+", "display_name": "Ascending"},
{"value": "-", "display_name": "Descending"},
],
},
};
// Add in selected filter options
@ -219,7 +216,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
fields,
icon: TablerIcons.circle_check,
onSuccess: (Map<String, dynamic> data) async {
// Extract data from the processed form
String f = (data["ordering_field"] ?? _field) as String;
String o = (data["ordering_order"] ?? _order) as String;
@ -235,7 +231,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Refresh data from the server
_pagingController.refresh();
}
},
);
}
@ -245,7 +241,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
int resultCount = 0;
String resultsString() {
if (resultCount <= 0) {
return noResultsText;
} else {
@ -260,7 +255,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
Timer? _debounceTimer;
// Pagination controller
final PagingController<int, InvenTreeModel> _pagingController = PagingController(firstPageKey: 0);
final PagingController<int, InvenTreeModel> _pagingController =
PagingController(firstPageKey: 0);
void refresh() {
_pagingController.refresh();
@ -286,8 +282,11 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
* Each implementing class must override this function,
* and return an InvenTreePageResponse object with the correct data format
*/
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
// Default implementation returns null - must be overridden
return null;
}
@ -301,7 +300,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Include user search term
if (searchTerm.isNotEmpty) {
String _search = searchTerm;
// Include original search in search test
@ -329,11 +327,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
params.addAll(f);
}
final page = await requestPage(
_pageSize,
pageKey,
params
);
final page = await requestPage(_pageSize, pageKey, params);
// We may have disposed of the widget while the request was in progress
// If this is the case, abort
@ -350,7 +344,7 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
if (page != null) {
for (var result in page.results) {
items.add(result);
items.add(result);
}
}
@ -367,16 +361,12 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
} catch (error, stackTrace) {
_pagingController.error = error;
sentryReportError(
"paginator.fetchPage",
error, stackTrace,
);
sentryReportError("paginator.fetchPage", error, stackTrace);
}
}
// Callback function when the search term is updated
void updateSearchTerm() {
if (searchTerm == searchController.text) {
// No change
return;
@ -410,7 +400,6 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
// Function to construct a single paginated item
// Must be overridden in an implementing subclass
Widget buildItem(BuildContext context, InvenTreeModel item) {
// This method must be overridden by the child class
return ListTile(
title: Text("*** UNIMPLEMENTED ***"),
@ -423,12 +412,8 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
String get noResultsText => L10().noResults;
@override
Widget build (BuildContext context) {
List<Widget> children = [
buildTitleWidget(context),
Divider(),
];
Widget build(BuildContext context) {
List<Widget> children = [buildTitleWidget(context), Divider()];
if (showSearchWidget) {
children.add(buildSearchInput(context));
@ -436,26 +421,26 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
children.add(
Expanded(
child: CustomScrollView(
shrinkWrap: true,
physics: AlwaysScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
slivers: <Widget>[
PagedSliverList.separated(
pagingController: _pagingController,
builderDelegate: PagedChildBuilderDelegate<InvenTreeModel>(
itemBuilder: (ctx, item, index) {
return buildItem(ctx, item);
},
noItemsFoundIndicatorBuilder: (context) {
return NoResultsWidget(noResultsText);
}
),
separatorBuilder: (context, item) => const Divider(height: 1),
)
]
)
)
child: CustomScrollView(
shrinkWrap: true,
physics: AlwaysScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
slivers: <Widget>[
PagedSliverList.separated(
pagingController: _pagingController,
builderDelegate: PagedChildBuilderDelegate<InvenTreeModel>(
itemBuilder: (ctx, item, index) {
return buildItem(ctx, item);
},
noItemsFoundIndicatorBuilder: (context) {
return NoResultsWidget(noResultsText);
},
),
separatorBuilder: (context, item) => const Divider(height: 1),
),
],
),
),
);
return RefreshIndicator(
@ -473,28 +458,34 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
* Build the title widget for this list
*/
Widget buildTitleWidget(BuildContext context) {
const double icon_size = 32;
List<Widget> _icons = [];
if (filterOptions.isNotEmpty || orderingOptions.isNotEmpty) {
_icons.add(IconButton(
onPressed: () async {
_setOrderingOptions(context);
},
icon: Icon(Icons.filter_alt, size: icon_size)
));
_icons.add(
IconButton(
onPressed: () async {
_setOrderingOptions(context);
},
icon: Icon(Icons.filter_alt, size: icon_size),
),
);
}
_icons.add(IconButton(
_icons.add(
IconButton(
onPressed: () {
setState(() {
showSearchWidget = !showSearchWidget;
});
},
icon: Icon(showSearchWidget ? Icons.zoom_out : Icons.search, size: icon_size)
));
icon: Icon(
showSearchWidget ? Icons.zoom_out : Icons.search,
size: icon_size,
),
),
);
// _icons.add(IconButton(
// onPressed: () async {
@ -506,20 +497,13 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
return ListTile(
title: Text(
widget.searchTitle,
style: TextStyle(
fontWeight: FontWeight.bold,
),
style: TextStyle(fontWeight: FontWeight.bold),
),
subtitle: Text(
"${L10().results}: ${resultCount}",
style: TextStyle(
fontStyle: FontStyle.italic
),
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: _icons,
style: TextStyle(fontStyle: FontStyle.italic),
),
trailing: Row(mainAxisSize: MainAxisSize.min, children: _icons),
);
}
@ -530,7 +514,9 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
return ListTile(
trailing: GestureDetector(
child: Icon(
searchController.text.isEmpty ? TablerIcons.search : TablerIcons.backspace,
searchController.text.isEmpty
? TablerIcons.search
: TablerIcons.backspace,
color: searchController.text.isNotEmpty ? COLOR_DANGER : COLOR_ACTION,
),
onTap: () {
@ -545,31 +531,22 @@ abstract class PaginatedSearchState<T extends PaginatedSearchWidget> extends Sta
onChanged: (value) {
updateSearchTerm();
},
decoration: InputDecoration(
hintText: L10().search,
),
)
decoration: InputDecoration(hintText: L10().search),
),
);
}
}
class NoResultsWidget extends StatelessWidget {
const NoResultsWidget(this.description);
final String description;
@override
Widget build(BuildContext context) {
return ListTile(
title: Text(
description,
style: TextStyle(fontStyle: FontStyle.italic),
),
title: Text(description, style: TextStyle(fontStyle: FontStyle.italic)),
leading: Icon(TablerIcons.exclamation_circle, color: COLOR_WARNING),
);
}
}

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

@ -1,4 +1,3 @@
import "package:flutter/material.dart";
import "package:flutter_tabler_icons/flutter_tabler_icons.dart";
@ -14,13 +13,15 @@ import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/progress.dart";
import "package:inventree/widget/refreshable_state.dart";
/*
* Widget for displaying a Bill of Materials for a specified Part instance
*/
class BillOfMaterialsWidget extends StatefulWidget {
const BillOfMaterialsWidget(this.part, {this.isParentComponent = true, Key? key}) : super(key: key);
const BillOfMaterialsWidget(
this.part, {
this.isParentComponent = true,
Key? key,
}) : super(key: key);
final InvenTreePart part;
@ -53,12 +54,11 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
showFilterOptions = !showFilterOptions;
});
},
)
),
];
@override
Widget getBody(BuildContext context) {
Map<String, String> filters = {};
if (widget.isParentComponent) {
@ -72,7 +72,11 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
ListTile(
leading: InvenTreeAPI().getThumbnail(widget.part.thumbnail),
title: Text(widget.part.fullname),
subtitle: Text(widget.isParentComponent ? L10().billOfMaterials : L10().usedInDetails),
subtitle: Text(
widget.isParentComponent
? L10().billOfMaterials
: L10().usedInDetails,
),
trailing: Text(L10().quantity),
),
Divider(thickness: 1.25),
@ -87,13 +91,14 @@ class _BillOfMaterialsState extends RefreshableState<BillOfMaterialsWidget> {
}
}
/*
* Create a paginated widget displaying a list of BomItem objects
*/
class PaginatedBomList extends PaginatedSearchWidget {
const PaginatedBomList(Map<String, String> filters, {this.isParentPart = true}) : super(filters: filters);
const PaginatedBomList(
Map<String, String> filters, {
this.isParentPart = true,
}) : super(filters: filters);
final bool isParentPart;
@ -104,9 +109,7 @@ class PaginatedBomList extends PaginatedSearchWidget {
_PaginatedBomListState createState() => _PaginatedBomListState();
}
class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
_PaginatedBomListState() : super();
@override
@ -123,23 +126,31 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
"sub_part_assembly": {
"label": L10().filterAssembly,
"help_text": L10().filterAssemblyDetail,
}
},
};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreeBomItem().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreeBomItem().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreeBomItem bomItem = model as InvenTreeBomItem;
InvenTreePart? subPart = widget.isParentPart ? bomItem.subPart : bomItem.part;
InvenTreePart? subPart = widget.isParentPart
? bomItem.subPart
: bomItem.part;
String title = subPart?.fullname ?? "error - no name";
@ -151,16 +162,17 @@ class _PaginatedBomListState extends PaginatedSearchState<PaginatedBomList> {
style: TextStyle(fontWeight: FontWeight.bold),
),
leading: InvenTreeAPI().getThumbnail(subPart?.thumbnail ?? ""),
onTap: subPart == null ? null : () async {
onTap: subPart == null
? null
: () async {
showLoadingOverlay();
var part = await InvenTreePart().get(subPart.pk);
hideLoadingOverlay();
showLoadingOverlay();
var part = await InvenTreePart().get(subPart.pk);
hideLoadingOverlay();
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
if (part is InvenTreePart) {
part.goToDetailPage(context);
}
},
);
}
}
}

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

@ -13,9 +13,7 @@ import "package:inventree/widget/progress.dart";
import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/refreshable_state.dart";
class CategoryDisplayWidget extends StatefulWidget {
const CategoryDisplayWidget(this.category, {Key? key}) : super(key: key);
final InvenTreePartCategory? category;
@ -24,9 +22,7 @@ class CategoryDisplayWidget extends StatefulWidget {
_CategoryDisplayState createState() => _CategoryDisplayState();
}
class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
_CategoryDisplayState();
@override
@ -40,12 +36,12 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
if (InvenTreePartCategory().canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
icon: Icon(TablerIcons.edit),
tooltip: L10().editCategory,
onPressed: () {
_editCategoryDialog(context);
},
)
),
);
}
}
@ -58,13 +54,13 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
List<SpeedDialChild> actions = [];
if (InvenTreePart().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.box),
label: L10().partCreateDetail,
onTap: _newPart,
)
);
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.box),
label: L10().partCreateDetail,
onTap: _newPart,
),
);
}
if (InvenTreePartCategory().canCreate) {
@ -74,8 +70,8 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
label: L10().categoryCreateDetail,
onTap: () {
_newCategory(context);
}
)
},
),
);
}
@ -91,12 +87,12 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
}
_cat.editForm(
context,
L10().editCategory,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().categoryUpdated, success: true);
}
context,
L10().editCategory,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().categoryUpdated, success: true);
},
);
}
@ -107,7 +103,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
@override
Future<void> request(BuildContext context) async {
// Update the category
if (widget.category != null) {
final bool result = await widget.category?.reload() ?? false;
@ -126,79 +121,69 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
title: Text(
L10().partCategoryTopLevel,
style: TextStyle(fontStyle: FontStyle.italic),
)
)
),
),
);
} else {
List<Widget> children = [
ListTile(
title: Text("${widget.category?.name}",
style: TextStyle(fontWeight: FontWeight.bold)
title: Text(
"${widget.category?.name}",
style: TextStyle(fontWeight: FontWeight.bold),
),
subtitle: Text("${widget.category?.description}"),
leading: widget.category!.customIcon != null ? Icon(widget.category!.customIcon) : Icon(TablerIcons.sitemap)
leading: widget.category!.customIcon != null
? Icon(widget.category!.customIcon)
: Icon(TablerIcons.sitemap),
),
];
if (extra) {
children.add(
ListTile(
title: Text(L10().parentCategory),
subtitle: Text("${widget.category?.parentPathString}"),
leading: Icon(
TablerIcons.arrow_move_up,
color: COLOR_ACTION,
),
onTap: () async {
ListTile(
title: Text(L10().parentCategory),
subtitle: Text("${widget.category?.parentPathString}"),
leading: Icon(TablerIcons.arrow_move_up, color: COLOR_ACTION),
onTap: () async {
int parentId = widget.category?.parentId ?? -1;
int parentId = widget.category?.parentId ?? -1;
if (parentId < 0) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(null),
),
);
} else {
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(parentId);
hideLoadingOverlay();
if (parentId < 0) {
Navigator.push(context, MaterialPageRoute(builder: (context) => CategoryDisplayWidget(null)));
} else {
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(parentId);
hideLoadingOverlay();
if (cat is InvenTreePartCategory) {
cat.goToDetailPage(context);
}
if (cat is InvenTreePartCategory) {
cat.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().parts),
];
return [Tab(text: L10().details), Tab(text: L10().parts)];
}
@override
List<Widget> getTabs(BuildContext context) {
return [
Column(children: detailTiles()),
Column(children: partsTiles()),
];
return [Column(children: detailTiles()), Column(children: partsTiles())];
}
// Construct the "details" panel
List<Widget> detailTiles() {
Map<String, String> filters = {};
int? parent = widget.category?.pk;
@ -212,12 +197,9 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
List<Widget> tiles = <Widget>[
getCategoryDescriptionCard(),
Expanded(
child: PaginatedPartCategoryList(
filters,
title: L10().subcategories,
),
child: PaginatedPartCategoryList(filters, title: L10().subcategories),
flex: 10,
)
),
];
return tiles;
@ -225,31 +207,21 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
// Construct the "parts" panel
List<Widget> partsTiles() {
Map<String, String> filters = {
"category": widget.category?.pk.toString() ?? "null",
};
return [
Expanded(
child: PaginatedPartList(filters),
flex: 10,
)
];
return [Expanded(child: PaginatedPartList(filters), flex: 10)];
}
Future<void> _newCategory(BuildContext context) async {
int pk = widget.category?.pk ?? -1;
InvenTreePartCategory().createForm(
context,
L10().categoryCreate,
data: {
"parent": (pk > 0) ? pk : null,
},
data: {"parent": (pk > 0) ? pk : null},
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
@ -260,29 +232,25 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
} else {
refresh(context);
}
}
},
);
}
Future<void> _newPart() async {
int pk = widget.category?.pk ?? -1;
InvenTreePart().createForm(
context,
L10().partCreate,
data: {
"category": (pk > 0) ? pk : null
},
data: {"category": (pk > 0) ? pk : null},
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
if (data.containsKey("pk")) {
var part = InvenTreePart.fromJson(data);
part.goToDetailPage(context);
}
}
},
);
}
}

42
lib/widget/part/category_list.dart
View File

@ -9,19 +9,15 @@ import "package:inventree/api.dart";
import "package:inventree/l10.dart";
class PartCategoryList extends StatefulWidget {
const PartCategoryList(this.filters);
final Map<String, String> filters;
@override
_PartCategoryListState createState() => _PartCategoryListState();
}
class _PartCategoryListState extends RefreshableState<PartCategoryList> {
_PartCategoryListState();
@override
@ -34,19 +30,21 @@ class _PartCategoryListState extends RefreshableState<PartCategoryList> {
}
class PaginatedPartCategoryList extends PaginatedSearchWidget {
const PaginatedPartCategoryList(Map<String, String> filters, {String title = ""}) : super(filters: filters, title: title);
const PaginatedPartCategoryList(
Map<String, String> filters, {
String title = "",
}) : super(filters: filters, title: title);
@override
String get searchTitle => title.isNotEmpty ? title : L10().partCategories;
@override
_PaginatedPartCategoryListState createState() => _PaginatedPartCategoryListState();
_PaginatedPartCategoryListState createState() =>
_PaginatedPartCategoryListState();
}
class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPartCategoryList> {
class _PaginatedPartCategoryListState
extends PaginatedSearchState<PaginatedPartCategoryList> {
// _PaginatedPartCategoryListState(Map<String, String> filters, bool searchEnabled) : super(filters, searchEnabled);
@override
@ -59,16 +57,12 @@ class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPart
"label": L10().includeSubcategories,
"help_text": L10().includeSubcategoriesDetail,
"tristate": false,
}
},
};
@override
Map<String, String> get orderingOptions {
Map<String, String> options = {
"name": L10().name,
"level": L10().level,
};
Map<String, String> options = {"name": L10().name, "level": L10().level};
// Note: API v69 changed 'parts' to 'part_count'
if (InvenTreeAPI().apiVersion >= 69) {
@ -81,16 +75,22 @@ class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPart
}
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePartCategory().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreePartCategory().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePartCategory category = model as InvenTreePartCategory;
return ListTile(
@ -103,4 +103,4 @@ class _PaginatedPartCategoryListState extends PaginatedSearchState<PaginatedPart
},
);
}
}
}

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

@ -27,24 +27,19 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/widget/stock/stock_list.dart";
import "package:inventree/widget/company/supplier_part_list.dart";
/*
* Widget for displaying a detail view of a single Part instance
*/
class PartDetailWidget extends StatefulWidget {
const PartDetailWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part;
@override
_PartDisplayState createState() => _PartDisplayState(part);
}
class _PartDisplayState extends RefreshableState<PartDetailWidget> {
_PartDisplayState(this.part);
InvenTreePart part;
@ -76,13 +71,13 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (InvenTreePart().canEdit) {
actions.add(
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editPart,
onPressed: () {
_editPartDialog(context);
}
)
IconButton(
icon: Icon(TablerIcons.edit),
tooltip: L10().editPart,
onPressed: () {
_editPartDialog(context);
},
),
);
}
return actions;
@ -94,11 +89,13 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (InvenTreePart().canEdit) {
actions.add(
customBarcodeAction(
context, this,
widget.part.customBarcode, "part",
widget.part.pk
)
customBarcodeAction(
context,
this,
widget.part.customBarcode,
"part",
widget.part.pk,
),
);
}
@ -111,13 +108,13 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (InvenTreeStockItem().canCreate) {
actions.add(
SpeedDialChild(
child: Icon(TablerIcons.packages),
label: L10().stockItemCreate,
onTap: () {
_newStockItem(context);
}
)
SpeedDialChild(
child: Icon(TablerIcons.packages),
label: L10().stockItemCreate,
onTap: () {
_newStockItem(context);
},
),
);
}
@ -132,10 +129,10 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
labels,
widget.part.pk,
"part",
"part=${widget.part.pk}"
"part=${widget.part.pk}",
);
}
)
},
),
);
}
@ -153,14 +150,22 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
@override
Future<void> request(BuildContext context) async {
final bool result = await part.reload();
// Load page settings from local storage
showPricing = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PRICING, true);
showParameters = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_PARAMETERS, true);
showPricing = await InvenTreeSettingsManager().getBool(
INV_PART_SHOW_PRICING,
true,
);
showParameters = await InvenTreeSettingsManager().getBool(
INV_PART_SHOW_PARAMETERS,
true,
);
showBom = await InvenTreeSettingsManager().getBool(INV_PART_SHOW_BOM, true);
allowLabelPrinting = await InvenTreeSettingsManager().getBool(INV_ENABLE_LABEL_PRINTING, true);
allowLabelPrinting = await InvenTreeSettingsManager().getBool(
INV_ENABLE_LABEL_PRINTING,
true,
);
if (!result || part.pk == -1) {
// Part could not be loaded, for some reason
@ -211,11 +216,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
}
// Request the number of BOM items
InvenTreePart().count(
filters: {
"in_bom_for": part.pk.toString(),
}
).then((int value) {
InvenTreePart().count(filters: {"in_bom_for": part.pk.toString()}).then((
int value,
) {
if (mounted) {
setState(() {
bomCount = value;
@ -224,11 +227,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
});
// Request number of "used in" parts
InvenTreeBomItem().count(
filters: {
"uses": part.pk.toString(),
}
).then((int value) {
InvenTreeBomItem().count(filters: {"uses": part.pk.toString()}).then((
int value,
) {
if (mounted) {
setState(() {
usedInCount = value;
@ -237,11 +238,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
});
// Request the number of variant items
InvenTreePart().count(
filters: {
"variant_of": part.pk.toString(),
}
).then((int value) {
InvenTreePart().count(filters: {"variant_of": part.pk.toString()}).then((
int value,
) {
if (mounted) {
setState(() {
variantCount = value;
@ -253,16 +252,14 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
allowLabelPrinting &= api.supportsMixin("labels");
if (allowLabelPrinting) {
String model_type = api.supportsModernLabelPrinting ? InvenTreePart.MODEL_TYPE : "part";
String model_type = api.supportsModernLabelPrinting
? InvenTreePart.MODEL_TYPE
: "part";
String item_key = api.supportsModernLabelPrinting ? "items" : "part";
_labels = await getLabelTemplates(
model_type,
{
item_key: widget.part.pk.toString()
}
);
_labels = await getLabelTemplates(model_type, {
item_key: widget.part.pk.toString(),
});
}
if (mounted) {
@ -273,41 +270,34 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
}
void _editPartDialog(BuildContext context) {
part.editForm(
context,
L10().editPart,
onSuccess: (data) async {
refresh(context);
showSnackIcon(L10().partEdited, success: true);
}
},
);
}
Widget headerTile() {
return Card(
child: ListTile(
title: Text(part.fullname),
subtitle: Text(part.description),
trailing: Text(
part.stockString(),
style: TextStyle(
fontSize: 20,
)
),
leading: GestureDetector(
child: api.getImage(part.thumbnail),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartImageWidget(part)
)
).then((value) {
refresh(context);
});
}),
child: ListTile(
title: Text(part.fullname),
subtitle: Text(part.description),
trailing: Text(part.stockString(), style: TextStyle(fontSize: 20)),
leading: GestureDetector(
child: api.getImage(part.thumbnail),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => PartImageWidget(part)),
).then((value) {
refresh(context);
});
},
),
),
);
}
@ -315,13 +305,10 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
* Build a list of tiles to display under the part description
*/
List<Widget> partTiles() {
List<Widget> tiles = [];
// Image / name / description
tiles.add(
headerTile()
);
tiles.add(headerTile());
if (loading) {
tiles.add(progressIndicator());
@ -331,23 +318,13 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (!part.isActive) {
tiles.add(
ListTile(
title: Text(
L10().inactive,
style: TextStyle(
color: COLOR_DANGER
)
),
title: Text(L10().inactive, style: TextStyle(color: COLOR_DANGER)),
subtitle: Text(
L10().inactiveDetail,
style: TextStyle(
color: COLOR_DANGER
)
style: TextStyle(color: COLOR_DANGER),
),
leading: Icon(
TablerIcons.exclamation_circle,
color: COLOR_DANGER
),
)
leading: Icon(TablerIcons.exclamation_circle, color: COLOR_DANGER),
),
);
}
@ -356,15 +333,11 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
ListTile(
title: Text(L10().templatePart),
subtitle: Text(parentPart!.fullname),
leading: api.getImage(
parentPart!.thumbnail,
width: 32,
height: 32,
),
leading: api.getImage(parentPart!.thumbnail, width: 32, height: 32),
onTap: () {
parentPart?.goToDetailPage(context);
}
)
},
),
);
}
@ -372,58 +345,58 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (part.categoryName.isNotEmpty) {
tiles.add(
ListTile(
title: Text(L10().partCategory),
subtitle: Text("${part.categoryName}"),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () async {
if (part.categoryId > 0) {
title: Text(L10().partCategory),
subtitle: Text("${part.categoryName}"),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () async {
if (part.categoryId > 0) {
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(part.categoryId);
hideLoadingOverlay();
showLoadingOverlay();
var cat = await InvenTreePartCategory().get(part.categoryId);
hideLoadingOverlay();
if (cat is InvenTreePartCategory) {
cat.goToDetailPage(context);
}
if (cat is InvenTreePartCategory) {
cat.goToDetailPage(context);
}
},
)
}
},
),
);
} else {
tiles.add(
ListTile(
title: Text(L10().partCategory),
subtitle: Text(L10().partCategoryTopLevel),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () {
Navigator.push(context, MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(null)));
},
)
ListTile(
title: Text(L10().partCategory),
subtitle: Text(L10().partCategoryTopLevel),
leading: Icon(TablerIcons.sitemap, color: COLOR_ACTION),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CategoryDisplayWidget(null),
),
);
},
),
);
}
// Display number of "variant" parts if any exist
if (variantCount > 0) {
tiles.add(
ListTile(
title: Text(L10().variants),
leading: Icon(TablerIcons.versions, color: COLOR_ACTION),
trailing: Text(variantCount.toString()),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartList(
{
"variant_of": part.pk.toString(),
},
title: L10().variants
)
)
);
},
)
ListTile(
title: Text(L10().variants),
leading: Icon(TablerIcons.versions, color: COLOR_ACTION),
trailing: Text(variantCount.toString()),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartList({
"variant_of": part.pk.toString(),
}, title: L10().variants),
),
);
},
),
);
}
@ -434,19 +407,16 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
leading: Icon(TablerIcons.packages),
trailing: Text(
part.stockString(),
style: TextStyle(
fontWeight: FontWeight.bold,
),
style: TextStyle(fontWeight: FontWeight.bold),
),
),
);
if (showPricing && partPricing != null) {
String pricing = formatPriceRange(
partPricing?.overallMin,
partPricing?.overallMax,
currency: partPricing?.currency
currency: partPricing?.currency,
);
tiles.add(
@ -455,15 +425,14 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
leading: Icon(TablerIcons.currency_dollar, color: COLOR_ACTION),
trailing: Text(
pricing.isNotEmpty ? pricing : L10().noPricingAvailable,
style: TextStyle(
fontWeight: FontWeight.bold,
),
style: TextStyle(fontWeight: FontWeight.bold),
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartPricingWidget(part: part, partPricing: partPricing),
builder: (context) =>
PartPricingWidget(part: part, partPricing: partPricing),
),
);
},
@ -473,7 +442,6 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
// Tiles for "purchaseable" parts
if (part.isPurchaseable) {
// On order
tiles.add(
ListTile(
@ -484,39 +452,41 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
onTap: () {
// TODO - Order views
},
)
),
);
}
// Tiles for an "assembly" part
if (part.isAssembly) {
if (showBom && bomCount > 0) {
tiles.add(
ListTile(
title: Text(L10().billOfMaterials),
leading: Icon(TablerIcons.list_tree, color: COLOR_ACTION),
trailing: Text(bomCount.toString()),
onTap: () {
Navigator.push(context, MaterialPageRoute(
builder: (context) => BillOfMaterialsWidget(part, isParentComponent: true)
));
},
)
ListTile(
title: Text(L10().billOfMaterials),
leading: Icon(TablerIcons.list_tree, color: COLOR_ACTION),
trailing: Text(bomCount.toString()),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
BillOfMaterialsWidget(part, isParentComponent: true),
),
);
},
),
);
}
if (part.building > 0) {
tiles.add(
ListTile(
title: Text(L10().building),
leading: Icon(TablerIcons.tools),
trailing: Text("${simpleNumberString(part.building)}"),
onTap: () {
// TODO
},
)
ListTile(
title: Text(L10().building),
leading: Icon(TablerIcons.tools),
trailing: Text("${simpleNumberString(part.building)}"),
onTap: () {
// TODO
},
),
);
}
}
@ -529,15 +499,16 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
subtitle: Text(L10().usedInDetails),
leading: Icon(TablerIcons.stack_2, color: COLOR_ACTION),
trailing: Text(usedInCount.toString()),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => BillOfMaterialsWidget(part, isParentComponent: false)
)
);
}
)
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
BillOfMaterialsWidget(part, isParentComponent: false),
),
);
},
),
);
}
}
@ -545,29 +516,28 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
// Keywords?
if (part.keywords.isNotEmpty) {
tiles.add(
ListTile(
title: Text("${part.keywords}"),
leading: Icon(TablerIcons.tags),
)
ListTile(
title: Text("${part.keywords}"),
leading: Icon(TablerIcons.tags),
),
);
}
// External link?
if (part.link.isNotEmpty) {
tiles.add(
ListTile(
title: Text("${part.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () {
part.openLink();
},
)
ListTile(
title: Text("${part.link}"),
leading: Icon(TablerIcons.link, color: COLOR_ACTION),
onTap: () {
part.openLink();
},
),
);
}
// Tiles for "component" part
if (part.isComponent && part.usedInCount > 0) {
tiles.add(
ListTile(
title: Text(L10().usedIn),
@ -577,44 +547,44 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
onTap: () {
// TODO
},
)
),
);
}
if (part.isPurchaseable) {
if (part.supplierCount > 0) {
tiles.add(
ListTile(
title: Text(L10().suppliers),
leading: Icon(TablerIcons.building_factory, color: COLOR_ACTION),
trailing: Text("${part.supplierCount}"),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => SupplierPartList({
"part": part.pk.toString()
}))
);
},
)
ListTile(
title: Text(L10().suppliers),
leading: Icon(TablerIcons.building_factory, color: COLOR_ACTION),
trailing: Text("${part.supplierCount}"),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
SupplierPartList({"part": part.pk.toString()}),
),
);
},
),
);
}
}
// Notes field
tiles.add(
ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION),
trailing: Text(""),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => NotesWidget(part))
);
},
)
ListTile(
title: Text(L10().notes),
leading: Icon(TablerIcons.note, color: COLOR_ACTION),
trailing: Text(""),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => NotesWidget(part)),
);
},
),
);
tiles.add(
@ -627,19 +597,18 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
context,
MaterialPageRoute(
builder: (context) => AttachmentWidget(
InvenTreePartAttachment(),
part.pk,
L10().part,
part.canEdit
)
)
InvenTreePartAttachment(),
part.pk,
L10().part,
part.canEdit,
),
),
);
},
)
),
);
return tiles;
}
// Return tiles for each stock item
@ -654,9 +623,13 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
L10().stockItems,
style: TextStyle(fontWeight: FontWeight.bold),
),
subtitle: part.stockItems.isEmpty ? Text(L10().stockItemsNotAvailable) : null,
trailing: part.stockItems.isNotEmpty ? Text("${part.stockItems.length}") : null,
)
subtitle: part.stockItems.isEmpty
? Text(L10().stockItemsNotAvailable)
: null,
trailing: part.stockItems.isNotEmpty
? Text("${part.stockItems.length}")
: null,
),
);
return tiles;
@ -666,7 +639,6 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
* Launch a form to create a new StockItem for this part
*/
Future<void> _newStockItem(BuildContext context) async {
var fields = InvenTreeStockItem().formFields();
// Serial number cannot be directly edited here
@ -677,9 +649,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
int? default_location = part.defaultLocation;
Map<String, dynamic> data = {
"part": part.pk.toString()
};
Map<String, dynamic> data = {"part": part.pk.toString()};
if (default_location != null) {
data["location"] = default_location;
@ -688,15 +658,22 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
if (part.isTrackable) {
// read the next available serial number
showLoadingOverlay();
var response = await api.get("/api/part/${part.pk}/serial-numbers/", expectedStatusCode: null);
var response = await api.get(
"/api/part/${part.pk}/serial-numbers/",
expectedStatusCode: null,
);
hideLoadingOverlay();
if (response.isValid() && response.statusCode == 200) {
data["serial_numbers"] = response.data["next"] ?? response.data["latest"];
data["serial_numbers"] =
response.data["next"] ?? response.data["latest"];
}
print("response: " + response.statusCode.toString() + response.data.toString());
print(
"response: " +
response.statusCode.toString() +
response.data.toString(),
);
} else {
// Cannot set serial numbers for non-trackable parts
fields.remove("serial_numbers");
@ -705,28 +682,24 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
print("data: ${data.toString()}");
InvenTreeStockItem().createForm(
context,
L10().stockItemCreate,
fields: fields,
data: data,
onSuccess: (result) async {
context,
L10().stockItemCreate,
fields: fields,
data: data,
onSuccess: (result) async {
Map<String, dynamic> data = result as Map<String, dynamic>;
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);
}
},
);
}
@override
List<Widget> getTabIcons(BuildContext context) {
List<Widget> icons = [
Tab(text: L10().details),
Tab(text: L10().stock)
];
List<Widget> icons = [Tab(text: L10().details), Tab(text: L10().stock)];
if (showParameters) {
icons.add(Tab(text: L10().parameters));
@ -740,11 +713,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
List<Widget> tabs = [
SingleChildScrollView(
physics: AlwaysScrollableScrollPhysics(),
child: Column(
children: partTiles(),
)
child: Column(children: partTiles()),
),
PaginatedStockItemList({"part": part.pk.toString()})
PaginatedStockItemList({"part": part.pk.toString()}),
];
if (showParameters) {
@ -753,5 +724,4 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
return tabs;
}
}

15
lib/widget/part/part_image_widget.dart
View File

@ -11,19 +11,15 @@ import "package:inventree/widget/snacks.dart";
import "package:inventree/l10.dart";
class PartImageWidget extends StatefulWidget {
const PartImageWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part;
@override
_PartImageState createState() => _PartImageState(part);
}
class _PartImageState extends RefreshableState<PartImageWidget> {
_PartImageState(this.part);
final InvenTreePart part;
@ -38,17 +34,14 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
@override
List<Widget> appBarActions(BuildContext context) {
List<Widget> actions = [];
if (part.canEdit) {
// File upload
actions.add(
IconButton(
icon: Icon(TablerIcons.file_upload),
onPressed: () async {
FilePickerDialog.pickFile(
onPicked: (File file) async {
final result = await part.uploadImage(file);
@ -58,11 +51,10 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
}
refresh(context);
}
},
);
},
)
),
);
}
@ -73,5 +65,4 @@ class _PartImageState extends RefreshableState<PartImageWidget> {
Widget getBody(BuildContext context) {
return InvenTreeAPI().getImage(part.image);
}
}
}

38
lib/widget/part/part_list.dart
View File

@ -9,9 +9,7 @@ import "package:inventree/inventree/part.dart";
import "package:inventree/widget/paginator.dart";
import "package:inventree/widget/refreshable_state.dart";
class PartList extends StatefulWidget {
const PartList(this.filters, {this.title = ""});
final String title;
@ -22,9 +20,7 @@ class PartList extends StatefulWidget {
_PartListState createState() => _PartListState(filters, title);
}
class _PartListState extends RefreshableState<PartList> {
_PartListState(this.filters, this.title);
final String title;
@ -40,13 +36,11 @@ class _PartListState extends RefreshableState<PartList> {
Widget getBody(BuildContext context) {
return PaginatedPartList(filters);
}
}
class PaginatedPartList extends PaginatedSearchWidget {
const PaginatedPartList(Map<String, String> filters) : super(filters: filters);
const PaginatedPartList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().parts;
@ -55,9 +49,7 @@ class PaginatedPartList extends PaginatedSearchWidget {
_PaginatedPartListState createState() => _PaginatedPartListState();
}
class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
_PaginatedPartListState() : super();
@override
@ -84,7 +76,7 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
},
"assembly": {
"label": L10().filterAssembly,
"help_text": L10().filterAssemblyDetail
"help_text": L10().filterAssemblyDetail,
},
"component": {
"label": L10().filterComponent,
@ -92,7 +84,7 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
},
"is_template": {
"label": L10().filterTemplate,
"help_text": L10().filterTemplateDetail
"help_text": L10().filterTemplateDetail,
},
"trackable": {
"label": L10().filterTrackable,
@ -105,18 +97,25 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
"has_stock": {
"label": L10().filterInStock,
"help_text": L10().filterInStockDetail,
}
},
};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePart().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreePart().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePart part = model as InvenTreePart;
return ListTile(
@ -124,10 +123,7 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
subtitle: Text(part.description),
trailing: Text(
part.stockString(),
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold
)
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
),
leading: InvenTreeAPI().getThumbnail(part.thumbnail),
onTap: () {
@ -135,4 +131,4 @@ class _PaginatedPartListState extends PaginatedSearchState<PaginatedPartList> {
},
);
}
}
}

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

@ -11,7 +11,6 @@ import "package:inventree/widget/refreshable_state.dart";
* Widget for displaying a list of parameters associated with a given Part instance
*/
class PartParameterWidget extends StatefulWidget {
const PartParameterWidget(this.part);
final InvenTreePart part;
@ -20,7 +19,6 @@ class PartParameterWidget extends StatefulWidget {
_ParameterWidgetState createState() => _ParameterWidgetState();
}
class _ParameterWidgetState extends RefreshableState<PartParameterWidget> {
_ParameterWidgetState();
@ -36,28 +34,18 @@ class _ParameterWidgetState extends RefreshableState<PartParameterWidget> {
@override
Widget getBody(BuildContext context) {
Map<String, String> filters = {"part": widget.part.pk.toString()};
Map<String, String> filters = {
"part": widget.part.pk.toString()
};
return Column(
children: [
Expanded(
child: PaginatedParameterList(filters)
)
],
);
return Column(children: [Expanded(child: PaginatedParameterList(filters))]);
}
}
/*
* Widget for displaying a paginated list of Part parameters
*/
class PaginatedParameterList extends PaginatedSearchWidget {
const PaginatedParameterList(Map<String, String> filters) : super(filters: filters);
const PaginatedParameterList(Map<String, String> filters)
: super(filters: filters);
@override
String get searchTitle => L10().parameters;
@ -66,18 +54,15 @@ class PaginatedParameterList extends PaginatedSearchWidget {
_PaginatedParameterState createState() => _PaginatedParameterState();
}
class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterList> {
class _PaginatedParameterState
extends PaginatedSearchState<PaginatedParameterList> {
_PaginatedParameterState() : super();
@override
String get prefix => "parameters_";
@override
Map<String, String> get orderingOptions => {
};
Map<String, String> get orderingOptions => {};
@override
Map<String, Map<String, dynamic>> get filterOptions => {
@ -85,32 +70,37 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
};
@override
Future<InvenTreePageResponse?> requestPage(int limit, int offset, Map<String, String> params) async {
final page = await InvenTreePartParameter().listPaginated(limit, offset, filters: params);
Future<InvenTreePageResponse?> requestPage(
int limit,
int offset,
Map<String, String> params,
) async {
final page = await InvenTreePartParameter().listPaginated(
limit,
offset,
filters: params,
);
return page;
}
Future<void> editParameter(InvenTreePartParameter parameter) async {
// Checkbox values are handled separately
if (parameter.is_checkbox) {
return;
} else {
parameter.editForm(
context,
L10().editParameter,
onSuccess: (data) async {
updateSearchTerm();
}
context,
L10().editParameter,
onSuccess: (data) async {
updateSearchTerm();
},
);
}
}
@override
Widget buildItem(BuildContext context, InvenTreeModel model) {
InvenTreePartParameter parameter = model as InvenTreePartParameter;
String title = parameter.name;
@ -123,27 +113,28 @@ class _PaginatedParameterState extends PaginatedSearchState<PaginatedParameterLi
title: Text(title),
subtitle: Text(parameter.description),
trailing: parameter.is_checkbox
? Switch(
value: parameter.as_bool,
onChanged: (bool value) {
if (parameter.canEdit) {
showLoadingOverlay();
parameter.update(
values: {
"data": value.toString()
? Switch(
value: parameter.as_bool,
onChanged: (bool value) {
if (parameter.canEdit) {
showLoadingOverlay();
parameter.update(values: {"data": value.toString()}).then((
value,
) async {
hideLoadingOverlay();
updateSearchTerm();
});
}
).then((value) async{
hideLoadingOverlay();
updateSearchTerm();
});
}
},
) : Text(parameter.value),
onTap: parameter.is_checkbox ? null : () async {
if (parameter.canEdit) {
editParameter(parameter);
}
},
},
)
: Text(parameter.value),
onTap: parameter.is_checkbox
? null
: () async {
if (parameter.canEdit) {
editParameter(parameter);
}
},
);
}
}
}

85
lib/widget/part/part_pricing.dart
View File

@ -7,8 +7,11 @@ import "package:inventree/widget/refreshable_state.dart";
import "package:inventree/helpers.dart";
class PartPricingWidget extends StatefulWidget {
const PartPricingWidget({Key? key, required this.part, required this.partPricing}) : super(key: key);
const PartPricingWidget({
Key? key,
required this.part,
required this.partPricing,
}) : super(key: key);
final InvenTreePart part;
final InvenTreePartPricing? partPricing;
@ -17,7 +20,6 @@ class PartPricingWidget extends StatefulWidget {
}
class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
@override
String getAppBarTitle() {
return L10().partPricing;
@ -25,14 +27,13 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [
Card(
child: ListTile(
title: Text(widget.part.fullname),
subtitle: Text(widget.part.description),
leading: api.getThumbnail(widget.part.thumbnail)
)
leading: api.getThumbnail(widget.part.thumbnail),
),
),
];
@ -41,7 +42,7 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
ListTile(
title: Text(L10().noPricingAvailable),
subtitle: Text(L10().noPricingDataFound),
)
),
);
return tiles;
@ -50,10 +51,7 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
final pricing = widget.partPricing!;
tiles.add(
ListTile(
title: Text(L10().currency),
trailing: Text(pricing.currency),
)
ListTile(title: Text(L10().currency), trailing: Text(pricing.currency)),
);
tiles.add(
@ -63,10 +61,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.overallMin,
pricing.overallMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
if (pricing.overallMin != null) {
@ -74,9 +72,9 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
ListTile(
title: Text(L10().priceOverrideMin),
trailing: Text(
renderCurrency(pricing.overallMin, pricing.overrideMinCurrency)
)
)
renderCurrency(pricing.overallMin, pricing.overrideMinCurrency),
),
),
);
}
@ -85,9 +83,9 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
ListTile(
title: Text(L10().priceOverrideMax),
trailing: Text(
renderCurrency(pricing.overallMax, pricing.overrideMaxCurrency)
)
)
renderCurrency(pricing.overallMax, pricing.overrideMaxCurrency),
),
),
);
}
@ -98,10 +96,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.internalCostMin,
pricing.internalCostMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
if (widget.part.isTemplate) {
@ -112,10 +110,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.variantCostMin,
pricing.variantCostMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
}
@ -124,13 +122,13 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
ListTile(
title: Text(L10().bomCost),
trailing: Text(
formatPriceRange(
formatPriceRange(
pricing.bomCostMin,
pricing.bomCostMax,
currency: pricing.currency
)
)
)
currency: pricing.currency,
),
),
),
);
}
@ -142,10 +140,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.purchaseCostMin,
pricing.purchaseCostMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
tiles.add(
@ -155,10 +153,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.supplierPriceMin,
pricing.supplierPriceMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
}
@ -172,10 +170,10 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.salePriceMin,
pricing.salePriceMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
tiles.add(
@ -185,14 +183,13 @@ class _PartPricingWidgetState extends RefreshableState<PartPricingWidget> {
formatPriceRange(
pricing.saleHistoryMin,
pricing.saleHistoryMax,
currency: pricing.currency
)
currency: pricing.currency,
),
),
)
),
);
}
return tiles;
}
}

8
lib/widget/part/part_suppliers.dart
View File

@ -10,19 +10,15 @@ import "package:inventree/inventree/company.dart";
import "package:inventree/widget/refreshable_state.dart";
class PartSupplierWidget extends StatefulWidget {
const PartSupplierWidget(this.part, {Key? key}) : super(key: key);
final InvenTreePart part;
@override
_PartSupplierState createState() => _PartSupplierState(part);
}
class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
_PartSupplierState(this.part);
final InvenTreePart part;
@ -46,7 +42,6 @@ class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
}
Widget _supplierPartTile(BuildContext context, int index) {
InvenTreeSupplierPart _part = _supplierParts[index];
return ListTile(
@ -73,5 +68,4 @@ class _PartSupplierState extends RefreshableState<PartSupplierWidget> {
itemBuilder: _supplierPartTile,
);
}
}
}

23
lib/widget/progress.dart
View File

@ -1,5 +1,3 @@
import "dart:io";
import "package:flutter/material.dart";
@ -7,17 +5,11 @@ import "package:flutter_overlay_loader/flutter_overlay_loader.dart";
import "package:inventree/app_colors.dart";
import "package:one_context/one_context.dart";
/*
* A simplified linear progress bar widget,
* with standardized color depiction
*/
Widget ProgressBar(
double value,
{
double maximum = 1.0
}) {
Widget ProgressBar(double value, {double maximum = 1.0}) {
double v = 0;
if (value <= 0 || maximum <= 0) {
@ -33,20 +25,14 @@ Widget ProgressBar(
);
}
/*
* Construct a circular progress indicator
*/
Widget progressIndicator() {
return Center(
child: CircularProgressIndicator()
);
return Center(child: CircularProgressIndicator());
}
void showLoadingOverlay() {
// Do not show overlay if running unit tests
if (Platform.environment.containsKey("FLUTTER_TEST")) {
return;
@ -60,11 +46,12 @@ void showLoadingOverlay() {
Loader.show(
context,
themeData: Theme.of(context).copyWith(colorScheme: ColorScheme.fromSwatch())
themeData: Theme.of(
context,
).copyWith(colorScheme: ColorScheme.fromSwatch()),
);
}
void hideLoadingOverlay() {
if (Loader.isShown) {
Loader.hide();

100
lib/widget/refreshable_state.dart
View File

@ -10,12 +10,10 @@ import "package:inventree/widget/back.dart";
import "package:inventree/widget/drawer.dart";
import "package:inventree/widget/search.dart";
/*
* Simple mixin class which defines simple methods for defining widget properties
*/
mixin BaseWidgetProperties {
/*
* Return a list of appBar actions
* By default, no appBar actions are available
@ -23,7 +21,9 @@ mixin BaseWidgetProperties {
List<Widget> appBarActions(BuildContext context) => [];
// Return a title for the appBar (placeholder)
String getAppBarTitle() { return "--- app bar ---"; }
String getAppBarTitle() {
return "--- app bar ---";
}
// Function to construct a drawer (override if needed)
Widget getDrawer(BuildContext context) {
@ -38,7 +38,6 @@ mixin BaseWidgetProperties {
// Function to construct a body
Widget getBody(BuildContext context) {
// Default implementation is to return a ListView
// Override getTiles to replace the internal context
return ListView(
@ -51,7 +50,6 @@ mixin BaseWidgetProperties {
* Construct the top AppBar for this view
*/
AppBar? buildAppBar(BuildContext context, GlobalKey<ScaffoldState> key) {
List<Widget> tabs = getTabIcons(context);
return AppBar(
@ -70,8 +68,10 @@ mixin BaseWidgetProperties {
* - Button to access global search
* - Button to access barcode scan
*/
BottomAppBar? buildBottomAppBar(BuildContext context, GlobalKey<ScaffoldState> key) {
BottomAppBar? buildBottomAppBar(
BuildContext context,
GlobalKey<ScaffoldState> key,
) {
const double iconSize = 40;
List<Widget> icons = [
@ -90,10 +90,8 @@ mixin BaseWidgetProperties {
onPressed: () {
if (InvenTreeAPI().checkConnection()) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SearchWidget(true)
)
context,
MaterialPageRoute(builder: (context) => SearchWidget(true)),
);
}
},
@ -106,27 +104,27 @@ mixin BaseWidgetProperties {
scanBarcode(context);
}
},
)
),
];
return BottomAppBar(
shape: AutomaticNotchedShape(
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
),
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(40)),
),
shape: AutomaticNotchedShape(
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
),
notchMargin: 10,
child: IconTheme(
data: IconThemeData(color: Theme.of(context).colorScheme.onPrimary),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: icons,
)
)
RoundedRectangleBorder(
borderRadius: BorderRadius.all(Radius.circular(40)),
),
),
notchMargin: 10,
child: IconTheme(
data: IconThemeData(color: Theme.of(context).colorScheme.onPrimary),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: icons,
),
),
);
}
@ -146,7 +144,6 @@ mixin BaseWidgetProperties {
* Build out action buttons for a given widget
*/
Widget? buildSpeedDial(BuildContext context) {
final actions = actionButtons(context);
final barcodeActions = barcodeButtons(context);
@ -165,44 +162,38 @@ mixin BaseWidgetProperties {
spacing: 14,
childPadding: const EdgeInsets.all(5),
spaceBetweenChildren: 15,
)
),
);
}
if (actions.isNotEmpty) {
children.add(
SpeedDial(
icon: Icons.more_horiz,
activeIcon: Icons.close,
children: actions,
spacing: 14,
childPadding: const EdgeInsets.all(5),
spaceBetweenChildren: 15,
)
SpeedDial(
icon: Icons.more_horiz,
activeIcon: Icons.close,
children: actions,
spacing: 14,
childPadding: const EdgeInsets.all(5),
spaceBetweenChildren: 15,
),
);
}
return Wrap(
direction: Axis.horizontal,
children: children,
spacing: 15,
);
return Wrap(direction: Axis.horizontal, children: children, spacing: 15);
}
// Return list of "tabs" for this widget
List<Widget> getTabIcons(BuildContext context) => [];
}
/*
* Abstract base class which provides generic "refresh" functionality.
*
* - Drag down and release to 'refresh' the widget
* - Define some method which runs to 'refresh' the widget state
*/
abstract class RefreshableState<T extends StatefulWidget> extends State<T> with BaseWidgetProperties {
abstract class RefreshableState<T extends StatefulWidget> extends State<T>
with BaseWidgetProperties {
final scaffoldKey = GlobalKey<ScaffoldState>();
final refreshKey = GlobalKey<RefreshIndicatorState>();
@ -235,7 +226,6 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
// Refresh the widget - handler for custom request() method
Future<void> refresh(BuildContext context) async {
// Escape if the widget is no longer loaded
if (!mounted) {
return;
@ -259,13 +249,14 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
@override
Widget build(BuildContext context) {
// Save the context for future use
_context = context;
List<Widget> tabs = getTabIcons(context);
Widget body = tabs.isEmpty ? getBody(context) : TabBarView(children: getTabs(context));
Widget body = tabs.isEmpty
? getBody(context)
: TabBarView(children: getTabs(context));
Scaffold view = Scaffold(
key: scaffoldKey,
@ -282,19 +273,16 @@ abstract class RefreshableState<T extends StatefulWidget> extends State<T> with
onRefresh: () async {
refresh(context);
},
child: body
child: body,
),
bottomNavigationBar: buildBottomAppBar(context, scaffoldKey),
);
// Default implementation is *not* tabbed
if (tabs.isNotEmpty) {
return DefaultTabController(
length: tabs.length,
child: view,
);
return DefaultTabController(length: tabs.length, child: view);
} else {
return view;
}
}
}
}

295
lib/widget/search.dart
View File

@ -23,21 +23,17 @@ import "package:inventree/widget/order/sales_order_list.dart";
import "package:inventree/widget/company/company_list.dart";
import "package:inventree/widget/company/supplier_part_list.dart";
// Widget for performing database-wide search
class SearchWidget extends StatefulWidget {
const SearchWidget(this.hasAppbar);
final bool hasAppbar;
@override
_SearchDisplayState createState() => _SearchDisplayState(hasAppbar);
}
class _SearchDisplayState extends RefreshableState<SearchWidget> {
_SearchDisplayState(this.hasAppBar) : super();
final _formKey = GlobalKey<FormState>();
@ -80,7 +76,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* Determine if the search is still running
*/
bool isSearching() {
if (searchController.text.isEmpty) {
return false;
}
@ -128,7 +123,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Callback when the text is being edited
// Incorporates a debounce timer to restrict search frequency
void onSearchTextChanged(String text, {bool immediate = false}) {
if (debounceTimer?.isActive ?? false) {
debounceTimer!.cancel();
}
@ -151,8 +145,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* }
* }
*/
int getSearchResultCount(Map <String, dynamic> results, String key) {
int getSearchResultCount(Map<String, dynamic> results, String key) {
dynamic result = results[key];
if (result == null || result is! Map) {
@ -170,43 +163,70 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Actually perform the search query
Future<void> _perform_search(Map<String, dynamic> body) async {
InvenTreeAPI().post(
"search/",
body: body,
expectedStatusCode: 200).then((APIResponse response) {
InvenTreeAPI().post("search/", body: body, expectedStatusCode: 200).then((
APIResponse response,
) {
String searchTerm = (body["search"] ?? "").toString();
String searchTerm = (body["search"] ?? "").toString();
// Only update if the results correspond to the current search term
if (searchTerm == searchController.text && mounted) {
decrementPendingSearches();
// Only update if the results correspond to the current search term
if (searchTerm == searchController.text && mounted) {
Map<String, dynamic> results = {};
decrementPendingSearches();
if (response.isValid() && response.data is Map<String, dynamic>) {
results = response.data as Map<String, dynamic>;
Map<String, dynamic> results = {};
setState(() {
nPartResults = getSearchResultCount(
results,
InvenTreePart.MODEL_TYPE,
);
nCategoryResults = getSearchResultCount(
results,
InvenTreePartCategory.MODEL_TYPE,
);
nStockResults = getSearchResultCount(
results,
InvenTreeStockItem.MODEL_TYPE,
);
nLocationResults = getSearchResultCount(
results,
InvenTreeStockLocation.MODEL_TYPE,
);
nPurchaseOrderResults = getSearchResultCount(
results,
InvenTreePurchaseOrder.MODEL_TYPE,
);
nSalesOrderResults = getSearchResultCount(
results,
InvenTreeSalesOrder.MODEL_TYPE,
);
nSupplierPartResults = getSearchResultCount(
results,
InvenTreeSupplierPart.MODEL_TYPE,
);
nManufacturerPartResults = getSearchResultCount(
results,
InvenTreeManufacturerPart.MODEL_TYPE,
);
nCompanyResults = getSearchResultCount(
results,
InvenTreeCompany.MODEL_TYPE,
);
if (response.isValid() && response.data is Map<String, dynamic>) {
results = response.data as Map<String, dynamic>;
setState(() {
nPartResults = getSearchResultCount(results, InvenTreePart.MODEL_TYPE);
nCategoryResults = getSearchResultCount(results, InvenTreePartCategory.MODEL_TYPE);
nStockResults = getSearchResultCount(results, InvenTreeStockItem.MODEL_TYPE);
nLocationResults = getSearchResultCount(results, InvenTreeStockLocation.MODEL_TYPE);
nPurchaseOrderResults = getSearchResultCount(results, InvenTreePurchaseOrder.MODEL_TYPE);
nSalesOrderResults = getSearchResultCount(results, InvenTreeSalesOrder.MODEL_TYPE);
nSupplierPartResults = getSearchResultCount(results, InvenTreeSupplierPart.MODEL_TYPE);
nManufacturerPartResults = getSearchResultCount(results, InvenTreeManufacturerPart.MODEL_TYPE);
nCompanyResults = getSearchResultCount(results, InvenTreeCompany.MODEL_TYPE);
// Special case for company search results
nCustomerResults = getSearchResultCount(results, "customer");
nManufacturerResults = getSearchResultCount(results, "manufacturer");
nSupplierResults = getSearchResultCount(results, "supplier");
});
} else {
resetSearchResults();
}
// Special case for company search results
nCustomerResults = getSearchResultCount(results, "customer");
nManufacturerResults = getSearchResultCount(
results,
"manufacturer",
);
nSupplierResults = getSearchResultCount(results, "supplier");
});
} else {
resetSearchResults();
}
}
});
}
@ -237,7 +257,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Consolidated search allows us to perform *all* searches in a single query
if (api.supportsConsolidatedSearch) {
Map<String, dynamic> body = {
"limit": 1,
"search": term,
@ -262,17 +281,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
}
if (body.isNotEmpty) {
if (mounted) {
setState(() {
nPendingSearches = 1;
});
_search_query = CancelableOperation.fromFuture(
_perform_search(body),
);
_search_query = CancelableOperation.fromFuture(_perform_search(body));
}
}
} else {
legacySearch(term);
@ -283,7 +298,6 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
* Perform "legacy" search (without consolidated search API endpoint
*/
Future<void> legacySearch(String term) async {
// Search parts
if (InvenTreePart().canView) {
nPendingSearches++;
@ -302,7 +316,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Search part categories
if (InvenTreePartCategory().canView) {
nPendingSearches++;
InvenTreePartCategory().count(searchQuery: term,).then((int n) {
InvenTreePartCategory().count(searchQuery: term).then((int n) {
if (term == searchController.text) {
if (mounted) {
decrementPendingSearches();
@ -346,37 +360,31 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
// Search purchase orders
if (InvenTreePurchaseOrder().canView) {
nPendingSearches++;
InvenTreePurchaseOrder().count(
searchQuery: term,
filters: {
"outstanding": "true"
}
).then((int n) {
if (term == searchController.text) {
if (mounted) {
decrementPendingSearches();
setState(() {
nPurchaseOrderResults = n;
});
}
}
});
nPendingSearches++;
InvenTreePurchaseOrder()
.count(searchQuery: term, filters: {"outstanding": "true"})
.then((int n) {
if (term == searchController.text) {
if (mounted) {
decrementPendingSearches();
setState(() {
nPurchaseOrderResults = n;
});
}
}
});
}
}
@override
List<Widget> getTiles(BuildContext context) {
List<Widget> tiles = [];
// Search input
tiles.add(
ListTile(
title: TextFormField(
decoration: InputDecoration(
hintText: L10().queryEmpty,
),
decoration: InputDecoration(hintText: L10().queryEmpty),
key: _formKey,
readOnly: false,
autofocus: true,
@ -385,12 +393,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
onChanged: (String text) {
onSearchTextChanged(text);
},
onFieldSubmitted: (String text) {
},
onFieldSubmitted: (String text) {},
),
trailing: GestureDetector(
child: Icon(
searchController.text.isEmpty ? TablerIcons.search : TablerIcons.backspace,
searchController.text.isEmpty
? TablerIcons.search
: TablerIcons.backspace,
color: searchController.text.isEmpty ? COLOR_ACTION : COLOR_DANGER,
),
onTap: () {
@ -398,8 +407,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
onSearchTextChanged("", immediate: true);
},
),
)
),
);
String query = searchController.text;
@ -415,17 +423,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
trailing: Text("${nPartResults}"),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartList(
{
"original_search": query
}
)
)
context,
MaterialPageRoute(
builder: (context) => PartList({"original_search": query}),
),
);
}
)
},
),
);
}
@ -440,15 +444,12 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PartCategoryList(
{
"original_search": query
}
)
)
builder: (context) =>
PartCategoryList({"original_search": query}),
),
);
},
)
),
);
}
@ -463,15 +464,11 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockItemList(
{
"original_search": query,
}
)
)
builder: (context) => StockItemList({"original_search": query}),
),
);
},
)
),
);
}
@ -486,15 +483,12 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => StockLocationList(
{
"original_search": query
}
)
)
builder: (context) =>
StockLocationList({"original_search": query}),
),
);
},
)
),
);
}
@ -510,14 +504,12 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
context,
MaterialPageRoute(
builder: (context) => PurchaseOrderListWidget(
filters: {
"original_search": query
}
)
)
filters: {"original_search": query},
),
),
);
},
)
),
);
}
@ -532,15 +524,12 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SalesOrderListWidget(
filters: {
"original_search": query
}
)
)
builder: (context) =>
SalesOrderListWidget(filters: {"original_search": query}),
),
);
},
)
),
);
}
@ -555,16 +544,13 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CompanyListWidget(
L10().companies,
{
"original_search": query
}
)
)
builder: (context) => CompanyListWidget(L10().companies, {
"original_search": query,
}),
),
);
},
)
),
);
}
@ -579,17 +565,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CompanyListWidget(
L10().customers,
{
"original_search": query,
"is_customer": "true"
}
)
)
builder: (context) => CompanyListWidget(L10().customers, {
"original_search": query,
"is_customer": "true",
}),
),
);
},
)
),
);
}
@ -604,17 +587,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CompanyListWidget(
L10().manufacturers,
{
"original_search": query,
"is_manufacturer": "true"
}
)
)
builder: (context) => CompanyListWidget(L10().manufacturers, {
"original_search": query,
"is_manufacturer": "true",
}),
),
);
},
)
),
);
}
@ -629,17 +609,14 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => CompanyListWidget(
L10().suppliers,
{
"original_search": query,
"is_supplier": "true"
}
)
)
builder: (context) => CompanyListWidget(L10().suppliers, {
"original_search": query,
"is_supplier": "true",
}),
),
);
},
)
),
);
}
@ -654,15 +631,12 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SupplierPartList(
{
"original_search": query
}
)
)
builder: (context) =>
SupplierPartList({"original_search": query}),
),
);
},
)
),
);
}
@ -672,7 +646,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
title: Text(L10().searching),
leading: Icon(TablerIcons.search),
trailing: CircularProgressIndicator(),
)
),
);
}
@ -684,7 +658,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
style: TextStyle(fontStyle: FontStyle.italic),
),
leading: Icon(TablerIcons.zoom_cancel),
)
),
);
} else {
for (Widget result in results) {
@ -694,5 +668,4 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
return tiles;
}
}

55
lib/widget/snacks.dart
View File

@ -8,8 +8,13 @@ import "package:inventree/l10.dart";
/*
* Display a configurable 'snackbar' at the bottom of the screen
*/
void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? success, String? actionText}) {
void showSnackIcon(
String text, {
IconData? icon,
Function()? onAction,
bool? success,
String? actionText,
}) {
debug("showSnackIcon: '${text}'");
// Escape quickly if we do not have context
@ -34,7 +39,6 @@ void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? suc
if (icon == null && onAction == null) {
icon = TablerIcons.circle_check;
}
} else if (success != null && success == false) {
backgroundColor = Colors.deepOrange;
@ -45,35 +49,32 @@ void showSnackIcon(String text, {IconData? icon, Function()? onAction, bool? suc
String _action = actionText ?? L10().details;
List<Widget> childs = [
Text(text),
Spacer(),
];
List<Widget> childs = [Text(text), Spacer()];
if (icon != null) {
childs.add(Icon(icon));
}
OneContext().showSnackBar(builder: (context) => SnackBar(
content: GestureDetector(
child: Row(
children: childs
OneContext().showSnackBar(
builder: (context) => SnackBar(
content: GestureDetector(
child: Row(children: childs),
onTap: () {
ScaffoldMessenger.of(context!).hideCurrentSnackBar();
},
),
onTap: () {
ScaffoldMessenger.of(context!).hideCurrentSnackBar();
},
backgroundColor: backgroundColor,
action: onAction == null
? null
: SnackBarAction(
label: _action,
onPressed: () {
// Immediately dismiss the notification
ScaffoldMessenger.of(context!).hideCurrentSnackBar();
onAction();
},
),
duration: Duration(seconds: onAction == null ? 5 : 10),
),
backgroundColor: backgroundColor,
action: onAction == null ? null : SnackBarAction(
label: _action,
onPressed: () {
// Immediately dismiss the notification
ScaffoldMessenger.of(context!).hideCurrentSnackBar();
onAction();
}
),
duration: Duration(seconds: onAction == null ? 5 : 10),
)
);
}
}

16
lib/widget/spinner.dart
View File

@ -2,7 +2,6 @@ import "package:flutter/material.dart";
import "package:inventree/app_colors.dart";
class Spinner extends StatefulWidget {
const Spinner({
this.color = COLOR_GRAY_LIGHT,
Key? key,
@ -27,12 +26,8 @@ class _SpinnerState extends State<Spinner> with SingleTickerProviderStateMixin {
_controller = AnimationController(
vsync: this,
duration: Duration(milliseconds: 2000),
)
..repeat();
_child = Icon(
widget.icon,
color: widget.color
);
)..repeat();
_child = Icon(widget.icon, color: widget.color);
super.initState();
}
@ -45,9 +40,6 @@ class _SpinnerState extends State<Spinner> with SingleTickerProviderStateMixin {
@override
Widget build(BuildContext context) {
return RotationTransition(
turns: _controller!,
child: _child,
);
return RotationTransition(turns: _controller!, child: _child);
}
}
}

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