From 5f7f72cf450af4d35c76dce9a4ae4de790bcd8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Tue, 12 Sep 2023 10:07:09 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EC=97=AD=EC=9D=B8=20=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=B6=94=EA=B0=80=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisMapper/TranslatorMapper.xml        |  1 +
 .../templates/translator/translator.html      |  4 ++-
 .../translator/translatorEditModal.html       | 22 ++++++------
 .../translator/translatorHistory.html         | 36 +++++++++++--------
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml
index efcbac9a..c9ce4d85 100644
--- a/src/main/resources/mybatisMapper/TranslatorMapper.xml
+++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml
@@ -52,6 +52,7 @@
           h.item_value  as tr_visa,
           dml_yn,
           info_share_chk,
+          edu_chk,
           apt_dt,
           tr_phone
     from translator_info a
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html
index f88f0fb5..585f6c53 100644
--- a/src/main/resources/templates/translator/translator.html
+++ b/src/main/resources/templates/translator/translator.html
@@ -120,6 +120,7 @@
                       <th>학력</th>
                       <th>비자</th>
                       <th>개인정보<br>동의여부</th>
+                      <th>교육이수<br>여부</th>
                       <th>해촉</th>
                       <th>위촉일</th>
                       <th>연락처</th>
@@ -139,7 +140,8 @@
                       <td th:text="${trInfo.trNny}"></td>
                       <td th:text="${trInfo.trEdu}"></td>
                       <td th:text="${trInfo.trVisa}"></td>
-                      <td th:text="${trInfo.infoShareChk eq 'T'?'●':''}"></td>
+                      <td th:text="${trInfo.infoShareChk eq 'T'?'O':'X'}"></td>
+                      <td th:text="${trInfo.eduChk eq 'T'?'O':'X'}"></td>
                       <td th:text="${trInfo.dmlYn eq 'O'?'●':''}"></td>
                       <td th:text="${trInfo.aptDt}"></td>
                       <td th:text="${trInfo.trPhone}"></td>
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html
index 98d27a30..b6ffb41e 100644
--- a/src/main/resources/templates/translator/translatorEditModal.html
+++ b/src/main/resources/templates/translator/translatorEditModal.html
@@ -93,15 +93,6 @@
               </div>
             </div>
             <div class="row mb-1">
-              <label for="eTrNny" class="col-sm-1 col-form-label-sm text-center">국적</label>
-              <div class="col-sm-3">
-                <select class="form-select" id="eTrNny" name="trNny">
-                  <option value="">선택</option>
-                  <th:block th:each="code:${session.commonCode.get('NNY')}">
-                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq trInfo.trNny}"></option>
-                  </th:block>
-                </select>
-              </div>
               <label for="eTrEdu" class="col-sm-1 col-form-label-sm text-center">학력</label>
               <div class="col-sm-3">
                 <select class="form-select" id="eTrEdu" name="trEdu">
@@ -111,6 +102,15 @@
                   </th:block>
                 </select>
               </div>
+              <label for="eTrNny" class="col-sm-1 col-form-label-sm text-center">국적</label>
+              <div class="col-sm-3">
+                <select class="form-select" id="eTrNny" name="trNny">
+                  <option value="">선택</option>
+                  <th:block th:each="code:${session.commonCode.get('NNY')}">
+                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq trInfo.trNny}"></option>
+                  </th:block>
+                </select>
+              </div>
               <label for="enaturalization" class="col-sm-1 col-form-label-sm text-center">귀화</label>
               <div class="col-sm-3">
                 <select class="form-select" id="enaturalization" name="naturalization" th:disabled="${trInfo.trNny ne 'NNY001'}">
@@ -163,11 +163,11 @@
               </th:block>
             </div>
             <div class="mb-2 row">
-              <label for="eEduChk" class="col-sm-2 col-form-label-sm text-center">교육 이수 여부</label>
+              <label for="eEduChk" class="col-sm-2 col-form-label-sm text-center">교육이수 여부</label>
               <div class="col-sm-2">
                 <input type="checkbox" class="mt-2" id="eEduChk" name="eduChk" th:checked="${trInfo.eduChk eq 'T'}" value="T">
               </div>
-              <label for="eEduChk" class="col-sm-2 col-form-label-sm text-center">교육 이수 여부</label>
+              <label for="eEduChk" class="col-sm-2 col-form-label-sm text-center">교육이수일</label>
               <div class="col-sm-2">
                 <input type="text" class="form-control dateSelector" name="eduDate" th:value="${trInfo.eduDate}">
               </div>
