Refactor StockList

lib/inventree/model.dart

@@ -392,7 +392,7 @@ class InvenTreeModel {
       String search = params["search"] ?? "";
       String original = params["original_search"] ?? "";
 
-      params["search"] = "${search} ${original}";
+      params["search"] = "${search} ${original}".trim();
 
       params.remove("original_search");
     }

lib/inventree/stock.dart

@@ -149,7 +149,8 @@ class InvenTreeStockItem extends InvenTreeModel {
       "part_detail": "true",
       "location_detail": "true",
       "supplier_detail": "true",
-      "cascade": "false"
+      "cascade": "false",
+      "in_stock": "true",
     };
   }
 

lib/widget/location_display.dart

@@ -16,6 +16,7 @@ import "package:flutter/material.dart";
 import "package:flutter/foundation.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
+import 'package:inventree/widget/stock_list.dart';
 
 class LocationDisplayWidget extends StatefulWidget {
 
@@ -286,7 +287,7 @@ class _LocationDisplayState extends RefreshableState<LocationDisplayWidget> {
           children: detailTiles(),
         );
       case 1:
-        return PaginatedStockList(filters);
+        return PaginatedStockItemList(filters);
       case 2:
         return ListView(
           children: ListTile.divideTiles(
@@ -467,166 +468,3 @@ class SublocationList extends StatelessWidget {
     );
   }
 }
-
-/*
- * Widget for displaying a list of stock items within a stock location.
- *
- * Users server-side pagination for snappy results
- */
-
-class PaginatedStockList extends StatefulWidget {
-
-  const PaginatedStockList(this.filters);
-
-  final Map<String, String> filters;
-
-  @override
-  _PaginatedStockListState createState() => _PaginatedStockListState(filters);
-}
-
-
-class _PaginatedStockListState extends State<PaginatedStockList> {
-
-  _PaginatedStockListState(this.filters);
-
-  static const _pageSize = 25;
-
-  String _searchTerm = "";
-
-  final Map<String, String> filters;
-
-  final PagingController<int, InvenTreeStockItem> _pagingController = PagingController(firstPageKey: 0);
-
-  @override
-  void initState() {
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
-
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _pagingController.dispose();
-    super.dispose();
-  }
-
-  int resultCount = 0;
-
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-
-      Map<String, String> params = filters;
-
-      params["search"] = "${_searchTerm}";
-
-      // Do we include stock items from sub-locations?
-      final bool cascade = await InvenTreeSettingsManager().getBool("stockSublocation", true);
-
-      params["cascade"] = "${cascade}";
-
-      final page = await InvenTreeStockItem().listPaginated(_pageSize, pageKey, filters: params);
-
-      int pageLength = page?.length ?? 0;
-      int pageCount = page?.count ?? 0;
-
-      final isLastPage = pageLength < _pageSize;
-
-      // Construct a list of stock item objects
-      List<InvenTreeStockItem> items = [];
-
-      if (page != null) {
-        for (var result in page.results) {
-          if (result is InvenTreeStockItem) {
-            items.add(result);
-          }
-        }
-      }
-
-      if (isLastPage) {
-        _pagingController.appendLastPage(items);
-      } else {
-        final int nextPageKey = pageKey + pageLength;
-        _pagingController.appendPage(items, nextPageKey);
-      }
-
-      setState(() {
-        resultCount = pageCount;
-      });
-
-    } catch (error, stackTrace) {
-      _pagingController.error = error;
-
-      sentryReportError(error, stackTrace);
-    }
-  }
-
-  void _openItem(BuildContext context, int pk) {
-    InvenTreeStockItem().get(pk).then((var item) {
-      if (item is InvenTreeStockItem) {
-        Navigator.push(context, MaterialPageRoute(builder: (context) => StockDetailWidget(item)));
-      }
-    });
-  }
-
-  Widget _buildItem(BuildContext context, InvenTreeStockItem item) {
-    return ListTile(
-      title: Text("${item.partName}"),
-      subtitle: Text("${item.locationPathString}"),
-      leading: InvenTreeAPI().getImage(
-        item.partThumbnail,
-        width: 40,
-        height: 40,
-      ),
-      trailing: Text("${item.displayQuantity}",
-        style: TextStyle(
-          fontWeight: FontWeight.bold,
-          color: item.statusColor,
-        ),
-      ),
-      onTap: () {
-        _openItem(context, item.pk);
-      },
-    );
-  }
-
-  final TextEditingController searchController = TextEditingController();
-
-  void updateSearchTerm() {
-    _searchTerm = searchController.text;
-    _pagingController.refresh();
-  }
-
-  @override
-  Widget build (BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        PaginatedSearchWidget(searchController, updateSearchTerm, resultCount),
-        Expanded(
-          child: CustomScrollView(
-            shrinkWrap: true,
-            physics: ClampingScrollPhysics(),
-            scrollDirection: Axis.vertical,
-            slivers: <Widget>[
-              // TODO - Search input
-              PagedSliverList.separated(
-                  pagingController: _pagingController,
-                  builderDelegate: PagedChildBuilderDelegate<InvenTreeStockItem>(
-                    itemBuilder: (context, item, index) {
-                      return _buildItem(context, item);
-                    },
-                    noItemsFoundIndicatorBuilder: (context) {
-                      return NoResultsWidget("No stock items found");
-                    }
-                  ),
-                  separatorBuilder: (context, item) => const Divider(height: 1),
-              )
-            ]
-          )
-        )
-      ]
-    );
-  }
-}

