inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 21:45:39 +00:00
Code Activity

Merge branch 'plugin-2037' of https://github.com/matmair/InvenTree into plugin-2037

Browse Source
This commit is contained in:
Matthias
2021-10-05 00:41:03 +02:00
parent 18630c0e0f 9d1c146a40
commit af66da4199
18 changed files with 208 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
InvenTree/templates/InvenTree/search.html
View File

@ -117,7 +117,7 @@
"{% url 'api-part-list' %}",
{
params: {
search: "{{ query }}",
original_search: "{{ query }}",
},
checkbox: false,
disableFilters: true,
@ -126,24 +126,10 @@
addItem('category', '{% trans "Part Categories" %}', 'fa-sitemap');
$("#table-category").inventreeTable({
url: "{% url 'api-part-category-list' %}",
queryParams: {
search: "{{ query }}",
},
columns: [
{
field: 'name',
title: '{% trans "Name" %}',
formatter: function(value, row, index, field) {
return renderLink(value, '/part/category/' + row.pk + '/');
},
},
{
field: 'description',
title: '{% trans "Description" %}',
},
],
loadPartCategoryTable($("#table-category"), {
params: {
original_search: "{{ query }}",
}
});
addItem('manufacturer-part', '{% trans "Manufacturer Parts" %}', 'fa-toolbox');
@ -153,7 +139,7 @@
"{% url 'api-manufacturer-part-list' %}",
{
params: {
search: "{{ query }}",
original_search: "{{ query }}",
part_detail: true,
supplier_detail: true,
manufacturer_detail: true
@ -168,7 +154,7 @@
"{% url 'api-supplier-part-list' %}",
{
params: {
search: "{{ query }}",
original_search: "{{ query }}",
part_detail: true,
supplier_detail: true,
manufacturer_detail: true
@ -186,7 +172,7 @@
loadBuildTable('#table-build-order', {
params: {
search: '{{ query }}',
original_search: '{{ query }}',
}
});
@ -197,105 +183,23 @@
addItem('stock', '{% trans "Stock Items" %}', 'fa-boxes');
$('#table-stock').inventreeTable({
loadStockTable($('#table-stock'), {
filterKey: 'stocksearch',
url: "{% url 'api-stock-list' %}",
queryParams: {
search: "{{ query }}",
params: {
original_search: "{{ query }}",
part_detail: true,
location_detail: true,
},
columns: [
{
field: 'part',
title: "{% trans "Part" %}",
sortable: true,
formatter: function(value, row) {
var url = `/stock/item/${row.pk}/`;
var thumb = row.part_detail.thumbnail;
var name = row.part_detail.full_name;
html = imageHoverIcon(thumb) + renderLink(name, url);
return html;
}
},
{
field: 'part_description',
title: '{% trans "Description" %}',
sortable: true,
formatter: function(value, row, index, field) {
return row.part_detail.description;
}
},
{
field: 'quantity',
title: '{% trans "Stock" %}',
sortable: true,
formatter: function(value, row, index, field) {
var val = parseFloat(value);
// If there is a single unit with a serial number, use the serial number
if (row.serial && row.quantity == 1) {
val = '# ' + row.serial;
} else {
val = +val.toFixed(5);
}
var html = renderLink(val, `/stock/item/${row.pk}/`);
return html;
}
},
{
field: 'status',
title: '{% trans "Status" %}',
sortable: 'true',
formatter: function(value, row, index, field) {
return stockStatusDisplay(value);
},
},
{
field: 'location_detail.pathstring',
title: '{% trans "Location" %}',
sortable: true,
formatter: function(value, row, index, field) {
if (value) {
return renderLink(value, `/stock/location/${row.location}/`);
}
else {
if (row.customer) {
var text = "{% trans "Shipped to customer" %}";
return renderLink(text, `/company/${row.customer}/assigned-stock/`);
} else {
return '<em>{% trans "No stock location set" %}</em>';
}
}
}
},
]
location_detail: true
}
});
addItem('location', '{% trans "Stock Locations" %}', 'fa-map-marker-alt');
$("#table-location").inventreeTable({
url: "{% url 'api-location-list' %}",
queryParams: {
search: "{{ query }}",
loadStockLocationTable($("#table-location"), {
filterKey: 'locationsearch',
params: {
original_search: "{{ query }}",
},
columns: [
{
field: 'name',
title: '{% trans "Name" %}',
formatter: function(value, row, index, field) {
return renderLink(row.pathstring, '/stock/location/' + row.pk + '/');
},
},
{
field: 'description',
title: '{% trans "Description" %}',
},
],
});
{% endif %}
@ -307,7 +211,7 @@
loadCompanyTable('#table-manufacturer', "{% url 'api-company-list' %}", {
params: {
search: "{{ query }}",
original_search: "{{ query }}",
is_manufacturer: "true",
}
});
@ -317,7 +221,7 @@
loadCompanyTable('#table-supplier', "{% url 'api-company-list' %}", {
params: {
search: "{{ query }}",
original_search: "{{ query }}",
is_supplier: "true",
}
});
@ -326,7 +230,7 @@
loadPurchaseOrderTable('#table-purchase-order', {
params: {
search: '{{ query }}',
original_search: '{{ query }}',
}
});
@ -337,7 +241,7 @@
loadCompanyTable('#table-customer', "{% url 'api-company-list' %}", {
params: {
search: "{{ query }}",
original_search: "{{ query }}",
is_customer: "true",
}
});
@ -346,7 +250,7 @@
loadSalesOrderTable('#table-sales-orders', {
params: {
search: '{{ query }}',
original_search: '{{ query }}',
}
});

2
InvenTree/templates/js/dynamic/inventree.js
View File

@ -116,7 +116,7 @@ function inventreeDocReady() {
success: function(data) {
var transformed = $.map(data.results, function(el) {
return {
label: el.name,
label: el.full_name,
id: el.pk,
thumbnail: el.thumbnail
};

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

@ -271,7 +271,7 @@ function loadBomTable(table, options) {
sortable: true,
formatter: function(value, row) {
var url = `/part/${row.sub_part_detail.pk}/?display=stock`;
var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`;
var text = value;
if (value == null || value <= 0) {

6
InvenTree/templates/js/translated/company.js
View File

@ -361,7 +361,7 @@ function loadCompanyTable(table, url, options={}) {
field: 'parts_supplied',
title: '{% trans "Parts Supplied" %}',
formatter: function(value, row) {
return renderLink(value, `/company/${row.pk}/parts/`);
return renderLink(value, `/company/${row.pk}/?display=supplier-parts`);
}
});
} else if (options.pagetype == 'manufacturers') {
@ -370,7 +370,7 @@ function loadCompanyTable(table, url, options={}) {
field: 'parts_manufactured',
title: '{% trans "Parts Manufactured" %}',
formatter: function(value, row) {
return renderLink(value, `/company/${row.pk}/parts/`);
return renderLink(value, `/company/${row.pk}/?display=manufacturer-parts`);
}
});
}
@ -469,6 +469,7 @@ function loadManufacturerPartTable(table, url, options) {
method: 'get',
original: params,
queryParams: filters,
sidePagination: 'server',
name: 'manufacturerparts',
groupBy: false,
formatNoMatches: function() {
@ -724,6 +725,7 @@ function loadSupplierPartTable(table, url, options) {
url: url,
method: 'get',
original: params,
sidePagination: 'server',
queryParams: filters,
name: 'supplierparts',
groupBy: false,

23
InvenTree/templates/js/translated/part.js
View File

@ -94,7 +94,12 @@ function partFields(options={}) {
},
default_location: {
},
default_supplier: {},
default_supplier: {
filters: {
part_detail: true,
supplier_detail: true,
}
},
default_expiry: {
icon: 'fa-calendar-alt',
},
@ -315,6 +320,9 @@ function editPart(pk) {
edit: true
});
// Filter supplied parts by the Part ID
fields.default_supplier.filters.part = pk;
var groups = partGroups({});
constructForm(url, {
@ -338,6 +346,9 @@ function duplicatePart(pk, options={}) {
duplicate: pk,
});
// Remove "default_supplier" field
delete fields['default_supplier'];
// If we are making a "variant" part
if (options.variant) {
@ -528,7 +539,7 @@ function loadPartVariantTable(table, partId, options={}) {
field: 'in_stock',
title: '{% trans "Stock" %}',
formatter: function(value, row) {
return renderLink(value, `/part/${row.pk}/?display=stock`);
return renderLink(value, `/part/${row.pk}/?display=part-stock`);
}
}
];
@ -934,7 +945,7 @@ function loadPartTable(table, url, options={}) {
title: '{% trans "Stock" %}',
searchable: false,
formatter: function(value, row) {
var link = 'stock';
var link = '?display=part-stock';
if (value) {
// There IS stock available for this part
@ -947,17 +958,17 @@ function loadPartTable(table, url, options={}) {
} else if (row.on_order) {
// There is no stock available, but stock is on order
value = `0<span class='label label-right label-primary'>{% trans "On Order" %}: ${row.on_order}</span>`;
link = 'orders';
link = '?display=purchase-orders';
} else if (row.building) {
// There is no stock available, but stock is being built
value = `0<span class='label label-right label-info'>{% trans "Building" %}: ${row.building}</span>`;
link = 'builds';
link = '?display=build-orders';
} else {
// There is no stock available
value = `0<span class='label label-right label-danger'>{% trans "No Stock" %}</span>`;
}
return renderLink(value, `/part/${row.pk}/${link}/`);
return renderLink(value, `/part/${row.pk}/${link}`);
}
};

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

@ -1019,7 +1019,7 @@ function loadStockTable(table, options) {
return '-';
}
var link = `/supplier-part/${row.supplier_part}/?display=stock`;
var link = `/supplier-part/${row.supplier_part}/?display=part-stock`;
var text = '';

9
InvenTree/templates/js/translated/tables.js
View File

@ -181,6 +181,15 @@ function convertQueryParameters(params, filters) {
if ('sortable' in params) {
delete params['sortable'];
}
// If "original_search" parameter is provided, add it to the "search"
if ('original_search' in params) {
var search = params['search'] || '';
params['search'] = search + ' ' + params['original_search'];
delete params['original_search'];
}
return params;
}