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

game/static/game/js/level_moderation.js

@@ -1,7 +1,6 @@
 /* global showPopupConfirmation */
 
 var levelID;
-var classID;
 var students;
 
 var saving = new ocargo.Saving();
@@ -57,6 +56,27 @@ jQuery.extend(jQuery.fn.dataTableExt.oSort, {
   },
 });
 
+approveLevel = function (id, callback, errorCallback) {
+  csrftoken = Cookies.get('csrftoken');
+  $.ajax({
+    url: Urls.approve_level(id),
+    type: 'POST',
+    dataType: 'json',
+    data: {csrfmiddlewaretoken: csrftoken},
+    beforeSend: function (xhr, settings) {
+      if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
+      }
+    },
+    success: function (json) {
+      callback();
+    },
+    error: function (xhr, errmsg, err) {
+      errorCallback(xhr.status + ": " + errmsg + " " + err + " " + xhr.responseText);
+    }
+  });
+};
+
 $(document).ready(function () {
   $(".delete").click(function () {
     levelID = this.getAttribute("value");
@@ -67,6 +87,17 @@ $(document).ready(function () {
     window.location.href = Urls.play_custom_level(this.getAttribute("value"));
   });
 
+  $(".approve").click(function () {
+    levelID = this.getAttribute("value");
+    approveLevel(levelID)
+    // Waiting half a second before redirecting because otherwise the Approve button doesn't become disabled
+    setTimeout(
+        function(){
+          window.location.href = Urls.level_moderation();
+          },
+        500);
+  });
+
   $("#clear-classes").on("click", () => {
     $('[id^="id_classes_"],#select-all-classes').prop("checked", false);
   });
@@ -105,7 +136,7 @@ $(document).ready(function () {
       {
         orderable: false,
         searchable: false,
-        targets: [-1, -2], // Play and Delete columns
+        targets: [-1, -2, -3], // Play, Approve and Delete columns
       },
       {
         type: "student-with-teacher",

game/static/game/js/level_selection.js

@@ -106,4 +106,4 @@ document.addEventListener("DOMContentLoaded", function() {
         });
     });
 
-});
+});

game/static/game/js/loadLanguages.js

@@ -11,11 +11,11 @@ function loadLanguage(path, langStr, callback) {
     }
   };
   xobj.send(null);
-};
+}
 
 function reloadWorkspace(workspace) {
   var blocklyDom = Blockly.Xml.workspaceToDom(workspace);
   workspace.clear();
   Blockly.Xml.domToWorkspace(blocklyDom, workspace);
   workspace.updateToolbox(BLOCKLY_XML);
-};
+}

game/static/game/js/model.js

