Fix timeout not cleared on BaseScene, TimeLimit in seconds in DB

Author: Jannled

app/model/Participant.py

@@ -310,18 +310,18 @@ def setGroup(self, newGroup: str, timeStamp: Union[str, int]):
 	def startGame(self, timeStamp: int):
 		self.logger.writeToLog(EventType.PhaseRequested, '§Scene: PreloadScene', timeStamp)
 
-		globalLimit = self.getGlobalTimerDuration(TIMER_NAME_GLOBAL_LIMIT)
-		globalLimit = globalLimit if globalLimit > 0 else None
+		globalLimit = self.getGlobalTimerDuration(TIMER_NAME_GLOBAL_LIMIT) # ms
+		globalLimit = globalLimit/1000 if globalLimit > 0 else None
 
 		event = ChronoEvent(
 			clientTime=timeStamp,
 			serverTime=now(),
 			pseudonym=self.pseudonym,
-			phase='PreloadScene',
+			phase=PhaseType.Preload,
 			level=None,
 			operation='start',
 			timerType='phase',
-			context='PreloadScene',
+			context=PhaseType.Preload,
 			limit=globalLimit
 		)
 		event.commit()

static/src/scenes/BaseScene.js

@@ -357,7 +357,7 @@ class BaseScene extends Phaser.Scene
 		}
 
 		// Que the countdown message, it will be send later by show()
-		JsonRPC.que("chrono", ["countdown", this.phase, "start", Rq.now()]);
+		JsonRPC.que("chrono", ["countdown", this.phase, "start", Rq.now(), this.timerDuration/1000]);
 		console.log("Time: " + this.timerDuration/1000 + " seconds remaining until " + advTimerName + ".");
 	}
 
@@ -471,6 +471,10 @@ class BaseScene extends Phaser.Scene
 	 */
 	cleanUp() 
 	{
+		// First make sure no countdown fires during cleanup
+		this.stopCountdown();
+
+		// Remove all Click Listeners
 		for(const e of this.eventList)
 			this.input.removeListener(e);
 

static/src/scenes/GameScene.js

@@ -926,7 +926,6 @@ ${textYourScore} ${this.level.stats.score.toString()} / 100
 	cleanUp()
 	{
 		try {this.timerReminderText.destroy();} catch {}
-		this.stopCountdown();
 		super.cleanUp();
 	}
 }