diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
index cba00566..f888db11 100644
--- a/src/main/java/com/dbnt/faisp/translator/TranslatorController.java
+++ b/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;
@@ -74,5 +77,13 @@ public class TranslatorController {
return translatorSevice.HistoryView(translator);
}
+
+ @GetMapping("/careerView")
+ public ModelAndView careerView(TranslatorCrr translatorCrr){
+ ModelAndView mav = new ModelAndView("translator/translatorCareerModal");
+ return mav;
+ }
+
+
}
diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js
index aede7600..401fa97e 100644
--- a/src/main/resources/static/js/translator/translator.js
+++ b/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 += '';
+ html += '';
+ $("#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 += '';
html += '';
- $("#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");
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html
index 0cd4d4e8..1c7d066d 100644
--- a/src/main/resources/templates/translator/translator.html
+++ b/src/main/resources/templates/translator/translator.html
@@ -57,6 +57,8 @@
+
+
@@ -77,12 +79,18 @@
-
+
-
- |
+
+
+
+
+ |
|
|
|
@@ -269,9 +277,8 @@
-
-
-
+
+
+
+
+
+
+