통역인현황 요청사항 반영.

- 자격증 삭제.
 - 교육이수여부, 이수일 항목 추가.
 - 목록 테이블 수정.

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<>();

src/main/resources/mybatisMapper/TranslatorMapper.xml

@@ -51,6 +51,7 @@
           tr_cft,
           h.item_value  as tr_visa,
           dml_yn,
+          info_share_chk,
           apt_dt,
           tr_phone
     from translator_info a

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");
   }
 });
 

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>

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">
+              <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>