vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed lesson labels

Browse Source
This commit is contained in:
Laurent Tourte
2024-05-14 15:27:15 +02:00
parent 28d15f5f5d
commit 4e58dde07d
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/gardens/gardens.gd
+5 -17
View File
@@ -112,25 +112,13 @@ func get_gardens_db_data() -> void:
func _setup_minigame_selection() -> void:
var query: = "Select Grapheme, Phoneme, Exercise1, Exercise2, Exercise3 FROM Lessons
INNER JOIN GPsInLessons ON GPsInLessons.LessonID = Lessons.ID
INNER JOIN GPs ON GPsInLessons.GPID = GPs.ID
INNER JOIN LessonsExercises ON Lessons.ID = LessonsExercises.LessonID
WHERE LessonNB == %o" % current_lesson_number
Database.db.query(query)
var lesson_dict: = Database.db.query_result[0]
Database.db.query("Select Type FROM ExerciseTypes
WHERE ID == %o" % lesson_dict.Exercise1)
var exercise1: String = Database.db.query_result[0].Type
Database.db.query("Select Type FROM ExerciseTypes
WHERE ID == %o" % lesson_dict.Exercise2)
var exercise2: String = Database.db.query_result[0].Type
Database.db.query("Select Type FROM ExerciseTypes
WHERE ID == %o" % lesson_dict.Exercise3)
var exercise3: String = Database.db.query_result[0].Type
var exercises: = Database.get_exercice_for_lesson(current_lesson_number)
var exercise1: String = exercises[0]
var exercise2: String = exercises[1]
var exercise3: String = exercises[2]
if lesson_button:
lesson_button.text = "%s-%s" % [lesson_dict.Grapheme, lesson_dict.Phoneme]
lesson_button.text = lessons[current_lesson_number][0].grapheme
lesson_button.display_text = true
if exercise_button_1:
exercise_button_1.text = exercise1
sources/utils/autoloads/Database.gd
+18
View File
@@ -82,6 +82,24 @@ func load_additional_word_list() -> String:
return ""
func get_exercice_for_lesson(lesson_nb: int) -> Array[String]:
var query: = "Select Exercise1, Exercise2, Exercise3 FROM LessonsExercises
INNER JOIN Lessons ON Lessons.ID = LessonsExercises.LessonID
WHERE LessonNB == %o" % lesson_nb
Database.db.query(query)
var answer: Array[String]
for res in Database.db.query_result:
Database.db.query("Select Type FROM ExerciseTypes WHERE ID == %o" % res.Exercise1)
answer.append(Database.db.query_result[0].Type)
Database.db.query("Select Type FROM ExerciseTypes WHERE ID == %o" % res.Exercise2)
answer.append(Database.db.query_result[0].Type)
Database.db.query("Select Type FROM ExerciseTypes WHERE ID == %o" % res.Exercise3)
answer.append(Database.db.query_result[0].Type)
return answer
func get_GP_for_lesson(lesson_nb: int, distinct: bool, only_new: bool = false, only_vowels: bool = false, with_other_phonemes: bool = false) -> Array:
var parameters := []