lib/widget/part_detail.dart

@@ -18,6 +18,7 @@ import "package:inventree/widget/part_image_widget.dart";
 import "package:inventree/widget/stock_detail.dart";
 
 import "package:inventree/widget/location_display.dart";
+import 'package:inventree/widget/stock_list.dart';
 
 
 class PartDetailWidget extends StatefulWidget {
@@ -494,7 +495,9 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
         ),
       );
       case 1:
-        return PaginatedStockList({"part": "${part.pk}"});
+        return PaginatedStockItemList(
+          {"part": "${part.pk}"}
+        );
       case 2:
         return Center(
           child: ListView(

lib/widget/purchase_order_detail.dart

@@ -13,6 +13,7 @@ import "package:inventree/widget/refreshable_state.dart";
 import "package:inventree/l10.dart";
 import "package:inventree/widget/location_display.dart";
 import "package:inventree/widget/snacks.dart";
+import 'package:inventree/widget/stock_list.dart';
 import "package:one_context/one_context.dart";
 
 
@@ -351,7 +352,7 @@ class _PurchaseOrderDetailState extends RefreshableState<PurchaseOrderDetailWidg
           "purchase_order": "${order.pk}"
         };
 
-        return PaginatedStockList(filters);
+        return PaginatedStockItemList(filters);
 
       default:
         return ListView();

lib/widget/purchase_order_list.dart

@@ -36,14 +36,14 @@ class _PurchaseOrderListWidgetState extends RefreshableState<PurchaseOrderListWi
 
   @override
   Widget getBody(BuildContext context) {
-    return _PaginatedPurchaseOrderList(filters);
+    return PaginatedPurchaseOrderList(filters);
   }
 }
 
 
-class _PaginatedPurchaseOrderList extends StatefulWidget {
+class PaginatedPurchaseOrderList extends StatefulWidget {
 
-  const _PaginatedPurchaseOrderList(this.filters, {this.onTotalChanged});
+  const PaginatedPurchaseOrderList(this.filters, {this.onTotalChanged});
 
   final Map<String, String> filters;
 
@@ -55,7 +55,7 @@ class _PaginatedPurchaseOrderList extends StatefulWidget {
 }
 
 
-class _PaginatedPurchaseOrderListState extends State<_PaginatedPurchaseOrderList> {
+class _PaginatedPurchaseOrderListState extends State<PaginatedPurchaseOrderList> {
 
   _PaginatedPurchaseOrderListState(this.filters, this.onTotalChanged);
 

lib/widget/search.dart

@@ -4,6 +4,7 @@ import 'package:inventree/inventree/company.dart';
 import 'package:inventree/inventree/purchase_order.dart';
 import "package:inventree/widget/part_detail.dart";
 import "package:inventree/widget/progress.dart";
+import 'package:inventree/widget/purchase_order_list.dart';
 import 'package:inventree/widget/refreshable_state.dart';
 import "package:inventree/widget/snacks.dart";
 import "package:inventree/widget/stock_detail.dart";
@@ -13,6 +14,9 @@ import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/l10.dart";
 import "package:inventree/inventree/part.dart";
 import "package:inventree/inventree/stock.dart";
+import 'package:inventree/widget/stock_list.dart';
+
+import 'company_list.dart';
 
 
 // Widget for performing database-wide search
@@ -204,6 +208,18 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
           title: Text(L10().stockItems),
           leading: FaIcon(FontAwesomeIcons.boxes),
           trailing: Text("${nStockResults}"),
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => StockItemList(
+                  {
+                    "original_search": query,
+                  }
+                )
+              )
+            );
+          },
         )
       );
     }
@@ -251,6 +267,18 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
           title: Text(L10().purchaseOrders),
           leading: FaIcon(FontAwesomeIcons.shoppingCart),
           trailing: Text("${nPurchaseOrderResults}"),
+          onTap: () {
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => PurchaseOrderListWidget(
+                  filters: {
+                    "original_search": query
+                  }
+                )
+              )
+            );
+          },
         )
       );
     }

lib/widget/stock_list.dart

