";
- html += "" + item.part.full_name + " ";
- html += "" + item.location.pathstring + " ";
+ html += "" + name + " ";
+ html += "" + item.location__path + " ";
html += "" + item.quantity + " ";
html += "";
@@ -372,14 +380,74 @@ function moveStockItems(items, options) {
function loadStockTable(table, options) {
+ var params = options.params || {};
+
+ // Aggregate stock items
+ //params.aggregate = true;
+
table.bootstrapTable({
sortable: true,
search: true,
method: 'get',
pagination: true,
- pageSize: 50,
+ pageSize: 25,
rememberOrder: true,
- queryParams: options.params,
+ formatNoMatches: function() {
+ return 'No stock items matching query';
+ },
+ customSort: customGroupSorter,
+ groupBy: true,
+ groupByField: options.groupByField || 'part',
+ groupByFormatter: function(field, id, data) {
+
+ var row = data[0];
+
+ if (field == 'part__name') {
+
+ var name = row.part__IPN;
+
+ if (name) {
+ name += ' | ';
+ }
+
+ name += row.part__name;
+
+ return imageHoverIcon(row.part__image) + name + ' (' + data.length + ' items) ';
+ }
+ else if (field == 'part__description') {
+ return row.part__description;
+ }
+ else if (field == 'quantity') {
+ var stock = 0;
+
+ data.forEach(function(item) {
+ stock += item.quantity;
+ });
+
+ return stock;
+ } else if (field == 'location__path') {
+ /* Determine how many locations */
+ var locations = [];
+
+ data.forEach(function(item) {
+ var loc = item.location;
+
+ if (!locations.includes(loc)) {
+ locations.push(loc);
+ }
+ });
+
+ if (locations.length > 1) {
+ return "In " + locations.length + " locations";
+ } else {
+ // A single location!
+ return renderLink(row.location__path, '/stock/location/' + row.location + '/')
+ }
+ }
+ else {
+ return '';
+ }
+ },
columns: [
{
checkbox: true,
@@ -392,47 +460,66 @@ function loadStockTable(table, options) {
visible: false,
},
{
- field: 'part_detail',
+ field: 'part__name',
title: 'Part',
sortable: true,
formatter: function(value, row, index, field) {
- return imageHoverIcon(value.image_url) + renderLink(value.full_name, value.url + 'stock/');
+
+ var name = row.part__IPN;
+
+ if (name) {
+ name += ' | ';
+ }
+
+ name += row.part__name;
+
+ return imageHoverIcon(row.part__image) + renderLink(name, '/part/' + row.part + '/stock/');
}
},
{
- field: 'part_detail.description',
+ field: 'part__description',
title: 'Description',
sortable: true,
},
{
- field: 'location_detail',
+ field: 'quantity',
+ title: 'Stock',
+ sortable: true,
+ formatter: function(value, row, index, field) {
+
+ var val = value;
+
+ // If there is a single unit with a serial number, use the serial number
+ if (row.serial && row.quantity == 1) {
+ val = '# ' + row.serial;
+ }
+
+ var text = renderLink(val, '/stock/item/' + row.pk + '/');
+
+ text = text + "" + row.status_text + " ";
+ return text;
+ }
+ },
+ {
+ field: 'location__path',
title: 'Location',
sortable: true,
formatter: function(value, row, index, field) {
if (value) {
- return renderLink(value.pathstring, value.url);
+ return renderLink(value, '/stock/location/' + row.location + '/');
}
else {
return 'No stock location set ';
}
}
},
- {
- field: 'quantity',
- title: 'Quantity',
- sortable: true,
- formatter: function(value, row, index, field) {
- var text = renderLink(value, row.url);
- text = text + "" + row.status_text + " ";
- return text;
- }
- },
{
field: 'notes',
title: 'Notes',
}
],
url: options.url,
+ queryParams: params,
});
if (options.buttons) {
diff --git a/InvenTree/static/script/inventree/tables.js b/InvenTree/static/script/inventree/tables.js
index 979a7d5a21..59bc446d5e 100644
--- a/InvenTree/static/script/inventree/tables.js
+++ b/InvenTree/static/script/inventree/tables.js
@@ -37,3 +37,74 @@ function linkButtonsToSelection(table, buttons) {
enableButtons(buttons, table.bootstrapTable('getSelections').length > 0);
});
}
+
+
+function isNumeric(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+
+
+function customGroupSorter(sortName, sortOrder, sortData) {
+
+ console.log('got here');
+
+ var order = sortOrder === 'desc' ? -1 : 1;
+
+ sortData.sort(function(a, b) {
+
+ // Extract default field values
+ var aa = a[sortName];
+ var bb = b[sortName];
+
+ // Extract parent information
+ var aparent = a._data && a._data['parent-index'];
+ var bparent = b._data && b._data['parent-index'];
+
+ // If either of the comparisons are in a group
+ if (aparent || bparent) {
+
+ // If the parents are different (or one item does not have a parent,
+ // then we need to extract the parent value for the selected column.
+
+ if (aparent != bparent) {
+ if (aparent) {
+ aa = a._data['table'].options.groupByFormatter(sortName, 0, a._data['group-data']);
+ }
+
+ if (bparent) {
+ bb = b._data['table'].options.groupByFormatter(sortName, 0, b._data['group-data']);
+ }
+ }
+ }
+
+ if (aa === undefined || aa === null) {
+ aa = '';
+ }
+ if (bb === undefined || bb === null) {
+ bb = '';
+ }
+
+ if (isNumeric(aa) && isNumeric(bb)) {
+ if (aa < bb) {
+ return order * -1;
+ } else if (aa > bb) {
+ return order;
+ } else {
+ return 0;
+ }
+ }
+
+ aa = aa.toString();
+ bb = bb.toString();
+
+ var cmp = aa.localeCompare(bb);
+
+ if (cmp === -1) {
+ return order * -1;
+ } else if (cmp === 1) {
+ return order;
+ } else {
+ return 0;
+ }
+ });
+}
\ No newline at end of file
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index ec998dde41..7fa88a646f 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -5,6 +5,7 @@ JSON API for the Stock app
from django_filters.rest_framework import FilterSet, DjangoFilterBackend
from django_filters import NumberFilter
+from django.conf import settings
from django.conf.urls import url, include
from django.urls import reverse
@@ -20,6 +21,8 @@ from .serializers import StockTrackingSerializer
from InvenTree.views import TreeSerializer
from InvenTree.helpers import str2bool
+import os
+
from rest_framework.serializers import ValidationError
from rest_framework.views import APIView
from rest_framework.response import Response
@@ -241,6 +244,7 @@ class StockList(generics.ListCreateAPIView):
- POST: Create a new StockItem
Additional query parameters are available:
+ - aggregate: If 'true' then stock items are aggregated by Part and Location
- location: Filter stock by location
- category: Filter by parts belonging to a certain category
- supplier: Filter by supplier
@@ -257,6 +261,53 @@ class StockList(generics.ListCreateAPIView):
kwargs['context'] = self.get_serializer_context()
return self.serializer_class(*args, **kwargs)
+ def list(self, request, *args, **kwargs):
+
+ queryset = self.filter_queryset(self.get_queryset())
+
+ # Instead of using the DRF serializer to LIST,
+ # we will serialize the objects manually.
+ # This is significantly faster
+
+ data = queryset.values(
+ 'pk',
+ 'quantity',
+ 'serial',
+ 'batch',
+ 'status',
+ 'notes',
+ 'location',
+ 'location__name',
+ 'location__description',
+ 'part',
+ 'part__IPN',
+ 'part__name',
+ 'part__description',
+ 'part__image',
+ 'part__category',
+ 'part__category__name',
+ 'part__category__description',
+ )
+
+ # Reduce the number of lookups we need to do for categories
+ # Cache location lookups for this query
+ locations = {}
+
+ for item in data:
+ item['part__image'] = os.path.join(settings.MEDIA_URL, item['part__image'])
+
+ loc_id = item['location']
+
+ if loc_id:
+ if loc_id not in locations:
+ locations[loc_id] = StockLocation.objects.get(pk=loc_id).pathstring
+
+ item['location__path'] = locations[loc_id]
+ else:
+ item['location__path'] = None
+
+ return Response(data)
+
def get_queryset(self):
"""
If the query includes a particular location,
@@ -264,7 +315,7 @@ class StockList(generics.ListCreateAPIView):
"""
# Start with all objects
- stock_list = StockItem.objects.all()
+ stock_list = StockItem.objects.filter(customer=None, belongs_to=None)
# Does the client wish to filter by the Part ID?
part_id = self.request.query_params.get('part', None)
@@ -310,8 +361,14 @@ class StockList(generics.ListCreateAPIView):
if supplier_id:
stock_list = stock_list.filter(supplier_part__supplier=supplier_id)
- # Pre-fetch related objects for better response time
- stock_list = self.get_serializer_class().setup_eager_loading(stock_list)
+ # Also ensure that we pre-fecth all the related items
+ stock_list = stock_list.prefetch_related(
+ 'part',
+ 'part__category',
+ 'location'
+ )
+
+ stock_list = stock_list.order_by('part__name')
return stock_list
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index f6651f6dd4..4efa347ecd 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -183,6 +183,9 @@ class StockItem(models.Model):
def get_absolute_url(self):
return reverse('stock-item-detail', kwargs={'pk': self.id})
+ def get_part_name(self):
+ return self.part.full_name
+
class Meta:
unique_together = [
('part', 'serial'),
diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py
index ddf06a3db7..21f2ef4e9e 100644
--- a/InvenTree/stock/serializers.py
+++ b/InvenTree/stock/serializers.py
@@ -57,17 +57,10 @@ class StockItemSerializer(serializers.ModelSerializer):
url = serializers.CharField(source='get_absolute_url', read_only=True)
status_text = serializers.CharField(source='get_status_display', read_only=True)
+ part_name = serializers.CharField(source='get_part_name', read_only=True)
+
part_detail = PartBriefSerializer(source='part', many=False, read_only=True)
location_detail = LocationBriefSerializer(source='location', many=False, read_only=True)
-
- @staticmethod
- def setup_eager_loading(queryset):
- queryset = queryset.prefetch_related('part')
- queryset = queryset.prefetch_related('part__stock_items')
- queryset = queryset.prefetch_related('part__category')
- queryset = queryset.prefetch_related('location')
-
- return queryset
def __init__(self, *args, **kwargs):
@@ -88,6 +81,7 @@ class StockItemSerializer(serializers.ModelSerializer):
'pk',
'url',
'part',
+ 'part_name',
'part_detail',
'supplier_part',
'location',
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index dd2f8bd706..cc58d27197 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -30,6 +30,7 @@