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 missing units to Build Order view (#4386) (#4388)

Browse Source 
* add missing units to Build Order view (#4386)

* JS styling fixes

* more JS styling fixes
This commit is contained in:
simonkuehling 2023-02-21 23:51:09 +01:00 committed by GitHub
parent a2b55314cb
commit fa7a33dc9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
InvenTree/templates/js/translated/build.js
View File

@ -479,6 +479,9 @@ function completeBuildOutputs(build_id, outputs, options={}) {
output_html += `{% trans "Serial Number" %}: ${output.serial}`; output_html += `{% trans "Serial Number" %}: ${output.serial}`;
} else { } else {
output_html += `{% trans "Quantity" %}: ${output.quantity}`; output_html += `{% trans "Quantity" %}: ${output.quantity}`;
if (output.part_detail && output.part_detail.units) {
output_html += ` ${output.part_detail.units} `;
}
} }
var buttons = `<div class='btn-group float-right' role='group'>`; var buttons = `<div class='btn-group float-right' role='group'>`;
@ -637,6 +640,9 @@ function deleteBuildOutputs(build_id, outputs, options={}) {
output_html += `{% trans "Serial Number" %}: ${output.serial}`; output_html += `{% trans "Serial Number" %}: ${output.serial}`;
} else { } else {
output_html += `{% trans "Quantity" %}: ${output.quantity}`; output_html += `{% trans "Quantity" %}: ${output.quantity}`;
if (output.part_detail && output.part_detail.units) {
output_html += ` ${output.part_detail.units} `;
}
} }
var buttons = `<div class='btn-group float-right' role='group'>`; var buttons = `<div class='btn-group float-right' role='group'>`;
@ -1247,6 +1253,9 @@ function loadBuildOutputTable(build_info, options={}) {
text = `{% trans "Serial Number" %}: ${row.serial}`; text = `{% trans "Serial Number" %}: ${row.serial}`;
} else { } else {
text = `{% trans "Quantity" %}: ${row.quantity}`; text = `{% trans "Quantity" %}: ${row.quantity}`;
if (row.part_detail && row.part_detail.units) {
text += ` <small>${row.part_detail.units}</small>`;
}
} }
if (row.batch) { if (row.batch) {
@ -1748,6 +1757,9 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
text = `{% trans "Serial Number" %}: ${serial}`; text = `{% trans "Serial Number" %}: ${serial}`;
} else { } else {
text = `{% trans "Quantity" %}: ${row.quantity}`; text = `{% trans "Quantity" %}: ${row.quantity}`;
if (row.part_detail && row.part_detail.units) {
text += ` <small>${row.part_detail.units}</small>`;
}
} }
var pk = row.stock_item || row.pk; var pk = row.stock_item || row.pk;
@ -1880,6 +1892,14 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
title: '{% trans "Quantity Per" %}', title: '{% trans "Quantity Per" %}',
sortable: true, sortable: true,
switchable: false, switchable: false,
formatter: function(value, row) {
var text = value;
if (row.sub_part_detail && row.sub_part_detail.units) {
text += ` <small>${row.sub_part_detail.units}</small>`;
}
return text;
}
}, },
{ {
field: 'available_stock', field: 'available_stock',
@ -1903,6 +1923,9 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
if (available_stock > 0) { if (available_stock > 0) {
text += `${available_stock}`; text += `${available_stock}`;
if (row.sub_part_detail && row.sub_part_detail.units) {
text += ` <small>${row.sub_part_detail.units}</small>`;
}
} }
var icons = ''; var icons = '';
@ -1953,7 +1976,11 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
formatter: function(value, row) { formatter: function(value, row) {
var required = requiredQuantity(row); var required = requiredQuantity(row);
var allocated = row.consumable ? required : allocatedQuantity(row); var allocated = row.consumable ? required : allocatedQuantity(row);
return makeProgressBar(allocated, required); var progressbar_text = `${allocated} / ${required}`;
if (row.sub_part_detail && row.sub_part_detail.units) {
progressbar_text += ` ${row.sub_part_detail.units}`;
}
return makeProgressBar(allocated, required, {text: progressbar_text});
}, },
sorter: function(valA, valB, rowA, rowB) { sorter: function(valA, valB, rowA, rowB) {
// Custom sorting function for progress bars // Custom sorting function for progress bars