diff --git a/InvenTree/build/api.py b/InvenTree/build/api.py
index ceddb10014..de44f1185c 100644
--- a/InvenTree/build/api.py
+++ b/InvenTree/build/api.py
@@ -95,20 +95,25 @@ class BuildItemList(generics.ListCreateAPIView):
to allow filtering by stock_item.part
"""
- # Does the user wish to filter by part?
- part_pk = self.request.query_params.get('part', None)
-
query = BuildItem.objects.all()
query = query.select_related('stock_item')
query = query.prefetch_related('stock_item__part')
query = query.prefetch_related('stock_item__part__category')
- if part_pk:
- query = query.filter(stock_item__part=part_pk)
-
return query
+ def filter_queryset(self, queryset):
+ queryset = super().filter_queryset(queryset)
+
+ # Does the user wish to filter by part?
+ part_pk = self.request.query_params.get('part', None)
+
+ if part_pk:
+ queryset = queryset.filter(stock_item__part=part_pk)
+
+ return queryset
+
permission_classes = [
permissions.IsAuthenticated,
]
@@ -128,7 +133,7 @@ build_item_api_urls = [
]
build_api_urls = [
- url(r'^item/?', include(build_item_api_urls)),
+ url(r'^item/', include(build_item_api_urls)),
url(r'^(?P
\d+)/', BuildDetail.as_view(), name='api-build-detail'),
diff --git a/InvenTree/build/serializers.py b/InvenTree/build/serializers.py
index bc90b2b152..6480004699 100644
--- a/InvenTree/build/serializers.py
+++ b/InvenTree/build/serializers.py
@@ -21,6 +21,8 @@ class BuildSerializer(InvenTreeModelSerializer):
part_detail = PartBriefSerializer(source='part', many=False, read_only=True)
+ quantity = serializers.FloatField()
+
def __init__(self, *args, **kwargs):
part_detail = kwargs.pop('part_detail', False)
@@ -63,6 +65,8 @@ class BuildItemSerializer(InvenTreeModelSerializer):
part_image = serializers.CharField(source='stock_item.part.image', read_only=True)
stock_item_detail = StockItemSerializerBrief(source='stock_item', read_only=True)
+ quantity = serializers.FloatField()
+
class Meta:
model = BuildItem
fields = [
diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html
index 3e67c65145..60637cf66f 100644
--- a/InvenTree/build/templates/build/allocate.html
+++ b/InvenTree/build/templates/build/allocate.html
@@ -1,5 +1,6 @@
{% extends "build/build_base.html" %}
{% load static %}
+{% load i18n %}
{% load inventree_extras %}
{% block page_title %}
@@ -27,6 +28,141 @@ InvenTree | Allocate Parts
{% block js_ready %}
{{ block.super }}
+ var buildTable = $("#build-item-list");
+
+ buildTable.inventreeTable({
+ uniqueId: 'sub_part',
+ url: "{% url 'api-bom-list' %}",
+ formatNoMatches: function() { return "{% trans 'No BOM items found' %}"; },
+ onLoadSuccess: function(tableData) {
+ // Once the BOM data are loaded, request allocation data for the build
+ inventreeGet('/api/build/item/', {
+ build: {{ build.id }},
+ },
+ {
+ success: function(data) {
+
+ // Iterate through the returned data, and group by "part"
+ var allocations = {};
+
+ data.forEach(function(item) {
+
+ // Group allocations by referenced 'part'
+ var part = item.part;
+ var key = parseInt(part);
+
+ if (!(key in allocations)) {
+ allocations[key] = new Array();
+ }
+
+ // Add the allocation to the list
+ allocations[key].push(item);
+ });
+
+ for (var key in allocations) {
+
+ // Select the associated row in the table
+ var tableRow = buildTable.bootstrapTable('getRowByUniqueId', key);
+
+ // Set the allocations for the row
+ tableRow.allocations = allocations[key];
+
+ // And push the updated row back into the main table
+ buildTable.bootstrapTable('updateByUniqueId', key, tableRow, true);
+ }
+ }
+ },
+ );
+ },
+ queryParams: {
+ part: {{ build.part.id }},
+ sub_part_detail: 1,
+ },
+ columns: [
+ {
+ field: 'id',
+ visible: false,
+ },
+ {
+ sortable: true,
+ field: 'sub_part',
+ title: '{% trans "Part" %}',
+ formatter: function(value, row, index, field) {
+ return imageHoverIcon(row.sub_part_detail.thumbnail) + renderLink(row.sub_part_detail.full_name, `/part/${row.sub_part}/`);
+ },
+ },
+ {
+ sortable: true,
+ field: 'sub_part_detail.description',
+ title: '{% trans "Description" %}',
+ },
+ {
+ sortable: true,
+ field: 'reference',
+ title: '{% trans "Reference" %}',
+ },
+ {
+ sortable: true,
+ field: 'quantity',
+ title: '{% trans "Required" %}',
+ formatter: function(value, row) {
+ return value * {{ build.quantity }};
+ },
+ },
+ {
+ sortable: true,
+ field: 'allocated',
+ title: '{% trans "Allocated" %}',
+ formatter: function(value, row) {
+ var progress = value || 0;
+
+ return makeProgressBar(progress, row.quantity * {{ build.quantity }});
+ },
+ sorter: function(valA, valB, rowA, rowB) {
+
+ var aA = rowA.allocated || 0;
+ var aB = rowB.allocated || 0;
+
+ var qA = rowA.quantity * {{ build.quantity }};
+ var qB = rowB.quantity * {{ build.quantity }};
+
+ if (aA == 0 && aB == 0) {
+ return (qA > qB) ? 1 : -1;
+ }
+
+ var progressA = parseFloat(aA) / qA;
+ var progressB = parseFloat(aB) / qB;
+
+ return (progressA < progressB) ? 1 : -1;
+ }
+ },
+ {
+ field: 'buttons',
+ formatter: function(value, row, index, field) {
+
+ var html = ``;
+ var pk = row.sub_part;
+
+ {% if build.status == BuildStatus.PENDING %}
+ if (row.sub_part_detail.purchaseable) {
+ html += makeIconButton('fa-shopping-cart', 'button-buy', pk, '{% trans "Buy parts" %}');
+ }
+
+ if (row.sub_part.assembly) {
+ html += makeIconButton('fa-tools', 'button-build', pk, '{% trans "Build parts" %}');
+ }
+
+ html += makeIconButton('fa-plus', 'button-add', pk, '{% trans "Allocate stock" %}');
+ {% endif %}
+
+ html += '
';
+
+ return html;
+ },
+ }
+ ],
+ });
+
{% if editing %}
{% for bom_item in bom_items.all %}
diff --git a/InvenTree/build/templates/build/allocate_view.html b/InvenTree/build/templates/build/allocate_view.html
index 6100f7232e..ed404a8fc1 100644
--- a/InvenTree/build/templates/build/allocate_view.html
+++ b/InvenTree/build/templates/build/allocate_view.html
@@ -1,7 +1,7 @@
{% load i18n %}
{% load inventree_extras %}
-{% trans "Required Parts" %}
+{% trans "Allocated Parts" %}
@@ -11,7 +11,9 @@