wip #4164 @2

diff --git a/WearParts/_doc/Sandvik WP Selection Guide Tool v3.0.xlsx b/WearParts/_doc/Sandvik WP Selection Guide Tool v3.0.xlsx
new file mode 100644 (file)
index 0000000..08ad45d
Binary files /dev/null and b/WearParts/_doc/Sandvik WP Selection Guide Tool v3.0.xlsx differ

diff --git a/WearParts/_doc/data.xlsx b/WearParts/_doc/data.xlsx
deleted file mode 100644 (file)
index 2766eee..0000000
Binary files a/WearParts/_doc/data.xlsx and /dev/null differ

diff --git a/WearParts/_doc/wearparts.xlsx b/WearParts/_doc/wearparts.xlsx
new file mode 100644 (file)
index 0000000..d95a711
Binary files /dev/null and b/WearParts/_doc/wearparts.xlsx differ

diff --git a/WearParts/style.css.map b/WearParts/style.css.map
index 8f5f9edd6a6e3ae92dd432fddd12b0830f0b2427..3d08e29f6491a026dfff6e6e053a27fc07b41cfc 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 b339b8451a761e7398e0820cd55f13c82a64d9d1..81ebbe342dbe6f567d8b4579824d95a7ba10ab24 100644 (file)
--- a/WearParts/style.less
+++ b/WearParts/style.less
@@ -6,6 +6,7 @@
   src: url("fonts/AktivGrotesk_W_Lt.woff");
 }
 
+
 @font-face {
   font-family: "Aktiv Grotesk";
   font-weight: 400;

diff --git a/WearParts/tools/common.php b/WearParts/tools/common.php
index 88752051e615f1cfbc91a5d11bcaf5490d45e134..78bf41f221abc0a3ead8e9a1c30454fccd82e96a 100644 (file)
--- a/WearParts/tools/common.php
+++ b/WearParts/tools/common.php
@@ -1,5 +1,5 @@
 <?php
-function postFiles($url, $file, $var = 'file')
+function postFiles($url, $file, $var = 'file',$data=[])
 {
     $boundary = '--------------------------' . microtime(true);
     $header = 'Content-Type: multipart/form-data; boundary=' . $boundary;
@@ -7,6 +7,11 @@ function postFiles($url, $file, $var = 'file')
         'Content-Disposition: form-data; name="' . $var . '"; filename="' . basename($file) . "\"\r\n" .
         "Content-Type: application/octet-stream\r\n\r\n" .
         file_get_contents($file) . "\r\n";
+    foreach ($data as $k=>$v){
+        $content .= "--".$boundary."\r\n".
+            "Content-Disposition: form-data; name=\"$k\"\r\n\r\n".
+            "$v\r\n";
+    }
     $content .= '--' . $boundary . "--\r\n";
     $context = stream_context_create(array(
         'http' => array(

diff --git a/WearParts/tools/refreshdata.php b/WearParts/tools/refreshdata.php
index f78e95ec477743e5013a8c32acfa9983bfccd09f..e0aef721a987318e737bee81acf642bd029605cb 100644 (file)
--- a/WearParts/tools/refreshdata.php
+++ b/WearParts/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');
-file_put_contents($js, 'DATA=' . $data . ';');
+$xlsx = $root . '/_doc/wearparts.xlsx';
+$data = postFiles('https://extranet.cubedesigners.com/tools/convertXlsxToJson', $xlsx, 'file', ['dataorg' => 'excelToArray', 'format' => 'js']);
+file_put_contents($js, $data);
 header('Location: ../');
\ No newline at end of file