wip #4164 @7

diff --git a/WearParts/_doc/wearparts.xlsx b/WearParts/_doc/wearparts.xlsx
index d95a7116bc6149feb9838bc5bcb17d27fdd74bd7..7600d0678f7ae618830303af0ac95f87cd325d44 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 ee75ea51e3b23bfb3bede32e1aca1987af33c57d..37f8cbf9e70588219d303d6760f11eddd82e505c 100644 (file)
--- a/WearParts/js/project.js
+++ b/WearParts/js/project.js
@@ -1,2 +1,17 @@
 var RESULT_TITLE = getTranslation("Recommended Media");
-var APPNAME = 'ScreeningMediaSelection';
\ No newline at end of file
+var APPNAME = 'WearParts';
+
+function getResultsContents() {
+    // <h2 data-l10n="' + RESULT_TITLE + '"></h2>
+    // <div className="resholder">
+    //     <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">';
+    res += '<div>' + $product_name + '</div>';
+    res += '<div>' + $product + '</div>';
+    res += '<div>' + sprintf(getTranslation("Thickness: %s mm"), $thickness) + '</div>';
+    res+='</div>';
+    return res;
+}
\ No newline at end of file

diff --git a/WearParts/js/script.js b/WearParts/js/script.js
index 9d120f35ee25c963ed78e2f58879940f5667294e..bdb98636ef241ce9906d90449ec05b255ddab8a5 100644 (file)
--- a/WearParts/js/script.js
+++ b/WearParts/js/script.js
@@ -88,6 +88,9 @@ function parseTable(table, sheet) {
         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('|');
+        }
         f.orderway = f.orderway === undefined ? 'asc' : f.orderway;
         f.exact_boundaries = f.exact_boundaries === '1';
         f.block = f.block !== '0';
@@ -114,7 +117,7 @@ function parseOptions(table, k, f) {
         var values = allValues.split("\n");
         $.each(values, function (kkk, vvv) {
             vvv = vvv.toString();
-            if(vvv===''){
+            if (vvv === '') {
                 return;
             }
             if (f.table_secondary_var !== undefined) {
@@ -227,7 +230,7 @@ function updateForm(initValues) {
 
 function addError(message, errorClass, force) {
     if (force === true || $('#fields .error').length === 0) {
-        $("#fields").append('<div class="error ' + errorClass + '">' + getTranslation(message)+ '</div>');
+        $("#fields").append('<div class="error ' + errorClass + '">' + getTranslation(message) + '</div>');
     }
 }
 
@@ -425,7 +428,9 @@ function addField(f, value) {
         var optionsValues = [];
         var optionsOrderedKeys = [];
 
-        if (f.orderby === 'appearance') {
+        if (Array.isArray(f.orderby)) {
+            optionsOrderedKeys = f.orderby;
+        } else if (f.orderby === 'appearance') {
             optionsOrderedKeys = Object.keys(f.options);
         } else if (f.orderby === "label" || f.orderby === 'numeric') {
             var cmp;
@@ -457,6 +462,9 @@ function addField(f, value) {
 
         $.each(optionsOrderedKeys, function (i, k) {
             var data = f.options[k];
+            if (data === undefined) {
+                return;
+            }
             if (array_intersect(getLinesOfOption(f, data.label), INPUT.sheets[INPUT.currentSheet].lines).length === 0) {
                 return;
             }
@@ -676,6 +684,7 @@ function addField(f, value) {
         var c;
         if (f.function !== undefined) {
             c = window[f.function].call();
+            hidden = false;
         } else {
             c = '<h2 data-l10n="' + RESULT_TITLE + '"></h2><div class="resholder"><div class="product_model">' + INPUT.product_model + '</div><div class="res">' + res.replace(/, /g, ',<br>') + ' ' + INPUT.result_disclaimer + '</div></div>';
             c += '<div class="disclaimer"><p data-l10n="Note:"></p>' +
@@ -705,7 +714,6 @@ function addField(f, value) {
 }
 
 
-
 function evalAndReturn(e) {
     try {
         var code = 'var res=' + e + ';';