From: Vincent Vanwaelscappel Date: Tue, 15 Mar 2022 10:30:10 +0000 (+0100) Subject: wip #4871 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=94d1156867ea94aa296e02a618019faed706aae3;p=sandvik-apps.git wip #4871 @2 --- diff --git a/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.5-Draft.xlsx b/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.5-Draft.xlsx new file mode 100644 index 0000000..c52621e Binary files /dev/null and b/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.5-Draft.xlsx differ diff --git a/ScreeningMediaSelection/_doc/data.xlsx b/ScreeningMediaSelection/_doc/data.xlsx deleted file mode 100644 index 70f7e0f..0000000 Binary files a/ScreeningMediaSelection/_doc/data.xlsx and /dev/null differ diff --git a/ScreeningMediaSelection/js/project.js b/ScreeningMediaSelection/js/project.js index ee75ea5..f8ff5dc 100644 --- a/ScreeningMediaSelection/js/project.js +++ b/ScreeningMediaSelection/js/project.js @@ -1,2 +1,2 @@ var RESULT_TITLE = getTranslation("Recommended Media"); -var APPNAME = 'ScreeningMediaSelection'; \ No newline at end of file +var APPNAME = 'ScreeningMediaSelection'; diff --git a/ScreeningMediaSelection/js/script.js b/ScreeningMediaSelection/js/script.js index 4cef17b..d91bfec 100644 --- a/ScreeningMediaSelection/js/script.js +++ b/ScreeningMediaSelection/js/script.js @@ -2,6 +2,7 @@ window.updateFormAgain = false; DEV = false; $(function () { + console.log('parse data'); parseData(); $("section").addClass('hidden'); @@ -81,6 +82,7 @@ function parseTable(table, sheet) { f.prevent_ignore = '0'; } f.prevent_ignore = f.prevent_ignore == '1'; + f.show_ignore = f.show_ignore == '1'; f.isNumber = f.type === 'float' || f.type === 'integer'; f.isInput = f.isNumber || f.type === 'select3' || f.type === 'select' || f.type === 'factor' || f.type === 'mdfactor'; f.hasOptions = f.type === 'select' || f.type === 'select3' || f.type === 'table' || f.type === 'factor' || f.type === 'mdfactor'; @@ -94,6 +96,7 @@ function parseTable(table, sheet) { f.block = f.block !== '0'; FIELDS.push(f); }); + console.log(FIELDS); } function parseOptions(table, k, f) { @@ -484,7 +487,7 @@ function addField(f, value) { l = format(l, f.value_format); } optionsValues.push(data.label); - var selected = (noptions <= 1 && !f.prevent_ignore) || (value !== undefined && data.label == value); + var selected = (noptions <= 1 && !f.prevent_ignore && !f.show_ignore) || (value !== undefined && data.label == value); var opt; if (f.type === 'select' || f.type === 'select2') { selected = selected ? ' selected' : ''; @@ -519,7 +522,7 @@ function addField(f, value) { window.updateFormAgain = true; } } - if (options.length <= 1 && !f.prevent_ignore) { + if (options.length <= 1 && !f.prevent_ignore && !f.show_ignore) { hidden = true; } } else if (f.type === 'float' || f.type === 'integer') { @@ -709,10 +712,7 @@ function addField(f, value) { c = window[f.function].call(); } else { c = '

' + INPUT.result_concat.join(' ').replace(/\s,/g, ',') + '
' + INPUT.result_disclaimer + '
'; - // c += '

' + - // '

' + - // '

'; - + c += '

' + '

' + '

'; } res = '
' + getTranslation(c) + '
'; } else if (input) { @@ -742,6 +742,9 @@ function addField(f, value) { function evalAndReturn(e) { + if(e===undefined || e===null || e===''){ + return true; + } try { var code = 'var res=' + e + ';'; eval(code); diff --git a/ScreeningMediaSelection/tools/refreshdata.php b/ScreeningMediaSelection/tools/refreshdata.php index c2e1e2b..38cb6f2 100644 --- 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.4-Draft.xlsx'; +$xlsx = $root . '/_doc/ScreenMediaSelection-2.0.5-Draft.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 diff --git a/WT6000/index.html b/WT6000/index.html index 09339d7..fe89bf8 100644 --- a/WT6000/index.html +++ b/WT6000/index.html @@ -1,5 +1,5 @@ - + @@ -9,7 +9,7 @@ diff --git a/WT6000/index.php b/WT6000/index.php index a5c0f26..94648cc 100644 --- a/WT6000/index.php +++ b/WT6000/index.php @@ -303,7 +303,7 @@ $translations = array( "Estimated installation time for a Sandvik WT6000 liner (hours)" => " Uppskattad monteringstid för ett Sandvik WT6000-foder (timmar)", "Let's go" => "NU KÖR VI", "Back" => "TILLBAKA", - "HOW IT PLAYS OUT" => "SÅ BLIR DET FÖR DIG", + "HOW IT PLAYS OUT" => "VAD DET INNEBÄR FÖR ER", "for you" => "till dig", "M \$currency" => "M \$currency", "worth of extra material hauled thanks to longer wear life and fewer liner changes" => "värde för ytterligare material som transporterats tack vare längre slitlivslängd och färre foderbyten", diff --git a/WT6000/style/calculator.css b/WT6000/style/calculator.css index e7954d3..793ac9e 100644 --- a/WT6000/style/calculator.css +++ b/WT6000/style/calculator.css @@ -220,7 +220,7 @@ header #calculator_locale_selector #current_locale { display: inline-block; font-size: 2rem; vertical-align: top; - margin-left: .5rem; + margin-left: 0.5rem; } #calculator { max-width: 160rem; @@ -237,7 +237,7 @@ header #calculator_locale_selector #current_locale { #calculator input[type="text"], #calculator select { background-color: #0099ff; - border: .2rem solid #fff; + border: 0.2rem solid #fff; color: #fff; height: 8.7rem; padding: 2rem; @@ -314,7 +314,7 @@ section#locale ul li { text-align: center; text-transform: uppercase; font-size: 4.5rem; - border-bottom: .1rem solid #fff; + border-bottom: 0.1rem solid #fff; padding: 2.5rem; list-style: none; cursor: pointer; @@ -369,7 +369,7 @@ section#locale ul li.active { } #results .back { background-color: transparent; - border: .2rem solid #fff; + border: 0.2rem solid #fff; color: #fff; margin: 6rem auto; position: relative; @@ -416,7 +416,7 @@ section#locale ul li.active { #results #schema hr { left: 5rem; border: 0.1rem solid rgba(255, 255, 255, 0.5); - width: 15.72727273rem; + width: 34.6rem/2.2; position: absolute; z-index: -1; transform: scale(2.2, 0.8); @@ -458,7 +458,7 @@ section#locale ul li.active { width: 100%; margin-right: 0; padding-bottom: 3rem; - border-bottom: .1rem solid #fff; + border-bottom: 0.1rem solid #fff; } } #results #res-intermediate article:last-child { @@ -496,7 +496,7 @@ section#locale ul li.active { } #results #res-total { text-align: center; - border: .2rem solid #fff; + border: 0.2rem solid #fff; display: block; vertical-align: top; margin: 12rem auto;