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

game/static/game/js/program.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var ocargo = ocargo || {};
 
@@ -6,298 +6,289 @@ var MAX_EXECUTION_STEPS = 10000;
 
 /* Program */
 
-ocargo.Program = function(events) {
-	this.thread = null;
-	this.procedures = {};
-	this.events = events;
+ocargo.Program = function (events) {
+  this.thread = null;
+  this.procedures = {};
+  this.events = events;
+  this.variables = {};
 };
 
 ocargo.Program.prototype.run = function() {
-	ocargo.model.chooseNewCowPositions();
 	ocargo.model.reset();
 	this.thread.run(ocargo.model);
 };
 
 /* Thread */
 
-ocargo.Thread = function(program) {
-	this.stack = []; //each element is an array of commands attached to each start block (currently we only have one start block)
-	this.noExecutionSteps = 0;
-	this.program = program;
-	this.eventLevel = Event.MAX_LEVEL; // no event active
+ocargo.Thread = function (program) {
+  this.stack = []; //each element is an array of commands attached to each start block (currently we only have one start block)
+  this.noExecutionSteps = 0;
+  this.program = program;
+  this.eventLevel = Event.MAX_LEVEL; // no event active
 };
 
-ocargo.Thread.prototype.run = function(model) {
-	let failed = false;
-	while (!failed && this.canStep()) {
-		failed = !this.step(model);
-	}
-	if (!failed) {
-		model.programExecutionEnded();
-	}
+ocargo.Thread.prototype.run = function (model) {
+  let failed = false;
+  while (!failed && this.canStep()) {
+    failed = !this.step(model);
+  }
+  if (!failed) {
+    model.programExecutionEnded();
+  }
 };
 
 ocargo.Thread.prototype.step = function(model) {
-	// check if any event condition is true
-	for (let i = 0; i < this.program.events.length; i++) {
-		let event = this.program.events[i];
-		model.shouldObserve = false;
-		if (event.condition(model)) {
-			event.execute(this, model);
-		}
-		model.shouldObserve = true;
-	}
-
-	let commandToProcess = this.stack.shift();
-	this.noExecutionSteps ++;
-
-	if (this.noExecutionSteps > MAX_EXECUTION_STEPS) {
-		ocargo.game.sendAttempt(0);
-		// alert user to likely infinite loop
-		ocargo.animation.appendAnimation({
-            type: 'popup',
-            popupType: 'FAIL',
-            failSubtype: 'QUERY_INFINITE_LOOP',
-            popupMessage: gettext('It looks as though your program\'s been running a while. Check your repeat loops are okay.'),
-            popupHint: ocargo.game.registerFailure(),
-            description: 'failure popup'
-        });
-		return false;
-	}
-
-	let successful = true;
-	if (commandToProcess) {
-		successful = commandToProcess.execute(this, model);
-	}
-
-	if (!successful) {
-		// Program crashed, queue a block highlight event
-        let block = commandToProcess.block;
-		queueHighlightIncorrect(model, block);
-		return false;
-	}
-
-	return true;
-};
 
-ocargo.Thread.prototype.canStep = function() {
-	return this.stack.length !== 0;
+  let commandToProcess = this.stack.shift();
+  this.noExecutionSteps++;
+
+  if (this.noExecutionSteps > MAX_EXECUTION_STEPS) {
+    ocargo.game.sendAttempt(0);
+    // alert user to likely infinite loop
+    ocargo.animation.appendAnimation({
+      type: "popup",
+      popupType: "FAIL",
+      failSubtype: "QUERY_INFINITE_LOOP",
+      popupMessage: gettext(
+        "It looks as though your program's been running a while. Check your repeat loops are okay."
+      ),
+      popupHint: ocargo.game.registerFailure(),
+      description: "failure popup",
+    });
+    return false;
+  }
+
+  let successful = true;
+  if (commandToProcess) {
+    successful = commandToProcess.execute(this, model);
+  }
+
+  if (!successful) {
+    // Program crashed, queue a block highlight event
+    let block = commandToProcess.block;
+    queueHighlightIncorrect(model, block);
+    return false;
+  }
+
+  return true;
 };
 
-ocargo.Thread.prototype.pushToStack = function(commands) {
-    this.stack.unshift.apply(this.stack, commands);
+ocargo.Thread.prototype.canStep = function () {
+  return this.stack.length !== 0;
 };
 
+ocargo.Thread.prototype.pushToStack = function (commands) {
+  this.stack.unshift.apply(this.stack, commands);
+};
 
 /* Simplified blocks containing only id, type
  * all methods after comile() uses simplified blocks */
 function Block(id, type) {
-	this.id = id;
-	this.type = type;
+  this.id = id;
+  this.type = type;
 }
 
 /* Instructions */
 
 function TurnLeftCommand(block) {
-	this.block = block;
+  this.block = block;
 }
 
-TurnLeftCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.turnLeft();
+TurnLeftCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.turnLeft();
 };
 
-
-
 function TurnRightCommand(block) {
-	this.block = block;
+  this.block = block;
 }
 
-TurnRightCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.turnRight();
+TurnRightCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.turnRight();
 };
 
-
-
 function ForwardCommand(block) {
-	this.block = block;
+  this.block = block;
 }
 
-ForwardCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.moveForwards();
+ForwardCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.moveForwards();
 };
 
-
-
 function TurnAroundCommand(block) {
-    this.block = block;
+  this.block = block;
 }
 
-TurnAroundCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.turnAround();
+TurnAroundCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.turnAround();
 };
 
