diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index b830554e..94d49656 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -65,6 +65,7 @@ public class IvsgtController { @GetMapping("/ivsgtViewModal") public ModelAndView ivsgtViewModal(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard){ ModelAndView mav = new ModelAndView("ivsgt/ivsgtViewModal"); + mav.addObject("modalType", investigationBoard.getModalType()); investigationBoard = ivsgtService.selectBoardInvestigation(investigationBoard.getIvsgtKey()); mav.addObject("investigation", investigationBoard); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -88,6 +89,7 @@ public class IvsgtController { public ModelAndView searchViewModal(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard){ ModelAndView mav = new ModelAndView("ivsgt/searchViewModal"); mav.addObject("userSeq",loginUser.getUserSeq()); + investigationBoard.setRowCnt(10); investigationBoard.setFirstIndex(0); investigationBoard.setQueryInfo(); investigationBoard.setWrtUserSeq(loginUser.getUserSeq()); diff --git a/src/main/resources/static/js/ivsgt/ivsgt.js b/src/main/resources/static/js/ivsgt/ivsgt.js index 62d6e969..7a470312 100644 --- a/src/main/resources/static/js/ivsgt/ivsgt.js +++ b/src/main/resources/static/js/ivsgt/ivsgt.js @@ -16,9 +16,11 @@ $(document).on('click', '.saveBtn', function (){ }); $(document).on('click', '.tr', function (){ - getIvsgtViewModal($(this).data('key')); + getIvsgtViewModal($(this).data('key'), null); }); - +$(document).on('click', '.relatedReportTr', function (){ + getIvsgtViewModal($(this).find('.ivsgtKey').val(), 'viewOnly') +}) $(document).on('click', '.ivsgtTab', function (){ location.href = "/ivsgt/arrestReport?ivsgtType="+ $(this).data("ivsgttype"); }); @@ -67,15 +69,20 @@ $(function(){ }); -function getIvsgtViewModal(ivsgtKey){ +function getIvsgtViewModal(ivsgtKey, modalType){ $.ajax({ url: '/ivsgt/ivsgtViewModal', - data: {ivsgtKey: ivsgtKey}, + data: {ivsgtKey: ivsgtKey, modalType: modalType}, type: 'GET', dataType:"html", success: function(html){ - $("#ivsgtViewBody").empty().append(html) - $("#ivsgtViewModal").modal('show'); + if(modalType !== 'viewOnly'){ + $("#ivsgtViewBody").empty().append(html) + $("#ivsgtViewModal").modal('show'); + }else{ + $("#relatedReportBody").empty().append(html) + $("#relatedReportModal").modal('show'); + } }, error:function(e){ ajaxErrorAction(e); diff --git a/src/main/resources/templates/ivsgt/ivsgt.html b/src/main/resources/templates/ivsgt/ivsgt.html index 46da078f..7f3f62fb 100644 --- a/src/main/resources/templates/ivsgt/ivsgt.html +++ b/src/main/resources/templates/ivsgt/ivsgt.html @@ -208,6 +208,13 @@ +