Fix forms

Gerviba · Gerviba · commit 3b3fe2749c14 · 2024-07-23T00:25:06.000+02:00
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/AdmissionEntryEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/AdmissionEntryEntity.kt
@@ -11,6 +11,8 @@ import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -62,6 +64,7 @@ data class AdmissionEntryEntity(
     var responseId: Int = 0,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 6,
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/TicketEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/admission/TicketEntity.kt
@@ -9,6 +9,8 @@ import hu.bme.sch.cmsch.dto.Preview
 import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -54,6 +56,7 @@ data class TicketEntity(
     var qrCode: String = "",
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 5,
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferenceCompanyEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferenceCompanyEntity.kt
@@ -7,6 +7,8 @@ import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -49,6 +51,7 @@ data class ConferenceCompanyEntity(
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 4, label = "Kategória",
         source = [ "MAIN_SPONSOR", "FEATURED_SPONSOR", "SPONSOR", "NO_ASSOCIATION" ])
     @property:GenerateOverview(visible = false)
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/conference/ConferencePresentationEntity.kt
@@ -8,6 +8,8 @@ import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -53,13 +55,15 @@ data class ConferencePresentationEntity(
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 3, label = "Terem", source = [ "IB028", "IB025", "OTHERS" ])
     @property:GenerateOverview(visible = false)
     @property:ImportFormat(ignore = false, type = IMPORT_ENUM)
     var room: RoomType = RoomType.OTHERS,
 
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 4, label = "Nyelv", source = [ "HU", "EN" ])
     @property:GenerateOverview(visible = false)
     @property:ImportFormat(ignore = false, type = IMPORT_ENUM)
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
@@ -13,6 +13,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
 import org.hibernate.annotations.ColumnDefault
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 enum class ProductType {
     MERCH,
@@ -47,6 +49,7 @@ data class ProductEntity(
     var price: Int = 0,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 3, label = "Típus", source = [ "MERCH", "FOOD", "OTHER" ])
     @property:GenerateOverview(visible = false)
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/email/EmailTemplateEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/email/EmailTemplateEntity.kt
@@ -9,6 +9,8 @@ import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -55,6 +57,7 @@ class EmailTemplateEntity(
 
     @field:JsonView(value = [ Edit::class, FullDetails::class ])
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 4, label = "Formátum", source = [ "TEXT", "HTML" ], defaultValue = "TEXT")
     @property:GenerateOverview(visible = false)
     @property:ImportFormat
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/event/EventEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/event/EventEntity.kt
@@ -14,6 +14,8 @@ import org.hibernate.Hibernate
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name="events")
@@ -134,6 +136,8 @@ data class EventEntity(
     @property:ImportFormat(ignore = false, columnId = 8, type = IMPORT_BOOLEAN)
     var visible: Boolean = false,
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 18, label = "Minimum rang a megtekintéshez",
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormEntity.kt
@@ -14,6 +14,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
 import org.hibernate.annotations.ColumnDefault
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name="forms")
@@ -57,6 +59,8 @@ data class FormEntity(
     @property:ImportFormat(ignore = false, columnId = 3, type = IMPORT_LOB)
     var formJson: String = "[]",
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 5,
@@ -67,6 +71,8 @@ data class FormEntity(
     @property:ImportFormat(ignore = false, columnId = 4, type = IMPORT_ENUM, enumSource = RoleType::class)
     var minRole: RoleType = RoleType.BASIC,
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 6,
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormGridTypes.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormGridTypes.kt
@@ -9,8 +9,3 @@ data class FormGridValue(
     val options: List<GridElement>,
     val questions: List<GridElement>,
 )
-
-data class ChoiceGridElement(
-    val key: String,
-    val value: String,
-)
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormMasterFillDashboard.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormMasterFillDashboard.kt
@@ -186,12 +186,13 @@ class FormMasterFillDashboard(
             val submission = mutableMapOf<String, String>()
 
             for (field in formStruct) {
-                val value = allRequestParams[field.fieldName]
+                var value = allRequestParams[field.fieldName] ?: ""
 
-                submission[field.fieldName] = allRequestParams[field.fieldName] ?: ""
-                if (field.type == FormElementType.CHECKBOX && value == "") {
-                    submission[field.fieldName] = "false"
+                if (field.type == FormElementType.CHECKBOX) {
+                    value = (value.equals("on", ignoreCase = true)).toString()
                 }
+
+                submission[field.fieldName] = value
             }
 
             val responseEntity = ResponseEntity(
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormService.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormService.kt
@@ -2,6 +2,7 @@ package hu.bme.sch.cmsch.component.form
 
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import hu.bme.sch.cmsch.component.app.DebugComponent
 import hu.bme.sch.cmsch.component.login.CmschUser
 import hu.bme.sch.cmsch.extending.FormSubmissionListener
@@ -25,14 +26,14 @@ open class FormService(
     private val responseRepository: ResponseRepository,
     private val userRepository: UserRepository,
     private val clock: TimeService,
-    private val objectMapper: ObjectMapper,
     private val debugComponent: DebugComponent,
     private val listeners: MutableList<out FormSubmissionListener>,
     private val formComponent: FormComponent,
 ) {
 
     internal val log = LoggerFactory.getLogger(javaClass)
 
+    private val objectMapper = jacksonObjectMapper()
     private val gridReader = objectMapper.readerFor(FormGridValue::class.java)
     private val choiceGridReader = objectMapper.readerFor(object : TypeReference<MutableMap<String, String>>() {})
     private val selectionGridReader = objectMapper.readerFor(object : TypeReference<MutableMap<String, Boolean>>() {})
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/key/AccessKeyEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/key/AccessKeyEntity.kt
@@ -9,6 +9,8 @@ import hu.bme.sch.cmsch.model.RoleType
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -70,6 +72,8 @@ data class AccessKeyEntity(
     @property:ImportFormat
     var setRole: Boolean = false,
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 7,
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
@@ -10,6 +10,8 @@ import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
 import org.hibernate.annotations.ColumnDefault
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -105,6 +107,7 @@ data class LocationEntity(
     var broadcast: Boolean = false,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 17, label = "Forma",
         source = [ "CIRCLE", "SQUARE", "INFO", "CAR", "CROSSHAIRS", "CAMP", "TOWER", "MARKER", "HOME" ])
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
@@ -10,6 +10,8 @@ import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
 import org.hibernate.annotations.ColumnDefault
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -81,6 +83,7 @@ data class WaypointEntity(
     var timestamp: Long = 0,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 10, label = "Forma",
         source = [ "CIRCLE", "SQUARE", "INFO", "CAR", "CROSSHAIRS", "CAMP", "TOWER", "MARKER", "HOME" ])
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/news/NewsEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/news/NewsEntity.kt
@@ -14,6 +14,8 @@ import org.hibernate.Hibernate
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name="news")
@@ -87,6 +89,8 @@ data class NewsEntity(
     @property:ImportFormat(ignore = false, columnId = 5, type = IMPORT_LONG)
     var timestamp: Long = 0,
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 8, label = "Minimum rang a megtekintéshez",
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
@@ -13,6 +13,8 @@ import org.hibernate.Hibernate
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name="riddleCategories")
@@ -48,6 +50,8 @@ data class RiddleCategoryEntity(
     @property:ImportFormat(ignore = false, columnId = 2, type = IMPORT_BOOLEAN)
     var visible: Boolean = false,
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 4, label = "Minimum rang",
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/component/staticpage/StaticPageEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/component/staticpage/StaticPageEntity.kt
@@ -14,6 +14,8 @@ import org.hibernate.Hibernate
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name="extraPages")
@@ -89,6 +91,7 @@ data class StaticPageEntity(
 
     @field:JsonView(value = [ Edit::class, FullDetails::class ])
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 9, label = "Minimum jogkör",
         source = [ "GUEST", "BASIC", "ATTENDEE", "PRIVILEGED", "STAFF", "ADMIN", "SUPERUSER" ],
         note = "BASIC = belépett, STAFF = rendező, ADMIN = minden jog")
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
@@ -13,6 +13,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
 import org.hibernate.annotations.ColumnDefault
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 enum class TaskCategoryType {
     REGULAR,
@@ -61,6 +63,7 @@ data class TaskCategoryEntity(
     var availableTo: Long = 0,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 5, label = "Típus", source = [ "REGULAR", "PROFILE_REQUIRED" ],
         note = "A PROFILE_REQUIRED olyan task ami a többi feladattól külön jelenik meg, és külön van mutatva a profil oldalon. " +
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
@@ -10,6 +10,8 @@ import hu.bme.sch.cmsch.model.ManagedEntity
 import hu.bme.sch.cmsch.service.StaffPermissions
 import jakarta.persistence.*
 import org.hibernate.Hibernate
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.core.env.Environment
 
@@ -77,6 +79,7 @@ data class TaskEntity(
     var solution: String = "",
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 5, label = "Típus",
         source = [ "TEXT", "IMAGE", "BOTH", "ONLY_PDF" ],
@@ -86,6 +89,7 @@ data class TaskEntity(
     var type: TaskType = TaskType.TEXT,
 
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 6, label = "Formátum",
         source = [ "NONE", "TEXT", "CODE", "FORM" ],
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GroupEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GroupEntity.kt
@@ -11,6 +11,8 @@ import hu.bme.sch.cmsch.service.StaffPermissions
 import org.hibernate.Hibernate
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(
@@ -33,6 +35,8 @@ data class GroupEntity(
     @property:ImportFormat(ignore = false, columnId = 0)
     var name: String = "",
 
+    @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @Column(nullable = false)
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 2, label = "Típus", source = [ "UNKNOWN", "IT", "EE", "BPROF" ])
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GroupToUserMappingEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GroupToUserMappingEntity.kt
@@ -10,6 +10,8 @@ import hu.bme.sch.cmsch.service.StaffPermissions
 import org.hibernate.Hibernate
 import org.springframework.core.env.Environment
 import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
 
 @Entity
 @Table(name = "groupToUser", indexes = [
@@ -55,6 +57,7 @@ data class GroupToUserMappingEntity(
 
     @field:JsonView(value = [ Edit::class, Preview::class, FullDetails::class ])
     @Enumerated(EnumType.STRING)
+    @JdbcTypeCode(SqlTypes.VARCHAR)
     @property:GenerateInput(type = INPUT_TYPE_BLOCK_SELECT, order = 4, label = "Szak", source = [ "UNKNOWN", "IT", "EE", "BPROF" ])
     @property:GenerateOverview(columnName = "Szak", order = 5, centered = true)
     @property:ImportFormat(ignore = false, columnId = 3, type = IMPORT_ENUM, enumSource = MajorType::class, defaultValue = "UNKNOWN")
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GuildToUserMappingEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/model/GuildToUserMappingEntity.kt
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/model/UserDetailsByInternalIdMappingEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/model/UserDetailsByInternalIdMappingEntity.kt
diff --git a/backend/src/main/kotlin/hu/bme/sch/cmsch/model/UserEntity.kt b/backend/src/main/kotlin/hu/bme/sch/cmsch/model/UserEntity.kt
diff --git a/backend/src/main/resources/templates/component/details/form-editor.html b/backend/src/main/resources/templates/component/details/form-editor.html

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,3 @@ data class FormGridValue(`
`9`	`9`	`val options: List<GridElement>,`
`10`	`10`	`val questions: List<GridElement>,`
`11`	`11`	`)`
`12`		`-`
`13`		`-data class ChoiceGridElement(`
`14`		`- val key: String,`
`15`		`- val value: String,`
`16`		`-)`