From 1372cfab1f717c7e6728d838cf4b67f866d70fc0 Mon Sep 17 00:00:00 2001 From: wyh Date: Thu, 29 Jun 2023 09:55:15 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=ED=99=95=EC=9E=A5=EC=9E=90=20=EB=B0=8F=20=EC=B2=A8=EB=B6=80?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9A=A9=EB=9F=89=20=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcc/com/utl/user/service/CheckFileUtil.java | 2 +- .../cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java b/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java index ae91cd4c..a80a6db9 100644 --- a/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java +++ b/src/main/java/kcc/com/utl/user/service/CheckFileUtil.java @@ -80,7 +80,7 @@ public class CheckFileUtil { - private String s_exts = "txt|xls|xlsx|png|jpg|jpeg|doc|ppt|hwp|pdf"; //첨부 가능한 확장자 + private String s_exts = "txt|xls|xlsx|png|jpg|jpeg|doc|ppt|hwp|pdf|zip"; //첨부 가능한 확장자 private int i_file_count = 3; //첨부가능한 파일 수량 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index 804a5224..9db847b3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -51,7 +51,7 @@ var _orgnFileForm = new Array(); function orgnlFileUpload(files,obj) //업로드 function { - var limitsize = 50*1024*1024; //파일 제한 체크(50개, 50MB) + var limitsize = 100*1024*1024; //파일 제한 체크(50개, 50MB) var limitcount = $("input[name=orgnl_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=orgnl_allrowFileExtsn]").val(); @@ -175,7 +175,7 @@ var _cpyFileForm = new Array(); function cpyFileUpload(files,obj) //업로드 function { - var limitsize = 50*1024*1024; //파일 제한 체크(50개, 50MB) + var limitsize = 100*1024*1024; //파일 제한 체크(50개, 50MB) var limitcount = $("input[name=cpy_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=cpy_allrowFileExtsn]").val(); @@ -299,7 +299,7 @@ var _evdncFileForm = new Array(); function evdncFileUpload(files,obj) //업로드 function { - var limitsize = 50*1024*1024; //파일 제한 체크(50개, 50MB) + var limitsize = 100*1024*1024; //파일 제한 체크(50개, 50MB) var limitcount = $("input[name=evdnc_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=evdnc_allrowFileExtsn]").val(); @@ -424,7 +424,7 @@ var _rmtTrnFileForm = new Array(); function rmtTrnFileUpload(files,obj) //업로드 function { - var limitsize = 50*1024*1024; //파일 제한 체크(50개, 50MB) + var limitsize = 100*1024*1024; //파일 제한 체크(50개, 50MB) var limitcount = $("input[name=rmtTrn_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=rmtTrn_allrowFileExtsn]").val(); From 2e815db9a1c1ff3ecf7385d0e0ee6a38615eba27 Mon Sep 17 00:00:00 2001 From: wyh Date: Thu, 29 Jun 2023 10:56:57 +0900 Subject: [PATCH 02/10] =?UTF-8?q?100MB=20->=2010MB=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmEnd/exprnClsrmEndRslt.jsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index c799aa97..fcb89cfc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -51,7 +51,7 @@ var _orgnFileForm = new Array(); function orgnlFileUpload(files,obj) //업로드 function { - var limitsize = 100*1024*1024; //파일 제한 체크(50개, 50MB) + var limitsize = 10*1024*1024; //파일 제한 체크(10개, 10MB) var limitcount = $("input[name=orgnl_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=orgnl_allrowFileExtsn]").val(); @@ -63,7 +63,7 @@ for (var i = 0; i < files.length; i++) { if(files[i].size > limitsize){ - alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 100MB이하만 업로드 가능합니다."); + alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 10MB이하만 업로드 가능합니다."); return ; } @@ -177,7 +177,7 @@ var _cpyFileForm = new Array(); function cpyFileUpload(files,obj) //업로드 function { - var limitsize = 100*1024*1024; //파일 제한 체크(50개, 100MB) + var limitsize = 10*1024*1024; //파일 제한 체크(10개, 10MB) var limitcount = $("input[name=cpy_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=cpy_allrowFileExtsn]").val(); @@ -189,7 +189,7 @@ for (var i = 0; i < files.length; i++) { if(files[i].size > limitsize){ - alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 100MB이하만 업로드 가능합니다."); + alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 10MB이하만 업로드 가능합니다."); return ; } @@ -304,7 +304,7 @@ var _evdncFileForm = new Array(); function evdncFileUpload(files,obj) //업로드 function { - var limitsize = 100*1024*1024; //파일 제한 체크(50개, 100MB) + var limitsize = 10*1024*1024; //파일 제한 체크(10개, 10MB) var limitcount = $("input[name=evdnc_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=evdnc_allrowFileExtsn]").val(); @@ -316,7 +316,7 @@ for (var i = 0; i < files.length; i++) { if(files[i].size > limitsize){ - alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 100MB이하만 업로드 가능합니다."); + alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 10MB이하만 업로드 가능합니다."); return ; } @@ -433,7 +433,7 @@ var _rmtTrnFileForm = new Array(); function rmtTrnFileUpload(files,obj) //업로드 function { - var limitsize = 100*1024*1024; //파일 제한 체크(50개, 100MB) + var limitsize = 10*1024*1024; //파일 제한 체크(10개, 10MB) var limitcount = $("input[name=rmtTrn_limitcount]").val()*1 ; var allrowFileExtsn = $("input[name=rmtTrn_allrowFileExtsn]").val(); @@ -445,7 +445,7 @@ for (var i = 0; i < files.length; i++) { if(files[i].size > limitsize){ - alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 100MB이하만 업로드 가능합니다."); + alert(files[i].name+"파일 사이즈가"+getStrFileSize(files[i].size)+"로 10MB이하만 업로드 가능합니다."); return ; } From 58204dc572e115f6f129d6042fdf98b5eaa01b3f Mon Sep 17 00:00:00 2001 From: wyh Date: Thu, 29 Jun 2023 11:46:03 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmEnd/exprnClsrmEndRslt.jsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp index fcb89cfc..5b9c5435 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp @@ -580,7 +580,7 @@ , url: "${pageContext.request.contextPath}/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRsltAjax.do" , data: data , dataType:'json' - , async: true + , async: false , processData: false , contentType: false , cache: false @@ -1028,7 +1028,7 @@

최대 1개

-

100MB제한

+

10MB제한

등록된 파일 0개

@@ -1108,7 +1108,7 @@

최대 1개

-

100MB제한

+

10MB제한

등록된 파일 0개

@@ -1187,7 +1187,7 @@

최대 1개

-

100MB제한

+

10MB제한

등록된 파일 0개

@@ -1266,7 +1266,7 @@

최대 1개

-

100MB제한

+

10MB제한

등록된 파일 0개

From 00ef66d450494a3528d4fb6f5f2b878735e69e7a Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 4 Jul 2023 16:51:04 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94=EB=89=B4=EA=B4=80?= =?UTF-8?q?=EB=A6=AC,=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=93=B1=EB=A1=9D/?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=B9=84=EA=B3=B5=EA=B0=9C=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80.?= =?UTF-8?q?=20=EB=A9=94=EB=89=B4=20=EA=B4=80=EB=A6=AC=20:=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=A9=94=EB=89=B4=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EB=B0=A9=EB=AC=B8=EC=9E=90=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=EC=97=90=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=EB=8F=84=20=EA=B0=99=EC=9D=B4=20=EC=A1=B0=ED=9A=8C=20=ED=95=98?= =?UTF-8?q?=EA=B2=8C=EB=81=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/cop/bbs/service/BoardMaster.java | 11 +++++++++++ .../sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml | 9 ++++++--- .../let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml | 10 +++++++++- .../let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml | 10 +++++++++- .../WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp | 10 ++++++++++ .../webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp | 11 +++++++++++ 6 files changed, 56 insertions(+), 5 deletions(-) diff --git a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java index 1d383601..efdcf18b 100644 --- a/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java +++ b/src/main/java/kcc/let/cop/bbs/service/BoardMaster.java @@ -241,6 +241,8 @@ public class BoardMaster implements Serializable { private String searchSortCnd = ""; // 정렬 항목 private String searchSortOrd = ""; // 정렬 구분(오름/내림) + + private String secretYn = ""; // 비밀글 여부 - 게시글 상세 조회 시 본인 글인지 체크 ex)ZOOM 게시판 /** @@ -1226,5 +1228,14 @@ public class BoardMaster implements Serializable { public void setTabBbsId(String tabBbsId) { this.tabBbsId = tabBbsId; } + + public String getSecretYn() { + return secretYn; + } + + public void setSecretYn(String secretYn) { + this.secretYn = secretYn; + } + } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml index a76e62c3..b852e38f 100644 --- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Mysql.xml @@ -79,6 +79,7 @@ + @@ -360,7 +361,7 @@ MENU_NO, - VIEWS_YN,SE_CMMN_CD_ID + VIEWS_YN,SE_CMMN_CD_ID, SECRET_YN ) VALUES ( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#, @@ -375,7 +376,7 @@ '9620000', /**사전정보공표 */ - #viewsYn#,#seCmmnCdId# + #viewsYn#,#seCmmnCdId#,#secretYn# ) @@ -411,6 +412,7 @@ a.DELETE_AUTH , a.VIEWS_YN, a.BBS_DC, + a.SECRET_YN, '' as MENU_COURS, /*REPLACE(GETMENUCOURS(h.MENU_NO), '|', ' > ') as MENU_COURS,*/ /*get1DepthMenuNo(h.MENU_NO) as FIRST_DEPT_MENU_NO,*/ @@ -514,7 +516,8 @@ MENU_NO = '9620000', /**사전정보공표 */ - BBS_DC = #bbsDc# + BBS_DC = #bbsDc#, + SECRET_YN = #secretYn# WHERE BBS_ID = #bbsId# diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml index f423c0a2..13f68fab 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml @@ -209,8 +209,16 @@ LETTNMENUINFO A INNER JOIN LETTNMENUCREATDTLS B on A.MENU_NO = B.MENU_NO WHERE A.MENU_NO > 0 - AND B.AUTHOR_CODE = #authorCode# ]]> + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + GROUP BY A.MENU_NO + + + AND B.AUTHOR_CODE = #authorCode# + ORDER BY A.UPPER_MENU_NO, A.MENU_ORDR, diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml index b4a90ca5..93ac28fd 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mpm/EgovMenuManage_SQL_Mysql.xml @@ -97,7 +97,15 @@ /* 매뉴사용여부 조회 */ - AND B.AUTHOR_CODE = #authorCode# + + + AND (B.AUTHOR_CODE = #authorCode# + OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER' + OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER') + + + AND B.AUTHOR_CODE = #authorCode# + LIMIT 1 diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp index eb4f5fd6..85c7b886 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrRegist.jsp @@ -318,6 +318,16 @@ function fn_egov_inqire_BBSMngInqire() { + + 비공개 여부 + + + 사용 + 미사용 + + + + 게시판 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp index e06b7c0c..c6374fba 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovBoardMstrUpdt.jsp @@ -379,6 +379,17 @@ $( document ).ready(function() { + + 비공개 여부 + + + 사용 + 미사용 + + + + + 게시판 사용여부 From 36ab5bd58607e6b7729a8aedd4e4ab34c5232550 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 5 Jul 2023 15:33:23 +0900 Subject: [PATCH 05/10] =?UTF-8?q?#3252=20[=EA=B4=80=EB=A6=AC=EC=9E=90]=20?= =?UTF-8?q?=EC=B2=AD=EC=86=8C=EB=85=84=EC=B0=BE=EC=95=84=EA=B0=80=EB=8A=94?= =?UTF-8?q?=EC=A0=80=EC=9E=91=EA=B6=8C=EA=B5=90=EC=9C=A1=20-=20=ED=8D=BC?= =?UTF-8?q?=EB=B8=94=EC=9A=94=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/EduAplctMngTngrController.java | 2 + .../web/EduRsltMngTngrController.java | 39 ++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml | 15 +- .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 59 +++ .../tngrVisitEdu/popup/chasiStatusPopup.jsp | 424 ++++++++++++++++++ .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 1 + 6 files changed, 526 insertions(+), 14 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java index 9f3b7b3a..311787d1 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java @@ -166,6 +166,8 @@ public class EduAplctMngTngrController { vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd()); } + System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery()); + //2. pageing step2 vEEduAplctVO = this.setPagingStep2Sub(vEEduAplctVO, paginationInfo); vEEduAplctVO.setNotiUserId(user.getUniqId()); diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 1cd0d39c..1c33f4df 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -407,6 +407,42 @@ public class EduRsltMngTngrController { } + + /** + * 교육결과관리 상세 화면 + */ + @RequestMapping("popup/chasiStatusPopup.do") + public String chasiStatusPopup( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + // 설문조사 문항리스트 조회 + + QustnrRespondInfoVO qustnrRespondInfoVO = new QustnrRespondInfoVO(); + qustnrRespondInfoVO.setSiteId(VeConstants.LCTR_DIV_CD_10); + QustnrRespondInfoVO info = egovQustnrRespondInfoService.selectSiteIdQustnrTmplat(qustnrRespondInfoVO); + + Map commandMap =new HashMap(); + commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); + commandMap.put("qestnrId",info.getQestnrId()); //문제 ID + model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); + + // 설문조사 결과 조회 + qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + qustnrRespondInfoVO.setEduChasiOrd(vEEduAplctVO.getEduChasiOrd()); + List chasiSrvyList = egovQustnrRespondInfoService.selectChasiSrvyList(qustnrRespondInfoVO); + if(chasiSrvyList.size() > 0) { + model.addAttribute("qestnrRespondent", chasiSrvyList.get(0).getQestnrRespondent()); + model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); + model.addAttribute("chasiSrvyList",chasiSrvyList); + } + System.out.println("=============================================chasiSrvyList============================================="); + + return "oprtn/tngrVisitEdu/popup/chasiStatusPopup"; + } /** * 교육결과관리 상세 화면 @@ -425,6 +461,7 @@ public class EduRsltMngTngrController { //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; LoginVO user = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + model.addAttribute("vEEduAplctVO", vEEduAplctVO); //로그인 처리==================================== try{ String chasiOrd = vEEduAplctVO.getEduChasiOrd(); @@ -534,6 +571,7 @@ public class EduRsltMngTngrController { commandMap.put("qestnrTmplatId", "QTMPLA_0000000000001"); commandMap.put("qestnrId",info.getQestnrId()); //문제 ID model.addAttribute("Comtnqustnrqesitm", egovQustnrRespondInfoService.selectQustnrRespondInfoManageComtnqustnrqesitm(commandMap)); + System.out.println("================================= Comtnqustnrqesitm ================================="); // 설문조사 결과 조회 qustnrRespondInfoVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); @@ -544,6 +582,7 @@ public class EduRsltMngTngrController { model.addAttribute("qestnrParticipant", chasiSrvyList.get(0).getQestnrParticipant()); model.addAttribute("chasiSrvyList",chasiSrvyList); } + System.out.println("=============================================chasiSrvyList============================================="); /* System.out.println("------------------------"); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml index 96856d1f..a6c2e8b2 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Cubrid.xml @@ -774,22 +774,9 @@ ORDER BY 1=1 - - , A.EDU_APLCT_ORD DESC - - - , CC.EDU_HOPE_DT desc - - - , CC.EDU_HOPE_DT asc - + , $orderByQuery$ - - - - - LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index e2704e44..bd3fb612 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -221,14 +221,63 @@ function replyCalculation(){ } }); } + + + + + + // 강사 변경 + function fn_chasiStatusPop() { + var form = document.chasiStatusPopForm; + +// form.eduAplctOrd.value = aplctOrd; +// form.eduChasiOrd.value = chasiOrd; +// form.strtTm.value = strtTm; +// form.endTm.value = endTm; +// form.asgnmAprvlCd.value = code; + + //추가 강사 변경 +// form.action = ""; +console.log("form :: ", form); + form.action = ""; + + + window.open("#", "_chasiStatusPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + form.target = "_chasiStatusPop"; + form.submit(); + } + + + + + + + + + + + + " /> + " /> + " /> " /> + + " /> + " /> + " /> + + " /> + " /> + + " /> + " />
@@ -622,6 +671,11 @@ function replyCalculation(){
+
+
+ +
+

비공개 메모

@@ -704,5 +758,10 @@ function replyCalculation(){
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp new file mode 100644 index 00000000..4b067dae --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp @@ -0,0 +1,424 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<% + /** + * @Class Name : instrAsgnmAddPopup.jsp + * @Description : 강사배치 추가강의 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.1.8 + * @version 1.0 + * @see + * + */ +%> + + + + +<%-- --%> + + + 강사배치 팝업 + + + + + + + + + + + + + +
+
+
+

강의만족도 결과 등록

+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
교육일차시구분대상배정강사인원설문완료 여부
2022-03-3014:10~15:35(85분)101-1반원영현55설문진행중
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
+

참석자

+ 		+ + + +

응답율

+ 		-
+

응답자

+ 		+ + + +

무응답

+ 		-
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
평가문항매우만족만족보통불만족매우불만족
+ 1) 본 교육운영에 대하여 전반적으로 만족하십니까? + + + + + + + + + + + + + + + + + + + +
+ 2) 본 교육 내용구성에 대해서는 어느 정도 만족 하십니까? + + + + + + + + + + + + + + + + + + + +
+ 3) 교육 시간은 적절했다고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 4) 본 교육을 받기 전 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 5) 본 교육을 받은 후, 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 6) 본 교육을 통해, 학교 수업 혹은 직무에 얼마나 도움이 될 것이라고 생각하십니까? + + + + + + + + + + + + + + + + + + + +
+ 7) 강사가 교육 5분 전까지 도착했나요?(지각여부_교사 only) + + + + + + + + + + + + + + + + + + + +
+ 8) 본 교육과 관련하여 강사가 교육 5분 전까지 도착했습니까?(지각여부확인_교사만) + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+
+ + + + +
+
+
+
+
+
+
+
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 8057de1d..6666ab8c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -96,6 +96,7 @@ } ,dataType:'json' ,success:function(returnData){ + console.log(returnData); var info = returnData.chasiInfo; var tm = info.strtTm.replace(/(.{2})/,"$1:") +"~"+ info.endTm.replace(/(.{2})/,"$1:")+"("+info.lrnTm+"분)" $("#popupEduHopeDt").text(info.eduHopeDt); From cea0cd85f95a6def7147a0b36134f33489c0e88c Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 6 Jul 2023 09:50:22 +0900 Subject: [PATCH 06/10] =?UTF-8?q?feat:=20[=EC=9E=84=EC=8B=9C=EC=99=84?= =?UTF-8?q?=EB=A3=8C]=20=EB=82=A0=EC=A7=9C=EC=9D=B8=ED=92=8B=20=EC=95=88?= =?UTF-8?q?=EB=82=98=EC=98=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20::=20css=20,?= =?UTF-8?q?=20js=20=EC=97=90=20contextPath=20=EA=B0=80=20=ED=95=98?= =?UTF-8?q?=EB=93=9C=EC=BD=94=EB=94=A9=EB=90=98=EC=96=B4=EC=9E=88=EC=96=B4?= =?UTF-8?q?=20=EC=83=81=EB=8C=80=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EA=BF=94=EC=95=BC=20=ED=95=A0=EC=A7=80=20=EB=85=BC=EC=9D=98=20?= =?UTF-8?q?=ED=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../popup/eduAplctMngDetailPopup.jsp | 2 +- .../oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp | 10 ++--- .../jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp | 4 +- .../jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp | 4 +- .../popup/eduAplctMngDetailPopup.jsp | 2 +- .../WEB-INF/jsp/web/com/webCommonFooter.jsp | 4 +- .../webapp/WEB-INF/jsp/web/com/webLayout.jsp | 21 +++++++-- .../adultVisitEdu/eduAplct/eduAplctList.jsp | 2 +- .../adultVisitEdu/eduAplct/eduAplctMdfy.jsp | 2 +- .../aplct/adultVisitEdu/eduEnd/eduEndList.jsp | 2 +- .../exprnClsrmEnd/exprnClsrmEndList.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctList.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctReg.jsp | 2 +- .../otsdCprtnPrcs/lctrAplct/lctrAplctList.jsp | 2 +- .../otsdCprtnPrcs/lctrAplct/lctrCmpltReg.jsp | 2 +- .../otsdCprtnPrcs/lctrAplct/lctrList.jsp | 2 +- .../tngrVisitEdu/eduAplct/eduAplctList.jsp | 2 +- .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 3 +- .../aplct/tngrVisitEdu/eduEnd/eduEndList.jsp | 2 +- .../tngrVisitEdu/lctrSrvy/lctrSrvyList.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstList.jsp | 2 +- .../asgnmInfo/instrAsgnmList.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstList.jsp | 2 +- .../adultVisitEdu/endInfo/instrEduEndList.jsp | 2 +- .../asgnmInfo/instrAsgnmAddRqstList.jsp | 2 +- .../tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp | 2 +- .../asgnmInfo/instrAsgnmRqstList.jsp | 2 +- .../tngrVisitEdu/endInfo/instrEduEndList.jsp | 2 +- .../com/cmm/utl/ckeditor/config.js | 2 +- src/main/webapp/js/ncms_common.js | 24 +++++----- src/main/webapp/js/web_common.js | 36 +++++++-------- .../visitEdu/adm/publish/css/content.css | 2 +- .../usr/datapicker/duet-date-picker.entry.js | 2 +- .../visitEdu/usr/datapicker/duet.esm.js | 4 +- .../visitEdu/usr/datapicker/duet.system.js | 2 +- .../visitEdu/usr/publish/css/common.css | 44 +++++++++---------- .../visitEdu/usr/publish/css/content.css | 4 +- .../visitEdu/usr/publish/script/content.js | 2 +- .../usr/publish/script/visitEduCom.js | 2 +- 39 files changed, 114 insertions(+), 100 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp index 6fac04d3..9ed5e8e2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -273,7 +273,7 @@

한국저작권위원회 위원장 귀중

- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp index 926d38c6..c654508f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngMdfy2.jsp @@ -546,7 +546,7 @@ - + @@ -810,8 +810,8 @@

명

- - + + @@ -950,8 +950,8 @@

명

- - + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp index 07dea008..0e2e77f9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp @@ -615,7 +615,7 @@

명

- + @@ -752,7 +752,7 @@

명

- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp index 8d7ef2ff..50613c75 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctReg.jsp @@ -639,7 +639,7 @@ $(document).ready(function(){

명

- + @@ -776,7 +776,7 @@ $(document).ready(function(){

명

- + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp index ff0129c3..94cfbe95 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduAplctMngDetailPopup.jsp @@ -302,7 +302,7 @@

한국저작권위원회 위원장 귀중

- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp index 0ac4a8e7..cb97f87e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -62,8 +62,8 @@ function footerSiteLinkPageGo (){

서울 [04323] 서울특별시 용산구 후암로 107, 5/16층 ☎ 대표번호 02.2669.0010

-
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp index a1a2afdc..7cab601f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp @@ -34,7 +34,7 @@ - + @@ -60,10 +60,23 @@ - - - + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp index b33a82e4..a1c40601 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctList.jsp @@ -78,7 +78,7 @@ <%-- --%>
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp index 84807a4c..cadfb569 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctMdfy.jsp @@ -710,7 +710,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp index 855fa1fb..e533810a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndList.jsp @@ -101,7 +101,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index d776cce1..54d3a20f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -66,7 +66,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index 8d91fba0..76e52969 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -114,7 +114,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp index d851a387..c9615530 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctReg.jsp @@ -895,7 +895,7 @@ <%-- --%> "> - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrCmpltReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrCmpltReg.jsp index d9fe121c..27b2150c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrCmpltReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/otsdCprtnPrcs/lctrAplct/lctrCmpltReg.jsp @@ -449,7 +449,7 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp index 27b5e73b..dac5f3ed 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctList.jsp @@ -83,7 +83,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 6666ab8c..9ef5e35d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -76,7 +76,8 @@ return } - $("#responseRate").text(Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100) +"%"); + var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1) + $("#responseRate").text(responseRateTxt + "%"); $("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent)); } diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp index 760fafd1..9c33c9b3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndList.jsp @@ -101,7 +101,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/lctrSrvy/lctrSrvyList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/lctrSrvy/lctrSrvyList.jsp index a8e3576d..a0a3b49d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/lctrSrvy/lctrSrvyList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/lctrSrvy/lctrSrvyList.jsp @@ -87,7 +87,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp index d151c18a..26ab3b32 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp @@ -101,7 +101,7 @@ <%-- --%> - +   학교(기관)명 :  diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp index 30b8a6b0..a2c5a1c4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -72,7 +72,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index f575b3b0..b02590f6 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -79,7 +79,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp index 56f60676..c3623f86 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndList.jsp @@ -78,7 +78,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp index ecd9b60d..9cd05952 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmAddRqstList.jsp @@ -211,7 +211,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp index 34f1dbdd..b9522092 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmList.jsp @@ -69,7 +69,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp index 01021d80..b43faa22 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/asgnmInfo/instrAsgnmRqstList.jsp @@ -79,7 +79,7 @@ <%-- --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp index 7691aee4..ad7e538d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/instrEduEndList.jsp @@ -78,7 +78,7 @@ <%-- --%> - + diff --git a/src/main/webapp/html/egovframework/com/cmm/utl/ckeditor/config.js b/src/main/webapp/html/egovframework/com/cmm/utl/ckeditor/config.js index 409779bc..5e912df5 100644 --- a/src/main/webapp/html/egovframework/com/cmm/utl/ckeditor/config.js +++ b/src/main/webapp/html/egovframework/com/cmm/utl/ckeditor/config.js @@ -9,7 +9,7 @@ CKEDITOR.editorConfig = function( config ) { // config.uiColor = '#AADC6E'; config.language = 'ko'; config.enterMode = CKEDITOR.ENTER_BR; - config.filebrowserUploadUrl = '/offedu/utl/wed/insertImage.do'; + config.filebrowserUploadUrl = '/offeduadvc/utl/wed/insertImage.do'; config.allowedContent = true; config.extraAllowedContent = '*(*)'; config.htmlEncodeOutput = false; diff --git a/src/main/webapp/js/ncms_common.js b/src/main/webapp/js/ncms_common.js index 6fb81b2a..add34be7 100644 --- a/src/main/webapp/js/ncms_common.js +++ b/src/main/webapp/js/ncms_common.js @@ -158,28 +158,28 @@ function getfile_img(file_name){ var img_url = ""; switch (img_type) { case "pdf" : - img_url = "/offedu/direct/img/enroll_pdf_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_pdf_file.png" ; break; case "xls" : - img_url = "/offedu/direct/img/enroll_exel_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_exel_file.png" ; break; case "hwp" : - img_url = "/offedu/direct/img/enroll_hwp_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_hwp_file.png" ; break; case "jpg" : - img_url = "/offedu/direct/img/enroll_jpg_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_jpg_file.png" ; break; case "mp4" : - img_url = "/offedu/direct/img/enroll_mp4_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_mp4_file.png" ; break; case "ppt" : - img_url = "/offedu/direct/img/enroll_ppt_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_ppt_file.png" ; break; case "zip" : - img_url = "/offedu/direct/img/enroll_zip_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_zip_file.png" ; break; default : - img_url = "/offedu/direct/img/enroll_jpg_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_jpg_file.png" ; } return img_url ; @@ -289,7 +289,7 @@ function delAtchFile(itemId , fileSn){ } $.ajax({ type: "POST", - url: "/offedu/uss/ion/fms/fmsfileDeleteAjax.do", + url: "/offeduadvc/uss/ion/fms/fmsfileDeleteAjax.do", data:{ "atchFileId" : itemId , "fileSn" : fileSn}, dataType:'json', cache: false, @@ -393,11 +393,11 @@ function goSave(method_parm ){ //method_parm :관리자로그 메소드에서 var url = ""; if($("#pageType").val() == "insert"){//게시판저장 - url = "/offedu/cop/bbs/insertBoardArticleAjax.do"; + url = "/offeduadvc/cop/bbs/insertBoardArticleAjax.do"; }else if($("#pageType").val() == "replay"){ //게시판 답변 - url = "/offedu/cop/bbs/replyBoardArticleAjax.do"; + url = "/offeduadvc/cop/bbs/replyBoardArticleAjax.do"; }else{ - url = document.writeForm == undefined ? "/offedu/cop/bbs/updateBoardArticleAjax.do" : "/offedu/uss/ion/fms/FmsFileInsertAjax.do?logParam="+method_parm; + url = document.writeForm == undefined ? "/offeduadvc/cop/bbs/updateBoardArticleAjax.do" : "/offeduadvc/uss/ion/fms/FmsFileInsertAjax.do?logParam="+method_parm; } $.ajax({ diff --git a/src/main/webapp/js/web_common.js b/src/main/webapp/js/web_common.js index ac731adb..0862b46d 100644 --- a/src/main/webapp/js/web_common.js +++ b/src/main/webapp/js/web_common.js @@ -74,7 +74,7 @@ $(document).ready(function(){ //공통 js return false; } var printPopup ; - printPopup= window.open("/offedu/tempPrint.html","print_open","width=760,height=750,top=0,left=0,noresizable,toolbar=no,status=no,scrollbars=yes,directory=n"); + printPopup= window.open("/offeduadvc/tempPrint.html","print_open","width=760,height=750,top=0,left=0,noresizable,toolbar=no,status=no,scrollbars=yes,directory=n"); }); }); @@ -138,28 +138,28 @@ function getfile_img(file_name){ var img_url = ""; switch (img_type) { case "pdf" : - img_url = "/offedu/direct/img/enroll_pdf_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_pdf_file.png" ; break; case "xls" : - img_url = "/offedu/direct/img/enroll_exel_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_exel_file.png" ; break; case "hwp" : - img_url = "/offedu/direct/img/enroll_hwp_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_hwp_file.png" ; break; case "jpg" : - img_url = "/offedu/direct/img/enroll_jpg_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_jpg_file.png" ; break; case "mp4" : - img_url = "/offedu/direct/img/enroll_mp4_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_mp4_file.png" ; break; case "ppt" : - img_url = "/offedu/direct/img/enroll_ppt_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_ppt_file.png" ; break; case "zip" : - img_url = "/offedu/direct/img/enroll_zip_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_zip_file.png" ; break; default : - img_url = "/offedu/direct/img/enroll_jpg_file.png" ; + img_url = "/offeduadvc/direct/img/enroll_jpg_file.png" ; } return img_url ; @@ -269,7 +269,7 @@ function delAtchFile(itemId , fileSn){ $.ajax({ type: "POST", - url: "/offedu/uss/ion/fms/fmsfileDeleteAjax.do", + url: "/offeduadvc/uss/ion/fms/fmsfileDeleteAjax.do", data:{ "atchFileId" : itemId , "fileSn" : fileSn}, dataType:'json', cache: false, @@ -308,7 +308,7 @@ function delAtchFile(itemId , fileSn){ function autoDelAtchFile(data){ $.ajax({ type: "POST", - url: "/offedu/uss/ion/fms/fmsfileMultipleDeleteAjax.do", + url: "/offeduadvc/uss/ion/fms/fmsfileMultipleDeleteAjax.do", data: JSON.stringify(data), dataType:'json', async: false, @@ -503,7 +503,7 @@ function delAtchPhotoFile(itemId , fileSn){ $.ajax({ type: "POST", - url: "/offedu/uss/ion/fms/fmsfileDeleteAjax.do", + url: "/offeduadvc/uss/ion/fms/fmsfileDeleteAjax.do", data:{ "atchFileId" : itemId , "fileSn" : fileSn}, dataType:'json', cache: false, @@ -519,7 +519,7 @@ function delAtchPhotoFile(itemId , fileSn){ $('.item_'+returnData.fmsFileVO.atchFileId+"_"+returnData.fmsFileVO.fileSn).remove(); alert("삭제되었습니다."); drawUploadArea(); - $('.put_photo_box').html('이미지를 넣어주세요'); + $('.put_photo_box').html('이미지를 넣어주세요'); /*강사 디테일 첨부파일 ID 삭제*/ /*각각 jsp파일에 function존재*/ atchFileIdDelete(); @@ -631,7 +631,7 @@ function delete_photo(obj, fileIdx){ 'overflow' : 'hidden' }); */ //이미지 형식 - $('.put_photo_box').html('이미지를 넣어주세요 '); + $('.put_photo_box').html('이미지를 넣어주세요 '); } } /*강사 첨부파일 등록 종료 - 썸네일 추가 기능*/ @@ -658,9 +658,9 @@ function goWebSave(method_parm){ //method_parm :관리자로그 메소드에서 var url = ""; if($("#pageType").val() == "insert"){//게시판저장 - url = "/offedu/web/cop/bbs/insertBoardArticleAjax.do"; + url = "/offeduadvc/web/cop/bbs/insertBoardArticleAjax.do"; }else if($("#pageType").val() == "update"){ //게시판 답변 - url = "/offedu/web/cop/bbs/updateBoardArticleAjax.do"; + url = "/offeduadvc/web/cop/bbs/updateBoardArticleAjax.do"; }/*else{ url = document.writeForm == undefined ? "/cop/bbs/updateBoardArticleAjax.do" : "/uss/ion/fms/FmsFileInsertAjax.do?logParam="+method_parm; }*/ @@ -700,7 +700,7 @@ function goWebSave(method_parm){ //method_parm :관리자로그 메소드에서 /*청소년강사 체크*/ function tngrInstrCheck(){ $.ajax({ - url: '/offedu/web/ve/instr/tngrVisitEdu/instrInfo/instrDivCheckAjax.do', + url: '/offeduadvc/web/ve/instr/tngrVisitEdu/instrInfo/instrDivCheckAjax.do', type: "post", success: function (returnData, status) { if(returnData.tngrInstrYn != 'Y'){ @@ -714,7 +714,7 @@ function tngrInstrCheck(){ /*성인강사 체크*/ function adultInstrCheck(){ $.ajax({ - url: '/offedu/web/ve/instr/tngrVisitEdu/instrInfo/instrDivCheckAjax.do', + url: '/offeduadvc/web/ve/instr/tngrVisitEdu/instrInfo/instrDivCheckAjax.do', type: "post", success: function (returnData, status) { if(returnData.adultInstrYn != 'Y'){ diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index c5a79a52..ba5f972d 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -142,7 +142,7 @@ input[type="text"].input_time {width: 50px;} .time_top p {font-size: 18px; color: #fff; font-weight: 400; align-self: center;} .time_cont{display: flex; justify-content: space-between; align-items: center; padding: 15px 15px 10px 15px;} .time_cont p{padding: 10px 0; font-size: 18px;} -.ampm_select, .hours_select, .min_select{width: 120px; height: 32px; border: 1px solid #d5d5d5; border-radius: 3px; padding-left: 10px; box-sizing: border-box; color: #222; font-size: 16px !important; font-weight: 300; font-size: 16px; background-image: url(/offedu/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: 85% center;} +.ampm_select, .hours_select, .min_select{width: 120px; height: 32px; border: 1px solid #d5d5d5; border-radius: 3px; padding-left: 10px; box-sizing: border-box; color: #222; font-size: 16px !important; font-weight: 300; font-size: 16px; background-image: url(/offeduadvc/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: 85% center;} .ampm_select {width: 70px; letter-spacing: -0.5px;} .time_close{width: auto !important; height: auto !important; padding: 3px 10px; border: 1px solid #dadada; border-radius: 0 !important; margin: 0 15px 20px 0; font-size: 14px !important; font-weight: 400; background-color: #eee; float: right;} .time_close i{background-color:#e20; width: 9px; height: 3px; margin-right: 5px; display: inline-block;vertical-align: middle; } diff --git a/src/main/webapp/visitEdu/usr/datapicker/duet-date-picker.entry.js b/src/main/webapp/visitEdu/usr/datapicker/duet-date-picker.entry.js index f1897c0b..a67da1dc 100644 --- a/src/main/webapp/visitEdu/usr/datapicker/duet-date-picker.entry.js +++ b/src/main/webapp/visitEdu/usr/datapicker/duet-date-picker.entry.js @@ -4,7 +4,7 @@ import { c as a, H as i, g as o -} from "/offedu/visitEdu/usr/datapicker/index-a3afd6e1.js"; +} from "/offeduadvc/visitEdu/usr/datapicker/index-a3afd6e1.js"; const d = /^(\d{4}).(\d{2}).(\d{2})$/; var r; diff --git a/src/main/webapp/visitEdu/usr/datapicker/duet.esm.js b/src/main/webapp/visitEdu/usr/datapicker/duet.esm.js index 8f76cd62..930ef5d0 100644 --- a/src/main/webapp/visitEdu/usr/datapicker/duet.esm.js +++ b/src/main/webapp/visitEdu/usr/datapicker/duet.esm.js @@ -5,7 +5,7 @@ import { N as s, a as i, b as r -} from "/offedu/visitEdu/usr/datapicker/index-a3afd6e1.js"; +} from "/offeduadvc/visitEdu/usr/datapicker/index-a3afd6e1.js"; (() => { e.t = a.__cssshim; const r = Array.from(t.querySelectorAll("script")).find((e => new RegExp(`/${s}(\\.esm)?\\.js($|\\?|#)`).test(e.src) || e.getAttribute("data-stencil-namespace") === s)), @@ -32,7 +32,7 @@ import { return c } } - })(n.resourcesUrl, r), a.customElements ? i(n) : __sc_import_duet("/offedu/visitEdu/usr/datapicker/dom-fb6a473e.js").then((() => n)) + })(n.resourcesUrl, r), a.customElements ? i(n) : __sc_import_duet("/offeduadvcadvc/visitEdu/usr/datapicker/dom-fb6a473e.js").then((() => n)) })().then((e => r([ ["duet-date-picker", [ [0, "duet-date-picker", { diff --git a/src/main/webapp/visitEdu/usr/datapicker/duet.system.js b/src/main/webapp/visitEdu/usr/datapicker/duet.system.js index 97d9c1f2..2f6af1c3 100644 --- a/src/main/webapp/visitEdu/usr/datapicker/duet.system.js +++ b/src/main/webapp/visitEdu/usr/datapicker/duet.system.js @@ -1 +1 @@ -System.register(["/offedu/visitEdu/usr/datapicker/index-7f002a21.system.js"],(function(e,r){"use strict";var t,n,i,s,a,c;return{setters:[function(e){t=e.p;n=e.w;i=e.d;s=e.N;a=e.a;c=e.b}],execute:function(){var e=function(e){return"__sc_import_"+e.replace(/\s|-/g,"_")};var o=function(){{t.$cssShim$=n.__cssshim}var e=Array.from(i.querySelectorAll("script")).find((function(e){return new RegExp("/"+s+"(\\.esm)?\\.js($|\\?|#)").test(e.src)||e.getAttribute("data-stencil-namespace")===s}));var c=r.meta.url;var o={};if(c!==""){o.resourcesUrl=new URL(".",c).href}else{o.resourcesUrl=new URL(".",new URL(e.getAttribute("data-resources-url")||e.src,n.location.href)).href;{u(o.resourcesUrl,e)}if(!n.customElements){return r.import("./dom-9370655f.system.js").then((function(){return o}))}}return a(o)};var u=function(r,t){var a=e(s);try{n[a]=new Function("w","return import(w);//"+Math.random())}catch(e){var c=new Map;n[a]=function(e){var s=new URL(e,r).href;var o=c.get(s);if(!o){var u=i.createElement("script");u.type="module";u.crossOrigin=t.crossOrigin;u.src=URL.createObjectURL(new Blob(["import * as m from '"+s+"'; window."+a+".m = m;"],{type:"application/javascript"}));o=new Promise((function(e){u.onload=function(){e(n[a].m);u.remove()}}));c.set(s,o);i.head.appendChild(u)}return o}}};o().then((function(e){return c([["duet-date-picker.system",[[0,"duet-date-picker",{name:[1],identifier:[1],disabled:[516],role:[1],direction:[1],required:[4],value:[1537],min:[1],max:[1],firstDayOfWeek:[2,"first-day-of-week"],localization:[16],dateAdapter:[16],isDateDisabled:[16],activeFocus:[32],focusedDay:[32],open:[32],setFocus:[64],show:[64],hide:[64]},[[6,"click","handleDocumentClick"]]]]]],e)}))}}})); \ No newline at end of file +System.register(["/offeduadvc/visitEdu/usr/datapicker/index-7f002a21.system.js"],(function(e,r){"use strict";var t,n,i,s,a,c;return{setters:[function(e){t=e.p;n=e.w;i=e.d;s=e.N;a=e.a;c=e.b}],execute:function(){var e=function(e){return"__sc_import_"+e.replace(/\s|-/g,"_")};var o=function(){{t.$cssShim$=n.__cssshim}var e=Array.from(i.querySelectorAll("script")).find((function(e){return new RegExp("/"+s+"(\\.esm)?\\.js($|\\?|#)").test(e.src)||e.getAttribute("data-stencil-namespace")===s}));var c=r.meta.url;var o={};if(c!==""){o.resourcesUrl=new URL(".",c).href}else{o.resourcesUrl=new URL(".",new URL(e.getAttribute("data-resources-url")||e.src,n.location.href)).href;{u(o.resourcesUrl,e)}if(!n.customElements){return r.import("./dom-9370655f.system.js").then((function(){return o}))}}return a(o)};var u=function(r,t){var a=e(s);try{n[a]=new Function("w","return import(w);//"+Math.random())}catch(e){var c=new Map;n[a]=function(e){var s=new URL(e,r).href;var o=c.get(s);if(!o){var u=i.createElement("script");u.type="module";u.crossOrigin=t.crossOrigin;u.src=URL.createObjectURL(new Blob(["import * as m from '"+s+"'; window."+a+".m = m;"],{type:"application/javascript"}));o=new Promise((function(e){u.onload=function(){e(n[a].m);u.remove()}}));c.set(s,o);i.head.appendChild(u)}return o}}};o().then((function(e){return c([["duet-date-picker.system",[[0,"duet-date-picker",{name:[1],identifier:[1],disabled:[516],role:[1],direction:[1],required:[4],value:[1537],min:[1],max:[1],firstDayOfWeek:[2,"first-day-of-week"],localization:[16],dateAdapter:[16],isDateDisabled:[16],activeFocus:[32],focusedDay:[32],open:[32],setFocus:[64],show:[64],hide:[64]},[[6,"click","handleDocumentClick"]]]]]],e)}))}}})); \ No newline at end of file diff --git a/src/main/webapp/visitEdu/usr/publish/css/common.css b/src/main/webapp/visitEdu/usr/publish/css/common.css index e2e4371f..206592f0 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/common.css +++ b/src/main/webapp/visitEdu/usr/publish/css/common.css @@ -30,9 +30,9 @@ header.on::before{opacity: 1;} .gnb_wrap .area_right .login_after + .login_info::before {right:7px;} .gnb_wrap .area_right .header_login_wrap {padding-right: 33px;} .gnb_wrap .area_right a i {display: inline-block; background-repeat: no-repeat; vertical-align: middle; margin-bottom: 2px; margin-right: 5px;} -.gnb_wrap .area_right .header_login i {background-image: url(/offedu/visitEdu/usr/publish/images/common/headerTop_icon1.png); width: 11px; height: 15px;} +.gnb_wrap .area_right .header_login i {background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/headerTop_icon1.png); width: 11px; height: 15px;} .gnb_wrap .area_right .header_join {padding-right: 22px;margin:0 -10px 0 0;} -.gnb_wrap .area_right .header_join i {background-image: url(/offedu/visitEdu/usr/publish/images/common/headerTop_icon2.png); width: 14px; height: 15px;} +.gnb_wrap .area_right .header_join i {background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/headerTop_icon2.png); width: 14px; height: 15px;} .gnb_wrap .area_right a:hover{text-decoration: underline;} .gnb_wrap .area_right .login_info::before,.gnb_wrap .area_right .login_after::before{position: absolute; content: " ";width: 1px; height: 13px; background-color: #dbdbdb; top: 50%; right: 13px; transform: translateY(-50%);} .gnb_wrap .area_right .login_after::before {right:7px;} @@ -40,8 +40,8 @@ header.on::before{opacity: 1;} .gnb_wrap .btn_util {margin:0 0 0 10px;} .gnb_wrap .btn_util button{width: 40px; height: 40px; vertical-align: middle; background-repeat: no-repeat; background-position: center; border-left: 1px solid #e2e4e6; } .gnb_wrap .btn_util button:hover{box-shadow: 0 0 5px rgba(0,0,0,.15);} -.gnb_wrap .btn_util .btn_minus{margin-right: -5px; background-image: url(/offedu/visitEdu/usr/publish/images/common/headerTop_btn1.png);} -.gnb_wrap .btn_util .btn_plus{background-image: url(/offedu/visitEdu/usr/publish/images/common/headerTop_btn2.png); border-right: 1px solid #e2e4e6;} +.gnb_wrap .btn_util .btn_minus{margin-right: -5px; background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/headerTop_btn1.png);} +.gnb_wrap .btn_util .btn_plus{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/headerTop_btn2.png); border-right: 1px solid #e2e4e6;} .header{padding: 0 20px; box-sizing: border-box;} .header_inner{max-width: 1400px; width: 100%; height: 90px; display: flex; align-items: center; justify-content: space-between; margin: 0 auto; position: relative;} @@ -72,13 +72,13 @@ header.on::before{opacity: 1;} .header_inner .depth02 a:hover,.header_inner .depth02 a:focus{color: #E95504;} .header_inner button{width: 27px; height: 26px; background-repeat: no-repeat;} -.header_inner .btn_search{background-image: url(/offedu/visitEdu/usr/publish/images/common/btn_search.png); margin-right: 25px; margin-top: -2px;} -.header_inner .btn_menu{background-image: url(/offedu/visitEdu/usr/publish/images/common/btn_menu.png);} +.header_inner .btn_search{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/btn_search.png); margin-right: 25px; margin-top: -2px;} +.header_inner .btn_menu{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/btn_menu.png);} .header_inner button.btn_mobile{display: none; margin: 0 8px; vertical-align: middle; margin-top: -2px;height:100%;background-position:center center;} -.header_inner .btn_login{background-image: url(/offedu/visitEdu/usr/publish/images/common/m_headerTop_icon1.png);background-size:21px auto;} -.header_inner .btn_logout{background-image: url(/offedu/kccadrPb/usr/image/common/btn_logout.png);} -.header_inner .btn_join{width: 35px; background-image: url(/offedu/visitEdu/usr/publish/images/common/m_headerTop_icon2.png);background-size:26px auto;} -.header_inner .btn_usredit{width: 35px; background-image: url(/offedu/kccadrPb/usr/image/common/btn_usredit.png);} +.header_inner .btn_login{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/m_headerTop_icon1.png);background-size:21px auto;} +.header_inner .btn_logout{background-image: url(/offeduadvc/kccadrPb/usr/image/common/btn_logout.png);} +.header_inner .btn_join{width: 35px; background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/m_headerTop_icon2.png);background-size:26px auto;} +.header_inner .btn_usredit{width: 35px; background-image: url(/offeduadvc/kccadrPb/usr/image/common/btn_usredit.png);} .header_inner .m_header_login, .header_inner .m_header_join {display:none;} /* //header */ @@ -87,7 +87,7 @@ header.on::before{opacity: 1;} .full_menu{visibility: hidden; width: 100%; position: fixed; background-color: #fff; min-height: 500px; padding: 50px; box-sizing: border-box; top: -500px; transition: top 0.5s ease, box-shadow 0.3s ease; z-index: 21;} .full_menu.on{visibility: visible; top: 0; box-shadow: 0 5px 8px rgba(0,0,0,0.1);} .full_menu .inner{max-width: 1400px; width: 100%; position: relative; margin: 0 auto;} -.full_menu .btn_close{background-image: url(/offedu/visitEdu/usr/publish/images/common/btn_close.png); width: 40px; height: 40px; background-repeat: no-repeat; position: absolute; right: 0; top: 15px; border: 1px solid #ef7b0f; border-radius: 3px; background-position: center;} +.full_menu .btn_close{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/btn_close.png); width: 40px; height: 40px; background-repeat: no-repeat; position: absolute; right: 0; top: 15px; border: 1px solid #ef7b0f; border-radius: 3px; background-position: center;} .full_menu .depth01{display: flex; justify-content: space-around; text-align: center; margin: 80px 50px 0 50px;} .full_menu .btn_close:hover {box-shadow: 0 0 5px rgba(0,0,0,.15); transition: width .4s ease-in-out;} .full_menu .depth01 .menu_link{font-size: 20px; font-weight: 500; color: #ea5404; position: relative; padding-bottom: 25px; letter-spacing: -1px; text-align: center; height: 40px;} @@ -96,7 +96,7 @@ header.on::before{opacity: 1;} .full_menu .depth02{margin-top: 10px;} .full_menu .depth02 a{height: 40px; display: flex; align-items: center; justify-content: center; letter-spacing: -1px; font-size: 17px; font-weight: 400;} .full_menu .depth02 a:hover {font-weight: 700;} -.full_menu .link{display: inline-block; width: 16px; height: 16px; background-image: url(/offedu/visitEdu/usr/publish/images/common/link_icon.png);background-repeat: no-repeat; margin-left: 6px;} +.full_menu .link{display: inline-block; width: 16px; height: 16px; background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/link_icon.png);background-repeat: no-repeat; margin-left: 6px;} /* //full menu */ /* moblie menu */ @@ -109,7 +109,7 @@ header.on::before{opacity: 1;} .path .pathedfr ul {display: flex; align-items: center; height: 50px;} .path .pathedfr ul li {align-self: center; font-size: 16px; color: #666; font-weight: 300;} .path .pathedfr ul li:nth-child(even) {color: #666; font-size: 14px; margin: 0 8px;} -.path .pathedfr ul li.home i {background-image: url(/offedu/visitEdu/usr/publish/images/common/home_icon.png); width: 19px; height: 17px; display: inline-block; margin-bottom: -2px; margin-right: 10px;} +.path .pathedfr ul li.home i {background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/home_icon.png); width: 19px; height: 17px; display: inline-block; margin-bottom: -2px; margin-right: 10px;} .path .m_pathedfr {display:none;} /* snb */ @@ -122,7 +122,7 @@ header.on::before{opacity: 1;} .snb .ssleftxt ul li a{width:100%;height:100%;color:#666;padding:0 15px;box-sizing:border-box; font-size: 18px; display: table-cell; vertical-align: middle; font-weight: 300;} .snb .ssleftxt ul li a span{font-size: 18px; line-height: 18px;} .snb .ssleftxt ul li.menu_on{background-color: #ec5908 ; border: 1px solid #ec5908;} -.snb .ssleftxt ul li.menu_on a {color:#fff; background-image: url(/offedu/visitEdu/usr/publish/images/common/arrow.png); background-repeat: no-repeat; background-position: 91% 50%;} +.snb .ssleftxt ul li.menu_on a {color:#fff; background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/arrow.png); background-repeat: no-repeat; background-position: 91% 50%;} /*// snb */ @@ -138,7 +138,7 @@ footer .site li::before{position: absolute; content: " "; width: 1px; height: 14 footer .site li:last-child::before{display: none;} footer .site li:first-child{padding-left: 0;} footer .site li a:hover {text-decoration: underline;} -footer select{height: 40px; border: 1px solid #cbcdd1; background-image: url(/offedu/visitEdu/usr/publish/images/common/footer_select.png); background-position: calc(100% - 15px) center; background-repeat: no-repeat; padding: 0 10px; font-size: 15px; color: #666;} +footer select{height: 40px; border: 1px solid #cbcdd1; background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/footer_select.png); background-position: calc(100% - 15px) center; background-repeat: no-repeat; padding: 0 10px; font-size: 15px; color: #666;} footer .btn_go{width: 50px; height: 40px; border: 1px solid #cbcdd1; background-color: #eaecef; vertical-align: middle; border-radius: 5px; color: #666; transition: all 0.1s linear; font-size: 16px;} footer .btn_go:hover{box-shadow: 0 0 5px rgba(0,0,0,0.2); transition: all 0.1s linear;} footer .logo,footer address{display: inline-block; vertical-align: middle;} @@ -150,7 +150,7 @@ footer .wa_mark .wa {width: 110px;} .error_page{width: 100%; height: 100%; margin: 0 auto; text-align: center;} .error_wrap{border: 1px solid #d5d5d5; display: inline-flex; align-items: center; margin: 200px auto 50px auto; padding: 15px 50px 15px 0; justify-content: center;} -.error_wrap i{display: block; width: 266px; height: 200px; background-image: url(/offedu/visitEdu/adm/publish/image/warming.jpg); border-right: 1px solid #d5d5d5; } +.error_wrap i{display: block; width: 266px; height: 200px; background-image: url(/offeduadvc/visitEdu/adm/publish/image/warming.jpg); border-right: 1px solid #d5d5d5; } .error_wrap .text_area{width: calc(100% - 266px); font-size: 20px; padding-left: 30px; text-align: left;} .error_wrap .text_area p{font-size: 16px; color: #555; margin-top: 10px; line-height: 1.4;} .error_wrap .error_btn {text-align:center;} @@ -173,7 +173,7 @@ footer .wa_mark .wa {width: 110px;} #m_menu.on{visibility: visible; right: 0; transition: all 0.5s ease;} #m_menu .area_top{text-align: right;} #m_menu .btn_close_wrap {width: 100%; height: 70px; position: absolute; top:0; left: 0; background-color: #ef7b0f;} - #m_menu .btn_close{background-image: url(/offedu/visitEdu/usr/publish/images/common/btn_close2.png);background-repeat: no-repeat; background-position: center; width: 40px; height: 40px; border: 1px solid #fff; border-radius: 3px; position: absolute; right: 20px; top: 50%; transform: translateY(-50%);} + #m_menu .btn_close{background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/btn_close2.png);background-repeat: no-repeat; background-position: center; width: 40px; height: 40px; border: 1px solid #fff; border-radius: 3px; position: absolute; right: 20px; top: 50%; transform: translateY(-50%);} #m_menu .btn_close:hover {box-shadow: 0 0 5px rgba(0,0,0,.25);} #m_menu .depth01{width: 100%; padding: 0 10px; margin-top: 70px;box-sizing: border-box;} #m_menu .depth01_li{overflow: hidden; height: 60px; transition: height 0.3s linear; display: block; position: relative;} @@ -181,7 +181,7 @@ footer .wa_mark .wa {width: 110px;} #m_menu .depth01_li.on{height: 280px;transition: height 0.3s linear;} #m_menu .depth01_li.on::before{opacity: 1; bottom: 0;} #m_menu .menu_tit{font-size: 20px; height: 60px; border-bottom: 1px solid #e5e5e5; width: 100%; text-align: left; padding-left: 20px; position: relative;} - #m_menu .menu_tit::after {background-image: url(/offedu/visitEdu/usr/publish/images/common/m_menu_plus.png); background-position: center; background-repeat: no-repeat; width: 36px; height: 36px; content: ""; position: absolute; top: 50%; right: 10px; transform: translateY(-50%);} + #m_menu .menu_tit::after {background-image: url(/offeduadvc/visitEdu/usr/publish/images/common/m_menu_plus.png); background-position: center; background-repeat: no-repeat; width: 36px; height: 36px; content: ""; position: absolute; top: 50%; right: 10px; transform: translateY(-50%);} #m_menu .menu_tit span {color: #f37632;} #m_menu .depth01_li.on .menu_tit {border-bottom: 1px solid #f37632; color: #f37632;} #m_menu .depth02{visibility: hidden; height: 100%; margin: 10px 0; opacity: 0; transition: all 0.3s linear; background-color: #f5f5f5;} @@ -212,11 +212,11 @@ footer .wa_mark .wa {width: 110px;} header .header .header_inner h1 a img {height:43px;} header .header .header_inner .area_right {height:100%;} header .header .header_inner .area_right .btn_search {display:none;} - header .header .header_inner .area_right .btn_menu {width:35px;height:100%;background-image:url(/offedu/visitEdu/usr/publish/images/common/m_btn_menu.png);background-size:29px 21px;background-position:center center;} + header .header .header_inner .area_right .btn_menu {width:35px;height:100%;background-image:url(/offeduadvc/visitEdu/usr/publish/images/common/m_btn_menu.png);background-size:29px 21px;background-position:center center;} header .header .header_inner .area_right .m_header_login {display:flex;width:40px;height:100%;margin:0 5px 0 0;padding:0;font-size:0;align-items:center;justify-content:center;text-indent:-9999em;z-index:1;} - header .header .header_inner .area_right .m_header_login i {width:21px;height:28px;margin:0;background-image:url(/offedu/visitEdu/usr/publish/images/common/m_headerTop_icon1.png);background-size:21px auto;} + header .header .header_inner .area_right .m_header_login i {width:21px;height:28px;margin:0;background-image:url(/offeduadvc/visitEdu/usr/publish/images/common/m_headerTop_icon1.png);background-size:21px auto;} header .header .header_inner .area_right .m_header_join {display:flex;width:40px;height:100%;margin:0 5px 0 0;padding:0;font-size:0;align-items:center;justify-content:center;text-indent:-9999em;z-index:1;} - header .header .header_inner .area_right .m_header_join i {width:26px;height:28px;margin:0;background-image:url(/offedu/visitEdu/usr/publish/images/common/m_headerTop_icon2.png);background-size:26px auto;} + header .header .header_inner .area_right .m_header_join i {width:26px;height:28px;margin:0;background-image:url(/offeduadvc/visitEdu/usr/publish/images/common/m_headerTop_icon2.png);background-size:26px auto;} .path {height:50px;background:#f5680b;} .path .pathedfr {display:none;} @@ -225,7 +225,7 @@ footer .wa_mark .wa {width: 110px;} .path .m_pathedfr > ul > li {position:relative;float:left;width:50%;height:100%;border-left:1px solid #fcae83;box-sizing:border-box;} .path .m_pathedfr > ul > li:first-child {border:0 none;} .path .m_pathedfr > ul > li .path_btn {position:relative;display:block;width:100%;height:50px; padding:0 0 0 10px;font-size:18px;text-align:left;color:#fff;} - .path .m_pathedfr > ul > li .path_btn:after {content:'';position:absolute;right:15px;top:0; width:18px;height:50px;background:url(/offedu/visitEdu/usr/publish/images/common/path_btn_arrow.png) no-repeat left top;} + .path .m_pathedfr > ul > li .path_btn:after {content:'';position:absolute;right:15px;top:0; width:18px;height:50px;background:url(/offeduadvc/visitEdu/usr/publish/images/common/path_btn_arrow.png) no-repeat left top;} .path .m_pathedfr > ul > li .path_btn.active:after {transform:rotate(180deg);} .path .m_pathedfr > ul > li ul {display:none;position:absolute;left:0;top:50px;width:100%; padding:3px 0;border-top:1px solid #fcae83;background:#fb8b4e;box-sizing:border-box;} .path .m_pathedfr > ul > li ul li a {display:block;padding:0 0 0 10px;font-size:16px;line-height:35px;color:#fff;} diff --git a/src/main/webapp/visitEdu/usr/publish/css/content.css b/src/main/webapp/visitEdu/usr/publish/css/content.css index fbef178e..60cc3ebd 100644 --- a/src/main/webapp/visitEdu/usr/publish/css/content.css +++ b/src/main/webapp/visitEdu/usr/publish/css/content.css @@ -181,7 +181,7 @@ input[type="checkbox"]+label {color: #555; font-size: 16px; font-weight: 300; li input[type="radio"]+label {color: #555; font-size: 16px; font-weight: 300; line-height: 1; vertical-align: middle;} textarea {border: 1px solid #d5d5d5; border-radius: 5px;} textarea::placeholder {color: #000;} -select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 50px 0 15px; font-size: 16px; color: #222; background-image: url(/offedu/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; color: #666;} +select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 50px 0 15px; font-size: 16px; color: #222; background-image: url(/offeduadvc/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: calc(100% - 15px) center; color: #666;} .tb_type02.tb_type02_write input[type="text"].input_time {width: 50px;} /* button type */ @@ -460,7 +460,7 @@ select.selType1 {height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; pa .time_top p {font-size: 18px; color: #fff; font-weight: 400; align-self: center;} .time_cont{display: flex; justify-content: space-between; align-items: center; padding: 15px 15px 10px 15px;} .time_cont p{padding: 10px 0; font-size: 18px;} -.ampm_select, .hours_select, .min_select{width: 120px !important; height: 32px; border: 1px solid #d5d5d5; border-radius: 3px; padding-left: 10px; box-sizing: border-box; color: #222; font-size: 16px !important; font-weight: 300; font-size: 16px; background-image: url(/offedu/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: 85% center;} +.ampm_select, .hours_select, .min_select{width: 120px !important; height: 32px; border: 1px solid #d5d5d5; border-radius: 3px; padding-left: 10px; box-sizing: border-box; color: #222; font-size: 16px !important; font-weight: 300; font-size: 16px; background-image: url(/offeduadvc/visitEdu/usr/publish/images/content/select.png); background-repeat: no-repeat; background-position: 85% center;} .ampm_select {width: 70px; letter-spacing: -0.5px;} .time_close{width: auto !important; height: auto !important; padding: 3px 10px; border: 1px solid #dadada; border-radius: 0 !important; margin: 0 15px 20px 0; font-size: 14px !important; font-weight: 400; background-color: #eee; float: right;} .time_close i{background-color:#e20; width: 9px; height: 3px; margin-right: 5px; display: inline-block;vertical-align: middle; } diff --git a/src/main/webapp/visitEdu/usr/publish/script/content.js b/src/main/webapp/visitEdu/usr/publish/script/content.js index 280cf221..25cbcea1 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/content.js +++ b/src/main/webapp/visitEdu/usr/publish/script/content.js @@ -525,7 +525,7 @@ function addEduClass1() { trHtml += ''; trHtml += ''; trHtml += '

명

'; - trHtml += ''; + trHtml += ''; trHtml += ''; eduTable.append(trHtml); diff --git a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js index d6e10c7d..0eebb33a 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js +++ b/src/main/webapp/visitEdu/usr/publish/script/visitEduCom.js @@ -412,7 +412,7 @@ function setFormat (opt, obj) { // 교육신청서 리포트 화면 function fn_adjstReq_preview(adrSeq) { - window.open("/offedu/web/kccadr/adjst/report/adjstReqReportAjax.do?adrSeq="+adrSeq); + window.open("/offeduadvc/web/kccadr/adjst/report/adjstReqReportAjax.do?adrSeq="+adrSeq); } From 76f6c1f821d05b7b0f782c5e872ddbaebd3fbda2 Mon Sep 17 00:00:00 2001 From: subsub Date: Thu, 6 Jul 2023 09:54:52 +0900 Subject: [PATCH 07/10] =?UTF-8?q?2023/07/06=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 2 +- .../tngrVisitEdu/popup/chasiStatusPopup.jsp | 22 +++++++-------- .../visitEdu/adm/publish/css/content.css | 1 - .../webapp/visitEdu/adm/publish/css/popup.css | 27 +++++++++++++++++++ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index bd3fb612..e87910de 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -671,7 +671,7 @@ console.log("form :: ", form); -
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp index 4b067dae..2b949912 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp @@ -38,6 +38,10 @@ + @@ -58,7 +62,7 @@
-
+
@@ -94,7 +98,7 @@
교육일, 차시, 구분, 대상, 배정강사, 인원, 설문완료 여부 등의 정보제공
-
+
@@ -134,7 +138,7 @@
참석자, 응답율, 응답자, 무응답에 대한 정보를 제공/입력
-
+
@@ -402,16 +406,12 @@
-
-
+
- - - - -
-
+ +
+
diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index c5a79a52..45de482d 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -84,7 +84,6 @@ .btn_down_excel{ height: 40px; padding: 0 18px 0 41px; border: 1px solid #0e8040; margin-left: 2px; background-color: #f9f9f9; color: #0e803f; font-size: 16px; border-radius: 5px; box-sizing: border-box; letter-spacing: -0.5px; background-image: url(/offedu/visitEdu/adm/publish/image/content/btn_down_excel.png); background-repeat: no-repeat; background-position: 18px center; vertical-align: middle;} .btn_down_excel:hover{background-color: #f2f2f2;} - /* 기타 input select type */ input[type="text"]:disabled,input[type="password"]:disabled{border: 1px solid #d5d5d5; background-color: #ededed; color: #888; height: 40px; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px;} input[type="text"],input[type="password"],select{height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px; color: #222; box-sizing: border-box;} diff --git a/src/main/webapp/visitEdu/adm/publish/css/popup.css b/src/main/webapp/visitEdu/adm/publish/css/popup.css index db91cb26..2bc8cc28 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/popup.css +++ b/src/main/webapp/visitEdu/adm/publish/css/popup.css @@ -75,6 +75,33 @@ .pop_tb_type02 td .river_area dl dd .city li ul li {margin:7px 0 6px;} .pop_tb_type02 td .river_area dl dd .area_list li {font-size:16px;font-weight:400;line-height:30px;color:#222;} +.pop_tb_type04{margin-bottom: 25px; max-height: 500px; overflow-y: scroll;} +.pop_tb_type04>table{width: 100%; table-layout: fixed; border-top: 2px solid #000;} +.pop_tb_type04>table>thead>tr{border-bottom: 1px solid #e5e5e5;} +.pop_tb_type04>table>tbody>tr{border-bottom: 1px solid #e5e5e5;} +.pop_tb_type04>table>thead>tr>th,.pop_tb_type04>table>tbody>tr>th,.pop_tb_type04>table>tbody>tr>td{font-size: 15px; text-align: center; vertical-align: middle; height: 45px; padding: 0 5px;} +.pop_tb_type04>table>thead>tr>th:last-child,.pop_tb_type04>table>tbody>tr>td:last-child{border-right: 0;} +.pop_tb_type04>table>thead>tr>th{font-weight: 400; background-color: #f5f5f5;} +.pop_tb_type04>table>tbody>tr>th, .pop_tb_type04>table>tbody>tr>td {color: #555; font-weight: 300;} +.pop_tb_type04>table>tbody>tr>td input[type=text] {margin:5px 0;} +.pop_tb_type04>table .btnType01 {font-size: 15px; height: 30px; padding: 0 10px; border-radius: 5px;} + +.pop_tb_type05 {margin-bottom: 40px; overflow-y: scroll; max-height: 500px;} +.pop_tb_type05>table{width: 100%; table-layout: fixed;} +.pop_tb_type05>table>tbody {border-top: 2px solid #000;} +.pop_tb_type05>table>tbody>tr{border-bottom: 1px solid #e5e5e5;} +.pop_tb_type05>table>tbody>tr>th,.pop_tb_type05>table>tbody>tr>td{ font-size: 15px; text-align: left;box-sizing: border-box;} +.pop_tb_type05>table>tbody>tr>th{background-color: #f5f5f5; font-weight: 400; vertical-align: top; padding-top: 19px; padding-left: 20px;} +.pop_tb_type05>table>tbody>tr>th p {line-height: 1.3;} +.pop_tb_type05>table>tbody>tr>td{padding: 10px 13px; height: 55px; font-weight: 300; color: #555; vertical-align: middle; line-height: 1.4;} +.pop_tb_type05>table>tbody>tr>td textarea {width: 100%; height: 80px; font-size: 16px; padding: 10px 15px; box-sizing: border-box;} +.pop_tb_type05>table>tbody>tr>td button {font-size: 15px; height: 35px; padding: 0 16px;} +.pop_tb_type05>table>tbody>tr>td .file_cf {margin: 5px 0 0 0; font-size: 15px;} + +.pop_btn_wrap button{margin: 0 1px;height: 34px; padding: 0 25px;font-size: 16px;text-align: center; vertical-align: middle; letter-spacing: -0.8px; border-radius: 5px; box-sizing: border-box; transition: background-color .1s linear;} +.pop_btn_wrap button:first-child{margin-left: 0;} +.pop_btn_wrap button:last-child{margin-right: 0;} + /* table type03 (table 모양이지만 div로 만듦) */ .pop_tb_type03 {border-top: 2px solid #000; margin-bottom: 50px;} .pop_tb_type03 .thead {padding: 10px 20px; background-color: #f5f5f5; display: flex; align-items: center; box-sizing: border-box;} From 2d177dc1c8efed9d1ef17cc41652c985d9711b96 Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 6 Jul 2023 15:10:32 +0900 Subject: [PATCH 08/10] =?UTF-8?q?feat=20:=20"pms:#3252=20[=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90]=20=20=EB=A7=8C=EC=A1=B1=EB=8F=84=20?= =?UTF-8?q?=ED=8F=89=EA=B0=80=20=3D=3D>=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EA=B0=80=EB=8A=A5=20=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=B4=EC=A3=BC=EC=84=B8=EC=9A=94"=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EgovQustnrRespondInfoService.java | 6 + .../EgovQustnrRespondInfoServiceImpl.java | 11 + .../service/impl/QustnrRespondInfoDao.java | 11 + .../eduEnd/web/EduEndTngrController.java | 1 + .../web/EduRsltMngTngrController.java | 87 ++++ .../qri/EgovQustnrRespondInfo_SQL_Mysql.xml | 59 ++- .../oprtn/tngrVisitEdu/eduRsltMngDetail.jsp | 50 +- .../tngrVisitEdu/popup/chasiStatusPopup.jsp | 476 ++++++++---------- .../tngrVisitEdu/eduEnd/eduEndDetail.jsp | 2 +- 9 files changed, 417 insertions(+), 286 deletions(-) diff --git a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java index 53c9b352..4685ec86 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/EgovQustnrRespondInfoService.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import kcc.com.cmm.ComDefaultVO; +import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; /** * 설문조사 Service Class 구현 * @author 공통서비스 장동한 @@ -156,4 +158,8 @@ public interface EgovQustnrRespondInfoService { public List selectChasiSrvyExcelList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception; + + void updateQustnrRespondManage(QustnrRespondManageVO qustnrRespondManageVO); + + void deleteChasiStatus(VEEduAplctVO vEEduAplctVO); } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java index 930691d5..c68daa86 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java @@ -8,6 +8,8 @@ import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.com.cmm.ComDefaultVO; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; +import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import javax.annotation.Resource; @@ -222,6 +224,11 @@ public class EgovQustnrRespondInfoServiceImpl extends EgovAbstractServiceImpl im dao.updateSrvyInfo(qustnrRespondInfoVO); } + @Override + public void updateQustnrRespondManage(QustnrRespondManageVO qustnrRespondManageVO) { + dao.updateQustnrRespondManage(qustnrRespondManageVO); + } + @Override public List selectChasiSrvyList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { return dao.selectChasiSrvyList(qustnrRespondInfoVO); @@ -234,5 +241,9 @@ public class EgovQustnrRespondInfoServiceImpl extends EgovAbstractServiceImpl im public List selectChasiSrvyExcelList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { return dao.selectChasiSrvyExcelList(qustnrRespondInfoVO); } + @Override + public void deleteChasiStatus(VEEduAplctVO vEEduAplctVO) { + dao.deleteChasiStatus(vEEduAplctVO); + } } diff --git a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java index d0e97a19..9460e1fb 100644 --- a/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java +++ b/src/main/java/kcc/let/uss/olp/qri/service/impl/QustnrRespondInfoDao.java @@ -6,6 +6,8 @@ import java.util.Map; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; import kcc.com.cmm.ComDefaultVO; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; +import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO; +import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import org.springframework.stereotype.Repository; /** @@ -199,4 +201,13 @@ public class QustnrRespondInfoDao extends EgovAbstractDAO { public List selectChasiSrvyExcelList(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { return (List) list("QustnrRespondInfo.selectChasiSrvyExcelList", qustnrRespondInfoVO); } + + public void updateQustnrRespondManage(QustnrRespondManageVO qustnrRespondManageVO) { + update("QustnrRespondInfo.updateQustnrRespondManage", qustnrRespondManageVO); + } + + public void deleteChasiStatus(VEEduAplctVO vEEduAplctVO) { + delete("QustnrRespondInfo.deleteChasiStatusFormLettnqustnrrespondinfo", vEEduAplctVO); + delete("QustnrRespondInfo.deleteChasiStatusFormlettnqestnrrslt", vEEduAplctVO); + } } diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index e2eaea06..51c3c28a 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -571,6 +571,7 @@ public class EduEndTngrController { return modelAndView; } + /** * 교육설문조사 등록 로직 */ diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java index 1c33f4df..1e573d45 100644 --- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java +++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java @@ -50,6 +50,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.cmm.CmmUtil; import kcc.let.uss.olp.qri.service.EgovQustnrRespondInfoService; import kcc.let.uss.olp.qri.service.QustnrRespondInfoVO; +import kcc.let.uss.olp.qrm.service.QustnrRespondManageVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.cmm.VeConstants; import kcc.ve.cmm.VeInstrFeeMng; @@ -408,6 +409,32 @@ public class EduRsltMngTngrController { } + /** + * 교육결과 삭제 + */ + @RequestMapping("deleteChasiStatus.do") + public ModelAndView deleteChasiStatus( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpSession session + , HttpServletRequest request + ) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + egovQustnrRespondInfoService.deleteChasiStatus(vEEduAplctVO); + + + modelAndView.addObject("result", "success"); + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + modelAndView.addObject("result", "fail"); + } + return modelAndView; + + } + + /** * 교육결과관리 상세 화면 */ @@ -440,10 +467,70 @@ public class EduRsltMngTngrController { model.addAttribute("chasiSrvyList",chasiSrvyList); } System.out.println("=============================================chasiSrvyList============================================="); + + + return "oprtn/tngrVisitEdu/popup/chasiStatusPopup"; } + + /** + * 교육설문 수정 + */ + @RequestMapping(value="/updateSrvyInfoAjax.do") + public ModelAndView updateSrvyInfoAjax( HttpServletRequest request + , ModelMap model + , VEEduAplctVO veEduAplctVO + , QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + try { + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); + if (loginVO == null) { + modelAndView.addObject("result", "fail"); + modelAndView.addObject("msg", "로그인 해주세요."); + return modelAndView; + } + + // 설문 참석자, 응답자, 결과 저장 + QustnrRespondManageVO qustnrRespondManageVO = new QustnrRespondManageVO(); + qustnrRespondManageVO.setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); + qustnrRespondManageVO.setEduChasiOrd(veEduAplctVO.getEduChasiOrd()); + qustnrRespondManageVO.setQestnrId(qustnrRespondInfoVO.getQestnrId()); + qustnrRespondManageVO.setQestnrParticipant(qustnrRespondInfoVO.getQestnrParticipant()); + qustnrRespondManageVO.setQestnrRespondent(qustnrRespondInfoVO.getQestnrRespondent()); + qustnrRespondManageVO.setFrstRegisterId(loginVO.getId()); + qustnrRespondManageVO.setLastUpdusrId(loginVO.getId()); + qustnrRespondManageVO.setQestnrRespondId(qustnrRespondInfoVO.getQestnrRespondId()); + + + +// eduAplctOrd "eduAplct_00000001371" (id=816) +// eduChasiOrd "eduChasi_00000001584" (id=821) +// qestnrRespondId "QRPD_000000000000630" (id=906) + + System.out.println("qustnrRespondManageVO.getQestnrRespondId() :: "+ qustnrRespondManageVO.getQestnrRespondId()); + + egovQustnrRespondInfoService.updateQustnrRespondManage(qustnrRespondManageVO); + // 설문 문항 결과 등록 + for(int i=0; i < qustnrRespondInfoVO.getResultList().size(); i++) { + qustnrRespondInfoVO.getResultList().get(i).setRespondId(loginVO.getId()); + qustnrRespondInfoVO.getResultList().get(i).setFrstRegisterId(loginVO.getId()); + qustnrRespondInfoVO.getResultList().get(i).setLastUpdusrId(loginVO.getId()); + qustnrRespondInfoVO.getResultList().get(i).setEduAplctOrd(veEduAplctVO.getEduAplctOrd()); + qustnrRespondInfoVO.getResultList().get(i).setEduChasiOrd(veEduAplctVO.getEduChasiOrd()); + egovQustnrRespondInfoService.updateSrvyInfo(qustnrRespondInfoVO.getResultList().get(i)); + } + }catch(Exception ex) { + System.out.println("Exception vEEduAplctOnlnService.updateBulk"); + } + modelAndView.addObject("result", "success"); + return modelAndView; + } + + /** * 교육결과관리 상세 화면 */ diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Mysql.xml index c5d46988..a800f8d2 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Mysql.xml @@ -6,7 +6,10 @@ + + + @@ -519,4 +536,18 @@ WHERE 1=1 AND B.EDU_APLCT_ORD = #eduAplctOrd# AND B.EDU_CHASI_ORD = #eduChasiOrd# + + + DELETE FROM lettnqustnrrespondinfo + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + + + DELETE FROM lettnqestnrrslt + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp index e87910de..39a9d1b9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngDetail.jsp @@ -43,7 +43,10 @@ function fncGoEdit(){ function replyCalculation(){ var qestnrParticipant = $("#qestnrParticipant").val(); //참석자 수량 var qestnrRespondent = $("#qestnrRespondent").val(); //응답자 수량 - $("#responseRate").text(Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100) +"%"); + + var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1); + + $("#responseRate").text(responseRateTxt +"%"); $("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent)); } function fileDownload(atchFileId, fileSn, newFileNm){ @@ -224,25 +227,43 @@ function replyCalculation(){ + function fn_delete(){ + + if (!confirm("삭제 하시겠습니까?")) { + return false; + } + + var form = new FormData(document.getElementById("chasiStatusPopForm")); + + $.ajax({ + type:"POST", + url:"", + data:form, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("정상적으로 삭제 되었습니다."); + location.reload(); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } - - // 강사 변경 + // 만족도 평가 수정 팝업 function fn_chasiStatusPop() { var form = document.chasiStatusPopForm; -// form.eduAplctOrd.value = aplctOrd; -// form.eduChasiOrd.value = chasiOrd; -// form.strtTm.value = strtTm; -// form.endTm.value = endTm; -// form.asgnmAprvlCd.value = code; - - //추가 강사 변경 -// form.action = ""; -console.log("form :: ", form); form.action = ""; - window.open("#", "_chasiStatusPop", "scrollbars = no, top=100px, left=100px, height=750px, width=1200px"); + window.open("#", "_chasiStatusPop", "scrollbars = no, top=100px, left=100px, height=750px, width=830px"); form.target = "_chasiStatusPop"; form.submit(); } @@ -671,11 +692,14 @@ console.log("form :: ", form);
평가문항, 매우만족, 만족, 보통, 불만족, 매우 불만족 입력
+
+
+

비공개 메모

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp index 2b949912..f07f2568 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/chasiStatusPopup.jsp @@ -33,8 +33,170 @@ 강사배치 팝업 @@ -45,19 +207,15 @@ - - - -
- - - - + + + +
-

강의만족도 결과 등록

+

강의만족도 결과

@@ -87,13 +245,13 @@ - 2022-03-30 - 14:10~15:35(85분) - 10 - 1-1반 - 원영현 - 55 - 설문진행중 + + + + + + + @@ -114,7 +272,7 @@ - +

응답율

@@ -127,7 +285,7 @@ - +

무응답

@@ -161,245 +319,47 @@ - - - 1) 본 교육운영에 대하여 전반적으로 만족하십니까? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2) 본 교육 내용구성에 대해서는 어느 정도 만족 하십니까? + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + ${status1.count}) + + (최대선택건수 ${QestmInfo.mxmmChoiseCo}) + + + + + + + + + " > + + + + " > + + + + " > + + + + " > + + + + " > + + + + + - - - 3) 교육 시간은 적절했다고 생각하십니까? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4) 본 교육을 받기 전 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5) 본 교육을 받은 후, 귀하의 저작권에 대한 인식은 어느 정도라고 생각하십니까? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6) 본 교육을 통해, 학교 수업 혹은 직무에 얼마나 도움이 될 것이라고 생각하십니까? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 7) 강사가 교육 5분 전까지 도착했나요?(지각여부_교사 only) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 8) 본 교육과 관련하여 강사가 교육 5분 전까지 도착했습니까?(지각여부확인_교사만) - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -408,8 +368,8 @@
- - + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index 9ef5e35d..d07eed2b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -76,7 +76,7 @@ return } - var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1) + var responseRateTxt = (Number(qestnrRespondent) / Number(qestnrParticipant)*Number(100)).toFixed(1); $("#responseRate").text(responseRateTxt + "%"); $("#noResponse").text(Number(qestnrParticipant) - Number(qestnrRespondent)); } From 581eb8420423cf8989f672f08256432457d9687a Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 7 Jul 2023 09:39:01 +0900 Subject: [PATCH 09/10] =?UTF-8?q?feat=20:=20jsp=20context=20path=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp | 4 ++-- .../webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp | 10 +++++----- .../WEB-INF/jsp/cop/cmt/EgovArticleCommentList.jsp | 2 +- .../jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp | 2 +- .../WEB-INF/jsp/uss/ion/cnt/cntManageInsert.jsp | 2 +- .../WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp | 13 +++++++------ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp | 2 +- .../ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp | 12 ++++++------ .../ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp | 4 ++-- .../exprnClsrmEnd/exprnClsrmEndDetail.jsp | 4 ++-- .../ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp | 10 +++++----- .../ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp | 10 +++++----- .../ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp | 4 ++-- .../WEB-INF/jsp/web/ve/comm/fileUploadPop.jsp | 2 +- .../jsp/web/ve/comm/searchInstrListPopup.jsp | 4 ++-- 15 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp index f6d9e790..fff37154 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeInqire.jsp @@ -91,7 +91,7 @@ var data = new FormData(prohibitForm); $.ajax({ type: "POST", - url: "/offedu/uss/ion/cnf/prohiCheckAjax.do", + url: "", async:false, data: data, dataType:'json', @@ -142,7 +142,7 @@ var data = new FormData(prohibitForm); $.ajax({ type: "POST", - url: "/offedu/uss/ion/cnf/prohiCheckAjax.do", + url:"", async:false, data: data, dataType:'json', diff --git a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp index d7612bea..e4f60b01 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp @@ -290,7 +290,7 @@ function bbsExcelDownload(){ - + @@ -298,7 +298,7 @@ function bbsExcelDownload(){ - + @@ -339,11 +339,11 @@ function bbsExcelDownload(){   - + - + ', '');"> @@ -359,7 +359,7 @@ function bbsExcelDownload(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/cop/cmt/EgovArticleCommentList.jsp b/src/main/webapp/WEB-INF/jsp/cop/cmt/EgovArticleCommentList.jsp index e2ce3eef..2d4755a3 100644 --- a/src/main/webapp/WEB-INF/jsp/cop/cmt/EgovArticleCommentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/cop/cmt/EgovArticleCommentList.jsp @@ -55,7 +55,7 @@
--%>
- 댓글 아이콘 + 댓글 아이콘

댓글 개

<%--
    diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp index ea2f2324..dffc5edd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctMngReg.jsp @@ -41,7 +41,7 @@ $.ajax({ method : "GET", - url : "/offedu/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctRegCodeAjax.do", + url:"", async : false, data : { "codeDc" : pram diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/cnt/cntManageInsert.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/cnt/cntManageInsert.jsp index a493d7d3..b4742723 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/cnt/cntManageInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/cnt/cntManageInsert.jsp @@ -83,7 +83,7 @@ function ckeditorPriview() { //미리보기 var vFrom = document.cntManageVO; vFrom.target = 'ckeditorPriview'; vFrom.method ="post"; - vFrom.action = "/offedu/web/ckeditorPriview.do"; + vFrom.action = ""; vFrom.submit(); } diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp index c4b332a2..4b30d780 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeList.jsp @@ -112,8 +112,9 @@ var _searchYear = "${boardVO.searchYear}";

    ${brdMstrVO.bbsNm}

    - - + c:url value='/web/ckeditorPriview.do' /> + +
    @@ -259,7 +260,7 @@ var _searchYear = "${boardVO.searchYear}"; - 첨부파일 있음 + 첨부파일 있음 @@ -306,7 +307,7 @@ var _searchYear = "${boardVO.searchYear}"; - 첨부파일 있음 + 첨부파일 있음 @@ -360,7 +361,7 @@ var _searchYear = "${boardVO.searchYear}"; 첨부 - 첨부파일 있음 + 첨부파일 있음 @@ -422,7 +423,7 @@ var _searchYear = "${boardVO.searchYear}";
  • 첨부 - 첨부파일 있음 + 첨부파일 있음
    • diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 9786208e..377ec137 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -186,7 +186,7 @@ function instrChk(){

    찾아가는 저작권 교육!

    편리하고 안전한 저작권 이용환경 조성을 통해
    올바른 저작권 문화 구축에 앞장서겠습니다.     - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 82fa5333..8c0de2ef 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -107,7 +107,7 @@ $.ajax({ method : "GET", - url : "/offedu/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctRegCodeAjax.do", + url : "", async : false, data : { "codeDc" : pram @@ -704,7 +704,7 @@
" class="time" name="strtTm" title="시작 시간 입력"> - +

시간 선택

@@ -764,7 +764,7 @@
" class="time" name="endTm" title="종료 시간 입력"> - +

시간 선택

@@ -846,7 +846,7 @@
- +

시간 선택

@@ -905,7 +905,7 @@
- +

시간 선택

@@ -977,7 +977,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index cebac82c..a6b8b18d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -299,8 +299,8 @@ ""+ ""+ ""+ - ""+ - " +
<%-- 등록일 경우에만 노출 --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp index 282efbe4..9cb435e3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp @@ -968,7 +968,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 " class="time" name="strtTm" title="시작 시간"> - +

시간 선택

@@ -1030,7 +1030,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 " class="time" name="endTm" title="종료 시간"> - +

시간 선택

@@ -1110,7 +1110,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
- +

시간 선택

@@ -1169,7 +1169,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
- +

시간 선택

@@ -1247,7 +1247,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크 - +
<%-- 등록일 경우에만 노출 --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp index d07eed2b..a23db01d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp @@ -261,8 +261,8 @@ ""+ ""+ ""+ - ""+ - "