Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add action buttons to each build output

Browse Source
This commit is contained in:
Oliver Walters 2020-10-23 00:51:01 +11:00
parent 6245d65ebc
commit 33c454ed5a
4 changed files with 103 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
InvenTree/build/templates/build/allocation_card.html
View File

@ -1,6 +1,6 @@
{% load i18n %}
<div class="panel panel-default">
<div class="panel panel-default" id='allocation-panel-{{ item.pk }}'>
<div class="panel-heading" role="tab" id="heading-{{ item.pk }}">
<div class="panel-title">
<div class='row'>
@ -10,11 +10,15 @@
</div>
</a>
<div class='col-sm-3'>
PROGRESS
<div>
{% trans "Completed lines" %}:
<div id='output-progress-{{ item.pk }}'>
<span class='fas fa-spin fa-spinner'></span>
</div>
</div>
</div>
<div class='col-sm-3'>
ACTIONS
<div class='btn-group float-right' id='#output-actions-{{ item.pk }}'>
<div class='btn-group float-right' id='output-actions-{{ item.pk }}'>
<span class='fas fa-spin fa-spinner'></span>
</div>
</div>

11
InvenTree/build/templates/build/delete_build_item.html
View File

@ -3,7 +3,12 @@
{% load inventree_extras %}
{% block pre_form_content %}
{% trans "Are you sure you want to unallocate these parts?" %}
<br>
This will remove {% decimal item.quantity %} parts from build '{{ item.build.title }}'.
<div class='alert alert-block alert-danger'>
<p>
{% trans "Are you sure you want to unallocate this stock?" %}
</p>
<p>
{% trans "The selected stock will be unallocated from the build output" %}
</p>
</div>
{% endblock %}

3
InvenTree/build/views.py
View File

@ -680,15 +680,12 @@ class BuildItemCreate(AjaxCreateView):
quantity = min(quantity, item.unallocated_quantity())
# If the output has been specified
print("output_id:", output_id)
if output_id:
try:
output = StockItem.objects.get(pk=output_id)
initials['install_into'] = output
print("Output:", output)
except (ValueError, StockItem.DoesNotExist):
pass
print("no output found")
if quantity is not None:
initials['quantity'] = quantity

89
InvenTree/templates/js/build.js
View File

@ -32,6 +32,60 @@ function newBuildOrder(options={}) {
}
function makeBuildOutputActionButtons(output) {
/* Generate action buttons for a build output.
*/
var outputId = output.pk;
var panel = `#allocation-panel-${outputId}`;
// Find the div where the buttons will be displayed
var buildActions = $(panel).find(`#output-actions-${outputId}`);
var html = `<div class='btn-group float-right' role='group'>`;
// Add a button to "auto allocate" against the particular build output
html += makeIconButton(
'fa-clipboard-check icon-blue', 'button-output-auto', outputId,
'{% trans "Allocate stock items to this output" %}'
);
// Add a button to "complete" the particular build output
html += makeIconButton(
'fa-tools icon-green', 'button-output-complete', outputId,
'{% trans "Complete build output" %}',
);
// Add a button to "cancel" the particular build output (unallocate)
html += makeIconButton(
'fa-times-circle icon-red', 'button-output-cancel', outputId,
'{% trans "Cancel build output" %}',
);
// Add a button to "destroy" the particular build output (mark as damaged, scrap)
// TODO
html += '</div>';
buildActions.html(html);
// Add callbacks for the buttons
$(panel).find(`#button-output-auto-${outputId}`).click(function() {
// TODO
});
$(panel).find(`#button-output-complete-${outputId}`).click(function() {
// TODO
});
$(panel).find(`#button-output-cancel-${outputId}`).click(function() {
// TODO
});
}
function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
/*
* Load the "allocation table" for a particular build output.
@ -97,14 +151,13 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
sub_part_detail: true,
},
formatNoMatches: function() {
return "{% trans "No BOM items found" %}";
return '{% trans "No BOM items found" %}';
},
name: 'build-allocation',
uniqueId: 'sub_part',
onPostBody: setupCallbacks,
onLoadSuccess: function(tableData) {
// Once the BOM data are loaded, request allocation data for this build output
inventreeGet('/api/build/item/',
{
build: buildId,
@ -115,6 +168,12 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
// Iterate through the returned data, and group by the part they point to
var allocations = {};
// Total number of line items
var totalLines = tableData.length;
// Total number of "completely allocated" lines
var allocatedLines = 0;
data.forEach(function(item) {
// Group BuildItem objects by part
@ -136,9 +195,35 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
// Set the allocation list for that row
tableRow.allocations = allocations[key];
// Calculate the total allocated quantity
var allocatedQuantity = 0;
tableRow.allocations.forEach(function (allocation) {
allocatedQuantity += allocation.quantity;
});
// Is this line item fully allocated?
if (allocatedQuantity >= (tableRow.quantity * output.quantity)) {
allocatedLines += 1;
}
// Push the updated row back into the main table
$(table).bootstrapTable('updateByUniqueId', key, tableRow, true);
}
// Update the total progress for this build output
var buildProgress = $(`#allocation-panel-${outputId}`).find($(`#output-progress-${outputId}`));
var progress = makeProgressBar(
allocatedLines,
totalLines
);
buildProgress.html(progress);
// Update the available actions for this build output
makeBuildOutputActionButtons(output);
}
}
);