diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java index 7dd49322..4b7b17fb 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java @@ -216,7 +216,7 @@ public class PoliceController { @GetMapping("/careerModal") public ModelAndView careerModal(@AuthenticationPrincipal UserInfo loginUser, UserCareer career){ ModelAndView mav = new ModelAndView("police/career/careerModal"); - + mav.addObject("updateStatus", career.getUpdateStatus()); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/police/careerMgt").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserCareer.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserCareer.java index 4e2630f1..f5754bca 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserCareer.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserCareer.java @@ -70,7 +70,9 @@ public class UserCareer{ @Transient - List careerList; + private List careerList; + @Transient + private String updateStatus; @Embeddable @Data diff --git a/src/main/resources/static/js/faRpt/sri.js b/src/main/resources/static/js/faRpt/sri.js index 6357569b..89c982c5 100644 --- a/src/main/resources/static/js/faRpt/sri.js +++ b/src/main/resources/static/js/faRpt/sri.js @@ -32,6 +32,11 @@ function getSriEditModal(faSriKey){ autoclose: true, startDate: "now" }); + $("#faSriETime").datetimepicker({ + datepicker: false, + format: 'H:i', + step:10 + }); setEditor('editor', '500'); setUploadDiv(); $("#sriEditModal").modal('show'); diff --git a/src/main/resources/static/js/police/careerMgt.js b/src/main/resources/static/js/police/careerMgt.js index 40af8e61..196a84bd 100644 --- a/src/main/resources/static/js/police/careerMgt.js +++ b/src/main/resources/static/js/police/careerMgt.js @@ -13,7 +13,7 @@ $(document).on('click', '#notPoliceTab', function (){ }) $(document).on('click', '.policeTr', function (){ - getCareerModal($(this).find(".userSeq").val(), "CRC001") + getCareerModal($(this).find(".userSeq").val(), "CRC001", null) }); $(document).on('click', '.careerAddBtn', function (){ @@ -30,7 +30,8 @@ $(document).on('click', '.careerAddBtn', function (){ $("#dateSelectorDiv").datepicker({ format: "yyyy-mm-dd", language: "ko", - autoclose: true + autoclose: true, + endDate: "now" }); $("#careerFormModal").modal('show'); }, @@ -79,7 +80,7 @@ $(document).on('click', '#kwmsModalSelectBtn', function (){ success : function(result) { alert("저장되었습니다."); $("#kwmsCareerModal").modal('hide'); - getCareerModal($("#mngModelUserSeq").val(), "CRC001"); + getCareerModal($("#mngModelUserSeq").val(), "CRC001", 'updated'); contentFade("out"); }, error : function(xhr, status) { @@ -125,7 +126,7 @@ $(document).on('click', '#saveBtn', function (){ success : function(result) { alert("저장되었습니다."); $("#careerFormModal").modal('hide'); - getCareerModal($("#mngModelUserSeq").val(), $("#careerForm").find("#careerCd").val()); + getCareerModal($("#mngModelUserSeq").val(), $("#careerForm").find("#careerCd").val(), 'updated'); contentFade("out"); }, error : function(xhr, status) { @@ -152,7 +153,7 @@ $(document).on('click', '.deleteCareerBtn', function (){ }, success : function(data) { alert("삭제 되었습니다."); - getCareerModal(userSeq, tabCd); + getCareerModal(userSeq, tabCd, 'updated'); contentFade("out"); }, error : function(xhr, status) { @@ -163,10 +164,20 @@ $(document).on('click', '.deleteCareerBtn', function (){ } }) -function getCareerModal(userSeq, careerCd){ +$(document).on('hidden.bs.modal', '#careerModal', function (){ + if($("#updateStatus").val()==='updated'){ + $("#searchBtn").click(); + } +}) + +function getCareerModal(userSeq, careerCd, updateStatus){ $.ajax({ url: '/police/careerModal', - data: {userSeq: userSeq, careerCd: careerCd}, + data: { + userSeq: userSeq, + careerCd: careerCd, + updateStatus: updateStatus + }, type: 'GET', dataType:"html", success: function(html){ diff --git a/src/main/resources/templates/police/career/careerModal.html b/src/main/resources/templates/police/career/careerModal.html index 34accfd0..14b644fa 100644 --- a/src/main/resources/templates/police/career/careerModal.html +++ b/src/main/resources/templates/police/career/careerModal.html @@ -18,6 +18,7 @@