From 7881b16e363fc1c10f1a1ea1ee75040ec20ac232 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 14 Sep 2022 11:31:01 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EB=AF=BC=EA=B0=84=ED=86=B5=EC=97=AD?= =?UTF-8?q?=EC=9D=B8=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../translator/TranslatorController.java | 11 ++++ .../static/js/translator/translator.js | 64 +++++++++++++++++-- .../templates/translator/translator.html | 38 ++++++++--- .../translator/translatorCareerModal.html | 63 ++++++++++++++++++ 4 files changed, 163 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/templates/translator/translatorCareerModal.html 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 @@ - - - + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html new file mode 100644 index 00000000..6a5e1441 --- /dev/null +++ b/src/main/resources/templates/translator/translatorCareerModal.html @@ -0,0 +1,63 @@ + + +
+ + +
+
+
+
+
통역인이름
+
+
+
+
해양경찰청 이력
+
+ + + + + + + + + + + + + + + + +
연번날짜내용비고
+
+
+
타기관 이력
+ + + + + + + + + + + + + + + + + +
연번날짜내용비고
+
+
+
+ + + + + + + \ No newline at end of file