mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-17 12:35:46 +00:00
working on updating build output tables
This commit is contained in:
@ -5,12 +5,10 @@ JSON API for the Build app
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.conf.urls import url, include
|
||||
|
||||
from rest_framework import filters, generics
|
||||
from rest_framework.serializers import ValidationError
|
||||
|
||||
from django_filters.rest_framework import DjangoFilterBackend
|
||||
from django_filters import rest_framework as rest_filters
|
||||
|
@ -218,26 +218,21 @@
|
||||
<h4>{% trans "Incomplete Build Outputs" %}</h4>
|
||||
</div>
|
||||
<div class='panel-content'>
|
||||
<div class='btn-group' role='group'>
|
||||
{% if build.active %}
|
||||
{% if build.active %}
|
||||
<div class='btn-group' role='group' id='build-output-toolbar'>
|
||||
<button class='btn btn-primary' type='button' id='btn-create-output' title='{% trans "Create new build output" %}'>
|
||||
<span class='fas fa-plus-circle'></span> {% trans "Create New Output" %}
|
||||
</button>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
{% if build.incomplete_outputs %}
|
||||
<div class="panel-group" id="build-output-accordion" role="tablist" aria-multiselectable="true">
|
||||
{% for item in build.incomplete_outputs %}
|
||||
{% include "build/allocation_card.html" with item=item tracked_items=build.has_tracked_bom_items %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class='alert alert-block alert-info'>
|
||||
<strong>{% trans "Create a new build output" %}</strong><br>
|
||||
{% trans "No incomplete build outputs remain." %}<br>
|
||||
{% trans "Create a new build output using the button above" %}
|
||||
</div>
|
||||
|
||||
<table class='table table-striped table-condensed' id='build-output-table' data-toolbar='#build-output-toolbar'></table>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
@ -321,8 +316,22 @@ var buildInfo = {
|
||||
{% if build.take_from %}
|
||||
source_location: {{ build.take_from.pk }},
|
||||
{% endif %}
|
||||
{% if build.has_tracked_bom_items %}
|
||||
tracked_parts: true,
|
||||
{% else %}
|
||||
tracked_parts: false,
|
||||
{% endif %}
|
||||
};
|
||||
|
||||
{% if build.active %}
|
||||
loadBuildOutputTable(
|
||||
buildInfo,
|
||||
{
|
||||
|
||||
}
|
||||
);
|
||||
{% endif %}
|
||||
|
||||
{% for item in build.incomplete_outputs %}
|
||||
// Get the build output as a javascript object
|
||||
inventreeGet('{% url 'api-stock-detail' item.pk %}', {},
|
||||
|
@ -153,7 +153,7 @@ class BuildCompleteTest(BuildAPITest):
|
||||
self.assertEqual(self.build.completed, 0)
|
||||
|
||||
# We shall complete 4 of these outputs
|
||||
outputs = self.build.incomplete_outputs[0:4]
|
||||
outputs = self.build.incomplete_outputs[0:4]
|
||||
|
||||
self.post(
|
||||
self.url,
|
||||
|
Reference in New Issue
Block a user