wait #6483 @0.75

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 3be5caf175a77edaad0e5f905bff1497c1bc2ef5..4b1671837534862ffde2ed37cc2f8b91a16bfc63 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="demo1.cubedesigners.com" confirmBeforeDeletion="false" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="Always" serverName="demo1.cubedesigners.com" confirmBeforeUploading="false" confirmBeforeDeletion="false" autoUploadExternalChanges="true">
     <option name="confirmBeforeDeletion" value="false" />
+    <option name="confirmBeforeUploading" value="false" />
     <serverData>
       <paths name="alphaville.cubedesigners.com">
         <serverdata>

diff --git a/_doc/screenselection.xlsx b/_doc/screenselection.xlsx
index 681fa3461ab139082e96f29333f15cca2968feee..a56d88e52ec127a1a1eb028587346737add25ea3 100644 (file)
Binary files a/_doc/screenselection.xlsx and b/_doc/screenselection.xlsx differ

diff --git a/js/project.js b/js/project.js
index 9388d67f392dd07d39af6146258ba1510ac0a3db..3bf0ca7d355d3149aa54a5f9b6b86256ceea9731 100644 (file)
--- a/js/project.js
+++ b/js/project.js
@@ -49,9 +49,9 @@ function getResultsContents() {
     var res = '<div id="results"><h2 data-l10n="Preliminary selection"></h2><h3">(<span data-l10n="For final selection, use Plant Designer"></span>)</h3>';
     res += '<div class="tile">' + $screen_type + ' ' + $SCREEN.MEDIA + '</div>';
     res += '<table class="variables">';
-    res += '<tr><td data-l10n="Screening area of selected screen"></td><td>' + round($SCREEN.AREA, 1) + ' <span data-l10n="m²"></span></td></tr>';
-    res += '<tr><td data-l10n="Minimum width"></td><td>' + round($width_min, 1) + ' <span data-l10n="m"></span></td></tr>';
-    res += '<tr><td data-l10n="Min. screening area"></td><td>' + round($AREA, 1) + ' <span data-l10n="m²"></span></td></tr>';
+    res += '<tr><td data-l10n="Screening area of selected screen"></td><td>' + round($SCREEN.AREA, 1) + '&nbsp;<span data-l10n="m²"></span></td></tr>';
+    res += '<tr><td data-l10n="Minimum width"></td><td>' + round($width_min, 1) + '&nbsp;<span data-l10n="m"></span></td></tr>';
+    res += '<tr><td data-l10n="Min. screening area"></td><td>' + round($AREA, 1) + '&nbsp;<span data-l10n="m²"></span></td></tr>';
     res += '</table>';
 
     var decks = {

diff --git a/js/script.js b/js/script.js
index d79578a1a999b65f0d40c2e8626188b29373f839..ab6ea1868d069071a8301d0a3bb9d7ed4c5c658b 100644 (file)
--- a/js/script.js
+++ b/js/script.js
@@ -115,7 +115,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) {
@@ -598,8 +598,8 @@ function addField(f, value) {
         if (evalAndReturn(f.when)) {
             addError(f.message, f.class, false);
             if (f.block) {
-            return true;
-        }
+                return true;
+            }
         }
     } else if (f.type === 'table') {
         hidden = true;
@@ -673,8 +673,11 @@ function addField(f, value) {
         label += '<div class="hint">' + formatHint(f, {'$min': min, '$max': max}) + '</div>';
     }
 
-    if (f.type === 'result') {
-        hidden=false;
+    if (f.type === undefined) {
+        res = '';
+        hidden = true;
+    } else if (f.type === 'result') {
+        hidden = false;
         var c;
         if (f.function !== undefined) {
             c = window[f.function].call();
@@ -689,7 +692,6 @@ function addField(f, value) {
     }
 
 
-
     var fclass = '';
     if (hidden) {
         fclass += ' hidden';

diff --git a/tools/refreshdata.php b/tools/refreshdata.php
index b2b08e5a71e44d3c9052fad9163ca7cd1b0ac9a9..a5951505e5af2459c960029d195221342116ec75 100644 (file)
--- a/tools/refreshdata.php
+++ b/tools/refreshdata.php
@@ -4,6 +4,6 @@ require_once 'common.php';
 $root = __DIR__ . '/../';
 $js = $root . 'js/data.js';
 $xlsx = $root . '/_doc/screenselection.xlsx';
-$data = postFiles('https://extranet.cubedesigners.com/tools/convertXlsxToJson', $xlsx, 'file');
+$data = postFiles('https://toolbox.fluidbook.com/opentools/doexcel2json', $xlsx, 'file');
 file_put_contents($js, 'DATA=' . $data . ';');
 header('Location: ../');
\ No newline at end of file