wip #4164 @7

diff --git a/WearParts/_doc/wearparts.xlsx b/WearParts/_doc/wearparts.xlsx
index 7600d0678f7ae618830303af0ac95f87cd325d44..ed71ae4c1ca95c741a129e57532fc82dd6890dec 100644 (file)
Binary files a/WearParts/_doc/wearparts.xlsx and b/WearParts/_doc/wearparts.xlsx differ

diff --git a/WearParts/js/project.js b/WearParts/js/project.js
index 37f8cbf9e70588219d303d6760f11eddd82e505c..b9a2e87e7655c21f38e773e4ce26e50bbc3d1785 100644 (file)
--- a/WearParts/js/project.js
+++ b/WearParts/js/project.js
@@ -7,11 +7,19 @@ function getResultsContents() {
     //     <div className="product_model">' + INPUT.product_model + '</div>
     //     <div className="res">' + res.replace(/, /g, ',<br>') + ' ' + INPUT.result_disclaimer + '</div>
     // </div>
-    var res='<h2>'+RESULT_TITLE+'</h2>';
-    res+='<div class="resholder">';
+    var res = '<h2>' + RESULT_TITLE + '</h2>';
+    res += '<div class="resholder">';
     res += '<div>' + $product_name + '</div>';
     res += '<div>' + $product + '</div>';
     res += '<div>' + sprintf(getTranslation("Thickness: %s mm"), $thickness) + '</div>';
-    res+='</div>';
+    res += '</div>';
+    return res;
+}
+
+function getDefaultSG() {
+    var res = window.ores[window.$sg];
+    if (res !== undefined && res > 0) {
+        window.updateFormAgain = true;
+    }
     return res;
 }
\ No newline at end of file

diff --git a/WearParts/js/script.js b/WearParts/js/script.js
index d127bdcae5c5f82a757e72c2e00f09f7325a8d9a..ff89cfcb9a8192025acb7f7dde931e7018764888 100644 (file)
--- a/WearParts/js/script.js
+++ b/WearParts/js/script.js
@@ -1,7 +1,7 @@
 window.updateFormAgain = false;
 DEV = false;
 
-var ores = {
+window.ores = {
     "Andesite": 2.8,
     "Barite": 4.3,
     "Basalt": 2.9,
@@ -86,6 +86,9 @@ $(function () {
     // })
 
     $(document).on('change', 'select,input,.select2', function () {
+        if ($(this).attr('id') === 'f_sg') {
+            $("#f_m_sg").val('');
+        }
         updateForm();
     });
 
@@ -147,7 +150,6 @@ function parseTable(table, sheet) {
         f.isTable = f.type === 'table' || f.table_secondary_var !== undefined;
         f.range = f.range === '1';
         f.isFilter = f.hasOptions || ((f.type === 'float' || f.type === 'integer') && f.range);
-        f.hidden = f.hidden === '1';
         f.orderby = f.orderby === undefined ? 'label' : f.orderby;
         if (f.orderby.indexOf('|') >= 0) {
             f.orderby = f.orderby.split('|');
@@ -437,6 +439,14 @@ function addField(f, value) {
     var hidden = false;
     var c = $("#" + cid);
 
+    if ((f.default !== undefined) && (value === undefined || value === '')) {
+        console.log(value);
+        if (f.default.indexOf('(') >= 0) {
+            value = evalAndReturn(f.default);
+        } else {
+            value = f.default;
+        }
+    }
 
     if (c.length > 0) {
         c.remove();
@@ -572,7 +582,25 @@ function addField(f, value) {
         if (options.length <= 1 && !f.prevent_ignore) {
             hidden = true;
         }
+    } else if (f.type === "oresg") {
+        input = true;
+        var l = f.label.split("\n");
+        f.label = l[0];
+
+        res = '<select id="f_' + f.id + '">';
+        res += '<option value="">--</option>';
+        $.each(ores, function (name, sg) {
+            var selected = name === value ? ' selected="selected"' : '';
+            res += '<option value="' + name + '"' + selected + '>' + getTranslation(name) + '</option>';
+        });
+        res += '</select>';
+
+        hidden = false;
     } else if (f.type === 'float' || f.type === 'integer') {
+
+        if (f.id === 'm_sg' && (window.$sg === undefined || window.$sg === '' || !window.$sg)) {
+            return false;
+        }
         input = true;
         res = '<input type="number" id="f_' + f.id + '" ';
         if (f.range) {
@@ -606,6 +634,7 @@ function addField(f, value) {
         if (f.unit) {
             res += '<span class="unit">' + getTranslation(f.unit) + '</span>';
         }
+
     } else if (f.type === 'info' || f.type === 'result' || f.type === 'product_model') {
         var finalLine = INPUT.sheets[INPUT.currentSheet].lines[0];
         INPUT.finalLine = finalLine;
@@ -726,8 +755,15 @@ function addField(f, value) {
         console.log('???', f);
     }
 
-    if (f.hidden) {
-        hidden = true;
+    if (f.hidden !== undefined) {
+        if (f.hidden.indexOf(')') >= 0) {
+            console.log(f.hidden);
+            hidden = evalAndReturn(f.hidden);
+        } else if (f.hidden === '1') {
+            hidden = true;
+        } else if (f.hidden) {
+            hidden = true;
+        }
     }
 
     if (f.type === 'product_model') {
@@ -771,6 +807,12 @@ function addField(f, value) {
 
     addLinkToResult('.res');
 
+    if (f.id == 'sg_m') {
+        if (value === undefined || value <= 0 || value == '' || !value) {
+            return true;
+        }
+    }
+
     return false;
 }
 

diff --git a/WearParts/style.css b/WearParts/style.css
index 3ed421e37e45fef59b1cbb2d8e764a32bbd3b096..3a791d819098486e81b9dfe54f8618de654bab77 100644 (file)
--- a/WearParts/style.css
+++ b/WearParts/style.css
@@ -283,7 +283,8 @@ section.visible {
 #fields .field.hidden {
   display: none;
 }
-#fields .field[data-type="select"]:after {
+#fields .field[data-type="select"]:after,
+#fields .field[data-type="oresg"]:after {
   display: block;
   content: "";
   position: absolute;

diff --git a/WearParts/style.css.map b/WearParts/style.css.map
index 3d08e29f6491a026dfff6e6e053a27fc07b41cfc..9e4c0dcac650741d8aa0fe63eade6f145f52b099 100644 (file)
--- a/WearParts/style.css.map
+++ b/WearParts/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/WearParts/style.less b/WearParts/style.less
index 81ebbe342dbe6f567d8b4579824d95a7ba10ab24..fecda5d2d0a6a8d46ba8adf8de4eed95e0b0662a 100644 (file)
--- a/WearParts/style.less
+++ b/WearParts/style.less
@@ -325,17 +325,20 @@ section {
       display: none;
     }
 
-    &[data-type="select"]:after {
-      display: block;
-      content: "";
-      position: absolute;
-      right: 3rem;
-      bottom: 3rem;
-      width: 3rem;
-      height: 1.4rem;
-      background-image: url("images/select-arrow.svg");
-      background-size: 100% 100%;
-      background-repeat: no-repeat;
+    &[data-type="select"], &[data-type="oresg"] {
+      &:after {
+        display: block;
+        content: "";
+        position: absolute;
+        right: 3rem;
+        bottom: 3rem;
+        width: 3rem;
+        height: 1.4rem;
+        background-image: url("images/select-arrow.svg");
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+      }
+
     }