From 4c814eee658969586213543290d564f48609ad9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 11 Sep 2023 10:14:26 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EC=97=AD=EC=9D=B8=ED=98=84=ED=99=A9?=
 =?UTF-8?q?=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81.?=
 =?UTF-8?q?=20=20-=20=EC=9E=90=EA=B2=A9=EC=A6=9D=20=EC=82=AD=EC=A0=9C.=20?=
 =?UTF-8?q?=20-=20=EA=B5=90=EC=9C=A1=EC=9D=B4=EC=88=98=EC=97=AC=EB=B6=80,?=
 =?UTF-8?q?=20=EC=9D=B4=EC=88=98=EC=9D=BC=20=ED=95=AD=EB=AA=A9=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80.=20=20-=20=EB=AA=A9=EB=A1=9D=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/translator/model/Translator.java     |  5 ++
 .../mybatisMapper/TranslatorMapper.xml        | 49 ++++++++++---------
 .../static/js/translator/translator.js        |  6 +--
 .../templates/translator/translator.html      |  6 +--
 .../translator/translatorEditModal.html       | 44 ++++++++++-------
 5 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java
index 8a961945..204da148 100644
--- a/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java
+++ b/src/main/java/com/dbnt/faisp/main/translator/model/Translator.java
@@ -84,6 +84,11 @@ public class Translator extends BaseModel implements Serializable{
   private String infoShareChk;
   @Column(name = "status")
   private String status;
+  @Column(name = "edu_chk")
+  private String eduChk;
+  @Column(name = "edu_date")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate eduDate;
 
   @Transient
   private List<TranslatorFile> translatorFileList = new ArrayList<>();
diff --git a/src/main/resources/mybatisMapper/TranslatorMapper.xml b/src/main/resources/mybatisMapper/TranslatorMapper.xml
index 5b1221e6..eeb4ca89 100644
--- a/src/main/resources/mybatisMapper/TranslatorMapper.xml
+++ b/src/main/resources/mybatisMapper/TranslatorMapper.xml
@@ -39,31 +39,32 @@
   </sql>
   <select id="selectTranslatorList" resultType="Translator" parameterType="Translator">
     select a.translator_key,
-    version_no,
-    c.item_value  as ogdp1,
-    d.item_value  as tr_lang,
-    tr_career,
-    tr_name,
-    e.item_value  as tr_sex,
-    tr_age,
-    f.item_value  as tr_nny,
-    g.item_value  as tr_edu,
-    tr_cft,
-    h.item_value  as tr_visa,
-    dml_yn,
-    apt_dt,
-    tr_phone
+          version_no,
+          c.item_value  as ogdp1,
+          d.item_value  as tr_lang,
+          tr_career,
+          tr_name,
+          e.item_value  as tr_sex,
+          tr_age,
+          f.item_value  as tr_nny,
+          g.item_value  as tr_edu,
+          tr_cft,
+          h.item_value  as tr_visa,
+          dml_yn,
+          info_share_chk,
+          apt_dt,
+          tr_phone
     from translator_info a
-    inner join (select translator_key, max(version_no) as lastVer
-    from translator_info
-    group by translator_key) b
-    on a.translator_key =b.translator_key and a.version_no = b.lastVer
-    left outer join code_mgt c on a.ogdp1 = c.item_cd
-    left outer join code_mgt d on a.tr_lang = d.item_cd
-    left outer join code_mgt e on a.tr_sex = e.item_cd
-    left outer join code_mgt f on a.tr_nny = f.item_cd
-    left outer join code_mgt g on a.tr_edu = g.item_cd
-    left outer join code_mgt h on a.tr_visa = h.item_cd
+        inner join (select translator_key, max(version_no) as lastVer
+                    from translator_info
+                    group by translator_key) b
+            on a.translator_key =b.translator_key and a.version_no = b.lastVer
+        left outer join code_mgt c on a.ogdp1 = c.item_cd
+        left outer join code_mgt d on a.tr_lang = d.item_cd
+        left outer join code_mgt e on a.tr_sex = e.item_cd
+        left outer join code_mgt f on a.tr_nny = f.item_cd
+        left outer join code_mgt g on a.tr_edu = g.item_cd
+        left outer join code_mgt h on a.tr_visa = h.item_cd
     <include refid="selectTranslatorListWhere"></include>
     order by translator_key desc
     limit #{rowCnt} offset #{firstIndex}
diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js
index 1dc431b4..0c9a328f 100644
--- a/src/main/resources/static/js/translator/translator.js
+++ b/src/main/resources/static/js/translator/translator.js
@@ -43,7 +43,7 @@ function getTranslatorEditModal(translatorKey, versionNo){
         language: "ko",
         autoclose: true
       });