@@ -0,0 +1,201 @@
+
+import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
+import "package:infinite_scroll_pagination/infinite_scroll_pagination.dart";
+import "package:inventree/inventree/sentry.dart";
+import "package:inventree/inventree/stock.dart";
+import "package:inventree/widget/paginator.dart";
+import "package:inventree/widget/refreshable_state.dart";
+
+import "package:inventree/l10.dart";
+import "package:inventree/app_settings.dart";
+import "package:inventree/widget/stock_detail.dart";
+
+import "package:inventree/api.dart";
+
+class StockItemList extends StatefulWidget {
+
+  const StockItemList(this.filters);
+
+  final Map<String, String> filters;
+
+  @override
+  _StockListState createState() => _StockListState(filters);
+}
+
+
+class _StockListState extends RefreshableState<StockItemList> {
+
+  _StockListState(this.filters);
+
+  final Map<String, String> filters;
+
+  @override
+  String getAppBarTitle(BuildContext context) => L10().purchaseOrders;
+
+  @override
+  Widget getBody(BuildContext context) {
+    return PaginatedStockItemList(filters);
+  }
+}
+
+class PaginatedStockItemList extends StatefulWidget {
+
+  const PaginatedStockItemList(this.filters);
+
+  final Map<String, String> filters;
+
+  @override
+  _PaginatedStockItemListState createState() => _PaginatedStockItemListState(filters);
+  
+}
+
+
+class _PaginatedStockItemListState extends State<PaginatedStockItemList> {
+
+  _PaginatedStockItemListState(this.filters);
+
+  static const _pageSize = 25;
+
+  String _searchTerm = "";
+
+  final Map<String, String> filters;
+
+  final PagingController<int, InvenTreeStockItem> _pagingController = PagingController(firstPageKey: 0);
+
+  @override
+  String getAppbarTitle(BuildContext context) => L10().stockItems;
+
+  @override
+  void initState() {
+    _pagingController.addPageRequestListener((pageKey) {
+      _fetchPage(pageKey);
+    });
+
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _pagingController.dispose();
+    super.dispose();
+  }
+
+  int resultCount = 0;
+
+  Future<void> _fetchPage(int pageKey) async {
+    try {
+
+      Map<String, String> params = filters;
+
+      params["search"] = "${_searchTerm}";
+
+      // Do we include stock items from sub-locations?
+      final bool cascade = await InvenTreeSettingsManager().getBool("stockSublocation", true);
+
+      params["cascade"] = "${cascade}";
+
+      final page = await InvenTreeStockItem().listPaginated(_pageSize, pageKey, filters: params);
+
+      int pageLength = page?.length ?? 0;
+      int pageCount = page?.count ?? 0;
+
+      final isLastPage = pageLength < _pageSize;
+
+      // Construct a list of stock item objects
+      List<InvenTreeStockItem> items = [];
+
+      if (page != null) {
+        for (var result in page.results) {
+          if (result is InvenTreeStockItem) {
+            items.add(result);
+          }
+        }
+      }
+
+      if (isLastPage) {
+        _pagingController.appendLastPage(items);
+      } else {
+        final int nextPageKey = pageKey + pageLength;
+        _pagingController.appendPage(items, nextPageKey);
+      }
+
+      setState(() {
+        resultCount = pageCount;
+      });
+
+    } catch (error, stackTrace) {
+      _pagingController.error = error;
+
+      sentryReportError(error, stackTrace);
+    }
+  }
+
+  void _openItem(BuildContext context, int pk) {
+    InvenTreeStockItem().get(pk).then((var item) {
+      if (item is InvenTreeStockItem) {
+        Navigator.push(context, MaterialPageRoute(builder: (context) => StockDetailWidget(item)));
+      }
+    });
+  }
+
+  Widget _buildItem(BuildContext context, InvenTreeStockItem item) {
+    return ListTile(
+      title: Text("${item.partName}"),
+      subtitle: Text("${item.locationPathString}"),
+      leading: InvenTreeAPI().getImage(
+        item.partThumbnail,
+        width: 40,
+        height: 40,
+      ),
+      trailing: Text("${item.displayQuantity}",
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+          color: item.statusColor,
+        ),
+      ),
+      onTap: () {
+        _openItem(context, item.pk);
+      },
+    );
+  }
+
+  final TextEditingController searchController = TextEditingController();
+
+  void updateSearchTerm() {
+    _searchTerm = searchController.text;
+    _pagingController.refresh();
+  }
+
+  @override
+  Widget build (BuildContext context) {
+    return Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          PaginatedSearchWidget(searchController, updateSearchTerm, resultCount),
+          Expanded(
+              child: CustomScrollView(
+                  shrinkWrap: true,
+                  physics: ClampingScrollPhysics(),
+                  scrollDirection: Axis.vertical,
+                  slivers: <Widget>[
+                    // TODO - Search input
+                    PagedSliverList.separated(
+                      pagingController: _pagingController,
+                      builderDelegate: PagedChildBuilderDelegate<InvenTreeStockItem>(
+                          itemBuilder: (context, item, index) {
+                            return _buildItem(context, item);
+                          },
+                          noItemsFoundIndicatorBuilder: (context) {
+                            return NoResultsWidget("No stock items found");
+                          }
+                      ),
+                      separatorBuilder: (context, item) => const Divider(height: 1),
+                    )
+                  ]
+              )
+          )
+        ]
+    );
+  }
+}