From 95cfe1ab4482365ccd7b733393575ad423b3bf9a Mon Sep 17 00:00:00 2001 From: Minjun Lee <127070837+MinjuN07@users.noreply.github.com> Date: Sat, 7 Sep 2024 11:29:40 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat(#120):=20=EC=9E=85=ED=95=99=20?= =?UTF-8?q?=EC=9B=90=EC=84=9C=20=EC=84=9C=EB=A5=98=20PDF=20=EC=84=9C?= =?UTF-8?q?=EC=8B=9D=20=EB=AA=85=EC=8B=9C=20-=20=EC=9E=85=ED=95=99=20?= =?UTF-8?q?=EC=9B=90=EC=84=9C=20=EC=84=9C=EB=A5=98=20=EC=A4=91=20=EC=A1=B4?= =?UTF-8?q?=EC=9E=AC=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=84=9C?= =?UTF-8?q?=EC=8B=9D=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=96=88=EC=96=B4?= =?UTF-8?q?=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/document.html | 6 +++++- src/main/resources/templates/form.html | 8 ++++++-- src/main/resources/templates/recommendation.html | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/document.html b/src/main/resources/templates/document.html index 0b4b8a94..24fc2429 100644 --- a/src/main/resources/templates/document.html +++ b/src/main/resources/templates/document.html @@ -43,7 +43,10 @@ font-weight: 500; padding: 8px 0; } - + .format { + font-size: 13px; + font-weight: bold; + } .ba { border: #000000 1px solid; } @@ -65,6 +68,7 @@ +

[서식2]

diff --git a/src/main/resources/templates/form.html b/src/main/resources/templates/form.html index bdba554e..5174d117 100644 --- a/src/main/resources/templates/form.html +++ b/src/main/resources/templates/form.html @@ -37,7 +37,10 @@ line-height: 48px; text-align: center; } - + .format { + font-size: 13px; + font-weight: bold; + } .school { font-weight: bold; font-size: 18px; @@ -100,7 +103,8 @@
자기소개서 및 학업계획서
성명
- +

[서식1]

+ diff --git a/src/main/resources/templates/recommendation.html b/src/main/resources/templates/recommendation.html index d73b639e..932d4144 100644 --- a/src/main/resources/templates/recommendation.html +++ b/src/main/resources/templates/recommendation.html @@ -43,7 +43,10 @@ font-weight: 500; padding: 8px 0; } - + .format { + font-size: 13px; + font-weight: bold; + } .ba { border: #000000 1px solid; } @@ -93,6 +96,7 @@
+

[서식4]

From fb0a4704a1ca3910c22f5ada13eb6549f29dbc07 Mon Sep 17 00:00:00 2001 From: Minjun Lee <127070837+MinjuN07@users.noreply.github.com> Date: Sat, 7 Sep 2024 11:40:15 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat(#120):=20=EC=9E=85=ED=95=99=20?= =?UTF-8?q?=EC=A0=84=ED=98=95=20=EC=84=9C=EB=A5=98=20=EC=84=9C=EC=95=BD?= =?UTF-8?q?=EC=84=9C=20=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20-=20?= =?UTF-8?q?=EC=9E=85=ED=95=99=20=EC=A0=84=ED=98=95=20=EC=84=9C=EB=A5=98?= =?UTF-8?q?=EC=9D=98=20=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=84=9C=EC=8B=9D?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EA=B8=88=EC=97=B0=20=EC=84=9C?= =?UTF-8?q?=EC=95=BD=EC=84=9C=EB=A5=BC=20=EB=8B=A4=EC=8B=9C=20=ED=8D=BC?= =?UTF-8?q?=EB=B8=94=EB=A6=AC=EC=8B=B1=20=ED=95=98=EC=98=80=EC=8A=B5?= =?UTF-8?q?=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/written-oath.html | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 src/main/resources/templates/written-oath.html diff --git a/src/main/resources/templates/written-oath.html b/src/main/resources/templates/written-oath.html new file mode 100644 index 00000000..3efc868f --- /dev/null +++ b/src/main/resources/templates/written-oath.html @@ -0,0 +1,152 @@ + + + + + + 원서 + + +
학교장 추천서
성명
+

[서식3]

+ + + + + + + + + + + + + + + + + +
서약서
성명접수번호1000
출신중학교
+
+

부산소프트웨어마이스터고등학교는 영마이스터(Young Meister)를 양성하는 특수목적고등학교입니다. 산업수요 맞춤형 교육과정 운영을 통해 학생의 취업 역량을 가리는 학교로 졸업 후 100% 우선 취업과 기술명장으로의 계속 성장을 지원합니다. 이에, 본교에 지원하는 학생에게 다음과 같은 조치를 취합니다.

+
+

1) (진로⋅진학 지도 미실시) 대학 진학과 관련된 어떠한 진로⋅진학 지도를 하지 않음

+

2) (학교 시설 이용 제한) 정규 시간 이외의 시간에는 학교의 시설(기숙사, 실험실 등)을 규정에 따라 이용을 제한 할 수 있음.

+

3) (기숙사 합숙 생활에 대한 규정) 전교생 기숙사 합숙생활의 특성과 화재의 위험을 예방하기 위해 흡연 등의 일체 유해한 행위를 불허함.

+
+

