From cc1bb3ad3b43a260fc396dab3db0ae8d5959cc98 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 20 Dec 2023 18:05:26 +0100 Subject: [PATCH] wait #6483 @0.75 --- js/project.js | 10 +++++----- js/script.js | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/js/project.js b/js/project.js index 98858b2..bcb2781 100644 --- a/js/project.js +++ b/js/project.js @@ -22,7 +22,7 @@ var APPNAME = 'ScreenSelectionGuide'; // }; var DEV_INIT_VALUES = { - 'max_feed_size': 250, + 'max_feed_size': 199, 'separation_deck_1': 32, 'bulk_density': 1.6, 'importance_wear_protection': 3, @@ -79,14 +79,14 @@ function findScreeningMedia($column) { return; } - line[3] = Math.abs(line[1] - $AREA) + line[5] = Math.abs(line[1] - $AREA) filteredTable.push(line); max = Math.max(line[1], max); maxmodel = Math.max(line[2], maxmodel); }); filteredTable.sort(function (a, b) { - return a[3] - b[3]; + return a[5] - b[5]; }); @@ -105,12 +105,12 @@ function findScreeningMedia($column) { break; } - let area = i[1]; let media = i[2]; - if (i.length > 4) { + if (i[3] !== undefined && i[3] !== null) { area = i[3]; media = i[4]; } + return {AREA: area, MEDIA: media, LARGE_ERROR: ($AREA > max), MODEL_ERROR: ERROR}; } \ No newline at end of file diff --git a/js/script.js b/js/script.js index ab6ea18..f72a6ba 100644 --- a/js/script.js +++ b/js/script.js @@ -1,5 +1,5 @@ window.updateFormAgain = false; -DEV = false; +DEV = true; $(function () { parseData(); @@ -787,7 +787,9 @@ function parsePipeTable(t, numbers) { } var s = v.split('|'); if (numbers) { - for (var i = 0; i < s.length; i++) s[i] = parseFloat(s[i]); + for (let i = 0; i < s.length; i++) { + s[i] = parseFloat(s[i]) + } } res.push(s); }); -- 2.39.5