Merge pull request #154 from Bamdoliro/perf/#153

[개선] 자기소개서, 학교장 추천서 및 서약서 양식 변경
Bamdoliro · Oct 13, 2024 · 1e1ed60 · 1e1ed60
2 parents 807ad77 + 9748de7
commit 1e1ed60
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 184 deletions.
diff --git 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";

diff --git a/src/main/resources/templates/document.html b/src/main/resources/templates/document.html
@@ -73,8 +73,8 @@
     <tr>
         <th scope="row" class="ba" style="width:15%;">성명</th>
         <td class="ba" style="width:35%;" th:text="${form.applicant.name}"></td>
-        <th scope="row" class="ba" style="width:15%;">접수번호</th>
-        <td class="ba" style="width:35%;" th:text="${form.id}"></td>
+        <th scope="row" class="ba" style="width:15%;">수험번호</th>
+        <td class="ba" style="width:35%;" th:text="${form.getExaminationNumber()}"></td>
     </tr>
     <tr>
         <th scope="row" class="ba">출신중학교</th>

diff --git a/src/main/resources/templates/no-smoking.html b/src/main/resources/templates/no-smoking.html
diff --git a/src/main/resources/templates/recommendation.html b/src/main/resources/templates/recommendation.html
@@ -101,8 +101,8 @@
     <tr>
         <th scope="row" class="ba" style="width:15%;">성명</th>
         <td class="ba" style="width:35%;" th:text="${form.applicant.name}"></td>
-        <th scope="row" class="ba" style="width:15%;">접수번호</th>
-        <td class="ba" style="width:35%;" th:text="${form.id}"></td>
+        <th scope="row" class="ba" style="width:15%;">수험번호</th>
+        <td class="ba" style="width:35%;" th:text="${form.getExaminationNumber()}"></td>
     </tr>
     <tr>
         <th scope="row" class="ba">출신중학교</th>
@@ -119,9 +119,8 @@
                 </tr>
                 <tr>
                     <th scope="colgroup" class="ba" style="width: 30%">전형 유형</th>
-                    <th scope="col" class="ba" style="width: 23.3%">마이스터인재전형</th>
-                    <th scope="col" class="ba" style="width: 23.3%">사회통합전형</th>
-                    <th scope="col" class="ba" style="width: 23.3%">정원외</th>
+                    <th scope="col" class="ba" style="width: 35%">마이스터인재전형</th>
+                    <th scope="col" class="ba" style="width: 35%">사회통합전형</th>
                 </tr>
                 <tr>
                     <th scope="row" class="ba">
@@ -131,8 +130,6 @@
                         th:text="${form.education.school.isBusan() && form.type.isMeister() ? 'O' : null}"></td>
                     <td class="ba"
                         th:text="${form.education.school.isBusan() && form.type.isSocial() ? 'O' : null}"></td>
-                    <td class="ba"
-                        th:text="${form.education.school.isBusan() && form.type.isSupernumerary() ? 'O' : null}"></td>
                 </tr>
                 <tr>
                     <th scope="row" class="ba">
@@ -142,8 +139,6 @@
                         th:text="${!form.education.school.isBusan() && form.type.isMeister() ? 'O' : null}"></td>
                     <td class="ba"
                         th:text="${!form.education.school.isBusan() && form.type.isSocial() ? 'O' : null}"></td>
-                    <td class="ba"
-                        th:text="${!form.education.school.isBusan() && form.type.isSupernumerary() ? 'O' : null}"></td>
                 </tr>
             </table>
             <div style="height: 72px;"></div>

diff --git a/src/main/resources/templates/written-oath.html b/src/main/resources/templates/written-oath.html
@@ -110,8 +110,8 @@
     <tr>
         <th scope="row" class="ba" style="width:15%;">성명</th>
         <td class="ba" style="width:35%;" th:text="${form.applicant.name}"></td>
-        <th scope="row" class="ba" style="width:15%;">접수번호</th>
-        <td class="ba" style="width:35%;" th:text="${form.id}">1000</td>
+        <th scope="row" class="ba" style="width:15%;">수험번호</th>
+        <td class="ba" style="width:35%;" th:text="${form.getExaminationNumber()}">1000</td>
     </tr>
     <tr>
         <th scope="row" class="ba">출신중학교</th>