Debug add_device in TeacherSettings

sources/menus/language_selection/package_downloader.gd

@@ -1,8 +1,6 @@
 extends Control
 class_name PackageDownloader
 
-const ConfirmPopup: = preload("res://sources/ui/popup.gd")
-
 const main_menu_scene_path: String = "res://sources/menus/main/main_menu.tscn"
 const device_selection_scene_path: String = "res://sources/menus/device_selection/device_selection.tscn"
 const login_scene_path: String = "res://sources/menus/login/login.tscn"

sources/menus/main/main_menu.gd

@@ -2,7 +2,6 @@ extends Control
 
 const Kalulu: = preload("res://sources/menus/main/kalulu.gd")
 const LoginForm: = preload("res://sources/menus/main/login.gd")
-const ConfirmPopup: = preload("res://sources/ui/popup.gd")
 
 const adult_check_scene_path := "res://sources/menus/adult_check/adult_check.tscn"
 const package_loader_scene_path: = "res://sources/menus/language_selection/package_downloader.tscn"

sources/menus/settings/device_tab.gd

@@ -1,4 +1,5 @@
 extends TabBar
+class_name DeviceTab
 
 signal student_pressed(code: int)
 

sources/menus/settings/teacher_settings.gd

@@ -1,11 +1,9 @@
 extends Control
 
-const main_menu_path := "res://sources/menus/main/main_menu.tscn"
-const login_menu_path := "res://sources/menus/login/login.tscn"
+const main_menu_path: String = "res://sources/menus/main/main_menu.tscn"
+const login_menu_path: String = "res://sources/menus/login/login.tscn"
 
-const DeviceTab: = preload("res://sources/menus/settings/device_tab.gd")
-const device_tab_scene : PackedScene = preload("res://sources/menus/settings/device_tab.tscn")
-const ConfirmPopup: = preload("res://sources/ui/popup.gd")
+const device_tab_scene: PackedScene = preload("res://sources/menus/settings/device_tab.tscn")
 
 @onready var devices_tab_container : TabContainer = %DevicesTabContainer
 @onready var lesson_unlocks: LessonUnlocks = $LessonUnlocks
@@ -14,6 +12,10 @@ const ConfirmPopup: = preload("res://sources/ui/popup.gd")
 @onready var add_device_button: Button = %AddDeviceButton
 @onready var add_student_button: Button = %AddStudentButton
 
+@onready var add_device_popup: CanvasLayer = %AddDevicePopup
+@onready var add_student_popup: CanvasLayer = %AddStudentPopup
+@onready var delete_student_popup: CanvasLayer = %DeleteStudentPopup
+
 var last_device_id: = -1
 
 func _ready() -> void:
@@ -38,13 +40,15 @@ func _refresh_devices_tabs() -> void:
 		return
 	
 	for device: int in UserDataManager.teacher_settings.students.keys():
-		var device_tab: DeviceTab = device_tab_scene.instantiate()
-		device_tab.name = tr("DEVICE_NUMBER").format({"number" : device})
+		var device_tab: DeviceTab
+		device_tab = device_tab_scene.instantiate()
+		devices_tab_container.add_child(device_tab)
+		await get_tree().process_frame # Not optional or an auto-rename bug will occur on the tabs (especiallly if there are a lot of them)
 		device_tab.device_id = device
 		device_tab.students = UserDataManager.teacher_settings.students[device]
-		devices_tab_container.add_child(device_tab)
-		
+		device_tab.name = tr("DEVICE_NUMBER").format({"number" : device})
 		device_tab.student_pressed.connect(_on_student_pressed)
+		device_tab.refresh()
 		
 		last_device_id = device
 
@@ -82,34 +86,37 @@ func _on_student_pressed(code: int) -> void:
 
 
 func _on_add_student_button_pressed() -> void:
-	(%AddStudentPopup as CanvasLayer).show()
+	add_student_popup.show()
 
 
 func _on_add_student_popup_accepted() -> void:
 	var current_tab: = devices_tab_container.get_current_tab_control() as DeviceTab
 	if not current_tab:
+		push_error("Error: DeviceTab not found in Teacher Settings")
 		return
 	var res: = await ServerManager.add_student({"device" :  current_tab.device_id})
 	if res.code == 200:
 		UserDataManager.update_configuration(res.body as Dictionary)
 		current_tab.students = UserDataManager.teacher_settings.students[current_tab.device_id]
 		current_tab.refresh()
+	else:
+		push_error("Request to add student failed in Teacher Settings. Error code " + str(res.code))
 
 
 func _on_add_device_button_pressed() -> void:
-	(%AddDevicePopup as CanvasLayer).show()
+	add_device_popup.show()
 
 
 func _on_add_device_popup_accepted() -> void:
 	var res: = await ServerManager.add_student({"device" : last_device_id + 1})
 	if res.code == 200:
-		UserDataManager.update_configuration(res.body)
+		UserDataManager.update_configuration(res.body as Dictionary)
 		_refresh_devices_tabs()
 		devices_tab_container.current_tab = last_device_id
 
 
 func _on_lesson_unlocks_student_deleted(_code: int) -> void:
-	(%DeleteStudentPopup as CanvasLayer).show()
+	delete_student_popup.show()
 
 
 func _on_delete_student_popup_accepted() -> void:

sources/ui/popup.gd

@@ -1,5 +1,6 @@
 @tool
 extends CanvasLayer
+class_name ConfirmPopup
 
 signal accepted
 signal refused