diff --git a/src/main/java/com/dbnt/faisp/main/translator/model/TranslatorFile.java b/src/main/java/com/dbnt/faisp/main/translator/model/TranslatorFile.java new file mode 100644 index 00000000..080dedef --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/translator/model/TranslatorFile.java @@ -0,0 +1,51 @@ +package com.dbnt.faisp.main.translator.model; + +import com.dbnt.faisp.config.FileInfo; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "translator_file") +@IdClass(TranslatorFile.TranslatorFileId.class) +public class TranslatorFile extends FileInfo { + @Id + @Column(name = "translator_key") + private Integer translatorKey; + @Id + @Column(name = "version_no") + private Integer versionNo; + @Id + @Column(name = "file_seq") + private Integer fileSeq; + @Column(name = "orig_nm") + private String origNm; + @Column(name = "conv_nm") + private String convNm; + @Column(name = "file_extn") + private String fileExtn; + @Column(name = "file_size") + private String fileSize; + @Column(name = "save_path") + private String savePath; + + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TranslatorFileId implements Serializable { + private Integer translatorKey; + private Integer versionNo; + private Integer fileSeq; + } + +} diff --git a/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorFileRepository.java b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorFileRepository.java new file mode 100644 index 00000000..196a37c1 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/translator/repository/TranslatorFileRepository.java @@ -0,0 +1,10 @@ +package com.dbnt.faisp.main.translator.repository; + +import com.dbnt.faisp.main.translator.model.TranslatorFile; +import org.springframework.data.jpa.repository.JpaRepository; + + + +public interface TranslatorFileRepository extends JpaRepository { + +} diff --git a/src/main/resources/static/js/translator/translator.js b/src/main/resources/static/js/translator/translator.js index 819d7575..e6aace15 100644 --- a/src/main/resources/static/js/translator/translator.js +++ b/src/main/resources/static/js/translator/translator.js @@ -1,5 +1,6 @@ let trCarrerList=[]; let selectedIdx=0; + $(function(){ $("#dateSelectorDiv").datepicker({ format: "yyyy-mm-dd", @@ -7,17 +8,33 @@ $(function(){ autoclose: true }); }) -$(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"; - } + +$(document).on('click', '.infoTr', function (){ + getTranslatorEditModal($(this).find(".trKey").val(), $(this).find(".verNo").val()); }) + +function getTranslatorEditModal(translatorKey, versionNo){ + $.ajax({ + url: "/translator/translatorEditModal", + data: {translatorKey: translatorKey, versionNo : versionNo}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#translatorEditModalContent").empty().append(html) + $("#translatorEditModal").modal('show'); + $("#viewAptDt").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} + $(document).on('click', '.translatorInfo', function (){ document.getElementById('accessTab').classList.add('active'); document.getElementById('approvalTab').classList.remove('active'); @@ -211,7 +228,7 @@ function revisionHistory(trKey,verNo,url){ type: 'GET', dataType:"html", success: function(html){ - $("#configInfo").empty().append(html) + $("#translatorEditContent").empty().append(html) $("#translatorEditModal").modal('show'); $("#viewAptDt").datepicker({ format: "yyyy-mm-dd", @@ -405,10 +422,6 @@ function deleteCareerBtn(crrSeq,trKey){ } } -$(document).on('click', '.btn-close', function (){ - location.reload(); -}) - $(document).on('click', '#trDeleteBtn', function (){ if(confirm("해임 하시겠습니까?")){ contentFade("in"); diff --git a/src/main/resources/templates/translator/translator.html b/src/main/resources/templates/translator/translator.html index 20e7fbd0..fcd0f496 100644 --- a/src/main/resources/templates/translator/translator.html +++ b/src/main/resources/templates/translator/translator.html @@ -126,16 +126,10 @@ - + - -

- - + @@ -146,8 +140,7 @@ - ● - + @@ -185,7 +178,7 @@
- +
@@ -195,177 +188,13 @@ -