inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 21:25:42 +00:00
Code Activity

Fixes for new "allocation" tab

Browse Source 
- Fix broken link
- Add "description" column
- Add thumbnail images
This commit is contained in:
Oliver
2022-01-27 16:25:26 +11:00
parent 0ea0edf1bb
commit f6ffef66e0
4 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/templates/js/translated/helpers.js
View File

@@ -62,15 +62,16 @@ function imageHoverIcon(url) {
* @param {String} url is the image URL
* @returns html <img> tag
*/
function thumbnailImage(url) {
function thumbnailImage(url, options={}) {
if (!url) {
url = blankImage();
}
// TODO: Support insertion of custom classes
var title = options.title || '';
var html = `<img class='hover-img-thumb' src='${url}'>`;
var html = `<img class='hover-img-thumb' src='${url}' title='${title}'>`;
return html;

43
InvenTree/templates/js/translated/stock.js
View File

@@ -2251,8 +2251,12 @@ function loadStockAllocationTable(table, options={}) {
onLoadSuccess: function(tableData) {
var query_params = params;
query_params.customer_detail = true;
query_params.order_detail = true;
delete query_params.build_detail;
// Load sales order allocation data
inventreeGet('{% url "api-so-allocation-list" %}', query_params, {
success: function(data) {
@@ -2270,18 +2274,34 @@ function loadStockAllocationTable(table, options={}) {
var html = '';
if (row.build) {
html = renderLink(
// Add an icon for the part being built
html += thumbnailImage(row.build_detail.part_detail.thumbnail, {
title: row.build_detail.part_detail.full_name
});
html += ' ';
html += renderLink(
global_settings.BUILDORDER_REFERENCE_PREFIX + row.build_detail.reference,
`/build/${row.build}/`
);
html += makeIconBadge('fa-tools', '{% trans "Build Order" %}');
} else if (row.order) {
html += renderLink(
global_settings.SALESORDER_REFERENCE_PREFIX + row.order,
`/order/so/${row.order}/`
);
// Add an icon for the customer
html += thumbnailImage(
row.customer_detail.thumbnail || row.customer_detail.image, {
title: row.customer_detail.name,
});
html += ' ';
html += renderLink(
global_settings.SALESORDER_REFERENCE_PREFIX + row.order_detail.reference,
`/order/sales-order/${row.order}/`
);
html += makeIconBadge('fa-truck', '{% trans "Sales Order" %}');
} else {
return '-';
@@ -2290,6 +2310,19 @@ function loadStockAllocationTable(table, options={}) {
return html;
}
},
{
field: 'description',
title: '{% trans "Description" %}',
formatter: function(value, row) {
if (row.order_detail) {
return row.order_detail.description;
} else if (row.build_detail) {
return row.build_detail.title;
} else {
return '-';
}
}
},
{
field: 'status',
title: '{% trans "Order Status" %}',