rapid-router 5.18.0__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/static/game/js/game.js

@@ -6,11 +6,18 @@ ocargo.Game = function () {
   this.tabs = null
   this.failures = 0
   this.currentlySelectedTab = null
-  this.isMuted = Cookies.get('muted') === 'true'
+
+  if (!hasFunctionalCookiesConsent()) {
+    deleteCookie('muted')
+    deleteCookie('preferredLanguage')
+  }
+  this.preferredLanguage = Cookies.get('preferredLanguage')
 }
 
 ocargo.Game.prototype.setup = function () {
-  gameUpdateBlockLanguage(navigator.language.toLowerCase())
+  document.getElementById("language_dropdown").value = this.preferredLanguage ?? navigator.language.toLowerCase()
+  gameUpdateBlockLanguage(this.preferredLanguage ?? navigator.language.toLowerCase())
+  this.isMuted = Cookies.get('muted') ?? false
 
   if(new Date().getMonth() === 11) {
     $("#paper").css('background-color', '#eef7ff')
@@ -66,7 +73,6 @@ ocargo.Game.prototype.setup = function () {
   this._setupConsoleSliderListeners()
   this._setupPythonViewSliderListeners()
   this._setupConsoleLogViewSliderListeners()
-  this._setupDirectDriveListeners()
   this._setupFuelGauge(ocargo.model.map.nodes, BLOCKS)
   this._setupTabs()
 
@@ -106,8 +112,16 @@ ocargo.Game.prototype.setup = function () {
     } else if (DEFAULT_LEVEL) {
       titlePrefix = gettext('Level %(level_name)s')
     }
+
+    let adjusted_level_name = ''
+    if (LEVEL_NAME > 1000) {
+      adjusted_level_name = LEVEL_NAME - 1000
+    } else {
+      adjusted_level_name = LEVEL_NAME;
+    }
+
     if (titlePrefix) {
-      title = interpolate(titlePrefix, { level_name: LEVEL_NAME }, true)
+      title = interpolate(titlePrefix, { level_name: adjusted_level_name }, true)
     } else {
       title = LEVEL_NAME
     }
@@ -129,15 +143,19 @@ ocargo.Game.prototype.setup = function () {
 
   const showMascot = BLOCKLY_ENABLED && !PYTHON_VIEW_ENABLED && LEVEL_NAME <= 80; // show mascot on Blockly-only levels that are not above 80
 
+  const subtitle = SUBTITLE == "None" ? "" : "<b>" + SUBTITLE + "</b> <br> <br> ";
+  const next_button_html = NEXT_LEVEL_URL == "/pythonden/" 
+    ? ocargo.button.episodeRedirectButtonHtml("next_button", NEXT_LEVEL_URL, gettext('Next episode'), NEXT_EPISODE)
+    : ocargo.button.dismissButtonHtml("next_button", gettext('Next level'))
   ocargo.Drawing.startPopup(
       title,
-      LESSON,
+      subtitle + LESSON,
       message,
       showMascot,
       [
         ocargo.button.dismissButtonHtml("prev_button", gettext("Previous level")),
         ocargo.button.dismissButtonHtml('play_button', gettext('Play')),
-        ocargo.button.dismissButtonHtml("next_button", gettext("Next level"))
+        next_button_html
       ]
   )
 }
@@ -170,6 +188,18 @@ ocargo.Game.prototype.reset = function () {
 }
 
 ocargo.Game.prototype.runProgramAndPrepareAnimation = function (blocks) {
+  if (window.location.href.startsWith("https://www.codeforlife.education")) {
+    if (window.location.href.includes("/pythonden/")) {
+      gtag("event", "python-den:level:play", {
+        levelId: LEVEL_NAME - 1000,
+      });
+    } else if (window.location.href.includes("/rapidrouter/")) {
+      gtag("event", "rapid-router:level:play", {
+        levelId: LEVEL_NAME,
+      });
+    }
+  }
+
   this.reset()
   let code = ocargo.pythonControl.getCode()
   ocargo.event.sendEvent('PlayButtonPressed', {
@@ -285,13 +315,18 @@ ocargo.Game.prototype.sendAttempt = function (score) {
 
 ocargo.Game.prototype.registerFailure = function () {
   this.failures += 1
-  return this.failures >= 3
+  return this.failures >= 1
 }
 
 ocargo.Game.prototype._setupFuelGauge = function (nodes, blocks) {
   if (FUEL_GAUGE) {
-    document.getElementById('fuelGauge').style.visibility = 'visible'
+    if (CHARACTER_NAME == "Electric van") {
+      document.getElementById("electricFuelGauge").style.visibility = "visible"
+    } else {
+      document.getElementById("fuelGauge").style.visibility = "visible"
+    }
 
+    // TODO: Investigate these for loops - are they necessary?
     for (var i = 0; i < blocks.length; i++) {
       if (blocks[i].type === 'turn_around' || blocks[i].type === 'wait') {
         return
@@ -306,44 +341,6 @@ ocargo.Game.prototype._setupFuelGauge = function (nodes, blocks) {
   }
 }
 
-ocargo.Game.prototype._setupDirectDriveListeners = function () {
-  var manoeuvreCallback = function () {
-    this.drawing.scrollToShowCharacter()
-    this.onStopControls()
-  }.bind(this)
-
-  $('#moveForward').click(
-    function () {
-      if (ocargo.model.reasonForTermination != 'CRASH') {
-        this.onPlayControls()
-        ocargo.blocklyControl.addBlockToEndOfProgram('move_forwards')
-        this.drawing.moveForward(manoeuvreCallback)
-      }
-    }.bind(this)
-  )
-  $('#turnLeft').click(
-    function () {
-      if (ocargo.model.reasonForTermination != 'CRASH') {
-        this.onPlayControls()
-        ocargo.blocklyControl.addBlockToEndOfProgram('turn_left')
-        this.drawing.turnLeft(manoeuvreCallback)
-      }
-    }.bind(this)
-  )
-  $('#turnRight').click(
-    function () {
-      if (ocargo.model.reasonForTermination != 'CRASH') {
-        this.onPlayControls()
-        ocargo.blocklyControl.addBlockToEndOfProgram('turn_right')
-        this.drawing.turnRight(manoeuvreCallback)
-      }
-    }.bind(this)
-  )
-  $('#go').click(function () {
-    $('#play_radio').trigger('click')
-  })
-}
-
 ocargo.Game.prototype._setupConsoleSliderListeners = function () {
   let tabsWidth = $('#tabs').width()
 
@@ -390,7 +387,6 @@ ocargo.Game.prototype._setupConsoleSliderListeners = function () {
     $('#consoleSlider').css('left', consoleSliderPosition + '%')
     $('#paper').css('width', 100 - consoleSliderPosition + '%')
     $('#tab_panes').css('width', consoleSliderPosition + '%')
-    $('#direct_drive').css('left', consoleSliderPosition + '%')
 
     ocargo.blocklyControl.redrawBlockly()
   }
@@ -545,8 +541,6 @@ const buttonTransit = (buttonElementId, state) => {
 ocargo.Game.prototype.onPlayControls = function () {
   this.disallowCodeChanges()
 
-  document.getElementById('direct_drive').style.visibility = 'hidden'
-
   this.tabs.play.transitTo('running')
   buttonTransit("run-code-button", "running")
   this.tabs.step.disable()
@@ -561,8 +555,6 @@ ocargo.Game.prototype.onPlayControls = function () {
 ocargo.Game.prototype.onStepControls = function () {
   this.disallowCodeChanges()
 
-  document.getElementById('direct_drive').style.visibility = 'hidden'
-
   this.tabs.play.transitTo('paused')
   buttonTransit("run-code-button", "paused")
   this.tabs.step.disable()
@@ -576,8 +568,6 @@ ocargo.Game.prototype.onStepControls = function () {
 ocargo.Game.prototype.onFastControls = function () {
   this.disallowCodeChanges()
 
-  document.getElementById('direct_drive').style.visibility = 'hidden'
-
   this.tabs.play.transitTo('running')
   buttonTransit("run-code-button", "running")
   this.tabs.fast.transitTo('fast')
@@ -592,8 +582,6 @@ ocargo.Game.prototype.onFastControls = function () {
 ocargo.Game.prototype.onSlowControls = function () {
   this.disallowCodeChanges()
 
-  document.getElementById('direct_drive').style.visibility = 'hidden'
-
   this.tabs.play.transitTo('running')
   buttonTransit("run-code-button", "running")
   this.tabs.fast.transitTo('slow')
@@ -780,9 +768,6 @@ ocargo.Game.prototype.onPauseControls = function () {
 ocargo.Game.prototype.onStopControls = function () {
   this.allowCodeChanges()
 
-  // TODO make this hidden unless blocks are clear or something...
-  document.getElementById('direct_drive').style.visibility = 'visible'
-
   this.tabs.play.transitTo('readyToPlay')
   buttonTransit("run-code-button", "readyToPlay")
   this.tabs.fast.transitTo('slow')
@@ -837,9 +822,9 @@ ocargo.Game.prototype._setupPythonTab = function () {
       $('#consoleOutput').text('')
     }.bind(this)
   )
-
+// --------- Commands for popup ---------------------------------------------------
   var leadMsg =
-    '<p>' +
+    '<p style="font-size: 20px;">' +
     interpolate(
       gettext(
         'Run the following commands on the van object %(var_name)s, e.g. %(example)s'
@@ -848,52 +833,8 @@ ocargo.Game.prototype._setupPythonTab = function () {
       true
     ) +
     '</p>' +
-    '<div class="row">' +
-    '<div class="large-4 columns">' +
-    '<p><b>' +
-    gettext('Movement') +
-    '</b>' +
-    '<br>my_van.move_forwards()' +
-    '<br>my_van.turn_left()' +
-    '<br>my_van.turn_right()' +
-    '<br>my_van.turn_around()' +
-    '<br>my_van.wait()</p>' +
-    '</div>' +
-    '<div class="large-4 columns">' +
-    '<p><b>' +
-    gettext('Position') +
-    '</b>' +
-    '<br>my_van.at_dead_end()' +
-    '<br>my_van.at_destination()' +
-    '<br>my_van.at_red_traffic_light()' +
-    '<br>my_van.at_green_traffic_light()' +
-    '<br>my_van.at_traffic_light(c)' +
-    '<br><i>' +
-    interpolate(
-      gettext("where %(arg_name)s is '%(red_color)s' or '%(green_color)s'"),
-      { arg_name: 'c', red_color: 'RED', green_color: 'GREEN' },
-      true
-    ) +
-    '</i></p>' +
-    '</div>' +
-    '<div class="large-4 columns">' +
-    '<p>' +
-    '<br>my_van.is_road_forward()' +
-    '<br>my_van.is_road_left()' +
-    '<br>my_van.is_road_right()' +
-    '<br>my_van.is_road(d)' +
-    '<br><i>' +
-    interpolate(
-      gettext(
-        "where %(arg_name)s is '%(forward)s', '%(left)s', or '%(right)s'"
-      ),
-      { arg_name: 'd', forward: 'FORWARD', left: 'LEFT', right: 'RIGHT' },
-      true
-    ) +
-    '</i></p>' +
-    '</div>' +
-    '</div>'
-
+    COMMANDS
+// -----------------------------------------------------------------------------
   $('#van_commands_help').click(
     function (e) {
       ocargo.Drawing.startPopup(gettext('Python Commands'), leadMsg, '')
@@ -1223,7 +1164,7 @@ ocargo.Game.prototype._setupSaveTab = function () {
         python_contents: ocargo.pythonControl.getCode(),
         blockly_enabled: BLOCKLY_ENABLED,
         python_enabled: PYTHON_ENABLED,
-        pythonViewEnabled: PYTHON_VIEW_ENABLED
+        python_view_enabled: PYTHON_VIEW_ENABLED
       }
 
       this.saving.saveWorkspace(
@@ -1382,21 +1323,44 @@ function restoreCmsLogin () {
 }
 
 function hasFunctionalCookiesConsent() {
-  return OnetrustActiveGroups && OnetrustActiveGroups.split(',').includes('C0003')
+  try {
+    return OnetrustActiveGroups.split(',').includes('C0003')
+  } catch (e) {
+    console.error(e)
+  }
+  return false
 }
 
 function setMutedCookie(mute) {
   if (hasFunctionalCookiesConsent()) {
-    Cookies.set('muted', mute.toString(), { path: Urls.levels() })
+    if (mute) {
+      Cookies.set('muted', true)
+    }
+    else {
+      deleteCookie('muted')
+    }
   }
 }
 
-function gameUpdateBlockLanguage(language_code) {
+function deleteCookie(name) {
+  // Set cookie expiry to yesterday, browser will remove the cookie.
+  // https://www.quirksmode.org/js/cookies.html
+  Cookies.set(name, "", { expires: -1 })
+}
+
+function gameUpdateBlockLanguage (language_code) {
   loadLanguage("/static/game/js/blockly/msg/js/", language_code, function() {
     reloadWorkspace(Blockly.mainWorkspace);
   });
 }
 
+function gameUpdateBlockLanguageAndCookie (language_code) {
+  if (hasFunctionalCookiesConsent()) {
+    Cookies.set("preferredLanguage", language_code)
+  }
+  gameUpdateBlockLanguage(language_code)
+}
+
 $(document).ready(function () {
   ocargo.game = new ocargo.Game()
   ocargo.game.setup()