diff --git a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java index 06ba9d86..fa8b646f 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/main/translator/TranslatorController.java @@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; import java.io.IOException; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -70,14 +71,15 @@ public class TranslatorController { return mav; } - @PostMapping("/insertTranslatorInfo") - public String insertTranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { + @PostMapping("/saveTranslatorInfo") + public void saveTranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { + translator.setWrtUserSeq(loginUser.getUserSeq()); translator.setWrtNm(loginUser.getUserNm()); translator.setWrtOrgan(loginUser.getOgCd()); translator.setWrtPart(loginUser.getOfcCd()); translator.setWrtTitle(loginUser.getTitleCd()); translator.setWrtDt(LocalDateTime.now()); - return translatorSevice.insertTranslatorInfo(translator); + translatorSevice.saveTranslatorInfo(translator); } @GetMapping("/translatorEditModal") @@ -85,59 +87,47 @@ public class TranslatorController { ModelAndView mav = new ModelAndView("translator/translatorEditModal"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - mav.addObject("wrtUserSeq", translatorSevice.selectTrFristUserSeq(translator.getTranslatorKey())); + mav.addObject("userSeq", loginUser.getUserSeq()); - mav.addObject("trInfo", translatorSevice.selectTranslatorView(translator)); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("accessAuth", accessAuth); + if(translator.getTranslatorKey() != null){ + List infoList = translatorSevice.selectHistoryList(translator.getTranslatorKey()); + mav.addObject("wrtUserSeq", infoList.get(infoList.size()-1).getWrtUserSeq()); + mav.addObject("trInfo", infoList.get(0)); + mav.addObject("historyList", infoList); + List careerList = translatorSevice.selectCareerList(translator.getTranslatorKey()); + List kcgCareerList = new ArrayList<>(); + List otherCareerList = new ArrayList<>(); + for(TranslatorCrr career: careerList){ + if(career.getHisGubun().equals("Y")){ + kcgCareerList.add(career); + }else{ + otherCareerList.add(career); + } + } + mav.addObject("kcgCareerList", kcgCareerList); + mav.addObject("otherCareerList", otherCareerList); + }else{ + mav.addObject("wrtUserSeq", null); + mav.addObject("trInfo", new Translator()); + mav.addObject("historyList", null); + mav.addObject("kcgCareerList", null); + mav.addObject("otherCareerList", null); + } return mav; } - - @PostMapping("/updateTranslatorInfo") - public Translator updatetranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { - translator.setWrtNm(loginUser.getUserNm()); - translator.setWrtOrgan(loginUser.getOgCd()); - translator.setWrtPart(loginUser.getOfcCd()); - translator.setWrtTitle(loginUser.getTitleCd()); - translator.setWrtDt(LocalDateTime.now()); - Translator result = translatorSevice.updatetranslatorInfo(translator); - return result; - } - - @GetMapping("/revisionHistory") - public ModelAndView revisionHistory(Translator translator){ - ModelAndView mav = new ModelAndView("translator/translatorHistory"); - mav.addObject("historyList", translatorSevice.selectHistoryList(translator)); - return mav; - } - - @GetMapping("/HistoryView") - @ResponseBody - public Translator HistoryView(Translator translator){ - return translatorSevice.HistoryView(translator); - } - - @GetMapping("/careerView") - public ModelAndView careerView(@AuthenticationPrincipal UserInfo loginUser,TranslatorCrr translatorCrr){ - ModelAndView mav = new ModelAndView("translator/translatorCareerModal"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/translator/info").get(0).getAccessAuth(); - mav.addObject("policeCrr", translatorSevice.selectMaritimePoliceCareer(translatorCrr)); - mav.addObject("anotherCrr", translatorSevice.selectAnotherOrganizationCareer(translatorCrr)); - mav.addObject("trKey", translatorCrr.getTranslatorKey()); - mav.addObject("wrtUserSeq", translatorSevice.selectTrFristUserSeq(translatorCrr.getTranslatorKey())); - mav.addObject("userSeq", loginUser.getUserSeq()); - mav.addObject("trName", translatorSevice.selectTrLastName(translatorCrr)); - mav.addObject("accessAuth", accessAuth); + @GetMapping("/HistoryView") + public ModelAndView HistoryView(Translator translator){ + ModelAndView mav = new ModelAndView("translator/translatorHistory"); + mav.addObject("trInfo", translatorSevice.selectTranslator(translator.getTranslatorKey(), translator.getVersionNo())); return mav; } - @GetMapping("/careerInsertPage") - public ModelAndView careerInsertPage(TranslatorCrr translatorCrr){ - ModelAndView mav = new ModelAndView("translator/translatorCareerInsert"); - mav.addObject("trKey", translatorCrr.getTranslatorKey()); - return mav; + @GetMapping("/careerInsertTr") + public ModelAndView careerInsertTr(){ + return new ModelAndView("translator/careerTr"); } @PostMapping("/insertTranslatorCareer") diff --git a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java index 888282d1..d9faa671 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorCareerRepository.java @@ -3,6 +3,7 @@ package com.dbnt.faisp.main.translator.repository; import com.dbnt.faisp.main.translator.model.TranslatorCrr; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; @@ -15,11 +16,5 @@ public interface TranslatorCareerRepository extends JpaRepository findByTranslatorKeyOrderByCareerSeqDesc(Integer translatorKey); } diff --git a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java index 455e6d0a..78c8ba2e 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorRepository.java @@ -5,11 +5,13 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.List; +import java.util.Optional; public interface TranslatorRepository extends JpaRepository { - Translator findFirstByOrderByTranslatorKeyDesc(); + Optional findFirstByOrderByTranslatorKeyDesc(); void deleteByTranslatorKey(int trKey); @@ -17,6 +19,7 @@ public interface TranslatorRepository extends JpaRepository findByTranslatorKeyOrderByVersionNoDesc(Integer translatorKey); - + Optional findTop1ByTranslatorKeyOrderByVersionNoDesc(Integer translatorKey); } diff --git a/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java index b0bc67f2..3b9a3e2a 100644 --- a/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/main/translator/service/TranslatorService.java @@ -25,17 +25,16 @@ public class TranslatorService { private final TranslatorCareerRepository translatorCareerRepository; private final TranslatorMapper translatorMapper; - public String insertTranslatorInfo(Translator translator) { - Translator dbTranslator = translatorRepository.findFirstByOrderByTranslatorKeyDesc(); - translator.setWrtDt(LocalDateTime.now()); - if (dbTranslator == null) { - translator.setTranslatorKey(1); - translator.setVersionNo(1); - } else { - translator.setTranslatorKey(dbTranslator.getTranslatorKey() + 1); - translator.setVersionNo(1); - } - return translatorRepository.save(translator).getTrName(); + @Transactional + public void saveTranslatorInfo(Translator translator) { + if(translator.getTranslatorKey()==null){ + Translator dbTranslator = translatorRepository.findFirstByOrderByTranslatorKeyDesc().orElse(null); + translator.setTranslatorKey(dbTranslator == null?1:(dbTranslator.getTranslatorKey()+1)); + translator.setVersionNo(1); + }else{ + translator.setVersionNo(translator.getVersionNo()+1); + } + translatorRepository.save(translator); } public List selectTranslatorList(Translator translator) { @@ -46,49 +45,17 @@ public class TranslatorService { return translatorMapper.selectTranslatorListCnt(translator); } - public Translator selectTranslatorView(Translator translator) { - return translatorRepository.findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())) - .orElse(null); + public Translator selectTranslator(Integer translatorKey, Integer versionNo) { + return translatorRepository.findById(new TranslatorId(translatorKey, versionNo)).orElse(null); } - @Transactional - public Translator updatetranslatorInfo(Translator translator) { - Translator dbTranslator = translatorRepository - .findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); - Translator translatorTmp = new Translator(); - translatorTmp.setTranslatorKey(dbTranslator.getTranslatorKey()); - translatorTmp.setVersionNo(dbTranslator.getVersionNo() + 1); - translatorTmp.setOgdp1(translator.getOgdp1()); - translatorTmp.setTrLang(translator.getTrLang()); - translatorTmp.setTrCareer(translator.getTrCareer()); - translatorTmp.setTrName(translator.getTrName()); - translatorTmp.setTrSex(translator.getTrSex()); - translatorTmp.setTrPhone(translator.getTrPhone()); - translatorTmp.setTrNny(translator.getTrNny()); - translatorTmp.setTrAge(translator.getTrAge()); - translatorTmp.setTrEdu(translator.getTrEdu()); - translatorTmp.setTrCft(translator.getTrCft()); - translatorTmp.setTrVisa(translator.getTrVisa()); - translatorTmp.setAptDt(translator.getAptDt()); - translatorTmp.setDmlYn(translator.getDmlYn()); - translatorTmp.setRemark(translator.getRemark()); - translatorTmp.setWrtNm(translator.getWrtNm()); - translatorTmp.setWrtDt(translator.getWrtDt()); - translatorTmp.setWrtOrgan(translator.getWrtOrgan()); - translatorTmp.setWrtPart(translator.getWrtPart()); - translatorTmp.setWrtTitle(translator.getWrtTitle()); - translatorTmp.setWrtUserSeq(translator.getWrtUserSeq()); - translatorRepository.save(translatorTmp); - return translatorTmp; + public List selectHistoryList(Integer translatorKey) { + return translatorRepository.findByTranslatorKeyOrderByVersionNoDesc(translatorKey); } - public List selectHistoryList(Translator translator) { - return translatorMapper.selectHistoryList(translator); - } - - public Translator HistoryView(Translator translator) { - return translatorMapper.HistoryView(translator); - } + public List selectCareerList(Integer translatorKey) { + return translatorCareerRepository.findByTranslatorKeyOrderByCareerSeqDesc(translatorKey); + } public int insertTranslatorCareer(List translatorCrr) { int trKey = 0; @@ -141,12 +108,4 @@ public class TranslatorService { return translatorMapper.selectTranslatorListEx(translator); } - public String selectTrFristUserSeq(int translatorKey) { - return translatorMapper.selectTrFristUserSeq(translatorKey); - } - - public String selectTrLastName(TranslatorCrr translatorCrr) { - return translatorRepository.getTrLastName(translatorCrr.getTranslatorKey()); - } - } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index 125e323a..f01b046d 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -99,9 +99,6 @@ .fs-13{ font-size: 13px; } -.pl-15{ - padding-left: 15%; -} .w-30{ width: 30%!important; } diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index e6aace15..de3ef24f 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -1,12 +1,23 @@ -let trCarrerList=[]; -let selectedIdx=0; - $(function(){ $("#dateSelectorDiv").datepicker({ format: "yyyy-mm-dd", language: "ko", autoclose: true }); + /*$("#aptDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $(".tcDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + });*/ +}) + +$(document).on('click', '#addTranslatorBtn', function (){ + getTranslatorEditModal(null, null); }) $(document).on('click', '.infoTr', function (){ @@ -35,129 +46,35 @@ function getTranslatorEditModal(translatorKey, versionNo){ }); } -$(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).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).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"); - } - }) - } -}) - -$(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"); - } - }) +$(document).on('click', '#saveBtn,#updateBtn', function (){ + if(contentCheck()){ + if(confirm("저장하시겠습니까?")){ + contentFade("in"); + const trInfoForm = $("#trInfoForm"); + trInfoForm.find('select,input').removeAttr("disabled"); + const formData = new FormData(trInfoForm[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/translator/saveTranslatorInfo", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다.") + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); + } + }) + } } }) $(document).on('click', '.historyInfoTr', function (){ + $(".hisChk").prop("checked", false); $(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: { @@ -165,40 +82,17 @@ $(document).on('click', '.historyInfoTr', function (){ 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); + dataType:"html", + success: function(html){ + $("#valueDiv").empty().append(html); }, error:function(e){ ajaxErrorAction(e); } }); }) -$(document).ready( function() { - $("#aptDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - $(".tcDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); -}); + + $(document).on('click', '#approvalTab', function (){ const trKey = (Number($('.tapTrKey').val())); @@ -262,120 +156,36 @@ $(document).on('change', '#eTrNny', function (){ } }); -$(document).on('click', '#crrAddBtn', function (){ - const trKey = (Number($('#tcInsertKey').val())); - $('#insertCareer').append( - '
'+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - '
'+ - '
'+ - ''+ - '
'+ - ''+ - '
'+ - '
'+ - ''+ - '
'+ - '
'+ - '
' - ) - $(".tcDt").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - trCarrerList.push({translatorKey:trKey, hisGubun:"",tcDt:"",contents:"",remark:""}); -}) - -$(document).on('click', '.rowDeleteBtn', function (){ - selectedIdx = $(this).parents("#crrDiv").index()-1; - trCarrerList.splice(selectedIdx,1); - $(this).parents('#crrDiv').remove(); -}) - -$(document).on('change', '.crrInput', function (){ - selectedIdx = $(this).parents("#crrDiv").index()-1; - const target = trCarrerList[selectedIdx]; - switch (this.name){ - case "hisGubun": - target.hisGubun = this.value - break; - case "tcDt": - target.tcDt = this.value - break; - case "contents": - target.contents = this.value - break; - case "remark": - target.remark = this.value - break; - } -}) - -$(document).on('click', '.careerInfo', function (){ - const trKey = Number($("#selectedKey").val()); - showCareer(trKey); -}) - -function showCareer(trKey){ +$(document).on('click', '.addCareerBtn', function (){ + const hisGubun = $(this).attr('data-hisgubun') $.ajax({ - url: '/translator/careerView', - data: { - translatorKey: trKey, - }, + url: '/translator/careerInsertTr', type: 'GET', dataType:"html", success: function(html){ - $("#careerView").empty().append(html) - $("#translatorCareerModal").modal('show'); + const addBody = $(html).find("#addBody"); + addBody.find(".tcDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + if(hisGubun === 'Y'){ + $("#kcgCareerTbody").append(addBody.children()[0]) + }else{ + $("#otherCareerTbody").append(addBody.children()[0]) + } }, error:function(e){ ajaxErrorAction(e); } }); -} - +}) $(document).on('click', '#crrInsertBtn', function (){ - const trKey = Number($("#tcmKey").val()); - $.ajax({ - url: '/translator/careerInsertPage', - data: { - translatorKey: trKey, - }, - type: 'GET', - dataType:"html", - success: function(html){ - $("#careerView").empty().append(html) - $("#translatorCareerModal").modal('show'); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + }) $(document).on('click', '#crrSaveBtn', function (){ - if(trCarrerList.length < 1){ - alert("새로 입력된 경력정보가 없습니다."); - return false; - } if(confirm("저장하시겠습니까?")){ contentFade("in"); $.ajax({ @@ -400,9 +210,9 @@ $(document).on('click', '#crrSaveBtn', function (){ } }) -function deleteCareerBtn(crrSeq,trKey){ +$(document).on('click', '.deleteCareerBtn', function (){ if(confirm("삭제하시겠습니까?")){ - $.ajax({ + /*$.ajax({ type : 'POST', url : "/translator/deleteCareer", data : JSON.stringify({careerSeq:crrSeq, @@ -418,9 +228,9 @@ function deleteCareerBtn(crrSeq,trKey){ error : function(xhr, status) { alert("삭제 처리에 실패하였습니다"); } - }) + })*/ } -} +}) $(document).on('click', '#trDeleteBtn', function (){ if(confirm("해임 하시겠습니까?")){ @@ -468,3 +278,27 @@ $(document).on('click', '#excelDown', function (){ +function contentCheck(){ + if(!$('#eOgdp1').val()){ + alert("관서를 선택해주세요."); + return false; + } + + if(!$('#eTrLang').val()){ + alert("언어를 선택해주세요."); + return false; + } + + if(!$('#eTrEname').val()){ + alert("성명을 입력해주세요."); + return false; + } + + if(!$('#eDmlYn').val()){ + alert("해촉여부를 선택해주세요."); + return false; + } + return true; +} + + diff --git a/src/main/resources/templates/translator/careerTr.html b/src/main/resources/templates/translator/careerTr.html new file mode 100644 index 00000000..4b8702cb --- /dev/null +++ b/src/main/resources/templates/translator/careerTr.html @@ -0,0 +1,16 @@ + + + + + + + + + + + + +
+ +
+ \ No newline at end of file diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index fcd0f496..2b3918dc 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -126,7 +126,7 @@ - + @@ -195,6 +195,5 @@ - \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorCareerInsert.html b/src/main/resources/templates/translator/translatorCareerInsert.html deleted file mode 100644 index d3ce80f5..00000000 --- a/src/main/resources/templates/translator/translatorCareerInsert.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - -
-
-
-
-
경력 등록
- -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
- \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorCareerModal.html b/src/main/resources/templates/translator/translatorCareerModal.html deleted file mode 100644 index d2bfde42..00000000 --- a/src/main/resources/templates/translator/translatorCareerModal.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - -
-
-
-
-
- -
- -
-
-
-
-
-
해양경찰청 이력
- - - - - - - - - - - - - - - - - - - - -
연번날짜내용비고
-
-
-
타기관 이력
- - - - - - - - - - - - - - - - - - - -
연번날짜내용비고
-
-
-
-
-
- -
-
-
-
- \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorDashBoard.html b/src/main/resources/templates/translator/translatorDashBoard.html deleted file mode 100644 index 82bb68c9..00000000 --- a/src/main/resources/templates/translator/translatorDashBoard.html +++ /dev/null @@ -1,84 +0,0 @@ - - - -
-
-
-
민간통역인현황
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
관서명언어성명위촉일연락처
-
-
- - - - - \ No newline at end of file diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index ea023998..6cb8b1a8 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -7,142 +7,286 @@
-