wip #5601 @2

diff --git a/PPD/Map2/Map2.zip b/PPD/Map2/Map2.zip
index 47f5e8152801b8bdecc589c72bf66f57b83a6221..f03fed9fc1f0d7f94904a5a90c672447915ff43b 100644 (file)
Binary files a/PPD/Map2/Map2.zip and b/PPD/Map2/Map2.zip differ

diff --git a/PPD/Map2/_doc/publish.bat b/PPD/Map2/_doc/publish.bat
index 97a40d67e6450a8888758402aba183b5f8b58a27..0f5a964b9a4a627f656f8409f9dd1d2521a89815 100644 (file)
--- a/PPD/Map2/_doc/publish.bat
+++ b/PPD/Map2/_doc/publish.bat
@@ -1,3 +1,3 @@
 @echo off
 "C:\Program Files\7-Zip\7z.exe" a -tzip ../Map2.zip ../ -xr0!_doc -xr0!*.zip -xr0!*.less -xr0!*.map
-scp ../Map2.zip extranet@workshop.fluidbook.com:/data1/extranet/www/fluidbook/books/working/21046
\ No newline at end of file
+scp -P 51895 ../Map2.zip extranet@workshop.fluidbook.com:/application/fluidbook/books/working/21046
\ No newline at end of file

diff --git a/PPD/Map2/index.html b/PPD/Map2/index.html
index 309f99940dc3fcf73f2f2e9c1c651cf1d831ecf4..68979a2d7ce05d75183227b32740aac3a86108da 100644 (file)
--- a/PPD/Map2/index.html
+++ b/PPD/Map2/index.html
@@ -2159,8 +2159,8 @@
        <div id="reporting"><img src="reporting.png"></div>
        <div id="mainsteps"></div>
 </main>
-<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-<!--<script src="../../../data/jquery.js"></script>-->
+<!--<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>-->
+<script src="../../../data/jquery.js"></script>
 <script src="map2.js"></script>
 </body>
 </html>
\ No newline at end of file

diff --git a/PPD/Map2/map2.js b/PPD/Map2/map2.js
index 4c717764b5a68c76ee0fec1aefe0b1ff1cb073ba..4f81f02af0195b15b58ee4b313e9ce87d150fcc2 100644 (file)
--- a/PPD/Map2/map2.js
+++ b/PPD/Map2/map2.js
@@ -4,7 +4,7 @@ var pJquery = window.parent.jQuery;
 var mainSteps = [1, 4, 6, 8, 10, 12, 14, 16];
 
 
-var NB_STEPS = 26;
+var NB_STEPS = 27;
 
 var currentFlashing = 1;
 var completedSteps = [];
@@ -69,7 +69,7 @@ $(function () {
 
         for (var i = 19; i <= 27; i++) {
             $.each(parseList(STEPS[i].layers), function (k, v) {
-                $("#"+STEPS[i].prefix+"-" + v).css('fill', '#666');
+                $("#" + STEPS[i].prefix + "-" + v).css('fill', '#666');
             });
         }
     }, 200);
@@ -88,9 +88,11 @@ $(function () {
         currentFlashing = parseInt(fluidbook.cache.get('map2_current_flashing', 1).toString());
         completedSteps = fluidbook.cache.get('map2_completed_steps', []).sort();
         lastPassedStep = fluidbook.cache.get('map2_last_passed_step', 0);
-        if (lastPassedStep == 26) {
+        let firstPartOk = congratSteps.diff(completedSteps).length === 0;
+        console.log(firstPartOk,  congratSteps, completedSteps);
+        if (lastPassedStep == 27) {
             _end();
-        } else if (congratSteps.diff(completedSteps).length === 0) {
+        } else if (firstPartOk) {
             completedPart1 = true;
             _congratulations();
         }
@@ -101,10 +103,10 @@ $(function () {
 
     $.each(STEPS, function (step, data) {
         $.each(parseList(data.show), function (k, id) {
-            $("#"+data.prefix+"-" + id).addClass('hidden');
+            $("#" + data.prefix + "-" + id).addClass('hidden');
         });
         $.each(parseList(data.layers), function (k, id) {
-            $("#"+data.prefix+"-" + id).addClass('disabled');
+            $("#" + data.prefix + "-" + id).addClass('disabled');
         });
     });
 
@@ -128,10 +130,10 @@ function setStep(s) {
         return;
     }
     $.each(parseList(STEPS[s].layers), function (k, id) {
-        $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').removeClass('flashing');
+        $("#" + STEPS[s].prefix + "-" + id).removeClass('disabled').removeClass('flashing');
     });
     $.each(parseList(STEPS[s].show), function (k, id) {
-        $("#"+STEPS[s].prefix+"-" + id).removeClass('hidden');
+        $("#" + STEPS[s].prefix + "-" + id).removeClass('hidden');
     });
     if (STEPS[s].e !== undefined) {
         $("#" + STEPS[s].e).removeClass('hidden').removeClass('flashing').addClass('enabled');
@@ -205,12 +207,12 @@ function setFlashing(s, cancel) {
     }
 
     $.each(parseList(STEPS[s].layers), function (k, id) {
-        $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').addClass('flashing');
+        $("#" + STEPS[s].prefix + "-" + id).removeClass('disabled').addClass('flashing');
     });
 
 
     $.each(parseList(STEPS[s].flashing), function (k, id) {
-        $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').addClass('flashing');
+        $("#" + STEPS[s].prefix + "-" + id).removeClass('disabled').addClass('flashing');
     });
     if (STEPS[s].e !== undefined) {
         $("#" + STEPS[s].e).removeClass('hidden').addClass('flashing');