From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 16 Aug 2022 07:17:04 +0000 (+0200)
Subject: wait #5330 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ba36fd9ff03499dec0cae06142accf76221cfeb5;p=sandvik-apps.git

wait #5330 @0.5
---

diff --git a/ScreeningMediaSelection/_doc/data.xlsx b/ScreeningMediaSelection/_doc/data.xlsx
index a856ad1..f6dad1f 100644
Binary files a/ScreeningMediaSelection/_doc/data.xlsx and b/ScreeningMediaSelection/_doc/data.xlsx differ
diff --git a/ScreeningMediaSelection/_doc/translations.xlsx b/ScreeningMediaSelection/_doc/translations.xlsx
index 241915b..7b46835 100644
Binary files a/ScreeningMediaSelection/_doc/translations.xlsx and b/ScreeningMediaSelection/_doc/translations.xlsx differ
diff --git a/ScreeningMediaSelection/_doc/~$200522 Sandvik SM Sel. Guide Tool v1.0 Draft_10-1.xlsx b/ScreeningMediaSelection/_doc/~$200522 Sandvik SM Sel. Guide Tool v1.0 Draft_10-1.xlsx
deleted file mode 100644
index b8107f7..0000000
Binary files a/ScreeningMediaSelection/_doc/~$200522 Sandvik SM Sel. Guide Tool v1.0 Draft_10-1.xlsx and /dev/null differ
diff --git a/ScreeningMediaSelection/_doc/~$data.xlsx b/ScreeningMediaSelection/_doc/~$data.xlsx
deleted file mode 100644
index b8107f7..0000000
Binary files a/ScreeningMediaSelection/_doc/~$data.xlsx and /dev/null differ
diff --git a/ScreeningMediaSelection/index.html b/ScreeningMediaSelection/index.html
index a612c52..a090142 100644
--- a/ScreeningMediaSelection/index.html
+++ b/ScreeningMediaSelection/index.html
@@ -29,7 +29,7 @@
         <p class="text">
             <span 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) decks, normally used for scalping, then the nearest available aperture is displayed instead."></span>
             <span data-l10n="Other parameters may have to be taken into consideration before a final decision is taken."></span>
-            <span data-l10n="A screening product specialist should always review and approve the aperture selection before an order is placed."></span>
+            <span data-l10n="A screening product specialist shall always review and approve the aperture selection before an order is placed."></span>
         </p>
         <p class="text"><strong data-l10n="Apertures - Shapes & Patterns"></strong></p>
         <p class="text">
diff --git a/ScreeningMediaSelection/js/common.js b/ScreeningMediaSelection/js/common.js
index f7c96d0..1310193 100644
--- a/ScreeningMediaSelection/js/common.js
+++ b/ScreeningMediaSelection/js/common.js
@@ -99,7 +99,6 @@ var currentSection = "#calculator";
 function initLocaleEvents() {
     $(document).on('click', "section#locale [data-locale]", function () {
         changeLocale($(this).data('locale'));
-        goBackToCurrentSection();
         return false;
     });
 
@@ -109,9 +108,11 @@ function initLocaleEvents() {
             return false;
         }
         currentSection = s;
+        $("#holder").show();
         showHide('section#locale', function () {
 
         });
+        $('body').css('overflow','hidden');
         return false;
     })
 }
diff --git a/ScreeningMediaSelection/js/script.js b/ScreeningMediaSelection/js/script.js
index b3a2f0d..71e3d2f 100644
--- a/ScreeningMediaSelection/js/script.js
+++ b/ScreeningMediaSelection/js/script.js
@@ -731,9 +731,9 @@ function addField(f, value) {
         } 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>';
             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>';
+                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 a 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>';
+                c += '<div class="disclaimer"><p data-l10n="Note:"></p>' + '<p data-l10n="Aperture selection to be confirmed by a 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>';
             }
 
         }
diff --git a/ScreeningMediaSelection/tools/refreshdata.php b/ScreeningMediaSelection/tools/refreshdata.php
index e4a4d48..be12bbd 100644
--- a/ScreeningMediaSelection/tools/refreshdata.php
+++ b/ScreeningMediaSelection/tools/refreshdata.php
@@ -5,5 +5,6 @@ $root = __DIR__ . '/../';
 $js = $root . 'js/data.js';
 $xlsx = $root . '/_doc/data.xlsx';
 $data = postFiles('https://extranet.cubedesigners.com/tools/convertXlsxToJson', $xlsx, 'file', ['dataorg' => 'excelToArray', 'format' => 'js']);
+$data = str_replace('"SUISSE"', '"CH"', $data);
 file_put_contents($js, $data);
 header('Location: ../');
\ No newline at end of file