지원자 본인과 보호자는 위 모든 사항을 숙지하였으며 이를 위반했을 경우 학교가 취하는 조치에 대하여 이의를 제기하지 않고 성실히 따를 것을 서약합니다.

+
+

2024년 9월 5일

+
+

+ 지원자 성명 : +     + (서명) +

+

+ 보호자 성명 : +     + (서명) +

+
+

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

+
+ + \ No newline at end of file From 62453ce9f3cae0feed45c07dd13e0c5091ee3a1f Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Sat, 7 Sep 2024 17:58:30 +0900 Subject: [PATCH 3/5] =?UTF-8?q?perf(#120):=20=EC=84=9C=EC=95=BD=EC=84=9C?= =?UTF-8?q?=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=EA=B8=88=EC=97=B0=20=EB=8F=99=EC=9D=98=EC=84=9C=EA=B0=80=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20=EC=84=9C=EC=95=BD=EC=84=9C=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EB=90=98=EC=96=B4=EC=84=9C=20=EC=84=9C?= =?UTF-8?q?=EC=95=BD=EC=84=9C=20=ED=85=9C=ED=94=8C=EB=A6=BF=EC=9D=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EA=B3=A0=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=ED=96=88=EC=96=B4=EC=9A=94.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bamdoliro/maru/application/form/ExportFormUseCase.java | 2 +- .../com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java index 8cc163cf..bb021a2f 100644 --- a/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java +++ b/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java @@ -103,7 +103,7 @@ private List getRequiredTemplates(Form form) { Templates.FORM, Templates.GRADE_TABLE, Templates.DOCUMENT, - Templates.NO_SMOKING + Templates.WRITTEN_OATH ); } 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 32984c9c..50d2fa5e 100644 --- a/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java +++ b/src/main/java/com/bamdoliro/maru/infrastructure/thymeleaf/Templates.java @@ -11,4 +11,5 @@ public class Templates { public static final String NO_SMOKING = "no-smoking"; public static final String ADMISSION_TICKET = "admission-ticket"; public static final String GRADE_TABLE = "grade-table"; + public static final String WRITTEN_OATH = "written-oath"; } From 48bbaeb5929e4b6edb93e5686e0b5075fc0a3929 Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Sat, 7 Sep 2024 18:12:24 +0900 Subject: [PATCH 4/5] =?UTF-8?q?perf(#120):=20=EC=84=9C=EC=95=BD=EC=84=9C?= =?UTF-8?q?=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=ED=8A=B9=EB=B3=84=EC=A0=84=ED=98=95=EB=8F=84=20=EA=B8=88?= =?UTF-8?q?=EC=97=B0=20=EB=8F=99=EC=9D=98=EC=84=9C=EA=B0=80=20=EC=95=84?= =?UTF-8?q?=EB=8B=8C=20=EC=84=9C=EC=95=BD=EC=84=9C=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EB=90=98=EC=96=B4=EC=84=9C=20=EC=84=9C=EC=95=BD?= =?UTF-8?q?=EC=84=9C=20=ED=85=9C=ED=94=8C=EB=A6=BF=EC=9D=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=98=EA=B3=A0=20=EC=A0=81=EC=9A=A9=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 --- .../bamdoliro/maru/application/form/ExportFormUseCase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java index bb021a2f..aef37bf7 100644 --- a/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java +++ b/src/main/java/com/bamdoliro/maru/application/form/ExportFormUseCase.java @@ -111,8 +111,8 @@ private List getRequiredTemplates(Form form) { Templates.FORM, Templates.GRADE_TABLE, Templates.DOCUMENT, - Templates.RECOMMENDATION, - Templates.NO_SMOKING + Templates.WRITTEN_OATH, + Templates.RECOMMENDATION ); } } From c8c6b1bbc954913cf77f07a070c9562ccc0f36d6 Mon Sep 17 00:00:00 2001 From: jyj1289 Date: Sat, 7 Sep 2024 18:14:55 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor(#120):=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=A4=91=EC=95=99=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=20-=202025=ED=95=99=EB=85=84=EB=8F=84=20=EC=9E=85?= =?UTF-8?q?=ED=95=99=EC=A0=84=ED=98=95=20=EC=9A=94=EA=B0=95=20=ED=95=99?= =?UTF-8?q?=EA=B5=90=EC=9E=A5=20=EC=B6=94=EC=B2=9C=EC=84=9C=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=9D=BC=20"=EB=B6=80=EC=82=B0=EC=86=8C=ED=94=84?= =?UTF-8?q?=ED=8A=B8=EC=9B=A8=EC=96=B4=EB=A7=88=EC=9D=B4=EC=8A=A4=ED=84=B0?= =?UTF-8?q?=EA=B3=A0=EB=93=B1=ED=95=99=EA=B5=90=EC=9E=A5=20=EA=B7=80?= =?UTF-8?q?=ED=95=98"=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=A4=91?= =?UTF-8?q?=EC=95=99=EC=A0=95=EB=A0=AC=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/recommendation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/recommendation.html b/src/main/resources/templates/recommendation.html index 932d4144..e17f7bb8 100644 --- a/src/main/resources/templates/recommendation.html +++ b/src/main/resources/templates/recommendation.html @@ -162,7 +162,7 @@ (직인)

-

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

+

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