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

Adjust display of extra "add bom item" button at bottom of BOM table (#3773)

Browse Source
This commit is contained in:
Oliver 2022-10-12 16:34:57 +11:00 committed by GitHub
parent 9002a1e5b3
commit 193b69eeb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
InvenTree/part/templates/part/detail.html
View File

@ -277,7 +277,7 @@
</div>
{% if roles.part.change %}
<button class='btn btn-success' type='button' title='{% trans "New BOM Item" %}' id='bom-item-new'>
<button class='btn btn-success' type='button' title='{% trans "Add BOM Item" %}' id='bom-item-new'>
<span class='fas fa-plus-circle'></span> {% trans "Add BOM Item" %}
</button>
{% endif %}
@ -286,12 +286,6 @@
</div>
<div class='panel-content'>
{% include "part/bom.html" with part=part %}
{% if roles.part.change %}
<button class='btn btn-success' type='button' title='{% trans "New BOM Item" %}' id='bom-item-new-footer'>
<span class='fas fa-plus-circle'></span> {% trans "Add BOM Item" %}
</button>
<br/>
{% endif %}
</div>
</div>
@ -618,19 +612,7 @@
});
$("[id^=bom-item-new]").click(function () {
var fields = bomItemFields();
fields.part.value = {{ part.pk }};
fields.sub_part.filters = {
active: true,
};
constructForm('{% url "api-bom-list" %}', {
fields: fields,
method: 'POST',
title: '{% trans "Create BOM Item" %}',
focus: 'sub_part',
addBomItem({{ part.pk }}, {
onSuccess: function() {
$('#bom-table').bootstrapTable('refresh');
}

41
InvenTree/templates/js/translated/bom.js
View File

@ -15,6 +15,7 @@
*/
/* exported
addBomItem,
constructBomUploadTable,
deleteBomItems,
downloadBomTemplate,
@ -28,6 +29,30 @@
*/
/*
* Launch a dialog to add a new BOM line item to a Bill of Materials
*/
function addBomItem(part_id, options={}) {
var fields = bomItemFields();
fields.part.value = part_id;
fields.sub_part.filters = {
active: true,
};
constructForm('{% url "api-bom-list" %}', {
fields: fields,
method: 'POST',
title: '{% trans "Create BOM Item" %}',
focus: 'sub_part',
onSuccess: function(response) {
handleFormSuccess(response, options);
}
});
}
/* Construct a table of data extracted from a BOM file.
* This data is used to import a BOM interactively.
*/
@ -1171,6 +1196,13 @@ function loadBomTable(table, options={}) {
`/part/${row.part}/bom/`
);
}
},
footerFormatter: function(data) {
return `
<button class='btn btn-success float-right' type='button' title='{% trans "Add BOM Item" %}' id='bom-item-new-footer'>
<span class='fas fa-plus-circle'></span> {% trans "Add BOM Item" %}
</button>
`;
}
});
}
@ -1297,6 +1329,15 @@ function loadBomTable(table, options={}) {
// In editing mode, attached editables to the appropriate table elements
if (options.editable) {
// Callback for "new bom item" button in footer
table.on('click', '#bom-item-new-footer', function() {
addBomItem(options.parent_id, {
onSuccess: function() {
table.bootstrapTable('refresh');
}
});
});
// Callback for "delete" button
table.on('click', '.bom-delete-button', function() {