From ad0cb8c77ae05ed174a54654c59293f432a22c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Bujdos=C3=B3?= Date: Wed, 12 Feb 2025 11:30:04 +0100 Subject: [PATCH 1/2] split solution options --- .../sch/cmsch/component/riddle/RiddleBusinessLogicService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleBusinessLogicService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleBusinessLogicService.kt index ded71ded5..1e14bb359 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleBusinessLogicService.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleBusinessLogicService.kt @@ -375,7 +375,9 @@ open class RiddleBusinessLogicService( .replace(",", "") } - return transformedSubmittedSolution != transformedRiddleSolution + val solutionList = transformedRiddleSolution.split(";") + + return transformedSubmittedSolution in solutionList } private fun replaceAccent(transformedSubmittedSolution: String) = transformedSubmittedSolution From 824ee24044d386173bbe4261aaf4830a27f294a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szab=C3=B3=20Benedek?= Date: Tue, 18 Feb 2025 18:47:30 +0100 Subject: [PATCH 2/2] note for riddleEntity solution field --- .../kotlin/hu/bme/sch/cmsch/component/riddle/RiddleEntity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleEntity.kt index b37ce0c2f..0832b9855 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleEntity.kt @@ -42,7 +42,8 @@ data class RiddleEntity( @field:JsonView(value = [ Edit::class ]) @Column(nullable = false) - @property:GenerateInput(maxLength = 128, order = 3, label = "Megoldás") + @property:GenerateInput(maxLength = 128, order = 3, label = "Megoldás", note = "A lehetséges megoldásokat pontosvesszővel elválasztva lehet megadni;" + + "Pontosvesszőt a lehetséges válaszok nem tartalmazhatnak") @property:GenerateOverview(visible = false) @property:ImportFormat var solution: String = "",