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 72de4b9e..10ee9a90 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 @@ -75,38 +75,40 @@ public class Translator extends BaseModel implements Serializable{ private String wrtNm; @Column(name = "wrt_dt") private LocalDateTime wrtDt; - - - + @Column(name = "naturalization") + private String naturalization; + + + @Transient private String excel; - -@Embeddable -@Data -@NoArgsConstructor -@AllArgsConstructor -public static class TranslatorId implements Serializable { - private Integer translatorKey; - - private Integer versionNo; -} -public Date getInt(String string) { - return null; -} + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TranslatorId implements Serializable { + private Integer translatorKey; -public Date getString(String string) { - return null; -} + private Integer versionNo; + } -@Override -public String toString() { - return "Translator [translatorKey=" + translatorKey + ", versionNo=" + versionNo + ", ogdp1=" + ogdp1 + ", trLang=" - + trLang + ", trCareer=" + trCareer + ", trName=" + trName + ", trSex=" + trSex + ", trPhone=" + trPhone - + ", trNny=" + trNny + ", trAge=" + trAge + ", trEdu=" + trEdu + ", trCft=" + trCft + ", trVisa=" + trVisa - + ", aptDt=" + aptDt + ", dmlYn=" + dmlYn + ", remark=" + remark + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt - + ", wrtOrgan=" + wrtOrgan + ", excel=" + excel + "]"; -} + public Date getInt(String string) { + return null; + } + + public Date getString(String string) { + return null; + } + + @Override + public String toString() { + return "Translator [translatorKey=" + translatorKey + ", versionNo=" + versionNo + ", ogdp1=" + ogdp1 + ", trLang=" + + trLang + ", trCareer=" + trCareer + ", trName=" + trName + ", trSex=" + trSex + ", trPhone=" + trPhone + + ", trNny=" + trNny + ", trAge=" + trAge + ", trEdu=" + trEdu + ", trCft=" + trCft + ", trVisa=" + trVisa + + ", aptDt=" + aptDt + ", dmlYn=" + dmlYn + ", remark=" + remark + ", wrtNm=" + wrtNm + ", wrtDt=" + wrtDt + + ", wrtOrgan=" + wrtOrgan + ", excel=" + excel + "]"; + } diff --git a/src/main/resources/static/js/fipTarget/partInfo.js b/src/main/resources/static/js/fipTarget/partInfo.js index bd9e9c4f..0660dfa0 100644 --- a/src/main/resources/static/js/fipTarget/partInfo.js +++ b/src/main/resources/static/js/fipTarget/partInfo.js @@ -28,6 +28,26 @@ $(document).on('change', '#rentType', function (){ } }); +$(document).on('change', '#plWorkType', function (){ + const plPeopleCnt = $("#plPeopleCnt"); + if(this.value === 'PIS001'){ + plPeopleCnt.removeAttr("disabled"); + }else{ + plPeopleCnt.val(''); + plPeopleCnt.attr("disabled", "disabled"); + } +}); + +$(document).on('change', '#mpWorkType', function (){ + const mpPeopleCnt = $("#mpPeopleCnt"); + if(this.value === 'PIS001'){ + mpPeopleCnt.removeAttr("disabled"); + }else{ + mpPeopleCnt.val(''); + mpPeopleCnt.attr("disabled", "disabled"); + } +}); + $(document).on('change', '#utilityType', function (){ const utilityPrice = $("#utilityPrice"); if(this.value === 'Y'){ @@ -116,15 +136,15 @@ $(document).on('click', '#savePartInfo', function (){ $('#terminalNm').focus(); return false; } - if($('#mpWorkType').val() != ''){ - if($('#mpPeopleCnt').val() == ''){ + if($('#mpWorkType').val() === 'PIS001'){ + if($('#mpPeopleCnt').val() === ''){ alert('해경 인원수를 입력해주세요'); $('#mpPeopleCnt').focus(); return false; } } - if($('#plWorkType').val() != ''){ - if($('#plPeopleCnt').val() == ''){ + if($('#plWorkType').val() === 'PIS001'){ + if($('#plPeopleCnt').val() === ''){ alert('육경 인원수를 입력해주세요'); $('#plPeopleCnt').focus(); return false; diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js index 0f9e307b..10213a68 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -226,7 +226,7 @@ $(document).on('click', '#fileDownBtn', function (){ }) $(document).on('click', '#printBtn', function (){ - window.open("http://localhost:8080/affair/print?affairKey="+$(this).attr("data-affairkey")); + window.open(location.origin+"/affair/print?affairKey="+$(this).attr("data-affairkey")); }) function getAffairViewModal(affairKey){ diff --git a/src/main/resources/static/js/police/edu.js b/src/main/resources/static/js/police/edu.js index 2ad93d6c..9a1ef062 100644 --- a/src/main/resources/static/js/police/edu.js +++ b/src/main/resources/static/js/police/edu.js @@ -2,17 +2,17 @@ let eduList=[]; let selectedIdx=0; $(document).on('click', '.policeTr', function (event){ - const target = event.target; - if(!(target.className === "checkBoxTd" ||$(target).parents("td").length>0)){ - const userSeq = (Number($(this).find(".userSeq").val())); - showModal(userSeq); - } + const target = event.target; + if(!(target.className === "checkBoxTd" ||$(target).parents("td").length>0)){ + const userSeq = (Number($(this).find(".userSeq").val())); + showModal(userSeq); + } }); function showModal(userSeq){ - $.ajax({ + $.ajax({ url: '/police/eduEditModal', - data: {userSeq: userSeq}, + data: {userSeq: userSeq}, type: 'GET', dataType:"html", success: function(html){ @@ -31,47 +31,47 @@ function showModal(userSeq){ } $(document).on('click', '#previousTab', function (){ - const userStatus = $(this).data('userstatus'); - location.href = "/police/educationMgt?userStatus="+userStatus; + const userStatus = $(this).data('userstatus'); + location.href = "/police/educationMgt?userStatus="+userStatus; }) $(document).on('click', '#presentTab', function (){ - const userStatus = $(this).data('userstatus'); - location.href = "/police/educationMgt?userStatus="+userStatus; + const userStatus = $(this).data('userstatus'); + location.href = "/police/educationMgt?userStatus="+userStatus; }) $(document).on('click', '#notPoliceTab', function (){ - const userStatus = $(this).data('userstatus'); - location.href = "/police/educationMgt?userStatus="+userStatus; + const userStatus = $(this).data('userstatus'); + location.href = "/police/educationMgt?userStatus="+userStatus; }) $(document).on('click', '#eduAddBtn', function (){ - const userSeq = (Number($(this).data('userseq'))); + const userSeq = (Number($(this).data('userseq'))); $('#insertEdu').append( - '
'+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - '
'+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ - '
' + '
'+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + '
'+ + '
'+ + '
'+ + ''+ + '
'+ + '
'+ + '
' ) $(".eduSdate").datepicker({ format: "yyyy-mm-dd", @@ -87,9 +87,9 @@ $(document).on('click', '#eduAddBtn', function (){ }) $(document).on('click', '.rowDeleteBtn', function (){ - selectedIdx = $(this).parents("#eduDiv").index()-1; - eduList.splice(selectedIdx,1); - $(this).parents('#eduDiv').remove(); + selectedIdx = $(this).parents("#eduDiv").index()-1; + eduList.splice(selectedIdx,1); + $(this).parents('#eduDiv').remove(); }) $(document).on('change', '.eduInput', function (){ @@ -112,56 +112,56 @@ $(document).on('change', '.eduInput', function (){ }) $(document).on('click', '#saveBtn', function (){ - if(eduList.length < 1){ - alert("새로 입력된 교육정보가 없습니다."); - return false; - } - if(confirm("저장하시겠습니까?")){ - contentFade("in"); - $.ajax({ - type : 'POST', - data : JSON.stringify(eduList), - url : "/police/saveEdu", - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - contentFade("out"); - alert("교육등록이 완료되었습니다."); - showModal(data); - eduList.length = 0; - }, - error : function(xhr, status) { - contentFade("out"); - alert("교육등록을 실패하였습니다"); - } - }) - } + if(eduList.length < 1){ + alert("새로 입력된 교육정보가 없습니다."); + return false; + } + if(confirm("저장하시겠습니까?")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify(eduList), + url : "/police/saveEdu", + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + contentFade("out"); + alert("교육등록이 완료되었습니다."); + showModal(data); + eduList.length = 0; + }, + error : function(xhr, status) { + contentFade("out"); + alert("교육등록을 실패하였습니다"); + } + }) + } }) $(document).on('click', '#deleteBtn', function (){ - const eduSeq = (Number($(this).data('eduseq'))); - const userSeq = (Number($(this).data('userseq'))); - if(confirm("삭제하시겠습니까?")){ - $.ajax({ - type : 'POST', - url : "/police/deleteEdu", - data : JSON.stringify({eduSeq:eduSeq, - userSeq:userSeq}), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - alert("삭제 처리되었습니다."); - showModal(data); - }, - error : function(xhr, status) { - alert("삭제 처리에 실패하였습니다"); - } - }) - } + const eduSeq = (Number($(this).data('eduseq'))); + const userSeq = (Number($(this).data('userseq'))); + if(confirm("삭제하시겠습니까?")){ + $.ajax({ + type : 'POST', + url : "/police/deleteEdu", + data : JSON.stringify({eduSeq:eduSeq, + userSeq:userSeq}), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("삭제 처리되었습니다."); + showModal(data); + }, + error : function(xhr, status) { + alert("삭제 처리에 실패하였습니다"); + } + }) + } }) diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index b6a3fe5c..fda7b958 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -8,162 +8,162 @@ $(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; - const dropdown = $(".dropdown-menu.show") - if(dropdown.length>0){ - dropdown[0].style.inset = "0px auto auto "+(x-event.currentTarget.getBoundingClientRect().x)+"px"; - } + $("#selectedKey").val($(this).find(".trKey").val()) + $("#selectedVerNo").val($(this).find(".verNo").val()) + const x = event.clientX; + const y = event.clientY; + const dropdown = $(".dropdown-menu.show") + if(dropdown.length>0){ + dropdown[0].style.inset = "0px auto auto "+(x-event.currentTarget.getBoundingClientRect().x)+"px"; + } }) $(document).on('click', '.translatorInfo', function (){ - document.getElementById('accessTab').classList.add('active'); - document.getElementById('approvalTab').classList.remove('active'); - const trKey = Number($("#selectedKey").val()); - const verNo = Number($("#selectedVerNo").val()); - const url = '/translator/translatorEditModal'; - revisionHistory(trKey,verNo,url); - var html=""; - html += ''; - html += ''; - $("#KeyValue").empty().html(html) + document.getElementById('accessTab').classList.add('active'); + document.getElementById('approvalTab').classList.remove('active'); + const trKey = Number($("#selectedKey").val()); + const verNo = Number($("#selectedVerNo").val()); + const url = '/translator/translatorEditModal'; + revisionHistory(trKey,verNo,url); + var html=""; + html += ''; + html += ''; + $("#KeyValue").empty().html(html) }) $(document).on('click', '#trView', function (){ - document.getElementById('accessTab').classList.add('active'); - document.getElementById('approvalTab').classList.remove('active'); - const trKey = (Number($(this).find(".trKey").val())); - const verNo = (Number($(this).find(".verNo").val())); - const url = '/translator/translatorEditModal'; - revisionHistory(trKey,verNo,url); - var html=""; - html += ''; - html += ''; - $("#KeyValue").empty().html(html); + document.getElementById('accessTab').classList.add('active'); + document.getElementById('approvalTab').classList.remove('active'); + const trKey = (Number($(this).find(".trKey").val())); + const verNo = (Number($(this).find(".verNo").val())); + const url = '/translator/translatorEditModal'; + revisionHistory(trKey,verNo,url); + var html=""; + html += ''; + html += ''; + $("#KeyValue").empty().html(html); }) $(document).on('click', '#updateBtn', function (){ - if($('#eOgdp1').val() == ''){ - alert("관서를 선택해주세요."); - $('#eOgdp1').focus(); - return false; - } - - if($('#eTrLang').val() == ''){ - alert("언어를 선택해주세요."); - $('#eTrLang').focus(); - return false; - } - - if($('#eTrEname').val() == ''){ - alert("성명을 입력해주세요."); - $('#eTrEname').focus(); - return false; - } - - if(confirm("수정하시겠습니까?")){ - document.getElementById("eOgdp1").disabled = false; - const url = '/translator/translatorEditModal'; - contentFade("in"); - const formData = new FormData($("#trInfoUpdate")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : "/translator/updateTranslatorInfo", - processData: false, - contentType: false, - success : function(data) { - alert("수정되었습니다."); - contentFade("out"); - revisionHistory(data.translatorKey,data.versionNo,url); - }, - error : function(xhr, status) { - alert("수정에 실패하였습니다."); - contentFade("out"); - } - }) + if($('#eOgdp1').val() == ''){ + alert("관서를 선택해주세요."); + $('#eOgdp1').focus(); + return false; + } + + if($('#eTrLang').val() == ''){ + alert("언어를 선택해주세요."); + $('#eTrLang').focus(); + return false; + } + + if($('#eTrEname').val() == ''){ + alert("성명을 입력해주세요."); + $('#eTrEname').focus(); + return false; + } + + if(confirm("수정하시겠습니까?")){ + document.getElementById("eOgdp1").disabled = false; + const url = '/translator/translatorEditModal'; + contentFade("in"); + const formData = new FormData($("#trInfoUpdate")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/translator/updateTranslatorInfo", + processData: false, + contentType: false, + success : function(data) { + alert("수정되었습니다."); + contentFade("out"); + revisionHistory(data.translatorKey,data.versionNo,url); + }, + error : function(xhr, status) { + alert("수정에 실패하였습니다."); + contentFade("out"); + } + }) } }) $(document).on('click', '#saveBtn', function (){ - if($('#ogdp1').val() == ''){ - alert("관서를 선택해주세요."); - $('#ogdp1').focus(); - return false; - } - - if($('#lang').val() == ''){ - alert("언어를 선택해주세요."); - $('#lang').focus(); - return false; - } - - if($('#trName').val() == ''){ - alert("성명을 입력해주세요."); - $('#trName').focus(); - return false; - } - - if($('#dmlYn').val() == ''){ - alert("해촉여부를 선택해주세요."); - $('#dmlYn').focus(); - return false; - } - - if(confirm("저장하시겠습니까?")){ - document.getElementById("ogdp1").disabled = false; - contentFade("in"); - const formData = new FormData($("#translatorInsert")[0]); - $.ajax({ - type : 'POST', - data : formData, - url : "/translator/insertTranslatorInfo", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다.") - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) - } + if($('#ogdp1').val() == ''){ + alert("관서를 선택해주세요."); + $('#ogdp1').focus(); + return false; + } + + if($('#lang').val() == ''){ + alert("언어를 선택해주세요."); + $('#lang').focus(); + return false; + } + + if($('#trName').val() == ''){ + alert("성명을 입력해주세요."); + $('#trName').focus(); + return false; + } + + if($('#dmlYn').val() == ''){ + alert("해촉여부를 선택해주세요."); + $('#dmlYn').focus(); + return false; + } + + if(confirm("저장하시겠습니까?")){ + document.getElementById("ogdp1").disabled = false; + contentFade("in"); + const formData = new FormData($("#translatorInsert")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/translator/insertTranslatorInfo", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다.") + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + } }) $(document).on('click', '.historyInfoTr', function (){ - $(this).find('.hisChk').prop('checked',true) - if($(this).find('.hisChk').prop('checked')){ - $('.hisChk').prop('checked',false); - $(this).find('.hisChk').prop('checked',true) - } + $(this).find('.hisChk').prop('checked',true) + if($(this).find('.hisChk').prop('checked')){ + $('.hisChk').prop('checked',false); + $(this).find('.hisChk').prop('checked',true) + } $.ajax({ url: '/translator/HistoryView', data: { - translatorKey: Number($(this).find(".trKey").val()), - versionNo : Number($(this).find(".verNo").val()) - }, + translatorKey: Number($(this).find(".trKey").val()), + versionNo : Number($(this).find(".verNo").val()) + }, type: 'GET', dataType:"json", success: function(data){ - $("#ogdp1V").val(data.ogdp1); - $("#trLangV").val(data.trLang); - $("#trCareerV").val(data.trCareer); - $("#trNameV").val(data.trName); - $("#trSexV").val(data.trSex); - $("#trPhoneV").val(data.trPhone); - $("#trNnyV").val(data.trNny); - $("#trAgeV").val(data.trAge); - $("#trVisaV").val(data.trVisa); - $("#trEduV").val(data.trEdu); - $("#trCftV").val(data.trCft); - $("#aptDtV").val(data.aptDt); - $("#dmlYnV").val(data.dmlYn); - $("#remarkV").val(data.remark); + $("#ogdp1V").val(data.ogdp1); + $("#trLangV").val(data.trLang); + $("#trCareerV").val(data.trCareer); + $("#trNameV").val(data.trName); + $("#trSexV").val(data.trSex); + $("#trPhoneV").val(data.trPhone); + $("#trNnyV").val(data.trNny); + $("#trAgeV").val(data.trAge); + $("#trVisaV").val(data.trVisa); + $("#trEduV").val(data.trEdu); + $("#trCftV").val(data.trCft); + $("#aptDtV").val(data.aptDt); + $("#dmlYnV").val(data.dmlYn); + $("#remarkV").val(data.remark); }, error:function(e){ ajaxErrorAction(e); @@ -184,30 +184,30 @@ $(document).ready( function() { }); $(document).on('click', '#approvalTab', function (){ - const trKey = (Number($('.tapTrKey').val())); - const verNo = (Number($('.tapVerNo').val())); - const url = '/translator/revisionHistory'; - revisionHistory(trKey,verNo,url); - document.getElementById('accessTab').classList.remove('active'); - document.getElementById('approvalTab').classList.add('active'); + const trKey = (Number($('.tapTrKey').val())); + const verNo = (Number($('.tapVerNo').val())); + const url = '/translator/revisionHistory'; + revisionHistory(trKey,verNo,url); + document.getElementById('accessTab').classList.remove('active'); + document.getElementById('approvalTab').classList.add('active'); }) $(document).on('click', '#accessTab', function (){ - const trKey = (Number($('.tapTrKey').val())); - const verNo = (Number($('.tapVerNo').val())); - const url = '/translator/translatorEditModal'; - revisionHistory(trKey,verNo,url); - document.getElementById('approvalTab').classList.remove('active'); - document.getElementById('accessTab').classList.add('active'); + const trKey = (Number($('.tapTrKey').val())); + const verNo = (Number($('.tapVerNo').val())); + const url = '/translator/translatorEditModal'; + revisionHistory(trKey,verNo,url); + document.getElementById('approvalTab').classList.remove('active'); + document.getElementById('accessTab').classList.add('active'); }) function revisionHistory(trKey,verNo,url){ - $.ajax({ + $.ajax({ url: url, data: { - translatorKey: trKey, - versionNo : verNo - }, + translatorKey: trKey, + versionNo : verNo + }, type: 'GET', dataType:"html", success: function(html){ @@ -226,45 +226,47 @@ function revisionHistory(trKey,verNo,url){ } $(document).on('change', '#trNny', function (){ - if($(this).val() == "NNY001"){ - $("#trVisa").attr("disabled",true); - }else{ - $("#trVisa").removeAttr("disabled"); - } + if($(this).val() === "NNY001"){ + $("#trVisa").attr("disabled", "disabled"); + $("#naturalization").removeAttr("disabled"); + }else{ + $("#trVisa").removeAttr("disabled"); + $("#naturalization").attr("disabled", "disabled"); + } }); $(document).on('click', '#crrAddBtn', function (){ - const trKey = (Number($('#tcInsertKey').val())); + const trKey = (Number($('#tcInsertKey').val())); $('#insertCareer').append( - '
'+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - '
'+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ - '
' + '
'+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + '
'+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + '
'+ + ''+ + '
'+ + '
'+ + '
' ) $(".tcDt").datepicker({ format: "yyyy-mm-dd", @@ -275,9 +277,9 @@ $(document).on('click', '#crrAddBtn', function (){ }) $(document).on('click', '.rowDeleteBtn', function (){ - selectedIdx = $(this).parents("#crrDiv").index()-1; - trCarrerList.splice(selectedIdx,1); - $(this).parents('#crrDiv').remove(); + selectedIdx = $(this).parents("#crrDiv").index()-1; + trCarrerList.splice(selectedIdx,1); + $(this).parents('#crrDiv').remove(); }) $(document).on('change', '.crrInput', function (){ @@ -300,16 +302,16 @@ $(document).on('change', '.crrInput', function (){ }) $(document).on('click', '.careerInfo', function (){ - const trKey = Number($("#selectedKey").val()); - showCareer(trKey); + const trKey = Number($("#selectedKey").val()); + showCareer(trKey); }) -function showCareer(trKey){ - $.ajax({ +function showCareer(trKey){ + $.ajax({ url: '/translator/careerView', data: { - translatorKey: trKey, - }, + translatorKey: trKey, + }, type: 'GET', dataType:"html", success: function(html){ @@ -319,17 +321,17 @@ function showCareer(trKey){ error:function(e){ ajaxErrorAction(e); } - }); + }); } $(document).on('click', '#crrInsertBtn', function (){ - const trKey = Number($("#tcmKey").val()); - $.ajax({ + const trKey = Number($("#tcmKey").val()); + $.ajax({ url: '/translator/careerInsertPage', data: { - translatorKey: trKey, - }, + translatorKey: trKey, + }, type: 'GET', dataType:"html", success: function(html){ @@ -343,101 +345,101 @@ $(document).on('click', '#crrInsertBtn', function (){ }) $(document).on('click', '#crrSaveBtn', function (){ - if(trCarrerList.length < 1){ - alert("새로 입력된 경력정보가 없습니다."); - return false; - } - if(confirm("저장하시겠습니까?")){ - contentFade("in"); - $.ajax({ - type : 'POST', - data : JSON.stringify(trCarrerList), - url : "/translator/insertTranslatorCareer", - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - contentFade("out"); - alert("이력등록이 완료되었습니다."); - showCareer(data); - trCarrerList.length = 0; - }, - error : function(xhr, status) { - contentFade("out"); - alert("이력등록을 실패하였습니다"); - } - }) - } + if(trCarrerList.length < 1){ + alert("새로 입력된 경력정보가 없습니다."); + return false; + } + if(confirm("저장하시겠습니까?")){ + contentFade("in"); + $.ajax({ + type : 'POST', + data : JSON.stringify(trCarrerList), + url : "/translator/insertTranslatorCareer", + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + contentFade("out"); + alert("이력등록이 완료되었습니다."); + showCareer(data); + trCarrerList.length = 0; + }, + error : function(xhr, status) { + contentFade("out"); + alert("이력등록을 실패하였습니다"); + } + }) + } }) function deleteCareerBtn(crrSeq,trKey){ - if(confirm("삭제하시겠습니까?")){ - $.ajax({ - type : 'POST', - url : "/translator/deleteCareer", - data : JSON.stringify({careerSeq:crrSeq, - translatorKey:trKey}), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - alert("삭제 처리되었습니다."); - showCareer(data); - }, - error : function(xhr, status) { - alert("삭제 처리에 실패하였습니다"); - } - }) - } + if(confirm("삭제하시겠습니까?")){ + $.ajax({ + type : 'POST', + url : "/translator/deleteCareer", + data : JSON.stringify({careerSeq:crrSeq, + translatorKey:trKey}), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("삭제 처리되었습니다."); + showCareer(data); + }, + error : function(xhr, status) { + alert("삭제 처리에 실패하였습니다"); + } + }) + } } $(document).on('click', '.btn-close', function (){ - location.reload(); + location.reload(); }) $(document).on('click', '#trDeleteBtn', function (){ - if(confirm("해임 하시겠습니까?")){ - contentFade("in"); - const trKey = Number($(".translatorKey").val()); - $.ajax({ - type : 'POST', - data : JSON.stringify(trKey), - url : "/translator/deleteTranslatorInfo", - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function() { - alert("해임되었습니다."); - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("해임을 실패하였습니다."); - contentFade("out"); - } - }) + if(confirm("해임 하시겠습니까?")){ + contentFade("in"); + const trKey = Number($(".translatorKey").val()); + $.ajax({ + type : 'POST', + data : JSON.stringify(trKey), + url : "/translator/deleteTranslatorInfo", + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function() { + alert("해임되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("해임을 실패하였습니다."); + contentFade("out"); + } + }) } }) $(document).on('click', '#goExcel', function (){ - if(confirm("엑셀로 다운로드 하시겠습니까?")){ - $('input[name=excel]').val('Y'); - $('#searchFm').submit(); - $('input[name=excel]').val(''); - }else{ - false; - } + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + $('input[name=excel]').val('Y'); + $('#searchFm').submit(); + $('input[name=excel]').val(''); + }else{ + false; + } }) $(document).on('click', '#excelDown', function (){ - if(confirm("엑셀로 다운로드 하시겠습니까?")){ - location.href='/translator/statisticsExcelDown'; - }else{ - false; - } + if(confirm("엑셀로 다운로드 하시겠습니까?")){ + location.href='/translator/statisticsExcelDown'; + }else{ + false; + } }) diff --git a/src/main/resources/templates/fipTarget/partInfoEditModal.html b/src/main/resources/templates/fipTarget/partInfoEditModal.html index d2f25f39..6c731db0 100644 --- a/src/main/resources/templates/fipTarget/partInfoEditModal.html +++ b/src/main/resources/templates/fipTarget/partInfoEditModal.html @@ -79,7 +79,7 @@
- +
@@ -109,7 +109,7 @@
- +
diff --git a/src/main/resources/templates/fipTarget/partInfoModifyModal.html b/src/main/resources/templates/fipTarget/partInfoModifyModal.html index 8b9ba681..390b6382 100644 --- a/src/main/resources/templates/fipTarget/partInfoModifyModal.html +++ b/src/main/resources/templates/fipTarget/partInfoModifyModal.html @@ -92,7 +92,7 @@
- +
@@ -122,7 +122,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index b8970a2a..1ec1d014 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -283,7 +283,7 @@
- +
diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index b4d0826c..20e7fbd0 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -262,6 +262,16 @@ + +
+ +
+ +
@@ -275,18 +285,18 @@
-
-
+
+
@@ -294,8 +304,6 @@
-
-
+
+
-
+
diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index ce3bb358..08d1d735 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -1,119 +1,129 @@ -
- - - - -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
-
- - -
-
+
+ + + + +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
\ No newline at end of file