diff --git a/src/main/resources/templates/translator/translatorHistory.html b/src/main/resources/templates/translator/translatorHistory.html
index 30e24185..4fdb9974 100644
--- a/src/main/resources/templates/translator/translatorHistory.html
+++ b/src/main/resources/templates/translator/translatorHistory.html
@@ -8,7 +8,11 @@
     </th:block>
   </label>
   <label class="col-sm-1 col-form-label-sm text-center">언어</label>
-  <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trLang}"></label>
+  <label class="col-sm-3 col-form-label-sm text-start">
+    <th:block th:each="code:${session.commonCode.get('LGG')}">
+      <th:block th:if="${code.itemCd eq trInfo.trLang}" th:text="${code.itemValue}"></th:block>
+    </th:block>
+  </label>
   <label class="col-sm-1 col-form-label-sm text-center">경력</label>
   <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trCareer}"></label>
 </div>
@@ -34,8 +38,16 @@
   </label>
   <label class="col-sm-1 col-form-label-sm text-center">연락처</label>
   <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trPhone}"></label>
+  <label class="col-sm-1 col-form-label-sm text-center">나이</label>
+  <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trAge}"></label>
 </div>
 <div class="row mb-1">
+  <label class="col-sm-1 col-form-label-sm text-center">학력</label>
+  <label class="col-sm-3 col-form-label-sm text-start">
+    <th:block th:each="code:${session.commonCode.get('EDU')}">
+      <th:block th:if="${code.itemCd eq trInfo.trEdu}" th:text="${code.itemValue}"></th:block>
+    </th:block>
+  </label>
   <label class="col-sm-1 col-form-label-sm text-center">국적</label>
   <label class="col-sm-3 col-form-label-sm text-start">
     <th:block th:each="code:${session.commonCode.get('NNY')}">
@@ -45,18 +57,6 @@
   <label class="col-sm-1 col-form-label-sm text-center">귀화</label>
   <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.naturalization}"></label>
 </div>
-<div class="row mb-1">
-  <label class="col-sm-1 col-form-label-sm text-center">나이</label>
-  <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trAge}"></label>
-  <label class="col-sm-1 col-form-label-sm text-center">학력</label>
-  <label class="col-sm-3 col-form-label-sm text-start">
-    <th:block th:each="code:${session.commonCode.get('EDU')}">
-      <th:block th:if="${code.itemCd eq trInfo.trEdu}" th:text="${code.itemValue}"></th:block>
-    </th:block>
-  </label>
-  <label class="col-sm-1 col-form-label-sm text-center">자격증</label>
-  <label class="col-sm-3 col-form-label-sm text-start" th:text="${trInfo.trCft}"></label>
-</div>
 <div class="row mb-1">
   <label class="col-sm-1 col-form-label-sm text-center">비자</label>
   <label class="col-sm-3 col-form-label-sm text-start">
@@ -71,8 +71,8 @@
 </div>
 <div class="row mb-1">
   <label class="col-sm-2 col-form-label-sm text-center">개인정보 동의 여부</label>
-  <label class="col-sm-2 col-form-label-sm text-start" th:text="${trInfo.infoShareChk eq 'T'?'O':'X'}"></label>
-  <label class="col-sm-1 col-form-label-sm text-center">동의서</label>
+  <label class="col-sm-1 col-form-label-sm text-start" th:text="${trInfo.infoShareChk eq 'T'?'O':'X'}"></label>
+  <label class="col-sm-2 col-form-label-sm text-center">동의서</label>
   <label class="col-sm-7 col-form-label-sm text-start">
     <th:block th:each="file:${trInfo.translatorFileList}">
       <th:block th:if="${file.fileSeq eq 2}">
@@ -82,6 +82,12 @@
     </th:block>
   </label>
 </div>
+<div class="row mb-1">
+  <label class="col-sm-2 col-form-label-sm text-center">교육이수 여부</label>
+  <label class="col-sm-1 col-form-label-sm text-start" th:text="${trInfo.infoShareChk eq 'T'?'O':'X'}"></label>
+  <label class="col-sm-2 col-form-label-sm text-center">교육이수일</label>
+  <label class="col-sm-7 col-form-label-sm text-start" th:text="${#temporals.format(trInfo.eduDate, 'yyyy-MM-dd HH:mm')}"></label>
+</div>
 <div class="row mb-1">
   <label class="col-sm-1 col-form-label-sm text-center">비고</label>
   <label class="col-sm-11 col-form-label-sm text-start" th:text="${trInfo.remark}"></label>