From 991a7a4388f6b5f404a754983f2a1004c305cfe9 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Mon, 1 Mar 2021 13:31:41 +1100 Subject: [PATCH] PaginatedPartList is now filterable in a more "generic" manner --- lib/widget/category_display.dart | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart index c5e358d9..64ba7417 100644 --- a/lib/widget/category_display.dart +++ b/lib/widget/category_display.dart @@ -272,7 +272,7 @@ class _CategoryDisplayState extends RefreshableState { children: detailTiles() ); case 1: - return PaginatedPartList(category?.pk ?? null); + return PaginatedPartList({"category": "${category?.pk ?? null}"}); case 2: return ListView( children: actionTiles() @@ -333,12 +333,12 @@ class SubcategoryList extends StatelessWidget { class PaginatedPartList extends StatefulWidget { - final int categoryId; + final Map filters; - PaginatedPartList(this.categoryId); + PaginatedPartList(this.filters); @override - _PaginatedPartListState createState() => _PaginatedPartListState(categoryId); + _PaginatedPartListState createState() => _PaginatedPartListState(filters); } @@ -348,9 +348,9 @@ class _PaginatedPartListState extends State { String _searchTerm; - final int categoryId; + final Map filters; - _PaginatedPartListState(this.categoryId); + _PaginatedPartListState(this.filters); final PagingController _pagingController = PagingController(firstPageKey: 0); @@ -372,15 +372,13 @@ class _PaginatedPartListState extends State { Future _fetchPage(int pageKey) async { try { - Map filters = { - "category": "${categoryId}", - }; + Map params = filters; if (_searchTerm != null && _searchTerm.isNotEmpty) { - filters["search"] = _searchTerm; + params["search"] = _searchTerm; } - final page = await InvenTreePart().listPaginated(_pageSize, pageKey, filters: filters); + final page = await InvenTreePart().listPaginated(_pageSize, pageKey, filters: params); final isLastPage = page.length < _pageSize; // Construct a list of part objects