Fix error when switching tools in IntroDrawing, Level Viewer more options, Statistics3 JSON Export

Author: Jannled

.dockerignore

@@ -21,6 +21,7 @@ conf/
 log_merging_config.json
 dockerComposeMPI.yml
 *.csv
+statistics_*.json
 reversim-conf
 
 # Debugpy logs, WinMerge Backups etc.

.gitignore

@@ -12,6 +12,7 @@ instance/statistics/**
 
 # Don't track generated statistics
 *.csv
+statistics_*.json
 log_merging_config.json
 investigateLogs.py
 

.vscode/launch.json

@@ -96,11 +96,13 @@
 			"type": "debugpy",
 			"request": "launch",
 			"module": "app.statistics3.statistics3",
-			"args": [
-			],
 			"env": {
 				"REVERSIM_INSTANCE": "${input:instancePath}"
 			},
+			"args": [
+				"--beginning",
+				"${input:date}"
+			],
 			"justMyCode": true,
 			"console": "integratedTerminal",
 		},
@@ -145,5 +147,11 @@
 			"type": "promptString",
 			"default": "instance"
 		},
+		{
+			"id": "date",
+			"description": "A date in ISO 8601 format at which the logs shall start",
+			"type": "promptString",
+			"default": ""
+		},
 	]
 }

app/model/Participant.py

@@ -730,11 +730,13 @@ def selectDrawingTool(self, timeStamp: int, tool: Any):
 
 		self.logger.writeToLog(EventType.Click, e, timeStamp)
 
+		LEVEL_INTRO_DRAWING = (LevelType.LEVEL, 'elementIntroduction/simple_circuit.txt')
+
 		event = SelectDrawToolEvent(
 			clientTime=timeStamp, serverTime=now(),
 			pseudonym=self.pseudonym,
 			phase=self.getPhaseName(),
-			level=self.getLevelContext(),
+			level=self.getLevelContext() if self.getPhase().hasLevels() else LEVEL_INTRO_DRAWING,
 			object=tool
 		)
 		event.commit()

app/screenshotGenerator.py

@@ -249,8 +249,16 @@ def screenshotLevel(page: Page, levelName: str):
 		#	print(f'Skipping: "{outputPath}"')
 		#	return
 
-		quotedLevelName = urllib.parse.quote_plus(currentLevel)
-		page.goto(f'{base_url}/game?group=viewer&lang=en&ui={pseudonym}&level={quotedLevelName}')
+		query_string = urllib.parse.urlencode({
+			'group': 'viewer',
+			'lang': 'en',
+			'showSwitchID': '',
+			'showClues': '',
+			'ui': pseudonym,
+			'level': currentLevel,
+		})
+
+		page.goto(f'{base_url}/game?' + query_string)
 		page.wait_for_timeout(1000)
 
 		downloadCanvasImage(page, outputName=outputPath)

app/statistics3/StatsCircuit.py

@@ -1,17 +1,15 @@
+from dataclasses import dataclass
 from typing import override
 from app.statistics3.StatsSlide import StatsSlide
 from app.statistics3.statisticsUtils import TIME_TOLERANCE, TIMESTAMP_MS, CurrentLevelState, LogValidationError
-from app.utilsGame import LevelType
 
 
+@dataclass
 class StatsCircuit(StatsSlide):
 
-	def __init__(self, type_slide: LevelType, log_name: str, time_load: TIMESTAMP_MS) -> None:
-		super().__init__(type_slide, log_name, time_load)
-
-		self.switchClicks: int = 0
-		self.minSwitchClicks: int|None = None
-		self.confirmClicks: int = 0
+	switchClicks: int = 0
+	minSwitchClicks: int|None = None
+	confirmClicks: int = 0
 
 
 	def click_switch(self):

app/statistics3/StatsParticipant.py

@@ -1,35 +1,33 @@
+from dataclasses import dataclass, field
 from datetime import timedelta
 from app.gameConfig import PHASES_WITH_LEVELS
 from app.statistics3.StatsPhase import StatsPhase
 from app.statistics3.StatsPhaseLevels import StatsPhaseLevels
 from app.statistics3.statisticsUtils import TIMESTAMP_MS, LogValidationError
 from app.utilsGame import PhaseType
 
-
+@dataclass
 class StatsParticipant:
 
-	@property
-	def activePhase(self) -> StatsPhase:
-		assert self.phaseIdx >= 0 and self.phaseIdx < len(self.phases)
-		return self.phases[self.phaseIdx]
-	
+	pseudonym: str
+	is_debug: bool
 
-	def __init__(self, pseudonym: str, is_debug: bool) -> None:
-		self.pseudonym = pseudonym
-		self.is_debug = is_debug
+	groups: list[str] = field(default_factory=list[str])
 
-		self.is_debug: bool
-		self.groups: list[str] = []
+	phases: list[StatsPhase] = field(default_factory=list[StatsPhase])
+	phaseIdx: int = -1
 
-		self.phases: list[StatsPhase] = []
-		self.phaseIdx: int = -1
+	quali_fails: int = 0
 
-		self.quali_fails: int = 0
+	game_started: bool = False
+	reloads: list[str] = field(default_factory=list[str])
 
-		self.game_started = False
-		self.reloads: list[str] = []
+	time_limit: timedelta|None = None
 
-		self.time_limit: timedelta|None = None
+	@property
+	def activePhase(self) -> StatsPhase:
+		assert self.phaseIdx >= 0 and self.phaseIdx < len(self.phases)
+		return self.phases[self.phaseIdx]
 
 
 	def load_phase(self, type_phase: str, time_loaded: TIMESTAMP_MS):

app/statistics3/StatsPhase.py

@@ -1,4 +1,5 @@
 
+from dataclasses import dataclass
 import logging
 from datetime import timedelta
 
@@ -10,21 +11,19 @@
 )
 from app.utilsGame import PhaseType
 
-
+@dataclass
 class StatsPhase:
+	phaseType: PhaseType
+	time_load: TIMESTAMP_MS
 
-	def __init__(self, type_phase: PhaseType, time_load: TIMESTAMP_MS) -> None:
-		self.phaseType = type_phase
-
-		self.time_load: TIMESTAMP_MS = time_load
-		self.time_start: TIMESTAMP_MS|None = None
-		self.time_start_levels: TIMESTAMP_MS|None = None
-		self.time_finish: TIMESTAMP_MS|None = None
+	time_start: TIMESTAMP_MS|None = None
+	time_start_levels: TIMESTAMP_MS|None = None
+	time_finish: TIMESTAMP_MS|None = None
 
-		self.time_limit: timedelta|None = None
+	time_limit: timedelta|None = None
 
-		self.status: CurrentState = CurrentState.LOADED
-		self.reloaded = False
+	status: CurrentState = CurrentState.LOADED
+	reloaded = False
 
 
 	def start(self, time_start: TIMESTAMP_MS, time_limit: float|None):

app/statistics3/StatsPhaseLevels.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass, field
 from typing import override
 
 from app.gameConfig import LEVEL_FILETYPES_WITH_TASK, PHASES_WITH_LEVELS
@@ -8,8 +9,12 @@
 from app.utilsGame import LevelType, PhaseType
 
 
+@dataclass
 class StatsPhaseLevels(StatsPhase):
 
+	levels: list[StatsSlide] = field(default_factory=list[StatsSlide])
+	levelIdx: int = -1
+
 	@property
 	def activeLevel(self) -> StatsSlide:
 		assert self.levelIdx >= 0 and self.levelIdx < len(self.levels)
@@ -20,8 +25,8 @@ def __init__(self, type_phase: PhaseType, time_load: TIMESTAMP_MS) -> None:
 		super().__init__(type_phase, time_load)
 		assert type_phase in PHASES_WITH_LEVELS
 
-		self.levels: list[StatsSlide] = []
-		self.levelIdx: int = -1
+		self.levels = []
+		self.levelIdx = -1
 
 
 	def load_level(self, type_level: str, log_name: str, time_load: TIMESTAMP_MS):

app/statistics3/StatsSlide.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 import logging
 from datetime import timedelta
 
@@ -10,24 +11,20 @@
 from app.utilsGame import LevelType
 
 
+@dataclass
 class StatsSlide:
 
-	def __init__(self,
-		type_slide: LevelType,
-		log_name: str,
-		time_load: TIMESTAMP_MS
-	) -> None:
-		self.slide_type = type_slide
-		self.log_name = log_name
+	slide_type: LevelType
+	log_name: str
 
-		self.time_load: TIMESTAMP_MS = time_load
-		self.time_start: TIMESTAMP_MS|None = None
-		self.time_finish: TIMESTAMP_MS|None = None
+	time_load: TIMESTAMP_MS
+	time_start: TIMESTAMP_MS|None = None
+	time_finish: TIMESTAMP_MS|None = None
 
-		self.time_limit: timedelta|None = None
+	time_limit: timedelta|None = None
 
-		self.status: CurrentLevelState = CurrentLevelState.LOADED
-		self.reloaded = False
+	status: CurrentLevelState = CurrentLevelState.LOADED
+	reloaded = False
 
 
 	def start(self, time_start: TIMESTAMP_MS, time_limit: float|None):