wip #4871 @1.5

diff --git a/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.4-Draft.xlsx b/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.4-Draft.xlsx
index 5d7bed800a08b68508f92481b3ec7ddd2f7837d8..744bed52f72eae20bc3127c003e4ad95c710998b 100644 (file)
Binary files a/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.4-Draft.xlsx and b/ScreeningMediaSelection/_doc/ScreenMediaSelection-2.0.4-Draft.xlsx differ

diff --git a/ScreeningMediaSelection/js/script.js b/ScreeningMediaSelection/js/script.js
index 39b30336729867fad4dec986552b2cb92c2068db..4cef17ba4c62b19e1cc4630ca24fd386c3bd8f5a 100644 (file)
--- a/ScreeningMediaSelection/js/script.js
+++ b/ScreeningMediaSelection/js/script.js
@@ -80,7 +80,7 @@ function parseTable(table, sheet) {
         if (f.prevent_ignore === undefined) {
             f.prevent_ignore = '0';
         }
-        f.prevent_ignore = f.prevent_ignore === '1';
+        f.prevent_ignore = f.prevent_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';
@@ -146,9 +146,22 @@ function parseOptions(table, k, f) {
 }
 
 function rangeVal(v) {
-    var res = v.split('-');
+    var res;
+    if (v === undefined || v === null || v === '') {
+        res = ['0', '0'];
+    } else {
+        res = v.split('-');
+        if (res.length === 1) {
+            res[1] = res[0];
+            res[0] = '0';
+            if (res[1] == '') {
+                res[1] = '0';
+            }
+        }
+    }
     res[0] = parseFloat(res[0]);
     res[1] = parseFloat(res[1]);
+    console.log(res);
     return res;
 }
 
@@ -375,6 +388,10 @@ function addField(f, value) {
     var hidden = false;
     var c = $("#" + cid);
 
+    if (f.type === undefined || f.type === null || f.type === "" || f.type === "undefined") {
+        return;
+    }
+
 
     if (c.length > 0) {
         c.remove();
@@ -511,15 +528,21 @@ function addField(f, value) {
         if (f.range) {
             var min = Number.MAX_VALUE;
             var max = Number.MIN_VALUE;
+            var changed = false;
             $.each(INPUT.sheets[INPUT.currentSheet].lines, function (k, lineNumber) {
                 $.each(f.options, function (k, option) {
                     if (option.lines.indexOf(lineNumber) === -1) {
                         return;
                     }
+                    changed = true;
                     min = Math.min(min, option.range[0]);
                     max = Math.max(max, option.range[1]);
                 });
             });
+            if (!changed) {
+                min = 0;
+                max = 0;
+            }
             res += ' min="' + min + '" max="' + max + '" ';
         } else {
             if (f.min) {
@@ -548,7 +571,9 @@ function addField(f, value) {
                 return false;
             }
         });
-        if (res === '') {
+        if (f.type === 'result' && INPUT.result_concat.length >= 0) {
+            hidden = false;
+        } else if (res === '') {
             hidden = true;
         }
         if (f.format) {
@@ -674,14 +699,16 @@ function addField(f, value) {
         label += '<div class="hint">' + formatHint(f, {'$min': min, '$max': max}) + '</div>';
     }
 
+
     if (f.type === 'result_concat') {
         INPUT.result_concat.push(res);
+        res = '';
     } else if (f.type === 'result') {
         var c;
         if (f.function !== undefined) {
             c = window[f.function].call();
         } else {
-            c = '<h2 data-l10n="' + RESULT_TITLE + '"></h2><div class="resholder"><div class="product_model">' + INPUT.result_concat.join(' ') + '</div> <div class="res">' + INPUT.result_disclaimer + '</div></div>';
+            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>';
@@ -702,11 +729,10 @@ function addField(f, value) {
     $("#fields").append(res);
 
     $(".select3").select3();
-    $("select[data-type=\"select2\"]").each(function () {
+    $("select[data-type=\"select2\"]:not([data-selectize=\"ok\"])").each(function () {
         $(this).selectize({
-            create: false,
-          //  sortField: "text",
-        });
+            dropdownParent: null, create: false,
+        }).attr('data-selectize', 'ok');
     });
 
     addLinkToResult('.res');

diff --git a/ScreeningMediaSelection/style/style.css b/ScreeningMediaSelection/style/style.css
index 6c481e73423f8edaa288391a9f2078b927105271..4254ba34141b735461095fb3b3c8cf1e68c689d4 100644 (file)
--- a/ScreeningMediaSelection/style/style.css
+++ b/ScreeningMediaSelection/style/style.css
@@ -304,6 +304,7 @@ section.visible {
 #fields .field .selectize-input .item {
   line-height: 1.2em;
   display: block;
+  position: absolute;
 }
 #fields .field .selectize-input input[type="select-one"] {
   height: 100%;

diff --git a/ScreeningMediaSelection/style/style.css.map b/ScreeningMediaSelection/style/style.css.map
index c10f841d42c1c1de896230f772b52f7e7e034afe..282a58daed41215dae207130cfee01e37717409f 100644 (file)
--- a/ScreeningMediaSelection/style/style.css.map
+++ b/ScreeningMediaSelection/style/style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style.less"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file
+{"version":3,"sources":["style.less"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file

diff --git a/ScreeningMediaSelection/style/style.less b/ScreeningMediaSelection/style/style.less
index dc7d57d005ab53b828d11f3abf02b3835d372a20..d851c4fff8b31b739dac9852b23b2205051778c5 100644 (file)
--- a/ScreeningMediaSelection/style/style.less
+++ b/ScreeningMediaSelection/style/style.less
@@ -351,10 +351,12 @@ section {
       .item {
         line-height: 1.2em;
         display: block;
+        position: absolute;
       }
 
       input[type="select-one"] {
         height: 100%;
+
         &::placeholder {
           color: #fff;
           opacity: 1;