-
-
 function WaitCommand(block) {
-    this.block = block;
+  this.block = block;
 }
 
-WaitCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.wait();
+WaitCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.wait();
 };
 
-
-
 function DeliverCommand(block) {
-    this.block = block;
+  this.block = block;
 }
 
-DeliverCommand.prototype.execute = function(thread, model) {
-	queueHighlight(model, this.block);
-	return model.deliver();
+DeliverCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  return model.deliver();
 };
 
-function SoundHornCommand(block){
-	this.block = block;
+function SoundHornCommand(block) {
+  this.block = block;
 }
 
-SoundHornCommand.prototype.execute = function(thread, model){
-	queueHighlight(model, this.block, true);
-	return model.sound_horn();
+SoundHornCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block, true);
+  return model.sound_horn();
 };
 
-function PuffUpCommand(block){
-	this.block = block;
+function SetVariableCommand(block, name, valueFunction) {
+  this.block = block;
+  this.name = name;
+  this.valueFunction = valueFunction;
 }
 
-PuffUpCommand.prototype.execute = function(thread, model){
-	queueHighlight(model, this.block, true);
-	return model.puff_up();
+SetVariableCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  thread.program.variables[this.name] = this.valueFunction();
+  return model.wait(); // TODO - need to change this if we don't want it to use fuel
 };
 
-function If(conditionalCommandSets, elseBody, block) {
-	this.conditionalCommandSets = conditionalCommandSets;
-	this.elseBody = elseBody;
-	this.block = block;
+function IncrementVariableCommand(block, name, incrValue) {
+  this.block = block;
+  this.name = name;
+  this.incrValue = incrValue;
 }
 
-If.prototype.execute = function(thread, model) {
-	var i = 0;
-	while (i < this.conditionalCommandSets.length) {
-		if (this.conditionalCommandSets[i].condition(model)) {
-			thread.pushToStack(this.conditionalCommandSets[i].commands.slice());
-			return true;
-		}
-
-		i++;
-	}
-
-	if(this.elseBody) {
-		thread.pushToStack(this.elseBody.slice());
-	}
-	return true;
+IncrementVariableCommand.prototype.execute = function (thread, model) {
+  queueHighlight(model, this.block);
+  thread.program.variables[this.name] += this.incrValue;
+  return model.wait(); // TODO - need to change this if we don't want it to use fuel
 };
 
+function If(conditionalCommandSets, elseBody, block) {
+  this.conditionalCommandSets = conditionalCommandSets;
+  this.elseBody = elseBody;
+  this.block = block;
+}
 
+If.prototype.execute = function (thread, model) {
+  var i = 0;
+  while (i < this.conditionalCommandSets.length) {
+    if (this.conditionalCommandSets[i].condition(model)) {
+      thread.pushToStack(this.conditionalCommandSets[i].commands.slice());
+      return true;
+    }
+
+    i++;
+  }
+
+  if (this.elseBody) {
+    thread.pushToStack(this.elseBody.slice());
+  }
+  return true;
+};
 
 function While(condition, body, block) {
-	this.condition = condition;
-	this.body = body;
-	this.block = block;
+  this.condition = condition;
+  this.body = body;
+  this.block = block;
 }
 
-While.prototype.execute = function(thread, model) {
-	if (this.condition(model)) {
-		thread.pushToStack([this]);
-		thread.pushToStack(this.body.slice());
-	}
-	return true;
+While.prototype.execute = function (thread, model) {
+  if (this.condition(model)) {
+    thread.pushToStack([this]);
+    thread.pushToStack(this.body.slice());
+  }
+  return true;
 };
 
-
-
-function Event(condition,body,block,conditionType) {
-	this.condition = condition;
-	this.body = body;
-	this.block = block;
+function Event(condition, body, block, conditionType) {
+  this.condition = condition;
+  this.body = body;
+  this.block = block;
 }
 
-Event.prototype.execute = function(thread, model) {
-	thread.pushToStack(this.body.slice());
+Event.prototype.execute = function (thread, model) {
+  thread.pushToStack(this.body.slice());
 
-	return true;
+  return true;
 };
 
-function Procedure(name,body,block) {
-	this.name = name;
-	this.body = body;
-	this.block = block;
+function Procedure(name, body, block) {
+  this.name = name;
+  this.body = body;
+  this.block = block;
 }
 
-Procedure.prototype.execute = function(thread) {
-	thread.pushToStack(this.body.slice());
-	return true;
+Procedure.prototype.execute = function (thread) {
+  thread.pushToStack(this.body.slice());
+  return true;
 };
 
 function ProcedureCall(block) {
-	this.block = block;
+  this.block = block;
 }
 
-ProcedureCall.prototype.bind = function(proc) {
-	this.proc = proc;
+ProcedureCall.prototype.bind = function (proc) {
+  this.proc = proc;
 };
 
-ProcedureCall.prototype.execute = function(thread) {
-	thread.pushToStack([this.proc]);
-	return true;
+ProcedureCall.prototype.execute = function (thread) {
+  thread.pushToStack([this.proc]);
+  return true;
 };
 
-
-
 /* Highlighting of blocks */
 
 function queueHighlight(model, block, keepHighlighting) {
-    if (model.shouldObserve) {
-        ocargo.animation.appendAnimation({
-            type: 'callable',
-	    functionType: 'highlight',
-	    functionCall: makeHighLightCallable(block.id, keepHighlighting),
-	    description: 'Blockly highlight: ' + block.type,
-	    blockId: block.id
-        });
-
-	}
+  if (model.shouldObserve) {
+    ocargo.animation.appendAnimation({
+      type: "callable",
+      functionType: "highlight",
+      functionCall: makeHighLightCallable(block.id, keepHighlighting),
+      description: "Blockly highlight: " + block.type,
+      blockId: block.id,
+    });
+  }
 }
 
-function queueHighlightIncorrect(model, block){
-    if (model.shouldObserve){
-		ocargo.animation.appendAnimation({
-			type: 'callable',
-			functionType: 'highlightIncorrect',
-			functionCall: makeHighLightIncorrectCallable(block.id),
-			description: 'Blockly highlight incorrect: ' + block.type,
-			blockId: block.id
-		});
-	}
+function queueHighlightIncorrect(model, block) {
+  if (model.shouldObserve) {
+    ocargo.animation.appendAnimation({
+      type: "callable",
+      functionType: "highlightIncorrect",
+      functionCall: makeHighLightIncorrectCallable(block.id),
+      description: "Blockly highlight incorrect: " + block.type,
+      blockId: block.id,
+    });
+  }
 }
 
 function makeHighLightCallable(id, keepHighlighting) {
-	return function() {
-		ocargo.blocklyControl.clearAllSelections();
-		var block = Blockly.mainWorkspace.getBlockById(id);
-		block.keepHighlighting = keepHighlighting;
-		ocargo.blocklyControl.setBlockSelected(block, true);
-
-	};
+  return function () {
+    ocargo.blocklyControl.clearAllSelections();
+    var block = Blockly.mainWorkspace.getBlockById(id);
+    block.keepHighlighting = keepHighlighting;
+    ocargo.blocklyControl.setBlockSelected(block, true);
+  };
 }
 
-function makeHighLightIncorrectCallable(id){
-	return function() {
-		ocargo.blocklyControl.highlightIncorrectBlock(Blockly.mainWorkspace.getBlockById(id));
-	}
+function makeHighLightIncorrectCallable(id) {
+  return function () {
+    ocargo.blocklyControl.highlightIncorrectBlock(
+      Blockly.mainWorkspace.getBlockById(id)
+    );
+  };
 }

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();
+    });
+  }
+});

game/static/game/js/sharing.js

@@ -8,8 +8,8 @@ var ocargo = ocargo || {};
 ocargo.Sharing = function (getLevelId, validationFunction) {
   this.text = [];
   this.text.shared = gettext("Yes");
+  this.text.admin = gettext("Yes");
   this.text.unshared = gettext("No");
-  this.text.pending = "...";
 
   this.classesTaught = [];
   this.fellowTeachers = [];
@@ -89,35 +89,47 @@ ocargo.Sharing.prototype.populateSharingTable = function (recipients) {
   $("#shareLevelTable tr").off("click");
   table.empty();
 
-  // Order them alphabetically
+  // sort by admins first
   recipients.sort(function (a, b) {
-    if (a.name < b.name) {
-      return -1;
-    } else if (a.name > b.name) {
-      return 1;
+    if (a.admin && !b.admin) {
+      return -1
+    } else if (b.admin && !a.admin) {
+      return 1
     }
     return 0;
   });
 
   this.allShared = true;
-  // Add a row to the table for each workspace saved in the database
+  // Add a row to the table for each recipient
   for (let i = 0; i < recipients.length; i++) {
     let recipient = recipients[i];
-    let status = recipient.shared ? "shared" : "unshared";
+    let status = recipient.shared ? "shared" || "admin" : "unshared";
 
     if (recipient.shared) {
       status = "shared";
+
+      if (recipient.admin) {
+        status = "admin"
+      }
+
     } else {
       status = "unshared";
       this.allShared = false;
     }
+
+    let name_text = recipient.name
+
+    if (recipient.admin) {
+      name_text += (" (Admin)")
+    }
+
     table.append(
       '<tr value="' +
         recipient.id +
         '" status="' +
         status +
-        '"><td>' +
-        $("<div>").text(recipient.name).html() +
+        '"><td class="share_name">' +
+        $("<div>").text(name_text).html() +
         '</td><td class="share_cell">' +
         this.text[status] +
         "</td></tr>"