@@ -127,7 +127,8 @@ ocargo.Model.prototype.getPreviousCoordinate = function() {
 
 ocargo.Model.prototype.moveVan = function(nextNode, action) {
     // Crash?
-    let currentNodeHasCow = this.getCowForNode(this.van.getPosition().currentNode, [ocargo.Cow.ACTIVE, ocargo.Cow.READY]);
+    let checkedNode = action == "WAIT" ? this.van.getPosition().previousNode : this.van.getPosition().currentNode
+    let currentNodeHasCow = this.getCowForNode(checkedNode, [ocargo.Cow.ACTIVE, ocargo.Cow.READY]);
 
     if (currentNodeHasCow) {
         handleCrash(this, gettext('You ran into a cow! '),
@@ -161,11 +162,13 @@ ocargo.Model.prototype.moveVan = function(nextNode, action) {
 
         ocargo.game.sendAttempt(0);
 
+        let noFuelMessage = CHARACTER_NAME == "Electric van" ? 'Your battery ran out of charge!' : 'You ran out of fuel!'
+
         ocargo.animation.appendAnimation({
             type: 'popup',
             popupType: 'FAIL',
             failSubtype: 'OUT_OF_FUEL',
-            popupMessage: gettext('You ran out of fuel! Try to find a shorter route to the destination.'),
+            popupMessage: gettext(noFuelMessage + ' Try to find a shorter route to the destination.'),
             popupHint: ocargo.game.registerFailure(),
             description: 'no fuel popup'
         });
@@ -384,6 +387,32 @@ ocargo.Model.prototype.deliver = function() {
             return false;
         }
         this.makeDelivery(destination, 'DELIVER');
+    } else {
+        ocargo.game.sendAttempt(0);
+        ocargo.animation.appendAnimation({
+            type: 'popup',
+            popupType: 'FAIL',
+            failSubtype: 'DELIVER_NON_DESTINATION',
+            popupMessage: gettext("You tried to deliver to a destination that doesn't exist."),
+            popupHint: ocargo.game.registerFailure(),
+            description: 'tried to deliver at non-destination'
+        });
+
+        ocargo.animation.appendAnimation({
+            type: 'callable',
+            functionType: 'playSound',
+            functionCall: ocargo.sound.failure,
+            description: 'failure sound'
+        });
+
+        ocargo.event.sendEvent("DeliverNonDestination", { levelName: LEVEL_NAME,
+                                                          defaultLevel: DEFAULT_LEVEL,
+                                                          workspace: ocargo.blocklyControl.serialize(),
+                                                          failures: this.failures,
+                                                          pythonWorkspace: ocargo.pythonControl.getCode()
+        });
+        this.reasonForTermination = 'DELIVER_AT_NON_DESTINATION';
+        return false;
     }
     return destination;
 };
@@ -401,6 +430,7 @@ ocargo.Model.prototype.sound_horn = function() {
         cow.queueLeaveAnimation(this, currentNode);
         cow.setInactive(this, currentNode);
     }
+    this.moveVan(this.van.getPosition().currentNode, 'SOUND_HORN');
     return true;
 };
 

game/static/game/js/pythonControl.js

@@ -129,9 +129,22 @@ ocargo.PythonControl = function () {
     }
 
     function outf(outputText) {
+        /** @type {string} */
+        let text = outputText
+
+        if (text.startsWith("ParseError: ")) {
+            text += "\nThis may be because your code has not been formatted correctly or you have not indented your code correctly."
+        } else if (text.startsWith("AttributeError: ")) {
+            text += "\nEnsure that the object has the method or property. Review the PY commands for help.\nYou may also be trying to import something that doesn't exist."
+        } else if (text.startsWith("NameError: ")) {
+            text += "\nName errors usually happen because you have misspelt a variable name. Double check your spelling."
+        } else if (text.startsWith("TypeError: ")) {
+            text += "\nType errors usually happen because you are trying to perform an illegal action on an object."
+        }
+
         ocargo.animation.appendAnimation({
             type: 'console',
-            text: outputText
+            text
         });
     }
 

game/static/game/js/scoreboard.js

@@ -69,49 +69,12 @@ $(document).ready(function () {
       $(".previous").removeClass("paginate_button");
     });
 
-    // Setup shared levels table
-    let sharedLevelsTable = $("#sharedLevelsTable").DataTable({
-      scrollY: false,
-      scrollX: true,
-      scrollCollapse: false,
-      paging: true,
-      deferRender: true,
-      language: {
-        emptyTable: "No data available in table",
-        loadingRecords: "Loading...",
-        processing: "Processing...",
-        search: "Search:",
-        zeroRecords: "No matching records found"
-      },
-      columnDefs: [
-        {
-          orderable: false,
-          targets: "no-sort"
-        }
-      ]
-    });
-
-    new $.fn.dataTable.FixedColumns(sharedLevelsTable, {
-      leftColumns: 2,
-    });
-
-    $("#sharedLevelsTable_next").append(" >");
-
-    sharedLevelsTable.on("draw", () => {
-      $("#sharedLevelsTable_next").append(" >");
-      $("#sharedLevelsTable_previous").prepend("< ");
-      $(".next").removeClass("paginate_button");
-      $(".previous").removeClass("paginate_button");
-    });
-
     $("#scoreboardSearch").on("keyup", function () {
       table.search(this.value).draw();
-      sharedLevelsTable.search(this.value).draw();
     });
 
     $(window).on("load", function () {
       table.columns.adjust();
-      sharedLevelsTable.columns.adjust();
     });
   }
 

game/static/game/js/scoreboardSharedLevels.js

@@ -0,0 +1,48 @@
+$(document).ready(function () {
+  let scoreboardPresent = document.getElementById("scoreboardTable") !== null;
+
+  if (scoreboardPresent) {
+    // Setup shared levels table
+    let sharedLevelsTable = $("#sharedLevelsTable").DataTable({
+      scrollY: false,
+      scrollX: true,
+      scrollCollapse: false,
+      paging: true,
+      deferRender: true,
+      language: {
+        emptyTable: "No data available in table",
+        loadingRecords: "Loading...",
+        processing: "Processing...",
+        search: "Search:",
+        zeroRecords: "No matching records found"
+      },
+      columnDefs: [
+        {
+          orderable: false,
+          targets: "no-sort"
+        }
+      ]
+    });
+
+    new $.fn.dataTable.FixedColumns(sharedLevelsTable, {
+      leftColumns: 2,
+    });
+
+    $("#sharedLevelsTable_next").append(" >");
+
+    sharedLevelsTable.on("draw", () => {
+      $("#sharedLevelsTable_next").append(" >");
+      $("#sharedLevelsTable_previous").prepend("< ");
+      $(".next").removeClass("paginate_button");
+      $(".previous").removeClass("paginate_button");
+    });
+
+    $("#scoreboardSearch").on("keyup", function () {
+      sharedLevelsTable.search(this.value).draw();
+    });
+
+    $(window).on("load", function () {
+      sharedLevelsTable.columns.adjust();
+    });
+  }
+});