-      $("#viewAptDt").datepicker({
+      $(".dateSelector").datepicker({
         format: "yyyy-mm-dd",
         language: "ko",
         autoclose: true
@@ -122,11 +122,11 @@ $(document).on('click', '#approvalTab', function (){
 
 $(document).on('change', '#eTrNny', function (){
   if($(this).val() === "NNY001"){
-    $("#eTrVisa").attr("disabled", "disabled");
+    $("#eTrVisa").val("").attr("disabled", "disabled");
     $("#enaturalization").removeAttr("disabled");
   }else{
     $("#eTrVisa").removeAttr("disabled");
-    $("#enaturalization").attr("disabled", "disabled");
+    $("#enaturalization").val("").attr("disabled", "disabled");
   }
 });
 
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html
index 2b3918dc..f88f0fb5 100644
--- a/src/main/resources/templates/translator/translator.html
+++ b/src/main/resources/templates/translator/translator.html
@@ -108,7 +108,7 @@
                   <input type="hidden" id="selectedVerNo">
                   <table class="table table-sm table-hover table-bordered">
                     <thead>
-                    <tr class="table-secondary">
+                    <tr class="table-secondary align-middle">
                       <th>순번</th>
                       <th>관서</th>
                       <th>언어</th>
@@ -118,8 +118,8 @@
                       <th>나이</th>
                       <th>국적</th>
                       <th>학력</th>
-                      <th>자격증</th>
                       <th>비자</th>
+                      <th>개인정보<br>동의여부</th>
                       <th>해촉</th>
                       <th>위촉일</th>
                       <th>연락처</th>
@@ -138,8 +138,8 @@
                       <td th:text="${trInfo.trAge}"></td>
                       <td th:text="${trInfo.trNny}"></td>
                       <td th:text="${trInfo.trEdu}"></td>
-                      <td th:text="${trInfo.trCft}"></td>
                       <td th:text="${trInfo.trVisa}"></td>
+                      <td th:text="${trInfo.infoShareChk eq 'T'?'●':''}"></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 8c21d98a..98d27a30 100644
--- a/src/main/resources/templates/translator/translatorEditModal.html
+++ b/src/main/resources/templates/translator/translatorEditModal.html
@@ -87,6 +87,10 @@
               <div class="col-sm-3">
                 <input type="text" class="form-control" id="eTrPhone" name="trPhone" th:value="${trInfo.trPhone}">
               </div>
+              <label for="eTrAge" class="col-sm-1 col-form-label-sm text-center">나이</label>
+              <div class="col-sm-3">
+                <input type="text" class="form-control" id="eTrAge" name="trAge" th:value="${trInfo.trAge}">
+              </div>
             </div>
             <div class="row mb-1">
               <label for="eTrNny" class="col-sm-1 col-form-label-sm text-center">국적</label>
@@ -98,20 +102,6 @@
                   </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'}">
-                  <option value="">선택</option>
-                  <option value="O" th:selected="${trInfo.naturalization eq 'O'}">O</option>
-                  <option value="X" th:selected="${trInfo.naturalization eq 'X'}">X</option>
-                </select>
-              </div>
-            </div>
-            <div class="row mb-1">
-              <label for="eTrAge" class="col-sm-1 col-form-label-sm text-center">나이</label>
-              <div class="col-sm-3">
-                <input type="text" class="form-control" id="eTrAge" name="trAge" th:value="${trInfo.trAge}">
-              </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">
@@ -121,9 +111,13 @@
                   </th:block>
                 </select>
               </div>
-              <label for="eTrCft" class="col-sm-1 col-form-label-sm text-center">자격증</label>
+              <label for="enaturalization" class="col-sm-1 col-form-label-sm text-center">귀화</label>
               <div class="col-sm-3">
-                <input type="text" class="form-control" id="eTrCft" name="trCft" th:value="${trInfo.trCft}">
+                <select class="form-select" id="enaturalization" name="naturalization" th:disabled="${trInfo.trNny ne 'NNY001'}">
+                  <option value="">선택</option>
+                  <option value="O" th:selected="${trInfo.naturalization eq 'O'}">O</option>
+                  <option value="X" th:selected="${trInfo.naturalization eq 'X'}">X</option>
+                </select>
               </div>
             </div>
             <div class="row mb-1">
@@ -138,7 +132,7 @@
               </div>
               <label for="viewAptDt" class="col-sm-1 col-form-label-sm text-center">위촉일</label>
               <div class="col-sm-3">
-                <input type="text" class="form-control" id="viewAptDt" name="aptDt" th:value="${trInfo.aptDt}" readonly>
+                <input type="text" class="form-control dateSelector" id="viewAptDt" name="aptDt" th:value="${trInfo.aptDt}" readonly>
               </div>
               <label for="eDmlYn" class="col-sm-1 col-form-label-sm text-center">해촉</label>
               <div class="col-sm-3">
@@ -168,6 +162,16 @@
                 </th:block>
               </th:block>
             </div>
+            <div class="mb-2 row">
+              <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>
+              <div class="col-sm-2">
+                <input type="text" class="form-control dateSelector" name="eduDate" th:value="${trInfo.eduDate}">
+              </div>
+            </div>
             <div class="mb-2 row">
               <label for="eRemark" class="col-sm-1 col-form-label-sm text-center">비고</label>
               <div class="col-sm-11">
@@ -175,8 +179,10 @@
               </div>
             </div>
             <div class="row justify-content-end">
-              <button type="button" class="btn btn-danger col-auto mx-1" id="trDeleteBtn" th:if="${accessAuth eq 'ACC003' or wrtUserSeq eq userSeq}">삭제</button>
-              <button type="button" class="btn btn-warning col-auto mx-1" id="updateBtn" th:if="${accessAuth eq 'ACC003' or wrtUserSeq eq userSeq}">수정</button>
+              <th:block th:if="${trInfo.translatorKey ne null}">
+                <button type="button" class="btn btn-danger col-auto mx-1" id="trDeleteBtn" th:if="${accessAuth eq 'ACC003' or wrtUserSeq eq userSeq}">삭제</button>
+                <button type="button" class="btn btn-warning col-auto mx-1" id="updateBtn" th:if="${accessAuth eq 'ACC003' or wrtUserSeq eq userSeq}">수정</button>
+              </th:block>
               <button type="button" class="btn btn-primary col-auto mx-1" id="saveBtn" th:if="${accessAuth ne 'ACC001' and trInfo.translatorKey eq null}">저장</button>
             </div>
           </div>