mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Tweaks
- Can't edit build status directly - Refresh BOM table on reload - Hide Company tabs that are not yet functional
This commit is contained in:
parent
fb89574c42
commit
7e7ac60a1a
@ -23,8 +23,6 @@ class EditBuildForm(HelperForm):
|
|||||||
'batch',
|
'batch',
|
||||||
'URL',
|
'URL',
|
||||||
'notes',
|
'notes',
|
||||||
'status',
|
|
||||||
# 'completion_date',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,11 +6,13 @@
|
|||||||
<li{% if tab == 'parts' %} class='active'{% endif %}>
|
<li{% if tab == 'parts' %} class='active'{% endif %}>
|
||||||
<a href="{% url 'company-detail-parts' company.id %}">Supplier Parts <span class='badge'>{{ company.part_count }}</span></a>
|
<a href="{% url 'company-detail-parts' company.id %}">Supplier Parts <span class='badge'>{{ company.part_count }}</span></a>
|
||||||
</li>
|
</li>
|
||||||
|
{% if 0 %}
|
||||||
<li{% if tab == 'po' %} class='active'{% endif %}>
|
<li{% if tab == 'po' %} class='active'{% endif %}>
|
||||||
<a href="#">Purchase Orders</a>
|
<a href="#">Purchase Orders</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if company.is_customer %}
|
{% endif %}
|
||||||
|
{% if company.is_customer and 0 %}
|
||||||
<li{% if tab == 'co' %} class='active'{% endif %}>
|
<li{% if tab == 'co' %} class='active'{% endif %}>
|
||||||
<a href="#">Sales Orders</a>
|
<a href="#">Sales Orders</a>
|
||||||
</li>
|
</li>
|
||||||
|
@ -60,7 +60,14 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
$("#bom-item-new").click(function () {
|
$("#bom-item-new").click(function () {
|
||||||
launchModalForm("{% url 'bom-item-create' %}?parent={{ part.id }}", {});
|
launchModalForm(
|
||||||
|
"{% url 'bom-item-create' %}?parent={{ part.id }}",
|
||||||
|
{
|
||||||
|
success: function() {
|
||||||
|
$("#bom-table").bootstrapTable('refresh');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -114,22 +114,12 @@ function loadBomTable(table, options) {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// Part notes
|
|
||||||
cols.push(
|
|
||||||
{
|
|
||||||
field: 'note',
|
|
||||||
title: 'Notes',
|
|
||||||
searchable: true,
|
|
||||||
sortable: false,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (options.editable) {
|
if (options.editable) {
|
||||||
cols.push({
|
cols.push({
|
||||||
formatter: function(value, row, index, field) {
|
formatter: function(value, row, index, field) {
|
||||||
var bEdit = "<button class='btn btn-success bom-edit-button btn-sm' type='button' url='/part/bom/" + row.pk + "/edit'>Edit</button>";
|
var bEdit = "<button class='btn btn-success bom-edit-button btn-sm' type='button' url='/part/bom/" + row.pk + "/edit'>Edit</button>";
|
||||||
var bDelt = "<button class='btn btn-danger bom-delete-button btn-sm' type='button' url='/part/bom/" + row.pk + "/delete'>Delete</button>";
|
var bDelt = "<button class='btn btn-danger bom-delete-button btn-sm' type='button' url='/part/bom/" + row.pk + "/delete'>Delete</button>";
|
||||||
|
|
||||||
return "<div class='btn-group'>" + bEdit + bDelt + "</div>";
|
return "<div class='btn-group'>" + bEdit + bDelt + "</div>";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -143,7 +133,7 @@ function loadBomTable(table, options) {
|
|||||||
sortable: true,
|
sortable: true,
|
||||||
formatter: function(value, row, index, field) {
|
formatter: function(value, row, index, field) {
|
||||||
var text = "";
|
var text = "";
|
||||||
|
|
||||||
if (row.quantity < row.sub_part_detail.available_stock)
|
if (row.quantity < row.sub_part_detail.available_stock)
|
||||||
{
|
{
|
||||||
text = "<span class='label label-success'>" + value + "</span>";
|
text = "<span class='label label-success'>" + value + "</span>";
|
||||||
@ -152,22 +142,32 @@ function loadBomTable(table, options) {
|
|||||||
{
|
{
|
||||||
text = "<span class='label label-warning'>" + value + "</span>";
|
text = "<span class='label label-warning'>" + value + "</span>";
|
||||||
}
|
}
|
||||||
|
|
||||||
return renderLink(text, row.sub_part.url + "stock/");
|
return renderLink(text, row.sub_part.url + "stock/");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Part notes
|
||||||
|
cols.push(
|
||||||
|
{
|
||||||
|
field: 'note',
|
||||||
|
title: 'Notes',
|
||||||
|
searchable: true,
|
||||||
|
sortable: false,
|
||||||
|
}
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
// Configure the table (bootstrap-table)
|
// Configure the table (bootstrap-table)
|
||||||
|
|
||||||
table.bootstrapTable({
|
table.bootstrapTable({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
search: true,
|
search: true,
|
||||||
clickToSelect: true,
|
clickToSelect: true,
|
||||||
queryParams: function(p) {
|
queryParams: function(p) {
|
||||||
return {
|
return {
|
||||||
part: options.parent_id,
|
part: options.parent_id,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
columns: cols,
|
columns: cols,
|
||||||
|
Loading…
Reference in New Issue
Block a user