From 9c09eb13a72f9fa17cc08915fc1041be4b00a900 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Sun, 6 Nov 2022 15:52:48 +0900 Subject: [PATCH 1/9] feat(evaluation): increase the maximum score for evaluation items --- src/main/kotlin/apply/ui/admin/evaluation/EvaluationItemForm.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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("설명") From 2e2b8dc769200dce8b8109104ad17e669faa2817 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 14:54:08 +0900 Subject: [PATCH 2/9] feat: set height of the evaluation page grid to 100% --- src/main/kotlin/apply/ui/admin/selections/SelectionView.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 } From 5c8f1531cb80067bb2044d438229e8f57df1d7c0 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 14:54:58 +0900 Subject: [PATCH 3/9] feat: set height of the term page grid to 100% --- src/main/kotlin/apply/ui/admin/term/TermsView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 } } From b0b6ac40d45ef3d7e19afd2d17af1521d1e9cc88 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:02:38 +0900 Subject: [PATCH 4/9] feat: set height of the recruitment page grid to 100% --- .../kotlin/apply/ui/admin/recruitment/RecruitmentsView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 } } From 8d3c97251e917be4b233e89920c0fdb27baa7fa3 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:08:48 +0900 Subject: [PATCH 5/9] feat: set height of the administrators page grid to 100% --- .../apply/ui/admin/administrator/AdministratorsView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 } } From 2962053da7078abf50c02d26009a2c4aaa6b1b98 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:09:09 +0900 Subject: [PATCH 6/9] feat: set height of the cheater page grid to 100% --- src/main/kotlin/apply/ui/admin/cheater/CheatersView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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() } } From 2ad8f1e678ccf44be0cd140a73b4e558dabb892b Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:12:12 +0900 Subject: [PATCH 7/9] feat: set height of the mail page grid to 100% --- src/main/kotlin/apply/ui/admin/mail/MailsView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 } } From 327cd29b82576fc1a1435a9b4c63d9f0b0764bde Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:12:32 +0900 Subject: [PATCH 8/9] feat: set height of the evaluation page grid to 100% --- src/main/kotlin/apply/ui/admin/evaluation/EvaluationsView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 } } From 5a386ec6a903f41040b454c3e26dfa6390f9a713 Mon Sep 17 00:00:00 2001 From: SuyeonChoi Date: Thu, 24 Nov 2022 15:25:29 +0900 Subject: [PATCH 9/9] feat: set height of the mission page grid to 100% --- src/main/kotlin/apply/ui/admin/mission/MissionsView.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 } }