diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/admin/GenerateOverview.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/admin/GenerateOverview.kt index b2ccb28e..c18f97ba 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/admin/GenerateOverview.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/admin/GenerateOverview.kt @@ -6,11 +6,11 @@ package hu.bme.sch.cmsch.admin enum class OverviewType(val value: String, val sorter: String, val formatSettings: Array>) { ID("id", "number", arrayOf("width" to 100, "vertAlign" to "middle", "visible" to false)), TEXT("text", "string", arrayOf("vertAlign" to "middle")), - DATE("date", "datetime", arrayOf("vertAlign" to "middle", "formatter" to "datetime")), + DATE("date", "number", arrayOf("vertAlign" to "middle", "formatter" to "datetime")), COLOR("color", "string", arrayOf("formatter" to "color", "width" to 20)), BOOLEAN("boolean", "boolean", arrayOf("formatter" to "tickCross", "width" to 120)), ICON("icon", "string", arrayOf("vertAlign" to "middle", "formatter" to "enumIconsFormatter", "width" to 120)), - TIME("time", "time", arrayOf("vertAlign" to "middle")), + TIME("time", "number", arrayOf("vertAlign" to "middle")), NUMBER("number", "number", arrayOf("vertAlign" to "middle")), IMAGE("image", "string", arrayOf("formatter" to "image", "width" to 120, "formatterParams" to mapOf("height" to "100px"))); } diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/challenge/ChallengeSubmissionEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/challenge/ChallengeSubmissionEntity.kt index 95edcad4..631cdc84 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/challenge/ChallengeSubmissionEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/challenge/ChallengeSubmissionEntity.kt @@ -62,7 +62,7 @@ data class ChallengeSubmissionEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class ]) @property:GenerateInput(type = InputType.NUMBER, min = Integer.MIN_VALUE, order = 4, label = "Adott pont") - @property:GenerateOverview(columnName = "Pont", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Pont", order = 5, centered = true) @property:ImportFormat var score: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/communities/TinderCommunityVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/communities/TinderCommunityVirtualEntity.kt index 0272bebf..275da938 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/communities/TinderCommunityVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/communities/TinderCommunityVirtualEntity.kt @@ -11,10 +11,10 @@ data class TinderCommunityVirtualEntity( @property:GenerateOverview(columnName = "Név", order = 1) val name: String, - @property:GenerateOverview(columnName = "Jobbra húzva", order = 2) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Jobbra húzva", order = 2) val likes: Int, - @property:GenerateOverview(columnName = "Balra húzva", order = 3) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Balra húzva", order = 3) val dislikes: Int, ) : IdentifiableEntity \ No newline at end of file diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByGroupVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByGroupVirtualEntity.kt index 7af658ad..2b3aa295 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByGroupVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByGroupVirtualEntity.kt @@ -12,13 +12,13 @@ data class DebtsByGroupVirtualEntity( @property:GenerateOverview(columnName = "Csoport", order = 1) var groupName: String = "", - @property:GenerateOverview(columnName = "Forgalom [JMF]", order = 2, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Forgalom [JMF]", order = 2, centered = true) var total: Int = 0, - @property:GenerateOverview(columnName = "Fizetetlen [JMF]", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Fizetetlen [JMF]", order = 3, centered = true) var notPayed: Int = 0, - @property:GenerateOverview(columnName = "Lezáratlan [JMF]", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Lezáratlan [JMF]", order = 4, centered = true) var notFinished: Int = 0 ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByUserVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByUserVirtualEntity.kt index 27d6e6ce..b1f227e3 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByUserVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/DebtsByUserVirtualEntity.kt @@ -15,13 +15,13 @@ data class DebtsByUserVirtualEntity( @property:GenerateOverview(columnName = "Csoport", order = 2, centered = true) var groupName: String = "", - @property:GenerateOverview(columnName = "Totál [JMF]", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Totál [JMF]", order = 3, centered = true) var total: Int = 0, - @property:GenerateOverview(columnName = "Fizetetlen [JMF]", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Fizetetlen [JMF]", order = 4, centered = true) var notPayed: Int = 0, - @property:GenerateOverview(columnName = "Lezáratlan [JMF]", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Lezáratlan [JMF]", order = 5, centered = true) var notFinished: Int = 0 ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/ProductEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/ProductEntity.kt index e1e724fd..a5267986 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/ProductEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/ProductEntity.kt @@ -45,7 +45,7 @@ data class ProductEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ]) @property:GenerateInput(type = InputType.NUMBER, order = 2, label = "Ár", min = 1, defaultValue = "100", note = "JMF-ben természetesen") - @property:GenerateOverview(columnName = "Ár", order = 1, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Ár", order = 1, centered = true) @property:ImportFormat var price: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/SoldProductEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/SoldProductEntity.kt index 57ea36a1..bdefd666 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/SoldProductEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/debt/SoldProductEntity.kt @@ -36,7 +36,7 @@ data class SoldProductEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(order = 2, label = "Ár", enabled = false, ignore = true, note = "Az árak JMF-ben értendőek") - @property:GenerateOverview(columnName = "Ár", order = 2) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Ár", order = 2) @property:ImportFormat var price: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormVirtualEntity.kt index f96976a0..2e05abb8 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormVirtualEntity.kt @@ -12,19 +12,19 @@ data class FormVirtualEntity( @property:GenerateOverview(columnName = "Cím", order = 1) val name: String, - @property:GenerateOverview(columnName = "Limit", order = 2) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Limit", order = 2) val limit: Int, - @property:GenerateOverview(columnName = "Beküldött", order = 3) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Beküldött", order = 3) val submitted: Int, - @property:GenerateOverview(columnName = "Fizetve", order = 4) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Fizetve", order = 4) val accepted: Int, - @property:GenerateOverview(columnName = "Visszautasított", order = 5) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Visszautasított", order = 5) val rejected: Int, - @property:GenerateOverview(columnName = "Elfogadva", order = 6) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Elfogadva", order = 6) val validated: Int, ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsGroupEntryDto.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsGroupEntryDto.kt index ae2f5b84..5ab4d298 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsGroupEntryDto.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsGroupEntryDto.kt @@ -3,6 +3,7 @@ package hu.bme.sch.cmsch.component.leaderboard import com.fasterxml.jackson.annotation.JsonView import hu.bme.sch.cmsch.admin.GenerateOverview import hu.bme.sch.cmsch.admin.ImportFormat +import hu.bme.sch.cmsch.admin.OverviewType import hu.bme.sch.cmsch.dto.FullDetails import hu.bme.sch.cmsch.dto.Preview import hu.bme.sch.cmsch.model.IdentifiableEntity @@ -19,27 +20,27 @@ data class LeaderBoardAsGroupEntryDto( override var name: String = "", @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Feladatok", order = 2, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Feladatok", order = 2, centered = true) @property:ImportFormat override var taskScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Riddleök", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Riddleök", order = 3, centered = true) @property:ImportFormat override var riddleScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Beadások", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Beadások", order = 4, centered = true) @property:ImportFormat override var challengeScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "QR Kódok", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "QR Kódok", order = 5, centered = true) @property:ImportFormat override var tokenScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Totál", order = 100, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Totál", order = 100, centered = true) @property:ImportFormat override var totalScore: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsUserEntryDto.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsUserEntryDto.kt index c36613fa..e04ca0c1 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsUserEntryDto.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/leaderboard/LeaderBoardAsUserEntryDto.kt @@ -3,6 +3,7 @@ package hu.bme.sch.cmsch.component.leaderboard import com.fasterxml.jackson.annotation.JsonView import hu.bme.sch.cmsch.admin.GenerateOverview import hu.bme.sch.cmsch.admin.ImportFormat +import hu.bme.sch.cmsch.admin.OverviewType import hu.bme.sch.cmsch.dto.FullDetails import hu.bme.sch.cmsch.dto.Preview import hu.bme.sch.cmsch.model.IdentifiableEntity @@ -24,27 +25,27 @@ data class LeaderBoardAsUserEntryDto( var groupName: String = "", @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Feladatok", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Feladatok", order = 3, centered = true) @property:ImportFormat override var taskScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Riddleök", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Riddleök", order = 4, centered = true) @property:ImportFormat override var riddleScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Beadások", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Beadások", order = 5, centered = true) @property:ImportFormat override var challengeScore: Int = 0, @field:JsonView(value = [Preview::class, FullDetails::class]) - @property:GenerateOverview(columnName = "QR Kódok", order = 6, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "QR Kódok", order = 6, centered = true) @property:ImportFormat override var tokenScore: Int = 0, @field:JsonView(value = [ Preview::class, FullDetails::class ]) - @property:GenerateOverview(columnName = "Totál", order = 100, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Totál", order = 100, centered = true) @property:ImportFormat override var totalScore: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/LocationEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/LocationEntity.kt index f466ccb9..bf79389e 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/LocationEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/LocationEntity.kt @@ -56,13 +56,13 @@ data class LocationEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 9, label = "Longitude", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Longitude", order = 4) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Longitude", order = 4) var longitude: Double = 0.0, @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 8, label = "Latitude", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Latitude", order = 3) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Latitude", order = 3) var latitude: Double = 0.0, @Column(nullable = false) @@ -74,7 +74,7 @@ data class LocationEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 11, label = "Pontosság", defaultValue = "0", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Pontosság", order = 5) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Pontosság", order = 5) var accuracy: Float = 0.0f, @Column(nullable = false) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/WaypointEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/WaypointEntity.kt index f95229a0..addebcea 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/WaypointEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/location/WaypointEntity.kt @@ -38,13 +38,13 @@ data class WaypointEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 3, label = "Longitude", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Longitude", order = 4) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Longitude", order = 4) var longitude: Double = 0.0, @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 2, label = "Latitude", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Latitude", order = 3) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Latitude", order = 3) var latitude: Double = 0.0, @Column(nullable = false) @@ -56,7 +56,7 @@ data class WaypointEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, FullDetails::class ]) @property:GenerateInput(maxLength = 32, order = 5, label = "Pontosság", defaultValue = "0", type = InputType.FLOAT) - @property:GenerateOverview(columnName = "Pontosság", order = 5) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Pontosság", order = 5) var accuracy: Float = 0.0f, @Column(nullable = false) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/FreestyleRaceRecordEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/FreestyleRaceRecordEntity.kt index 26fe51e8..bd9edda6 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/FreestyleRaceRecordEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/FreestyleRaceRecordEntity.kt @@ -64,7 +64,7 @@ data class FreestyleRaceRecordEntity( @field:JsonView(value = [ Edit::class ]) @property:GenerateInput(type = InputType.FLOAT3, order = 4, label = "Mért idő", defaultValue = "0.0", note = "Másodpercben kell megadni, és ponttal (.) van elválasztva, nem vesszővel! 3 tizedes pontig lehet megadni pontosságot.") - @property:GenerateOverview(columnName = "Idő", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.TIME, columnName = "Idő", order = 4, centered = true) @property:ImportFormat var time: Float = 0.0f, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/RaceRecordEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/RaceRecordEntity.kt index 9bbc91f5..0d60a8ae 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/RaceRecordEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/race/RaceRecordEntity.kt @@ -65,7 +65,7 @@ data class RaceRecordEntity( @field:JsonView(value = [ Edit::class ]) @property:GenerateInput(type = InputType.FLOAT3, order = 4, label = "Mért idő", defaultValue = "0.0", note = "Másodpercben kell megadni, és ponttal (.) van elválasztva, nem vesszővel! 3 tizedes pontig lehet megadni pontosságot.") - @property:GenerateOverview(columnName = "Idő", order = 4, centered = true) + @property:GenerateOverview(renderer = OverviewType.TIME, columnName = "Idő", order = 4, centered = true) @property:ImportFormat var time: Float = 0.0f, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleCategoryEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleCategoryEntity.kt index 1eff02d4..af892012 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleCategoryEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleCategoryEntity.kt @@ -40,7 +40,7 @@ data class RiddleCategoryEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ]) @property:GenerateInput(type = InputType.NUMBER, min = 0, order = 2, label = "Kategória id-je") - @property:GenerateOverview(columnName = "Kategória", order = 2) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Kategória", order = 2) @property:ImportFormat var categoryId: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleMappingVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleMappingVirtualEntity.kt index f4c9b7e5..ef21cf48 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleMappingVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleMappingVirtualEntity.kt @@ -9,7 +9,7 @@ data class RiddleMappingVirtualEntity( @property:GenerateOverview(renderer = OverviewType.ID, columnName = "ID", order = -1) override var id: Int = 0, - @property:GenerateOverview(columnName = "Kat. id", order = 1) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Kat. id", order = 1) var category: Int = 0, @property:GenerateOverview(columnName = "Riddle", order = 2) @@ -24,7 +24,7 @@ data class RiddleMappingVirtualEntity( @property:GenerateOverview(columnName = "Átugorva", order = 4, centered = true, renderer = OverviewType.BOOLEAN) var skipped: Boolean = false, - @property:GenerateOverview(columnName = "Próbálkozás", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Próbálkozás", order = 5, centered = true) var attempt: Int = 0, @property:GenerateOverview(columnName = "Beadva", order = 6, centered = true, renderer = OverviewType.DATE) diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleStatsVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleStatsVirtualEntity.kt index 0b93b692..d58a6358 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleStatsVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/riddle/RiddleStatsVirtualEntity.kt @@ -12,10 +12,10 @@ data class RiddleStatsVirtualEntity( @property:GenerateOverview(columnName = "Beadó", order = 1) var owner: String = "", - @property:GenerateOverview(columnName = "Elfogadott", order = 2, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Elfogadott", order = 2, centered = true) var completed: Int = 0, - @property:GenerateOverview(columnName = "Hintek felhasználva", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Hintek felhasználva", order = 3, centered = true) var hintsUsed: Int = 0, ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/SubmittedTaskEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/SubmittedTaskEntity.kt index 23af29c8..70dc6f02 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/SubmittedTaskEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/SubmittedTaskEntity.kt @@ -104,7 +104,7 @@ data class SubmittedTaskEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ]) @property:GenerateInput(type = InputType.NUMBER, order = 10, label = "Adott pont") - @property:GenerateOverview(columnName = "Pont", order = 5, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER,columnName = "Pont", order = 5, centered = true) var score: Int = 0, @ColumnDefault("''") diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskCategoryEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskCategoryEntity.kt index 6cde8689..428067be 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskCategoryEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskCategoryEntity.kt @@ -46,7 +46,7 @@ data class TaskCategoryEntity( @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ]) @property:GenerateInput(type = InputType.NUMBER, min = 0, order = 2, label = "Kategória id-je. " + "Egyedinek kell lennie, különben összeakad a rendszer!") - @property:GenerateOverview(columnName = "ID", order = 2) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "ID", order = 2) @property:ImportFormat var categoryId: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskEntity.kt index 14abff41..04fb7b8a 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/task/TaskEntity.kt @@ -55,7 +55,7 @@ data class TaskEntity( @Column(nullable = false) @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ]) @property:GenerateInput(type = InputType.NUMBER, min = 0, order = 2, label = "Kategória id-je") - @property:GenerateOverview(columnName = "Kategória", order = 2, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Kategória", order = 2, centered = true) @property:ImportFormat var categoryId: Int = 0, diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByGroupVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByGroupVirtualEntity.kt index 72bc807c..ded64fd3 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByGroupVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByGroupVirtualEntity.kt @@ -12,7 +12,7 @@ data class TokenListByGroupVirtualEntity( @property:GenerateOverview(columnName = "Csoport", order = 1) val groupName: String, - @property:GenerateOverview(columnName = "Tokenek [db]", order = 2, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Tokenek [db]", order = 2, centered = true) val tokens: Int, ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByUserVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByUserVirtualEntity.kt index 92f4f4c0..4266704c 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByUserVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenListByUserVirtualEntity.kt @@ -15,7 +15,7 @@ data class TokenListByUserVirtualEntity( @property:GenerateOverview(columnName = "Csoport", order = 2, centered = true) val groupName: String, - @property:GenerateOverview(columnName = "Tokenek [db]", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Tokenek [db]", order = 3, centered = true) val tokens: Int, ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenStatVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenStatVirtualEntity.kt index cef5335c..e5a2c021 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenStatVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenStatVirtualEntity.kt @@ -15,7 +15,7 @@ data class TokenStatVirtualEntity( @property:GenerateOverview(columnName = "Típus", order = 2) var type: String = "", - @property:GenerateOverview(columnName = "Beolvasás", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Beolvasás", order = 3, centered = true) var count: Int = 0 ) : IdentifiableEntity diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenVirtualEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenVirtualEntity.kt index 6cdc6e4d..0d5770f0 100644 --- a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenVirtualEntity.kt +++ b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/token/TokenVirtualEntity.kt @@ -15,7 +15,7 @@ data class TokenVirtualEntity( @property:GenerateOverview(columnName = "Típus", order = 2) var type: String = "", - @property:GenerateOverview(columnName = "Pont", order = 3, centered = true) + @property:GenerateOverview(renderer = OverviewType.NUMBER, columnName = "Pont", order = 3, centered = true) var score: Int = 0, @property:GenerateOverview(columnName = "Beolvasva", order = 4, centered = true, renderer = OverviewType.DATE)