diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b6d47fd..d020ff1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -89,8 +89,9 @@ spring: datasource: hikari: - driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false + #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy + driver-class-name: org.mariadb.jdbc.Driver + jdbc-url: jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false username: addsweb password: addsweb1234 auto-commit: false diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index a0fa1b8..e7904a5 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -218,9 +218,10 @@ $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", true); return; } - $("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false); - $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false); - + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false); + $("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false); + } let key = item.data.dscdmng_id; $("#tbody--${pageName}").setCurrentRow(key); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index afb194c..a3a5d3c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -274,18 +274,19 @@ $P.detailControl.query = { "schDscdmngId" : dscdmngId}; $P.detailControl.load(1); - if(item.data.PRGRS_STTS_CD == '21'){ - $("#btnPrgsSttus--${pageName}").prop("disabled", false); - }else{ - $("#btnPrgsSttus--${pageName}").prop("disabled", true); - } + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + if(item.data.PRGRS_STTS_CD == '21'){ + $("#btnPrgsSttus--${pageName}").prop("disabled", false); + }else{ + $("#btnPrgsSttus--${pageName}").prop("disabled", true); + } - if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){ - $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false); - }else{ - $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true); + if(item.data.PRGRS_STTS_CD == '06' || item.data.PRGRS_STTS_CD == '21'){ + $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", false); + }else{ + $("#btnCreateDsuseMgtMapping--${pageName}").prop("disabled", true); + } } - }; // 현재 선택 자료 변경 이벤트 diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index 6fa83ea..19ff9c1 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -224,8 +224,6 @@ if (!item) return; $P.bsshFormFields.set($P.control, item); - // 업무구분에 따른 URL 변경 - //$P.fnSetURL(item.data.bsshCd); } $P.productControl.onCurrentChange = item => { @@ -233,8 +231,6 @@ // Dataset 셋팅 $P.productFormFields.set($P.productControl, item); - // 업무구분에 따른 URL 변경 - //$P.fnSetURL(item.data.bsshCd); } // 저장 callback @@ -388,14 +384,7 @@ $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; $P.control.load(1); } - - // 업무구분에 따른 URL 설정 - $P.fnSetURL = (taskSeCd) => { -// $P.control.urls.create = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/create.do"); // 등록 -// $P.control.urls.update = wctx.url("/" + taskSeCd + "${infoPrefixUrl}" + "/040/update.do"); // 수정 - } - - // 전자우편 안내문 등록 버튼 이벤트 + $P.fnSearchBssh = (title) => { $P.control.getBsshInfo(); } @@ -547,7 +536,9 @@ // 초기 화면 설정 $P.initForm = () => { - + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnSave--${pageName}").prop("disabled", true); + } } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index 9039bb1..7964616 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -643,6 +643,11 @@ $("#schDateTo--${pageName}").datepicker("setDate", new Date()); $('#schSggCd--${pageName}').val("${currentUser.deptCode}"); + + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', true); + $('#btnRemoveDsuseMGT--${pageName}').prop('disabled', true); + } } /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp index c707481..9762b47 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp @@ -52,7 +52,8 @@ -
+
+
-
+
-
+
- +
@@ -454,7 +455,9 @@ initDatepicker("frmEdit--${pageName}"); // 달력 초기화 - + if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $("#btnSave--${pageName}").prop("disabled", true); + } } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index b032dc9..b6dea03 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -271,11 +271,16 @@ // 현재 선택 자료 변경 이벤트 $P.detailControl.onCurrentChange = (item) => { - if (!item) return; + if (!item){ + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', true); + return; + } let key = item.data.DSCDMNG_SN; - $("#tbody--${pageName}Detail").setCurrentRow(key); + if(!${currentUser.hasAuthorities("ROLE_MANAGER")} && !${currentUser.hasAuthorities("ROLE_ADMIN")}) { + $('#btnCreateDsuseMGT--${pageName}').prop('disabled', false); + } }; // 신청서 정보 dialog @@ -560,7 +565,6 @@ $('#schSttsCd--${pageName}').val('01'); $('#schSggCd--${pageName}').val("${currentUser.deptCode}"); } - /************************************************************************** * 최초 실행 함수 **************************************************************************/