diff --git a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java index 11976aaf..42db0725 100644 --- a/src/main/java/com/dbnt/faisp/controller/TranslatorController.java +++ b/src/main/java/com/dbnt/faisp/controller/TranslatorController.java @@ -7,6 +7,7 @@ import com.dbnt.faisp.menuMgt.model.MenuMgt; import com.dbnt.faisp.organMgt.OrganConfigService; import com.dbnt.faisp.translator.TranslatorService; import com.dbnt.faisp.translator.model.Translator; +import com.dbnt.faisp.translator.model.TranslatorCrr; import com.dbnt.faisp.userInfo.UserInfoService; import com.dbnt.faisp.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -44,9 +45,11 @@ public class TranslatorController { } @PostMapping("/insertTranslatorInfo") - public String insertTranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator) { + @ResponseBody + public String insertTranslatorInfo(@AuthenticationPrincipal UserInfo loginUser,Translator translator, @RequestParam List tCrr) { translator.setWrtNm(loginUser.getUserId()); translator.setWrtOrgan(loginUser.getOgCd()); + System.out.println("@@="+tCrr); return translatorSevice.insertTranslatorInfo(translator); } diff --git a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java index 27ebdae0..b98f1ef8 100644 --- a/src/main/java/com/dbnt/faisp/translator/TranslatorService.java +++ b/src/main/java/com/dbnt/faisp/translator/TranslatorService.java @@ -56,8 +56,8 @@ public class TranslatorService { @Transactional public void updatetranslatorInfo(Translator translator) { - Translator dbTranslator = translatorRepository - .findById(new TranslatorId(translator.getTranslatorKey(), translator.getVersionNo())).orElse(null); + System.out.println("@@="+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); diff --git a/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java b/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java new file mode 100644 index 00000000..d6df0bdc --- /dev/null +++ b/src/main/java/com/dbnt/faisp/translator/model/TranslatorCrr.java @@ -0,0 +1,70 @@ +package com.dbnt.faisp.translator.model; + +import com.dbnt.faisp.authMgt.model.AccessConfig; +import com.dbnt.faisp.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.codeMgt.model.CodeMgt; +import com.dbnt.faisp.config.BaseModel; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import javax.persistence.*; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "translator_career") +public class TranslatorCrr extends BaseModel implements Serializable{ + @Id + @Column(name = "career_seq") + private Integer careerSeq; + @Column(name = "translator_key") + private Integer translatorKey; + @Column(name = "version_no") + private Integer versionNo; + @Column(name = "his_gubun") + private String hisGubun; + @Column(name = "contents") + private String contents; + @Column(name = "tc_dt") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate tcDt; + @Column(name = "remark") + private String remark; + + +@Override +public String toString() { + return "TranslatorCrr [careerSeq=" + careerSeq + ", translatorKey=" + translatorKey + ", versionNo=" + versionNo + + ", hisGubun=" + hisGubun + ", contents=" + contents + ", tcDt=" + tcDt + ", remark=" + remark + "]"; +} + + + + + + + + +} diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index e5e3d1bf..aede7600 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -1,3 +1,6 @@ +let trCarrerList=[]; +let selectedIdx=0; + $(document).on('click', '.userInfoTr', function (){ document.getElementById('accessTab').classList.add('active'); document.getElementById('approvalTab').classList.remove('active'); @@ -35,15 +38,17 @@ $(document).on('click', '#updateBtn', function (){ }) $(document).on('click', '#saveBtn', function (){ + console.log(trCarrerList); if(confirm("저장하시겠습니까?")){ contentFade("in"); const formData = new FormData($("#translatorInsert")[0]); + var values = JSON.stringify(trCarrerList); + $('input[name=TranslatorCrr]').val(values); $.ajax({ type : 'POST', data : formData, url : "/translator/insertTranslatorInfo", - processData: false, - contentType: false, + contentType: 'false', success : function(result) { alert("저장되었습니다.") contentFade("out"); @@ -151,6 +156,10 @@ $(document).ready( function() { format: "yyyy-mm-dd", language: "ko" }); + $(".tcDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); }); $(document).on('click', '#approvalTab', function (){ @@ -197,3 +206,69 @@ $(document).on('change', '#trNny', function (){ $("#trVisa").removeAttr("disabled"); } }); + +$(document).on('click', '#crrAddBtn', function (){ + $('#crr').append( + '
'+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + ''+ + '
'+ + '
' + ) + $(".tcDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); + trCarrerList.push({hisGubun:"",tcDt:"",contents:"",remark:""}); + console.log(trCarrerList); +}) + +$(document).on('click', '.rowDeleteBtn', function (){ + console.log($(this).parents('#crr').children('#crrDiv')); + selectedIdx = $(this).parents('#crr').children('#crrDiv').length-1; + trCarrerList.splice(selectedIdx,1); + console.log(selectedIdx); + console.log(trCarrerList); + + $(this).parents('#crrDiv').remove(); +}) + +$(document).on('change', '.crrInput', function (){ + selectedIdx = $(this).parents('#crr').children('#crrDiv').length-1; + const target = trCarrerList[selectedIdx]; + console.log(target) + 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; + } +}) diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 0ad5e27b..0cd4d4e8 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -154,7 +154,6 @@
-
@@ -241,6 +240,7 @@
+
- +
-
- +
- +
+

경력사항

+
+
+ +
+
-
- + diff --git a/src/main/resources/templates/translator/translatorEditModal.html b/src/main/resources/templates/translator/translatorEditModal.html index 6af1332c..5d640225 100644 --- a/src/main/resources/templates/translator/translatorEditModal.html +++ b/src/main/resources/templates/translator/translatorEditModal.html @@ -5,8 +5,8 @@
- - + +
@@ -98,8 +98,8 @@