diff --git a/assets/release_notes.md b/assets/release_notes.md index 6b27642f..bc0ccd81 100644 --- a/assets/release_notes.md +++ b/assets/release_notes.md @@ -1,6 +1,11 @@ ## InvenTree App Release Notes --- +### 0.8.3 - September 2022 +--- + +- Display list of assemblies which components are used in + ### 0.8.2 - August 2022 --- diff --git a/lib/inventree/bom.dart b/lib/inventree/bom.dart index 20487bcd..55217864 100644 --- a/lib/inventree/bom.dart +++ b/lib/inventree/bom.dart @@ -24,6 +24,8 @@ class InvenTreeBomItem extends InvenTreeModel { Map defaultListFilters() { return { "sub_part_detail": "true", + "part_detail": "true", + "show_pricing": "false", }; } diff --git a/lib/widget/bom_list.dart b/lib/widget/bom_list.dart index 461d1bc4..aeed5519 100644 --- a/lib/widget/bom_list.dart +++ b/lib/widget/bom_list.dart @@ -21,23 +21,29 @@ import "package:inventree/widget/refreshable_state.dart"; */ class BillOfMaterialsWidget extends StatefulWidget { - const BillOfMaterialsWidget(this.part, {Key? key}) : super(key: key); + const BillOfMaterialsWidget(this.part, {this.isParentComponent = true, Key? key}) : super(key: key); final InvenTreePart part; + final bool isParentComponent; + @override - _BillOfMaterialsState createState() => _BillOfMaterialsState(part); + _BillOfMaterialsState createState() => _BillOfMaterialsState(); } class _BillOfMaterialsState extends RefreshableState { - _BillOfMaterialsState(this.part); - - final InvenTreePart part; + _BillOfMaterialsState(); bool showFilterOptions = false; @override - String getAppBarTitle(BuildContext context) => L10().billOfMaterials; + String getAppBarTitle(BuildContext context) { + if (widget.isParentComponent) { + return L10().billOfMaterials; + } else { + return L10().usedIn; + } + } @override List getAppBarActions(BuildContext context) => [ @@ -53,11 +59,36 @@ class _BillOfMaterialsState extends RefreshableState { @override Widget getBody(BuildContext context) { - return PaginatedBomList( - { - "part": part.pk.toString(), - }, - showFilterOptions, + + Map filters = {}; + + if (widget.isParentComponent) { + filters["part"] = widget.part.pk.toString(); + } else { + filters["uses"] = widget.part.pk.toString(); + } + + return Column( + children: [ + ListTile( + leading: InvenTreeAPI().getImage( + widget.part.thumbnail, + width: 32, + height: 32, + ), + title: Text(widget.part.fullname), + subtitle: Text(widget.isParentComponent ? L10().billOfMaterials : L10().usedInDetails), + trailing: Text(L10().quantity), + ), + Divider(thickness: 1.25), + Expanded( + child: PaginatedBomList( + filters, + showSearch: showFilterOptions, + isParentPart: widget.isParentComponent, + ), + ), + ], ); } } @@ -68,7 +99,9 @@ class _BillOfMaterialsState extends RefreshableState { */ class PaginatedBomList extends PaginatedSearchWidget { - const PaginatedBomList(Map filters, bool showSearch) : super(filters: filters, showSearch: showSearch); + const PaginatedBomList(Map filters, {bool showSearch = false, this.isParentPart = true}) : super(filters: filters, showSearch: showSearch); + + final bool isParentPart; @override _PaginatedBomListState createState() => _PaginatedBomListState(); @@ -109,7 +142,7 @@ class _PaginatedBomListState extends PaginatedSearchState { InvenTreeBomItem bomItem = model as InvenTreeBomItem; - InvenTreePart? subPart = bomItem.subPart; + InvenTreePart? subPart = widget.isParentPart ? bomItem.subPart : bomItem.part; String title = subPart?.fullname ?? "error - no name"; @@ -128,7 +161,7 @@ class _PaginatedBomListState extends PaginatedSearchState { onTap: subPart == null ? null : () async { showLoadingOverlay(context); - var part = await InvenTreePart().get(bomItem.subPartId); + var part = await InvenTreePart().get(subPart.pk); hideLoadingOverlay(); if (part is InvenTreePart) { diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart index f9457f5b..f7384ca8 100644 --- a/lib/widget/part_detail.dart +++ b/lib/widget/part_detail.dart @@ -4,10 +4,12 @@ import "package:font_awesome_flutter/font_awesome_flutter.dart"; import "package:inventree/api.dart"; import "package:inventree/app_colors.dart"; -import "package:inventree/inventree/stock.dart"; import "package:inventree/l10.dart"; import "package:inventree/helpers.dart"; + +import "package:inventree/inventree/bom.dart"; import "package:inventree/inventree/part.dart"; +import "package:inventree/inventree/stock.dart"; import "package:inventree/widget/attachment_widget.dart"; import "package:inventree/widget/bom_list.dart"; @@ -49,6 +51,8 @@ class _PartDisplayState extends RefreshableState { int bomCount = 0; + int usedInCount = 0; + int variantCount = 0; @override @@ -154,6 +158,19 @@ class _PartDisplayState extends RefreshableState { } }); + // Request number of "used in" parts + InvenTreeBomItem().count( + filters: { + "uses": part.pk.toString(), + } + ).then((int value) { + if (mounted) { + setState(() { + usedInCount = value; + }); + } + }); + // Request the number of variant items InvenTreePart().count( filters: { @@ -415,6 +432,27 @@ class _PartDisplayState extends RefreshableState { } } + if (part.isComponent) { + if (usedInCount > 0) { + tiles.add( + ListTile( + title: Text(L10().usedIn), + subtitle: Text(L10().usedInDetails), + leading: FaIcon(FontAwesomeIcons.layerGroup, color: COLOR_CLICK), + trailing: Text(usedInCount.toString()), + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => BillOfMaterialsWidget(part, isParentComponent: false) + ) + ); + } + ) + ); + } + } + // Keywords? if (part.keywords.isNotEmpty) { tiles.add(