From 570e21930444fd221b5475b3213c16e806709c7a Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Fri, 11 Oct 2024 02:15:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?perf(#153):=20=EC=9E=90=EA=B8=B0=EC=86=8C?= =?UTF-8?q?=EA=B0=9C=EC=84=9C,=20=ED=95=99=EA=B5=90=EC=9E=A5=20=EC=B6=94?= =?UTF-8?q?=EC=B2=9C=EC=84=9C=20=EB=B0=8F=20=EC=84=9C=EC=95=BD=EC=84=9C=20?= =?UTF-8?q?=EC=96=91=EC=8B=9D=20=EB=B3=80=EA=B2=BD=20-=20=EC=9E=90?= =?UTF-8?q?=EA=B8=B0=EC=86=8C=EA=B0=9C=EC=84=9C,=20=ED=95=99=EA=B5=90?= =?UTF-8?q?=EC=9E=A5=20=EC=B6=94=EC=B2=9C=EC=84=9C=20=EB=B0=8F=20=EC=84=9C?= =?UTF-8?q?=EC=95=BD=EC=84=9C=EC=97=90=20=EC=9E=88=EB=8A=94=20=EC=A0=91?= =?UTF-8?q?=EC=88=98=EB=B2=88=ED=98=B8=EB=A5=BC=20=EC=88=98=ED=97=98?= =?UTF-8?q?=EB=B2=88=ED=98=B8=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=96=88?= =?UTF-8?q?=EC=96=B4=EC=9A=94.=20-=20=ED=95=99=EA=B5=90=EC=9E=A5=20?= =?UTF-8?q?=EC=B6=94=EC=B2=9C=EC=84=9C=EC=97=90=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=A0=95=EC=9B=90=20=EC=99=B8=20=EC=A0=84=ED=98=95=20=EC=B9=B8?= =?UTF-8?q?=EC=9D=84=20=EC=A0=9C=EA=B1=B0=ED=96=88=EC=96=B4=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/document.html | 4 ++-- src/main/resources/templates/recommendation.html | 13 ++++--------- src/main/resources/templates/written-oath.html | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/resources/templates/document.html b/src/main/resources/templates/document.html index 24fc2429..4b24d86e 100644 --- a/src/main/resources/templates/document.html +++ b/src/main/resources/templates/document.html @@ -73,8 +73,8 @@ 성명 - 접수번호 - + 수험번호 + 출신중학교 diff --git a/src/main/resources/templates/recommendation.html b/src/main/resources/templates/recommendation.html index e17f7bb8..595bc6b5 100644 --- a/src/main/resources/templates/recommendation.html +++ b/src/main/resources/templates/recommendation.html @@ -101,8 +101,8 @@ 성명 - 접수번호 - + 수험번호 + 출신중학교 @@ -119,9 +119,8 @@ 전형 유형 - 마이스터인재전형 - 사회통합전형 - 정원외 + 마이스터인재전형 + 사회통합전형 @@ -131,8 +130,6 @@ th:text="${form.education.school.isBusan() && form.type.isMeister() ? 'O' : null}"> - @@ -142,8 +139,6 @@ th:text="${!form.education.school.isBusan() && form.type.isMeister() ? 'O' : null}"> -
diff --git a/src/main/resources/templates/written-oath.html b/src/main/resources/templates/written-oath.html index 3efc868f..4fdc20ab 100644 --- a/src/main/resources/templates/written-oath.html +++ b/src/main/resources/templates/written-oath.html @@ -110,8 +110,8 @@ 성명 - 접수번호 - 1000 + 수험번호 + 1000 출신중학교 From 946370a5bad903a644c1d2e569a681d874a2bb39 Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Sun, 13 Oct 2024 02:50:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?perf(#153):=20=EA=B8=88=EC=97=B0=20?= =?UTF-8?q?=EB=8F=99=EC=9D=98=EC=84=9C=20=EC=96=91=EC=8B=9D=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20-=20=EA=B8=88=EC=97=B0=20=EB=8F=99=EC=9D=98?= =?UTF-8?q?=EC=84=9C=EB=A5=BC=20=EB=8D=94=20=EC=9D=B4=EC=83=81=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=84=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=ED=96=88=EC=96=B4=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/no-smoking.html | 170 ------------------- 1 file changed, 170 deletions(-) delete mode 100644 src/main/resources/templates/no-smoking.html diff --git a/src/main/resources/templates/no-smoking.html b/src/main/resources/templates/no-smoking.html deleted file mode 100644 index 655d830e..00000000 --- a/src/main/resources/templates/no-smoking.html +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - 원서 - - - - - - - - - - - - - - - - - - - - -
금연 동의서
성명접수번호1000
출신중학교
-

하나. 나 자신의 건강을 위해서 흡연을 하지 않겠습니다.

-

하나. 흡연의 유혹에 절대로 흔들리지 않겠습니다.

-

하나. 흡연을 하는 친구가 있으면 충고하여 금연을 할 수 있도록 돕겠습니다.

-
-

나 은(는) 이 시대를 이끌어갈 SW 분야 영 마이스터가 되기 위해 흡연을 하지 않겠습니다.

-

보호자는 지원자의 건강한 성장과 발전을 위해 용기와 도움을 줄 것을 약속합니다.

-
-

■ 개인 정보 수집·이용 동의

- - - - - - - - - - - - - - - - - - -
항목수집목적보유기간
학생(성명, 출신중학교)금연동의서1년
- ※ 개인정보 수집·이용에 대한 동의를 거부할 권리가 있습니다.
-      그러나 동의를 거부할 경우 최종입학에 제한을 받을 수 있습니다. -
-
개인정보 수집·이용 동의□ 예      □ 아니오
-
-

-
-

- 지원자   -     - (서명) -

-

- 보호자   -     - (서명) -

-
-

부산소프트웨어마이스터고등학교장 귀하

-
- - \ No newline at end of file From 9748de7f82423bd5e2254fd472d7da219341a916 Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Sun, 13 Oct 2024 15:17:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?perf(#153):=20=EA=B8=88=EC=97=B0=EC=84=9C?= =?UTF-8?q?=EC=95=BD=EC=84=9C=20enum=20=EC=82=AD=EC=A0=9C=20-=20=EB=8D=94?= =?UTF-8?q?=20=EC=9D=B4=EC=83=81=20=EA=B8=88=EC=97=B0=EC=84=9C=EC=95=BD?= =?UTF-8?q?=EC=84=9C=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=95=84=20eum=EC=9D=84=20=EC=82=AD=EC=A0=9C=ED=96=88?= =?UTF-8?q?=EC=96=B4=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java b/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java index c5e4a0e7..0c2c4082 100644 --- a/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java +++ b/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java @@ -8,7 +8,6 @@ public class Templates { public static final String FORM = "form"; public static final String DOCUMENT = "document"; public static final String RECOMMENDATION = "recommendation"; - public static final String NO_SMOKING = "no-smoking"; public static final String ADMISSION_TICKET = "admission-ticket"; public static final String PROOF_OF_APPLICATION = "proof-of-application"; public static final String GRADE_TABLE = "grade-table";