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

Logic fix for table row grouping

Browse Source
This commit is contained in:
Oliver Walters 2020-05-17 21:51:46 +10:00
parent 8ace71ef56
commit 5f318799c1
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/stock/templates/stock/item_tests.html
View File

@ -61,6 +61,7 @@ $("#test-result-table").on('click', '.button-test-add', function() {
stock_item: {{ item.id }}, stock_item: {{ item.id }},
test: test_name test: test_name
}, },
success: reloadTable,
} }
); );
}); });

19
InvenTree/templates/js/stock.html
View File

@ -102,6 +102,10 @@ function loadStockTestResultsTable(table, options) {
formatter: function(value, row) { formatter: function(value, row) {
var html = value; var html = value;
if (row.required) {
html = `<b>${value}</b>`;
}
if (row.result == null) { if (row.result == null) {
html += noResultBadge(); html += noResultBadge();
} else { } else {
@ -171,16 +175,27 @@ function loadStockTestResultsTable(table, options) {
// Iterate through the returned test result data, and group by test // Iterate through the returned test result data, and group by test
data.forEach(function(item) { data.forEach(function(item) {
var match = false; var match = false;
var override = false;
var key = testKey(item.test); var key = testKey(item.test);
// Try to associate this result with a test row // Try to associate this result with a test row
tableData.forEach(function(row) { tableData.forEach(function(row, index) {
// The result matches the test template row // The result matches the test template row
if (key == testKey(row.test_name)) { if (key == testKey(row.test_name)) {
// Force the names to be the same! // Force the names to be the same!
item.test_name = row.test_name; item.test_name = row.test_name;
item.required = row.required;
if (row.result == null) {
// The original row has not recorded a result - override!
tableData[index] = item;
override = true;
}
match = true; match = true;
} }
}); });
@ -191,7 +206,9 @@ function loadStockTestResultsTable(table, options) {
item.test_name = item.test; item.test_name = item.test;
} }
if (!override) {
tableData.push(item); tableData.push(item);
}
}); });
// Finally, push the data back into the table! // Finally, push the data back into the table!