diff --git a/src/main/kotlin/apply/ui/admin/administrator/AdministratorsView.kt b/src/main/kotlin/apply/ui/admin/administrator/AdministratorsView.kt index 17192658d..8bd3b042e 100644 --- a/src/main/kotlin/apply/ui/admin/administrator/AdministratorsView.kt +++ b/src/main/kotlin/apply/ui/admin/administrator/AdministratorsView.kt @@ -26,11 +26,12 @@ import support.views.toDisplayName class AdministratorsView(private val administratorService: AdministratorService) : VerticalLayout() { init { add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("관리자")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -43,7 +44,7 @@ class AdministratorsView(private val administratorService: AdministratorService) } } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } } diff --git a/src/main/kotlin/apply/ui/admin/cheater/CheatersView.kt b/src/main/kotlin/apply/ui/admin/cheater/CheatersView.kt index 2d9b80db5..ef8ba797d 100644 --- a/src/main/kotlin/apply/ui/admin/cheater/CheatersView.kt +++ b/src/main/kotlin/apply/ui/admin/cheater/CheatersView.kt @@ -27,11 +27,12 @@ class CheatersView( ) : VerticalLayout() { init { add(createTitle(), createAddCheater(), createCheaterGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("부정행위자")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -45,7 +46,7 @@ class CheatersView( } ).apply { justifyContentMode = FlexComponent.JustifyContentMode.END - setSizeFull() + setWidthFull() } } diff --git a/src/main/kotlin/apply/ui/admin/evaluation/EvaluationItemForm.kt b/src/main/kotlin/apply/ui/admin/evaluation/EvaluationItemForm.kt index 725209f99..6d45c7429 100644 --- a/src/main/kotlin/apply/ui/admin/evaluation/EvaluationItemForm.kt +++ b/src/main/kotlin/apply/ui/admin/evaluation/EvaluationItemForm.kt @@ -9,7 +9,7 @@ import support.views.createIntSelect class EvaluationItemForm() : BindingIdentityFormLayout(EvaluationItemData::class) { private val title: TextField = TextField("항목명") - private val maximumScore: Select = createIntSelect(max = 10).apply { label = "최대 점수" } + private val maximumScore: Select = createIntSelect(max = 100).apply { label = "최대 점수" } private val position: Select = createIntSelect(max = 10).apply { label = "순서" } private val description: TextArea = TextArea("설명") diff --git a/src/main/kotlin/apply/ui/admin/evaluation/EvaluationsView.kt b/src/main/kotlin/apply/ui/admin/evaluation/EvaluationsView.kt index bbe5441c5..8727f0e30 100644 --- a/src/main/kotlin/apply/ui/admin/evaluation/EvaluationsView.kt +++ b/src/main/kotlin/apply/ui/admin/evaluation/EvaluationsView.kt @@ -24,11 +24,12 @@ import support.views.createPrimarySmallButton class EvaluationsView(private val evaluationService: EvaluationService) : VerticalLayout() { init { add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("평가 관리")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -39,7 +40,7 @@ class EvaluationsView(private val evaluationService: EvaluationService) : Vertic UI.getCurrent().navigate(EvaluationsFormView::class.java, NEW_VALUE) } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } } diff --git a/src/main/kotlin/apply/ui/admin/mail/MailsView.kt b/src/main/kotlin/apply/ui/admin/mail/MailsView.kt index 8864343c6..3058edd08 100644 --- a/src/main/kotlin/apply/ui/admin/mail/MailsView.kt +++ b/src/main/kotlin/apply/ui/admin/mail/MailsView.kt @@ -26,11 +26,12 @@ class MailsView( ) : VerticalLayout() { init { add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("메일 관리")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -41,7 +42,7 @@ class MailsView( UI.getCurrent().navigate(MailsFormView::class.java, NEW_VALUE) } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } } diff --git a/src/main/kotlin/apply/ui/admin/mission/MissionsView.kt b/src/main/kotlin/apply/ui/admin/mission/MissionsView.kt index 4a11a6e6a..e40967f23 100644 --- a/src/main/kotlin/apply/ui/admin/mission/MissionsView.kt +++ b/src/main/kotlin/apply/ui/admin/mission/MissionsView.kt @@ -9,6 +9,7 @@ import com.vaadin.flow.component.Component import com.vaadin.flow.component.UI import com.vaadin.flow.component.button.Button import com.vaadin.flow.component.grid.Grid +import com.vaadin.flow.component.html.H1 import com.vaadin.flow.component.orderedlayout.FlexComponent import com.vaadin.flow.component.orderedlayout.HorizontalLayout import com.vaadin.flow.component.orderedlayout.VerticalLayout @@ -20,7 +21,6 @@ import com.vaadin.flow.router.Route import com.vaadin.flow.router.WildcardParameter import support.views.EDIT_VALUE import support.views.NEW_VALUE -import support.views.Title import support.views.addSortableColumn import support.views.addSortableDateTimeColumn import support.views.createDeleteButtonWithDialog @@ -37,10 +37,14 @@ class MissionsView( override fun setParameter(event: BeforeEvent, @WildcardParameter parameter: Long) { recruitmentId = parameter add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { - return Title("${recruitmentService.getById(recruitmentId).title} 과제 관리") + return HorizontalLayout(H1("${recruitmentService.getById(recruitmentId).title} 과제 관리")).apply { + setWidthFull() + justifyContentMode = FlexComponent.JustifyContentMode.CENTER + } } private fun createButton(): Component { @@ -49,7 +53,7 @@ class MissionsView( UI.getCurrent().navigate(MissionsFormView::class.java, "$recruitmentId/$NEW_VALUE") } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } } diff --git a/src/main/kotlin/apply/ui/admin/recruitment/RecruitmentsView.kt b/src/main/kotlin/apply/ui/admin/recruitment/RecruitmentsView.kt index 794d04da2..06e3ccc4e 100644 --- a/src/main/kotlin/apply/ui/admin/recruitment/RecruitmentsView.kt +++ b/src/main/kotlin/apply/ui/admin/recruitment/RecruitmentsView.kt @@ -27,11 +27,12 @@ import support.views.createPrimarySmallButton class RecruitmentsView(private val recruitmentService: RecruitmentService) : VerticalLayout() { init { add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("모집 관리")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -42,7 +43,7 @@ class RecruitmentsView(private val recruitmentService: RecruitmentService) : Ver UI.getCurrent().navigate(RecruitmentsFormView::class.java, NEW_VALUE) } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } } diff --git a/src/main/kotlin/apply/ui/admin/selections/SelectionView.kt b/src/main/kotlin/apply/ui/admin/selections/SelectionView.kt index 0a7f36e40..3618bdc2f 100644 --- a/src/main/kotlin/apply/ui/admin/selections/SelectionView.kt +++ b/src/main/kotlin/apply/ui/admin/selections/SelectionView.kt @@ -75,6 +75,7 @@ class SelectionView( override fun setParameter(event: BeforeEvent, @WildcardParameter parameter: Long) { this.recruitmentId = parameter add(createTitle(), createContent()) + setSizeFull() } private fun createTitle(): Component { @@ -106,7 +107,7 @@ class SelectionView( setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.BETWEEN } - return VerticalLayout(menu, grids, evaluationFileButtons).apply { setWidthFull() } + return VerticalLayout(menu, grids, evaluationFileButtons).apply { setSizeFull() } } private fun createEvaluationFileButtons(): HorizontalLayout { @@ -146,6 +147,7 @@ class SelectionView( addSortableColumn("부정행위자") { if (it.isCheater) "O" else "X" } addColumn(createButtonRenderer()).apply { isAutoWidth = true } setItems(users) + setSizeFull() } } @@ -170,6 +172,7 @@ class SelectionView( addSortableColumn("평가자", EvaluationTargetResponse::administratorId) addColumn(createEvaluationButtonRenderer()).apply { isAutoWidth = true } setItems(evaluationTargets) + setSizeFull() } } @@ -206,7 +209,7 @@ class SelectionView( tabs = this } - val grids = Div(*tabsToGrids.values.toTypedArray()).apply { setWidthFull() } + val grids = Div(*tabsToGrids.values.toTypedArray()).apply { setSizeFull() } return tabs to grids } diff --git a/src/main/kotlin/apply/ui/admin/term/TermsView.kt b/src/main/kotlin/apply/ui/admin/term/TermsView.kt index 9e6e382a7..ab45b7f65 100644 --- a/src/main/kotlin/apply/ui/admin/term/TermsView.kt +++ b/src/main/kotlin/apply/ui/admin/term/TermsView.kt @@ -27,11 +27,12 @@ import support.views.toDisplayName class TermsView(private val termService: TermService) : VerticalLayout() { init { add(createTitle(), createButton(), createGrid()) + setSizeFull() } private fun createTitle(): Component { return HorizontalLayout(H1("기수 관리")).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.CENTER } } @@ -44,7 +45,7 @@ class TermsView(private val termService: TermService) : VerticalLayout() { } } ).apply { - setSizeFull() + setWidthFull() justifyContentMode = FlexComponent.JustifyContentMode.END } }