wip #6483 @1.5

diff --git a/_doc/screenselection.xlsx b/_doc/screenselection.xlsx
index a56d88e52ec127a1a1eb028587346737add25ea3..82947affc70314b03c098240ff1c2e34ecb81238 100644 (file)
Binary files a/_doc/screenselection.xlsx and b/_doc/screenselection.xlsx differ

diff --git a/js/project.js b/js/project.js
index 3bf0ca7d355d3149aa54a5f9b6b86256ceea9731..60833234fcce1e26acbc02b6e1b45aea5e1cd19a 100644 (file)
--- a/js/project.js
+++ b/js/project.js
@@ -22,24 +22,22 @@ var APPNAME = 'ScreenSelectionGuide';
 // };
 
 var DEV_INIT_VALUES = {
-    'max_feed_size': 300,
-    'separation_deck_1': 80,
-    'bulk_density': 1.7,
-    'importance_wear_protection': 4,
-    'importance_misplaced_particles': 4,
+    'max_feed_size': 200,
+    'separation_deck_1': 32,
+    'bulk_density': 1.6,
+    'importance_wear_protection': 3,
+    'importance_misplaced_particles': 3,
     'importance_available_height': 3,
-    'importance_tolc': 2,
-    //'screen_type_choice': 'SL|Adjustability, screening efficiency, maintenance friendly, installation requires a low space in the height direction, less sensible for blinding (linear stroke, high g-force)|Horizontal or slightly inclined installation, always double mechanism arrangement, modular screening deck design, suitable for all mining and construction duty applications',
-    // 'screen_type_choice': 'SJ|Widely used type, high capacity, less sensible for pegging (circular stroke)|Inclined screen, mainly one mech. Arrangement, modular desing, suitable for heavy duty quarry and medium duty mining applications',
-    'screen_type_choice': 'SA|Widely used type, low investment cost, less sensible for pegging (circular stroke)|Inclined screen, single mechanism arrangement, suitable for medium duty quarry applications, only side tensioned screening media arrangements applicable',
-    'decks': 2,
-    'feed_capacity': 800,
-    'separation_deck_2': 50,
-    'separation_deck_3': 0,
+    'importance_tolc': 3, //'screen_type_choice': 'SL|Adjustability, screening efficiency, maintenance friendly, installation requires a low space in the height direction, less sensible for blinding (linear stroke, high g-force)|Horizontal or slightly inclined installation, always double mechanism arrangement, modular screening deck design, suitable for all mining and construction duty applications',
+    'screen_type_choice': 'SJ|Widely used type, easily adaptable to varying conditions, low capex to performance ratio, less sensible for pegging (circular stroke)|Inclined screen, mainly single mechanism arrangement, modular screening deck design, suitable for heavy duty quarry and medium duty mining applications', //'screen_type_choice': 'SA|Widely used type, low investment cost, less sensible for pegging (circular stroke)|Inclined screen, single mechanism arrangement, suitable for medium duty quarry applications, only side tensioned screening media arrangements applicable',
+    'decks': 3,
+    'feed_capacity': 600,
+    'separation_deck_2': 60,
+    'separation_deck_3': 40,
     'separation_deck_4': 0,
-    'pct_deck_1': 80,
-    'pct_deck_2': 40,
-    'pct_deck_3': 0,
+    'pct_deck_1': 60,
+    'pct_deck_2': 30,
+    'pct_deck_3': 10,
     'pct_deck_4': 0,
 };
 
@@ -55,10 +53,7 @@ function getResultsContents() {
     res += '</table>';
 
     var decks = {
-        1: getTranslation('1st'),
-        2: getTranslation('2nd'),
-        3: getTranslation('3rd'),
-        4: getTranslation('4th')
+        1: getTranslation('1st'), 2: getTranslation('2nd'), 3: getTranslation('3rd'), 4: getTranslation('4th')
     };
 
     res += '<div class="decks">';
@@ -94,7 +89,6 @@ function findScreeningMedia($column) {
         return a[3] - b[3];
     });
 
-    console.log($AREA, filteredTable);
 
     var mw = ($width_min * 1000);
     var ERROR = false;
@@ -104,10 +98,20 @@ function findScreeningMedia($column) {
             break;
         }
         var i = filteredTable.shift();
+
         if (i[2] < mw) {
             continue;
         }
         break;
     }
-    return {AREA: i[1], MEDIA: i[2], LARGE_ERROR: ($AREA > max), MODEL_ERROR: ERROR};
+
+    console.log(i);
+
+    let area = i[1];
+    let media = i[2];
+    if (i.length > 4) {
+        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 ab6ea1868d069071a8301d0a3bb9d7ed4c5c658b..7d5bfefee8d386b59daf774f8fab978a83fe07f8 100644 (file)
--- a/js/script.js
+++ b/js/script.js
@@ -1,5 +1,5 @@
 window.updateFormAgain = false;
-DEV = false;
+DEV = true;
 
 $(function () {
     parseData();