wip #5225 @0.5

diff --git a/CrushingChamber/_doc/data.xlsx b/CrushingChamber/_doc/data.xlsx
index a2ea7fc4d13486cd939152576fba42d8a9640af9..78bbc029f29f901419db3e6bbaa382dc33d66943 100644 (file)
Binary files a/CrushingChamber/_doc/data.xlsx and b/CrushingChamber/_doc/data.xlsx differ

diff --git a/CrushingChamber/js/script.js b/CrushingChamber/js/script.js
index a576979e1300db737873958fd61f52c8eb817a5e..bb69243c7c77f6f5c2a145acbdfeeec882f1976c 100644 (file)
--- a/CrushingChamber/js/script.js
+++ b/CrushingChamber/js/script.js
@@ -534,6 +534,9 @@ function addField(name, value) {
     html += '<option value="" data-l10n="Choose..."' + selected + '></option>';
     hasSelected = value === '';
     $.each(f.options, function (k, v) {
+        if(!v){
+            return;
+        }
         if (value == k) {
             hasSelected = true;
         }

diff --git a/CrushingChamber/tools/refreshdata.php b/CrushingChamber/tools/refreshdata.php
index 1a21fad10a269437513090bfc2de869892eae888..4ac29c95bb7142463fe2aa780dd94ae9be61bb23 100644 (file)
--- a/CrushingChamber/tools/refreshdata.php
+++ b/CrushingChamber/tools/refreshdata.php
@@ -3,7 +3,7 @@ require_once 'common.php';
 $root = __DIR__ . '/../';
 $js = $root . 'js/data.js';
 $xlsx = $root . '/_doc/data.xlsx';
-$data = postFiles('https://extranet.cubedesigners.com/tools/convertXlsxToJson', $xlsx, 'file', ['dataorg' => 'excelToArray', 'format' => 'js']);
+$data = postFiles('https://toolbox.fluidbook.com/opentools/doexcel2json', $xlsx, 'file', ['dataorg' => 'excelToArray', 'format' => 'js']);
 $data = str_replace('"SUISSE"', '"CH"',$data);
 file_put_contents($js, $data);
 header('Location: ../');
\ No newline at end of file