wait #4871 @0.5

diff --git a/ScreeningMediaSelection/_doc/data.xlsx b/ScreeningMediaSelection/_doc/data.xlsx
new file mode 100644 (file)
index 0000000..7375e8f
Binary files /dev/null and b/ScreeningMediaSelection/_doc/data.xlsx differ

diff --git a/ScreeningMediaSelection/index.html b/ScreeningMediaSelection/index.html
index 467d62e71155bf19996d511fd449bf20c8178a45..eee154767145f5792d116dccec05fb2c737e657a 100644 (file)
--- a/ScreeningMediaSelection/index.html
+++ b/ScreeningMediaSelection/index.html
@@ -26,7 +26,7 @@
             <span data-l10n="This selection guide is to be used for conventional screens such as Sandvik SA, SJ & SL screen models."></span><br>
             <strong data-l10n="Not to be used for Free-fall or Multi slope screens!"></strong>
         </p>
-        <p class="text" data-l10n="It is designed to provide an aperture for a specific separation (cut point) based on a limited number of parameters. Other parameters may have to be taken into consideration before a final decision is taken. A screening product specialist should always review and approve the aperture selection before an order is placed."></p>
+        <p class="text" data-l10n="It is designed to provide an aperture for a specific separation (cut point) based on a limited number of parameters, except for Flat (Self-supporting), normally used for scalping, then the nearest available aperture is displayed instead. Other parameters may have to be taken into consideration before a final decision is taken. A screening product specialist should always review and approve the aperture selection before an order is placed."></p>
         <p class="text"><strong data-l10n="Apertures - Shapes & Patterns"></strong></p>
         <p class="text">
         <ul>

diff --git a/ScreeningMediaSelection/js/script.js b/ScreeningMediaSelection/js/script.js
index 8dece9b9c998096cfdcf7cc6d14ee6ee19126e23..9cb47e49d8b64bd889c017bebf97b991ccccf1ee 100644 (file)
--- a/ScreeningMediaSelection/js/script.js
+++ b/ScreeningMediaSelection/js/script.js
@@ -733,7 +733,12 @@ function addField(f, value) {
             c = window[f.function].call();
         } else {
             c = '<h2 data-l10n="' + RESULT_TITLE + '"></h2><div class="resholder"><div class="product_model">' + INPUT.result_concat.join(' ').replace(/\s,/g, ',') + '</div> <div class="res">' + INPUT.result_disclaimer + '</div></div>';
-            c += '<div class="disclaimer"><p data-l10n="Note:"></p>' + '<p data-l10n="Aperture selection to be confirmed by product specialist. Other apertures are also available upon request"></p>' + '<p data-l10n="The result is based on the input given on basic parameters and should only be used as rough first guidance."></p>';
+            if(INPUT.result_concat[0].indexOf('WN')===0){
+                c += '<div class="disclaimer"><p data-l10n="Note:"></p>' + '<p data-l10n="The aperture size shown is a theoretical value. It doesn’t necessarily mean that tooling (pin pack) is available."></p>' + '<p data-l10n="Aperture selection to be confirmed by product specialist."></p><p data-l10n="The result is based on the input given on basic parameters and should only be used as rough first guidance."></p>';
+            }else {
+                c += '<div class="disclaimer"><p data-l10n="Note:"></p>' + '<p data-l10n="Aperture selection to be confirmed by product specialist. Other apertures are also available upon request"></p>' + '<p data-l10n="The result is based on the input given on basic parameters and should only be used as rough first guidance."></p>';
+            }
+
         }
         res = '<div class="label ' + f.type + '">' + getTranslation(c) + '</div>';
     } else if (input) {

diff --git a/ScreeningMediaSelection/tools/refreshdata.php b/ScreeningMediaSelection/tools/refreshdata.php
index c4eb3d1ab9babce73d4ef3d36ff6c182b55850fb..e4a4d482750f266ce03dd8fb669d5bcf93c5608a 100644 (file)
--- a/ScreeningMediaSelection/tools/refreshdata.php
+++ b/ScreeningMediaSelection/tools/refreshdata.php
@@ -3,7 +3,7 @@
 require_once 'common.php';
 $root = __DIR__ . '/../';
 $js = $root . 'js/data.js';
-$xlsx = $root . '/_doc/ScreenMediaSelection-2.0.7-Draft.xlsx';
+$xlsx = $root . '/_doc/data.xlsx';
 $data = postFiles('https://extranet.cubedesigners.com/tools/convertXlsxToJson', $xlsx, 'file', ['dataorg' => 'excelToArray', 'format' => 'js']);
 file_put_contents($js, $data);
 header('Location: ../');
\ No newline at end of file