fix:민간통역인 중간저장

src/main/java/com/dbnt/faisp/translator/TranslatorController.java

@@ -5,11 +5,14 @@ import com.dbnt.faisp.codeMgt.service.CodeMgtService;
 import com.dbnt.faisp.menuMgt.service.MenuMgtService;
 import com.dbnt.faisp.organMgt.service.OrganConfigService;
 import com.dbnt.faisp.translator.model.Translator;
+import com.dbnt.faisp.translator.model.TranslatorCrr;
 import com.dbnt.faisp.translator.service.TranslatorService;
 import com.dbnt.faisp.userInfo.service.UserInfoService;
 import com.dbnt.faisp.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -75,4 +78,12 @@ public class TranslatorController {
     return translatorSevice.HistoryView(translator);
   }
   
+  @GetMapping("/careerView")
+  public ModelAndView careerView(TranslatorCrr translatorCrr){
+    ModelAndView mav = new ModelAndView("translator/translatorCareerModal");
+    return mav;
+  }
+  
+  
+
 }

src/main/resources/static/js/translator/translator.js

@@ -1,7 +1,54 @@
 let trCarrerList=[];
 let selectedIdx=0;
 
-$(document).on('click', '.userInfoTr', function (){
+$(document).on('click', '.userInfoTr', function (event){
+	$("#selectedKey").val($(this).find(".trKey").val())
+	$("#selectedVerNo").val($(this).find(".verNo").val())
+	const x = event.clientX;
+	const y = event.clientY;
+	$(".dropdown-menu.show").attr('style','position: absolute; inset: 0px auto auto 0px; margin: 0px; transform: translate(4px, 100px);');
+})
+
+function traslatorInfo(trKey){
+	console.log(trKey);
+}
+
+$(document).on('click', '.translatorInfo', function (){
+	console.log($(this));
+	document.getElementById('accessTab').classList.add('active');
+	document.getElementById('approvalTab').classList.remove('active');
+	const trKey = Number($("#selectedKey").val());
+	const verNo = Number($("#selectedVerNo").val());
+	console.log(trKey);
+	console.log(verNo);
+	const url = '/translator/translatorEditModal';
+	revisionHistory(trKey,verNo,url);
+	var html="";
+	html += '<input type="hidden" class="tapTrKey" value="'+trKey+'">';
+	html += '<input type="hidden" class="tapVerNo" value="'+verNo+'">';
+	$("#KeyValue").empty().html(html)
+})
+
+$(document).on('click', '.careerInfo', function (){
+	const trKey = (Number($(this).parents("tr").find('.trKey').val()));
+	$.ajax({
+    url: '/translator/careerView',
+    data: {
+			translatorKey: trKey,
+			},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#careerView").empty().append(html)
+      $("#translatorCareerModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+})
+
+$(document).on('click', '#trView', function (){
 	document.getElementById('accessTab').classList.add('active');
 	document.getElementById('approvalTab').classList.remove('active');
 	const trKey = (Number($(this).find(".trKey").val()));
@@ -11,7 +58,7 @@ $(document).on('click', '.userInfoTr', function (){
 	var html="";
 	html += '<input type="hidden" class="tapTrKey" value="'+trKey+'">';
 	html += '<input type="hidden" class="tapVerNo" value="'+verNo+'">';
-	$("#KeyValue").empty().html(html)
+	$("#KeyValue").empty().html(html);
 })
 
 $(document).on('click', '#updateBtn', function (){
@@ -42,13 +89,20 @@ $(document).on('click', '#saveBtn', function (){
     if(confirm("저장하시겠습니까?")){
       contentFade("in");
       const formData = new FormData($("#translatorInsert")[0]);
-      var values = JSON.stringify(trCarrerList);
-      $('input[name=TranslatorCrr]').val(values);
+      for(const carrer of trCarrerList){
+		formData.append('contents', carrer.contents)
+		formData.append('hisGubun', carrer.hisGubun)
+		formData.append('remark', carrer.remark)
+		formData.append('tcDt', carrer.tcDt)	
+	  }
+      // var values = JSON.stringify(trCarrerList);
+      // $('input[name=TranslatorCrr]').val(values);
       $.ajax({
         type : 'POST',
         data : formData,
         url : "/translator/insertTranslatorInfo",
-        contentType: 'false',
+        processData: false,
+        contentType: false,
         success : function(result) {
           alert("저장되었습니다.")
           contentFade("out");

src/main/resources/templates/translator/translator.html

@@ -57,6 +57,8 @@
               <div class="card">
                 <div class="card-body">
                   <div class="row">
+                  <input type="hidden" id="selectedKey">
+                  <input type="hidden" id="selectedVerNo">
                     <table class="table table-striped">
                       <thead>
                       <tr>
@@ -77,12 +79,18 @@
                       </tr>
                       </thead>
                       <tbody>
-                      <tr class="userInfoTr" th:each="trInfo:${translatorList}">
+                      <tr class="userInfoTr" data-bs-toggle="dropdown" aria-expanded="false" th:each="trInfo:${translatorList}">
                       <th:block>
                       <input type="hidden" class="trKey" th:value="${trInfo.translatorKey}">
                       <input type="hidden" class="verNo" th:value="${trInfo.versionNo}">
                       </th:block>
-                       <td th:text="${trInfo.translatorKey}"></td>
+                       <td>
+                       	<p class="m-0" th:text="${trInfo.translatorKey}"></p>
+	                     <ul class="dropdown-menu">
+						   <li><a class="dropdown-item careerInfo" href="#">경력관리</a></li>
+						   <li><a class="dropdown-item translatorInfo" href="#">인적사항</a></li>
+						 </ul>
+					   </td>
                        <td th:text="${trInfo.ogdp1}"></td>
                        <td th:text="${trInfo.trLang}"></td>
                        <td th:text="${trInfo.trCareer}"></td>
@@ -272,7 +280,6 @@
     </div>  
 
 
-
   <div class="modal fade" id="translatorEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="authEditModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl modal-dialog-scrollable">
       <div class="modal-content" id="authEditModalContent">
@@ -281,7 +288,6 @@
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div id="KeyValue">
-
           </div>
         <div class="modal-body">
           <ul class="nav nav-tabs" id="userTab" role="tablist">
@@ -293,11 +299,27 @@
             </li>
           </ul>
           <div class="tab-content border border-top-0" id="configInfo">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
   
+  
+  <div class="modal fade" id="translatorCareerModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="authEditModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="authEditModalContent">
+        <div class="modal-header">
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <div class="tab-content border border-top-0" id="careerView">
           </div>
         </div>
       </div>
     </div>
   </div>
+
+
 </div>
 </html>

src/main/resources/templates/translator/translatorCareerModal.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+  <main class="pt-3">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <div class="row mx-0">
+      <div class="col-12 card">
+        <div class="card-body">
+          <div class="row justify-content-start">
+			<h6>통역인이름</h6>
+              <div class="card">
+                <div class="card-body">
+                  <div class="row">
+                  <h5>해양경찰청 이력</h5>
+                    <table class="table table-striped" id="categoryTable">
+                      <thead>
+                      <tr>
+                        <th>연번</th>
+                        <th>날짜</th>
+                        <th>내용</th>
+                        <th>비고</th>
+                      </tr>
+                      </thead>
+                      <tbody class="overflow-scroll">
+                      <tr class="historyInfoTr" >                    
+                      <td></td>
+                      <td></td>
+                      <td></td>
+                      <td></td>
+                      </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                  <div class="row">
+                  <h5>타기관 이력</h5>
+                    <table class="table table-striped" id="categoryTable">
+                      <thead>
+                      <tr>
+                        <th>연번</th>
+                        <th>날짜</th>
+                        <th>내용</th>
+                        <th>비고</th>
+                      </tr>
+                      </thead>
+                      <tbody class="overflow-scroll">
+                      <tr class="historyInfoTr" >                    
+                      <td></td>
+                      <td></td>
+                      <td></td>
+                      <td></td>
+                      </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+</html>